Merge pull request #4 from FastCampusGroupFE9/KimSeongEun/adminpage

Kim seong eun/adminpage
KDT1-FE · Jul 27, 2023 · c38238e · c38238e
2 parents 7e1ae57 + 05202c7
commit c38238e
Show file tree

Hide file tree

Showing 15 changed files with 435 additions and 17 deletions.
diff --git a/src/API/dummyAPI/mypage.json b/src/API/dummyAPI/mypage.json
@@ -0,0 +1,105 @@
+[
+  {
+    "name": "고길동",
+    "annualBalance": 20,
+    "annualHistory": [
+      {
+        "id": 1,
+        "reason": "경조사 휴가",
+        "startDate": "2023-01-09",
+        "endDate": "2023-01-15",
+        "status": "결제 완료"
+      },
+      {
+        "id": 2,
+        "reason": "기타 휴가",
+        "startDate": "2023-03-10",
+        "endDate": "2023-03-20",
+        "status": "결제 완료"
+      },
+      {
+        "id": 3,
+        "reason": "병가 휴가",
+        "startDate": "2023-03-24",
+        "endDate": "2023-03-28",
+        "status": "결제 완료"
+      },
+      {
+        "id": 4,
+        "reason": "병가 휴가",
+        "startDate": "2023-02-23",
+        "endDate": "2022-02-27",
+        "status": "결제 완료"
+      },
+      {
+        "id": 5,
+        "reason": "연차유급 휴가",
+        "startDate": "2023-08-05",
+        "endDate": "2022-08-15",
+        "status": "결제 대기"
+      }
+    ],
+    "dutyHistory": [
+      {
+        "id": 1,
+        "startDate": "2023-03-10",
+        "endDate": "2023-03-10",
+        "status": "결제 대기"
+      },
+      {
+        "id": 2,
+        "startDate": "2023-01-19",
+        "endDate": "2023-01-19",
+        "status": "결제 대기"
+      }
+    ]
+  },
+  {
+    "name": "둘리",
+    "annualBalance": 15,
+    "annualHistory": [
+      {
+        "id": 1,
+        "reason": "출산 전후 휴가",
+        "startDate": "2023-03-12",
+        "endDate": "2023-06-03",
+        "status": "결제 완료"
+      },
+      {
+        "id": 2,
+        "reason": "연차유급 휴가",
+        "startDate": "2023-01-31",
+        "endDate": "2023-06-23",
+        "status": "결제 완료"
+      },
+      {
+        "id": 3,
+        "reason": "경조사 휴가",
+        "startDate": "2023-04-23",
+        "endDate": "2023-04-29",
+        "status": "결제 대기"
+      },
+      {
+        "id": 4,
+        "reason": "기타 휴가",
+        "startDate": "2023-03-17",
+        "endDate": "2023-07-15",
+        "status": "결제 대기"
+      }
+    ],
+    "dutyHistory": [
+      {
+        "id": 1,
+        "startDate": "2023-07-15",
+        "endDate": "2023-07-15",
+        "status": "결제 대기"
+      },
+      {
+        "id": 2,
+        "startDate": "2023-03-20",
+        "endDate": "2023-02-20",
+        "status": "결제 완료"
+      }
+    ]
+  }
+]
diff --git a/src/API/dummyAPI/restdayAll.json b/src/API/dummyAPI/restdayAll.json
@@ -0,0 +1,84 @@
+{
+  "response": [
+    {
+      "id": 1,
+      "name": "김아무",
+      "category": "연차",
+      "startDate": "2023-06-09",
+      "endDate": "2023-06-10",
+      "reason": "경조사 휴가"
+    },
+    {
+      "id": 2,
+      "name": "이아무",
+      "category": "연차",
+      "startDate": "2023-06-02",
+      "endDate": "2023-06-05",
+      "reason": "기타 휴가"
+    },
+    {
+      "id": 3,
+      "name": "박아무",
+      "category": "연차",
+      "startDate": "2023-10-27",
+      "endDate": "2023-10-31",
+      "reason": "병가 휴가"
+    },
+    {
+      "id": 4,
+      "name": "손아무",
+      "category": "연차",
+      "startDate": "2023-01-05",
+      "endDate": "2023-01-07",
+      "reason": "연차유급 휴가"
+    },
+    {
+      "id": 5,
+      "name": "최아무",
+      "category": "연차",
+      "startDate": "2023-03-13",
+      "endDate": "2023-03-14",
+      "reason": "병가 휴가"
+    },
+    {
+      "id": 6,
+      "name": "김이나",
+      "category": "당직",
+      "startDate": "2023-06-05",
+      "endDate": "2023-06-06",
+      "reason": "당직"
+    },
+    {
+      "id": 7,
+      "name": "이이나",
+      "category": "당직",
+      "startDate": "2023-06-15",
+      "endDate": "2023-06-16",
+      "reason": "당직"
+    },
+    {
+      "id": 8,
+      "name": "박이나",
+      "category": "당직",
+      "startDate": "2023-07-03",
+      "endDate": "2023-07-04",
+      "reason": "당직"
+    },
+    {
+      "id": 9,
+      "name": "손이나",
+      "category": "당직",
+      "startDate": "2023-06-07",
+      "endDate": "2023-06-07",
+      "reason": "당직"
+    },
+    {
+      "id": 10,
+      "name": "최이나",
+      "category": "당직",
+      "startDate": "2023-07-12",
+      "endDate": "2023-07-12",
+      "reason": "당직"
+    }
+  ]
+}
diff --git a/src/API/dummyAPI/signup.json b/src/API/dummyAPI/signup.json
@@ -0,0 +1,62 @@
+[
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$c9FhdT09lvcCb250DjLdKeX1PIQjv2TkbE.OkvfD73CwOzyoJbS9m",
+    "name": "김땡땡",
+    "join": "2023-03-27"
+  },
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$tpse8d1m7ocpBLn1prCJBOsu9So/yTi4A2TpRnt8mj/yyZyDeShG6",
+    "name": "박땡땡",
+    "join": "2022-09-15"
+  },
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$wylfBvz8hQ6ZNcTMtW39h.uLBHo.iKRuWNfWAQyaUlp5lSkqdeGGe",
+    "name": "이땡땡",
+    "join": "2022-03-31"
+  },
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$f/zPQ48GVImW7RAk8vHNX.67wKNzzjY2bVXDH3ap8GCUpjB/pSI/u",
+    "name": "송땡땡",
+    "join": "2022-09-27"
+  },
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$8siG.pXXi8jHIZ7z8VIKs.06Xmtj98XNj1y7z.lOIJFMGef6obQUC",
+    "name": "아무개",
+    "join": "2020-08-10"
+  },
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$8/2nCi3EVer5bExUbYP9N.O6PeceSVN4IebosR7Czu7cI4KJrb38O",
+    "name": "김김김",
+    "join": "2022-05-01"
+  },
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$ES3t8zrizq5kC.hKWbASJOTVA12fozc9OpAbpOxdXJ5zTHO35BY9C",
+    "name": "박박박",
+    "join": "2021-01-07"
+  },
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$DY/70RcPDcs.f4h88aWvDuR5UiQDUjltf8ZeL5Oam.xhGQEZ1/H8e",
+    "name": "송송송",
+    "join": "2020-10-22"
+  },
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$kWFZOtRWjLu7F6TVXdFDSOYvBxsIcgSIXbU3WwAGlF5dURrUHvTpy",
+    "name": "이이이",
+    "join": "2022-06-28"
+  },
+  {
+    "email": "[email protected]",
+    "password": "$2a$04$lgHZrfIsK0k6nAINt5UA7.x1C0j2/fOt2y0TgsEnLx.UBAWUCj9pS",
+    "name": "김박이",
+    "join": "2022-09-16"
+  }
+]
diff --git a/src/App.css b/src/App.css
diff --git a/src/App.scss b/src/App.scss
@@ -0,0 +1,3 @@
+.App {
+	text-align: center;
+}
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,19 +1,17 @@
 import Main from "./pages/Main/main.tsx";
-import { Route, Routes } from "react-router-dom";
 import Mypage from "./pages/Mypage/mypage.tsx";
+import Admin from "./pages/Admin/admin.tsx";
+import { Route, Routes } from "react-router-dom";
 // import ProtectedRoute from "./Components/ProtectedRoute.tsx";
-// import Admin from "./pages/Admin/admin.tsx";
-
 
 function App() {
   return (
   <Routes>
     <Route path="/" element={<Main />} />
     <Route path={'/mypage'} element={<Mypage />} />
-    {/*<Route path="/admin" */}
-    {/*       element={<ProtectedRoute adminRequired={true} element={<Admin />}*/}
+      {/* <Route path={"/admin"} element={<ProtectedRoute adminRequired={true} element={<Admin />}} /> */}
   </Routes>
   )
 }
 
-export default App
+export default App;
diff --git a/src/_variables.scss b/src/_variables.scss
@@ -0,0 +1,20 @@
+// * 키 컬러
+$main-color: #497174;
+$main-color-50: #49717475;
+$sub-color: #839ea0;
+$green-BG-color: #d6e4e5;
+$light-Green-BG-color: #eff5f5;
+
+// * 블랙 & 화이트
+$white-color: #ffffff;
+$black-color: #1f1f1f;
+$light-Grey-color: #f9fafa;
+
+// * 포인트 컬러
+$point-color: #ea613c;
+$date-rcolor: #3acab9;
+$white-orange: #feefec;
+$white-green: #eef6f1;
+
+// * 사이즈 설정
+$container-width: 1080px;
diff --git a/src/index.css b/src/index.css