Merge branch 'develop'

BCSDLab · May 10, 2024 · 33bdf5c · 33bdf5c
2 parents 96c86f1 + 07de92d
commit 33bdf5c
Show file tree

Hide file tree

Showing 187 changed files with 6,621 additions and 1,294 deletions.
diff --git a/.github/workflows/CHECK_PR_MERGED.yml b/.github/workflows/CHECK_PR_MERGED.yml
@@ -0,0 +1,26 @@
+on:
+  pull_request:
+    types: closed
+
+jobs:
+  check_pr_merged:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Check PR Merged
+        id: check_pr_merged
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const prUrl = context.payload.pull_request.html_url ?? context.payload.pull_request._links.html.href;
+            core.setOutput('pullRequestLink', JSON.stringify(prUrl));
+      - name: Send Slack Trigger
+        run: |
+          curl -X POST https://api-slack.internal.bcsdlab.com/api/pr-merged/frontend \
+          -H 'Content-Type: application/json' \
+          -d '{
+                "pullRequestLink": ${{ steps.check_pr_merged.outputs.pullRequestLink }}
+              }'
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@types-gtag.js-npm-0.0.19-8d50f84a08-7ecd5ae645.zip b/.yarn/cache/@types-gtag.js-npm-0.0.19-8d50f84a08-7ecd5ae645.zip
diff --git a/.yarn/cache/@types-quill-npm-1.3.10-4ddf84ba7e-e629157d11.zip b/.yarn/cache/@types-quill-npm-1.3.10-4ddf84ba7e-e629157d11.zip
diff --git a/.yarn/cache/clone-npm-2.1.2-1d491c6629-aaf106e9bc.zip b/.yarn/cache/clone-npm-2.1.2-1d491c6629-aaf106e9bc.zip
diff --git a/.yarn/cache/dayjs-npm-1.11.10-2b4382efc1-a6b5a3813b.zip b/.yarn/cache/dayjs-npm-1.11.10-2b4382efc1-a6b5a3813b.zip
diff --git a/.yarn/cache/deep-equal-npm-1.1.2-3af5068c14-2d50f27fff.zip b/.yarn/cache/deep-equal-npm-1.1.2-3af5068c14-2d50f27fff.zip
diff --git a/.yarn/cache/dom-serializer-npm-2.0.0-378ebc7200-cd1810544f.zip b/.yarn/cache/dom-serializer-npm-2.0.0-378ebc7200-cd1810544f.zip
diff --git a/.yarn/cache/domhandler-npm-5.0.3-3ede73dc10-0f58f4a6af.zip b/.yarn/cache/domhandler-npm-5.0.3-3ede73dc10-0f58f4a6af.zip
diff --git a/.yarn/cache/domutils-npm-3.1.0-66c92ef7eb-e5757456dd.zip b/.yarn/cache/domutils-npm-3.1.0-66c92ef7eb-e5757456dd.zip
diff --git a/.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip b/.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip
diff --git a/.yarn/cache/eventemitter3-npm-2.0.3-71d4ac3a65-dfbf4a0714.zip b/.yarn/cache/eventemitter3-npm-2.0.3-71d4ac3a65-dfbf4a0714.zip
diff --git a/.yarn/cache/extend-npm-3.0.2-e1ca07ac54-a50a8309ca.zip b/.yarn/cache/extend-npm-3.0.2-e1ca07ac54-a50a8309ca.zip
diff --git a/.yarn/cache/fast-diff-npm-1.1.2-907d4b29ef-2ef726603e.zip b/.yarn/cache/fast-diff-npm-1.1.2-907d4b29ef-2ef726603e.zip
diff --git a/.yarn/cache/fsevents-patch-21ad2b1333-8.zip b/.yarn/cache/fsevents-patch-21ad2b1333-8.zip
diff --git a/.yarn/cache/html-dom-parser-npm-5.0.8-6f09317bfc-f264d58665.zip b/.yarn/cache/html-dom-parser-npm-5.0.8-6f09317bfc-f264d58665.zip
diff --git a/.yarn/cache/html-react-parser-npm-5.1.10-887458c19c-b304921bd0.zip b/.yarn/cache/html-react-parser-npm-5.1.10-887458c19c-b304921bd0.zip
diff --git a/.yarn/cache/htmlparser2-npm-9.1.0-5ef8394060-e5f8d51939.zip b/.yarn/cache/htmlparser2-npm-9.1.0-5ef8394060-e5f8d51939.zip
diff --git a/.yarn/cache/inline-style-parser-npm-0.2.3-b8a7023d7a-ed6454de80.zip b/.yarn/cache/inline-style-parser-npm-0.2.3-b8a7023d7a-ed6454de80.zip
diff --git a/.yarn/cache/parchment-npm-1.1.4-a3bac35728-4799756742.zip b/.yarn/cache/parchment-npm-1.1.4-a3bac35728-4799756742.zip
diff --git a/.yarn/cache/quill-delta-npm-3.6.3-3ae240a64d-e62ed33983.zip b/.yarn/cache/quill-delta-npm-3.6.3-3ae240a64d-e62ed33983.zip
diff --git a/.yarn/cache/quill-npm-1.3.7-c79f7446fc-db3e265a84.zip b/.yarn/cache/quill-npm-1.3.7-c79f7446fc-db3e265a84.zip
diff --git a/.yarn/cache/react-property-npm-2.0.2-55c6f95f6b-c67fb2590d.zip b/.yarn/cache/react-property-npm-2.0.2-55c6f95f6b-c67fb2590d.zip
diff --git a/.yarn/cache/react-quill-npm-2.0.0-f2d141fe1d-568e28656a.zip b/.yarn/cache/react-quill-npm-2.0.0-f2d141fe1d-568e28656a.zip
diff --git a/.yarn/cache/style-to-js-npm-1.1.12-55adf1b7c2-8c66706981.zip b/.yarn/cache/style-to-js-npm-1.1.12-55adf1b7c2-8c66706981.zip
diff --git a/.yarn/cache/style-to-object-npm-1.0.6-b50013e448-5b58295dcc.zip b/.yarn/cache/style-to-object-npm-1.0.6-b50013e448-5b58295dcc.zip
diff --git a/package.json b/package.json
@@ -9,15 +9,19 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "^13.2.1",
+    "@types/gtag.js": "^0.0.19",
     "@types/jest": "^27.0.1",
     "@types/node": "^16.7.13",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "assert": "^2.1.0",
     "axios": "^1.3.4",
+    "dayjs": "^1.11.10",
+    "html-react-parser": "^5.1.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.43.9",
+    "react-quill": "^2.0.0",
     "react-router-dom": "^6.9.0",
     "react-scripts": "5.0.1",
     "react-toastify": "^10.0.4",

diff --git a/public/index.html b/public/index.html
@@ -23,12 +23,18 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>코인 - 사장님용</title>
+    <title>코인 - 비즈니스</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <script type="text/javascript" src="https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=%REACT_APP_NAVER_MAPS_CLIENT_ID%"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', '%REACT_APP_GOOGLE_ANALYTICS_ID%');
+    </script>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,44 +1,89 @@
-import { Routes, Route } from 'react-router-dom';
-import DefaultLayout from 'layout/DefaultLayout';
+import {
+  Routes, Route, Navigate, Outlet,
+} from 'react-router-dom';
+import OwnerLayout from 'layout/OwnerLayout';
+import CoopLayout from 'layout/CoopLayout';
 import Login from 'page/Auth/Login';
 import Signup from 'page/Auth/Signup';
 import FindPassword from 'page/Auth/FindPassword/SendAuthNumber';
 import NewPassword from 'page/Auth/FindPassword/NewPassword';
 import CompleteChangePassword from 'page/Auth/FindPassword/CompleteChangePassword';
 import AuthLayout from 'layout/AuthLayout';
-import MyStorePage from 'page/MyShopPage';
+import MyShopPage from 'page/MyShopPage';
 import ShopRegistration from 'page/ShopRegistration';
 import AddMenu from 'page/AddMenu';
 import PageNotFound from 'page/Error/PageNotFound';
 import ModifyMenu from 'page/ModifyMenu';
 import { Suspense } from 'react';
 import Toast from 'component/common/Toast';
+import { UserType } from 'model/auth';
+import Coop from 'page/Coop';
+import useUserTypeStore from 'store/useUserTypeStore';
+import AddingEvent from 'page/ManageEvent/AddingEvent';
+import ModifyEvent from 'page/ManageEvent/ModifyEvent';
+import LogPage from 'component/common/PageLog';
+
+interface ProtectedRouteProps {
+  userTypeRequired: UserType;
+}
+
+function ProtectedRoute({ userTypeRequired }: ProtectedRouteProps) {
+  const { userType, updateUserType } = useUserTypeStore();
+  updateUserType();
+
+  if (userType !== userTypeRequired) {
+    if (userType === 'OWNER') {
+      return <Navigate to="/owner" replace />;
+    }
+    if (userType === 'COOP') {
+      return <Navigate to="/coop" replace />;
+    }
+    if (userType === null) {
+      return <Navigate to="/login" replace />;
+    }
+  }
+
+  return <Outlet />;
+}
 
 function App() {
   return (
     <Suspense fallback={<div />}>
       <Routes>
-        <Route path="/" element={<DefaultLayout />}>
-          <Route path="/" element={<MyStorePage />} />
-          <Route path="/store-registration" element={<ShopRegistration />} />
-          <Route path="/add-menu" element={<AddMenu />} />
-          <Route path="/modify-menu/:menuId" element={<ModifyMenu />} />
-          <Route path="/modify-info" element={<PageNotFound />} />
-          <Route path="/menu-management" element={<PageNotFound />} />
-          <Route path="/order-management" element={<PageNotFound />} />
-          <Route path="/sales-management" element={<PageNotFound />} />
-          <Route path="/shop-add" element={<PageNotFound />} />
+        <Route path="/" element={<Navigate to="/owner" />} />
+        <Route element={<ProtectedRoute userTypeRequired="OWNER" />}>
+          <Route path="/owner" element={<OwnerLayout />}>
+            <Route path="/owner" element={<MyShopPage />} />
+            <Route path="/owner/shop-registration" element={<ShopRegistration />} />
+            <Route path="/owner/add-menu" element={<AddMenu />} />
+            <Route path="/owner/modify-menu/:menuId" element={<ModifyMenu />} />
+            <Route path="/owner/modify-info" element={<PageNotFound />} />
+            <Route path="/owner/menu-management" element={<PageNotFound />} />
+            <Route path="/owner/order-management" element={<PageNotFound />} />
+            <Route path="/owner/sales-management" element={<PageNotFound />} />
+            <Route path="/owner/event-add/:id" element={<AddingEvent />} />
+            <Route path="/owner/event-modify/:id" element={<ModifyEvent />} />
+          </Route>
         </Route>
+        <Route element={<ProtectedRoute userTypeRequired="COOP" />}>
+          <Route path="/coop" element={<CoopLayout />}>
+            <Route path="/coop" element={<Coop />} />
+          </Route>
+        </Route>
+
         <Route element={<AuthLayout />}>
-          <Route path="/login" element={<Login />} />
-          <Route path="/signup" element={<Signup />} />
-          <Route path="/find-id" element={<PageNotFound />} />
-          <Route path="/find-password" element={<FindPassword />} />
+          <Route element={<ProtectedRoute userTypeRequired={null} />}>
+            <Route path="/login" element={<Login />} />
+            <Route path="/signup" element={<Signup />} />
+            <Route path="/find-id" element={<PageNotFound />} />
+            <Route path="/find-password" element={<FindPassword />} />
+          </Route>
           <Route path="/new-password" element={<NewPassword />} />
           <Route path="/complete-change-password" element={<CompleteChangePassword />} />
         </Route>
       </Routes>
       <Toast />
+      <LogPage />
     </Suspense>
   );
 }

diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
@@ -1,8 +1,7 @@
 import { accessClient, client } from 'api';
-import { LoginParams, LoginResponse, UserResponse } from 'model/auth';
-// import {
-//   LoginParams, LoginResponse, UserResponse,
-// } from 'api/auth/model';
+import {
+  LoginParams, LoginResponse, OwnerResponse, UserTypeResponse,
+} from 'model/auth';
 
 export const postLogin = async (param: LoginParams) => {
   const { data } = await client.post<LoginResponse>('/user/login', param);
@@ -11,9 +10,14 @@ export const postLogin = async (param: LoginParams) => {
 
 export const postLogout = () => accessClient.post('/user/logout');
 
-export const getMe = async () => {
-  const { data } = await accessClient.get<UserResponse>('/owner');
-  return UserResponse.parse(data);
+export const getUserType = async () => {
+  const { data } = await accessClient.get<UserTypeResponse>('/user/auth');
+  return UserTypeResponse.parse(data);
+};
+
+export const getOwnerInfo = async () => {
+  const { data } = await accessClient.get<OwnerResponse>('/owner');
+  return OwnerResponse.parse(data);
 };
 
 export const findPasswordVerify = ({ email }: { email: string }) => client.post('/owners/password/reset/verification', { address: email });

diff --git a/src/api/category/index.ts b/src/api/category/index.ts
@@ -1,9 +1,9 @@
 import { accessClient } from 'api';
-import { StoreCategory } from 'model/category/storeCategory';
+import { ShopCategory } from 'model/category/shopCategory';
 
 const getShopCategory = async () => {
-  const { data } = await accessClient.get<StoreCategory>('/shops/categories');
-  return StoreCategory.parse(data);
+  const { data } = await accessClient.get<ShopCategory>('/shops/categories');
+  return ShopCategory.parse(data);
 };
 
 export default getShopCategory;
diff --git a/src/api/coop/index.ts b/src/api/coop/index.ts
@@ -0,0 +1,20 @@
+import { accessClient } from 'api';
+import { CoopResponse, DiningImages, SoldOut } from 'model/Coop';
+
+export const getDining = async (date: string) => {
+  const { data } = await accessClient.get(`/dinings?date=${date}`);
+  return data;
+};
+
+export const uploadDiningImage = async (data: DiningImages) => {
+  await accessClient.patch<DiningImages>('/coop/dining/image', data);
+};
+
+export const updateSoldOut = async (data: SoldOut) => {
+  await accessClient.patch<SoldOut>('/coop/dining/soldout', data);
+};
+
+export const getCoopInfo = async () => {
+  const { data } = await accessClient.get<CoopResponse>('/user/coop/me');
+  return CoopResponse.parse(data);
+};
diff --git a/src/api/shop/index.ts b/src/api/shop/index.ts
@@ -1,9 +1,12 @@
-import { MyShopListRes, MyShopInfoRes, MyShopParam } from 'model/shopInfo/myShopInfo';
+import {
+  MyShopListRes, MyShopInfoRes, MyShopParam, EventListParam, ShopEventResponse,
+} from 'model/shopInfo/myShopInfo';
 import { MonoMenu, MenuInfoRes } from 'model/shopInfo/menuCategory';
 import { ShopListRes } from 'model/shopInfo/allShopInfo';
 import { accessClient, client } from 'api';
 import { OwnerShop } from 'model/shopInfo/ownerShop';
 import { NewMenu } from 'model/shopInfo/newMenu';
+import { EventInfo } from 'model/shopInfo/event';
 
 export const getMyShopList = async () => {
   const { data } = await accessClient.get<MyShopListRes>('/owner/shops');
@@ -39,3 +42,20 @@ export const modifyMenu = (menuId:number, param:NewMenu) => accessClient.put(`/o
 export const putShop = (id: number, data: OwnerShop) => accessClient.put(`/owner/shops/${id}`, data);
 
 export const deleteMenu = (menuId:number) => accessClient.delete(`/owner/shops/menus/${menuId}`);
+
+export const getShopEventList = async (param : EventListParam) => {
+  const { data } = await accessClient.get<ShopEventResponse>(`/owner/shops/${param.id}/event`);
+  return ShopEventResponse.parse(data);
+};
+export const addEvent = (id: string, eventInfo: EventInfo) => accessClient.post(`owner/shops/${id}/event`, eventInfo);
+
+export const deleteEvent = (shopId: number, eventId:number) => accessClient.delete(`owner/shops/${shopId}/events/${eventId}`);
+
+export const modifyEvent = (
+  shopId: number,
+  eventId: number,
+  eventInfo: EventInfo,
+) => accessClient.put(
+  `/owner/shops/${shopId}/events/${eventId}`,
+  eventInfo,
+);
diff --git a/src/api/uploadFile/Uploadfile.ts → src/api/uploadFile/index.ts b/src/api/uploadFile/Uploadfile.ts → src/api/uploadFile/index.ts
@@ -1,9 +1,23 @@
 import { accessClient } from 'api';
 
+interface File {
+  content_length: number;
+  content_type: string;
+  file_name: string;
+}
+
+export interface FileResponse {
+  pre_signed_url: string;
+  file_url: string;
+  expiration_date: string;
+}
+
 export const uploadFile = (formData: FormData) => accessClient.post('/OWNERS/upload/file', formData, {
   headers: { 'Content-Type': 'multipart/form-data' },
 }).catch((error) => Promise.reject(error));
 
 export const uploadFiles = (formData: FormData) => accessClient.post('/OWNERS/upload/files', formData, {
   headers: { 'Content-Type': 'multipart/form-data' },
 });
+
+export const getCoopUrl = (fileName: File) => accessClient.post<FileResponse>('/coop/upload/url', fileName);
diff --git a/src/assets/svg/common/cancel.svg b/src/assets/svg/common/cancel.svg
diff --git a/src/assets/svg/common/checkbox.svg b/src/assets/svg/common/checkbox.svg
diff --git a/src/assets/svg/common/picture-disable.svg b/src/assets/svg/common/picture-disable.svg
diff --git a/src/assets/svg/common/picture.svg b/src/assets/svg/common/picture.svg