Merge branch 'iipbs/dm/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/dm/dev

apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx

@@ -226,7 +226,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
         <LoadingOverlay isLoading={isLoadingPlanFclty} />
         <div className="grid grid-cols-12 gap-1">
           <div className="col-span-5">
-            <Table variant="secondary">
+            <Table variant="default">
               <TableHeader>
                 {upChangeRePlanFclty}
               </TableHeader>
@@ -239,7 +239,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
                       :((index === 6 || index === 7 || index === 8) && (head.id === 'now' || head.id === 'stepOne' || head.id === 'stepThree' || head.id === 'stepFour'))?
                       null
                       :((index ===  5) && (head.id === 'provisionalApproval' || head.id === 'stepTwo'))?
-                      <TableCell colSpan={3} className="text-center border border-[var(--border)] bg-[rgb(234,243,251)] text-[rgb(100,119,132)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
+                      <TableCell colSpan={3} className="text-center border border-[var(--border)] bg-[rgb(141,141,148)] !text-[rgb(255,255,255)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
                       :((index ===  5) && (head.id === 'now' || head.id === 'stepOne' || head.id === 'stepThree'|| head.id === 'stepFour'))?
                       null
                       :(index < 5 || index > 5)&& (index!= 4) && (head.id ==='provisionalApproval'||head.id ==='now'||head.id ==='stepOne'||head.id ==='stepTwo'||head.id ==='stepThree'||head.id ==='stepFour')
@@ -250,7 +250,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
                       ?null
                       :(head.id === 'item' && index != 5)?
                       <TableCell className="text-center text-[rgb(100,119,132)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
-                      :<TableCell className="text-center border border-[var(--border)] bg-[rgb(234,243,251)] text-[rgb(100,119,132)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
+                      :<TableCell className="text-center border border-[var(--border)] bg-[rgb(141,141,148)] !text-[rgb(255,255,255)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
                     ))}
                   </TableRow>
                 ))}
@@ -260,7 +260,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
           <div className="col-span-7 h-[600px] overflow-x-auto">
             <div className="w-[200%]">
               <LoadingOverlay isLoading={isLoadingOperationStatus} />
-              <Table variant="secondary">
+              <Table variant="default">
                 <TableHeader>
                   {upChangeHeadListOperationStatus}
                 </TableHeader>

apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx

@@ -1,5 +1,5 @@
 /**
- * 대시보드 - 표로보기 상단구역 페에지
+ * 대시보드 - 표로보기 상단구역 페이지
  * 
  * - 대시보드 - 표로보기의 3개의 탭 상단에 조회년도, 행정정보, 시설명의 구역을 컴포넌트
  */

apps/fo/src/app/styles/components-red.css

@@ -15,12 +15,12 @@
   }
 
   [data-theme="red"] {
-    .card-border {
+    /* .card-border {
       @apply border-[#3f4042] bg-[rgba(255,255,255,0.065)];
     }
     .card-header {
       @apply border-b-[#3f4042];
-    }
+    } */
   }
 
   input[type="file"] {

apps/wr/src/app/styles/components-black.css

@@ -15,6 +15,52 @@
   }
 
   [data-theme="black"] {
+    .card {
+        color: #fff;
+        background-color: #0a0a0a !important;
+    }
+    form {
+        color: rgb(255 255 255);
+    }
+    label {
+        color: rgb(241, 241, 241);
+    }
+    input {
+        height: 3.2rem;
+        background-color: #1a1a1a;
+        border: 1px solid #262626;
+        border-radius: 4px;
+    }
+    input.text-gray-600 {
+        color: #f1f1f1;
+    }
+    button {
+        color: #171717;
+    }
+    button[role="combobox"] {
+        color: #f1f1f1;
+        background-color: rgb(26, 26, 26);
+    }
+    div [role='tablist'] {
+        border: unset;
+        gap: 4px;
+    }
+    .tabs-trigger[data-state="inactive"] {
+        color: #a4b7bf;
+        background: #55595d;
+    }
+    .tabs-trigger[data-state="inactive"]:hover {
+        color: #6bbaff;
+        background: #4c4f52;
+    }
+    .card-border {
+        box-shadow: 0 0 10px -1px #0000000f;
+        border: 1px solid #393939;
+    }
+    a[aria-current="page"] {
+        background-color: rgb(32, 148, 250);
+        color: #000;
+    }
     .card-border {
       @apply border-[#3f4042] bg-[rgba(255,255,255,0.065)];
     }
@@ -77,6 +123,13 @@
     .gis-layer-toggle:hover {
       background: #1a1c20;
     }
+
+    .table-ui.secondary th {
+        background-color : rgb(98, 104, 109) !important;
+    }
+    .table-ui.secondary tr {
+        background-color : rgb(84, 85, 86) !important;
+    }
   }
 
   input[type="file"] {