Merge branch 'develop'

.github/workflows/reviewer.json

@@ -20,19 +20,14 @@
       "githubName": "daepan",
       "team" : "business"
     },
-    {
-      "name": "윤해진",
-      "githubName": "haejinyun",
-      "team" : "user"
-    },
     {
       "name": "김혜준",
       "githubName": "hyejun0228",
       "team" : "user"
     },
     {
-      "name": "김도훈",
-      "githubName": "dooohun",
+      "name": "서예진",
+      "githubName": "Yejin0070",
       "team" : "user"
     },
     {

package.json

@@ -37,6 +37,7 @@
     "react-router-dom": "^6.9.0",
     "react-scripts": "5.0.1",
     "react-toastify": "^10.0.4",
+    "react-tooltip": "^5.28.0",
     "sass": "^1.60.0",
     "typescript": "^4.4.2",
     "vite": "^5.2.12",

src/App.tsx

@@ -6,6 +6,7 @@ import AuthLayout from 'layout/AuthLayout';
 import DefaultLayout from 'layout/DefaultLayout';
 import Coop from 'pages/Coop';
 import Login from 'pages/Login';
+import Setting from 'pages/Setting';
 import { useCoopMe } from 'query/auth';
 
 function ProtectedRoute() {
@@ -29,6 +30,7 @@ function App() {
         <Route element={<DefaultLayout />}>
           <Route path="/" element={<Coop />} />
         </Route>
+        <Route path="/setting" element={<Setting />} />
       </Route>
       <Route element={<PublicRoute />}>
         <Route element={<AuthLayout />}>

src/api/dinings/index.ts

@@ -1,7 +1,16 @@
 import { accessClient } from 'api';
-import { DiningsParams, OriginalDinings } from 'models/dinings';
+import { DiningsParams, OriginalDinings, DiningExcelParams } from 'models/dinings';
 
 export const getDinings = async (date: DiningsParams) => {
   const { data } = await accessClient.get<DiningsParams>(`/dinings?date=${date}`);
   return OriginalDinings.parse(data);
 };
+
+export const getExcel = async (params: DiningExcelParams) => {
+  const response = await accessClient.get(
+    `/coop/dining/excel?startDate=${params.startDate}&endDate=${params.endDate}&isCafeteria=${params.isCafeteria}`,
+    { responseType: 'blob' },
+  );
+
+  return response;
+};

src/assets/styles/fonts.scss

@@ -1,3 +1,2 @@
 @use "./mixin.scss";
-@include mixin.font-face("NotoSansKR", "/assets/fonts/NotoSansKR-Regular", 400);
-@include mixin.font-face("NotoSansKR", "/assets/fonts/NotoSansKR-Medium", 500);
+@include mixin.font-face("Pretandard", "/assets/fonts/PretandardVariable", 400, normal);