Merge branch 'develop' of https://github.com/potato-club/develop-orde…

…r-service into develop
potato-club · May 9, 2023 · 56c2e0e · 56c2e0e
2 parents b515989 + 9e4b7b4
commit 56c2e0e
Show file tree

Hide file tree

Showing 27 changed files with 1,046 additions and 230 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,13 +34,18 @@
     "react-hook-form": "^7.43.0",
     "react-icons": "^4.7.1",
     "react-intersection-observer": "^9.4.3",
+    "react-modal": "^3.16.1",
     "react-phone-number-input": "^3.2.17",
+    "react-query": "^3.39.3",
     "react-scroll": "^1.8.9",
     "react-scroll-wheel-handler": "^2.2.0",
     "react-transition-group": "^4.4.5",
     "recoil": "^0.7.7",
     "styled-components": "^5.3.6",
     "swiper": "^9.0.4",
     "typescript": "4.9.4"
+  },
+  "devDependencies": {
+    "@types/react-modal": "^3.13.1"
   }
 }
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -1,18 +1,21 @@
 import styled from "styled-components";
+import Router from "next/router";
 import { GlobalStyle } from "../styles/global.style";
 import type { AppProps } from "next/app";
-import { Header } from "../src/components/header/Header";
-import { Footer } from "../src/components/footer/Footer";
 import { Layout } from "../src/components/layout/Layout";
 import { RecoilRoot } from "recoil";
-import { ScrollCSS } from "../src/components/layout/ScrollCSS";
+import { QueryClient, QueryClientProvider } from "react-query";
 
 export default function App({ Component, pageProps }: AppProps) {
+  const queryClient = new QueryClient();
+
   return (
     <RecoilRoot>
-      <Layout>
-        <Component {...pageProps} />
-      </Layout>
+      <QueryClientProvider client={queryClient}>
+        <Layout>
+          <Component {...pageProps} />
+        </Layout>
+      </QueryClientProvider>
     </RecoilRoot>
   );
 }
diff --git a/pages/admin/index.tsx b/pages/admin/index.tsx
@@ -0,0 +1,8 @@
+import type { NextPage } from "next";
+import { AdminPage } from "../../src/components";
+
+const Admin: NextPage = () => {
+  return <AdminPage />;
+};
+
+export default Admin;
diff --git a/pages/admin/login/index.tsx b/pages/admin/login/index.tsx
@@ -0,0 +1,8 @@
+import type { NextPage } from "next";
+import { AdminLoginPage } from "../../../src/components";
+
+const AdminLogin: NextPage = () => {
+  return <AdminLoginPage />;
+};
+
+export default AdminLogin;
diff --git a/src/apis/api.ts b/src/apis/api.ts
@@ -1,14 +1,13 @@
-import axios from 'axios';
-import applyDefaultParams from './applyDefaultParams';
+import axios from "axios";
+import applyDefaultParams from "./applyDefaultParams";
 
 import normalizeAxiosError, {
   SERVER_ERROR,
   TIMEOUT_ERROR,
   NETWORK_ERROR,
   CLIENT_ERROR,
   UNAUTH_ERROR,
-} from './normalizeAxiosError';
-import { settings } from '@street-vendor/core';
+} from "./normalizeAxiosError";
 
 const API_TIMEOUT = 50000; // 50s
 
@@ -19,13 +18,13 @@ const api = axios.create({
 });
 
 function getBaseUrl() {
-  return settings.api.baseUrl;
+  return "http://localhost:8080";
 }
 
 api.interceptors.request.use(applyDefaultParams);
 api.interceptors.response.use(undefined, normalizeAxiosError);
 api.interceptors.response.use(undefined, function (err) {
-  console.log('ERR :: ', err);
+  console.log("ERR :: ", err);
 
   if (err.code === TIMEOUT_ERROR || err.code === NETWORK_ERROR) {
     //

diff --git a/src/apis/controller/signUp.api.ts b/src/apis/controller/signUp.api.ts
@@ -0,0 +1,12 @@
+import sendApi from "../sendApi";
+
+export const SignUpApi = {
+  registerSignUp: async (data: FormData) => {
+    const response = await sendApi.post("/orders", data);
+    return response.data;
+  },
+  loadMeetings: async () => {
+    const response = await sendApi.get("/orders/meeting");
+    return response.data;
+  },
+};
diff --git a/src/apis/normalizeAxiosError.ts b/src/apis/normalizeAxiosError.ts
@@ -1,17 +1,17 @@
-import { sessionService } from '../libs/sessionService';
-import axios from 'axios';
+import { tokenService } from "../libs/tokenService";
+import axios from "axios";
 
-export const UNAUTH_ERROR = 'UNAUTH_ERROR';
-export const CLIENT_ERROR = 'CLIENT_ERROR';
-export const SERVER_ERROR = 'SERVER_ERROR';
-export const CANCEL_ERROR = 'CANCEL_ERROR';
-export const TIMEOUT_ERROR = 'TIMEOUT_ERROR';
-export const NETWORK_ERROR = 'NETWORK_ERROR';
-export const UNKNOWN_ERROR = 'UNKNOWN_ERROR';
+export const UNAUTH_ERROR = "UNAUTH_ERROR";
+export const CLIENT_ERROR = "CLIENT_ERROR";
+export const SERVER_ERROR = "SERVER_ERROR";
+export const CANCEL_ERROR = "CANCEL_ERROR";
+export const TIMEOUT_ERROR = "TIMEOUT_ERROR";
+export const NETWORK_ERROR = "NETWORK_ERROR";
+export const UNKNOWN_ERROR = "UNKNOWN_ERROR";
 
 function xhrError({ code, status = 0, data = {} }: any) {
   const err: any = new Error();
-  err.name = 'XhrError';
+  err.name = "XhrError";
   err.message = err.code = code;
   err.data = data;
   err.status = status;
@@ -20,7 +20,7 @@ function xhrError({ code, status = 0, data = {} }: any) {
 
 export default function normalizeAxiosError(error: any) {
   // timeout
-  if (error.code === 'ECONNABORTED') {
+  if (error.code === "ECONNABORTED") {
     return xhrError({
       code: TIMEOUT_ERROR,
     });
@@ -37,8 +37,8 @@ export default function normalizeAxiosError(error: any) {
   // service error, 400 401 404 500 502...
   if (error.response) {
     if ([401, 423].includes(error.response.status)) {
-      sessionService.resetIdSession();
-      location.replace('/login?warn');
+      // tokenService.resetToken();
+      location.replace("/login?warn");
 
       return xhrError({
         code: UNAUTH_ERROR,

diff --git a/src/apis/sendApi.ts b/src/apis/sendApi.ts
@@ -1,85 +1,85 @@
-import { sessionService } from "../libs/sessionService";
+import { tokenService } from "../libs/tokenService";
 import api from "./api";
 
 // eslint-disable-next-line import/no-anonymous-default-export
 export default {
   get: async (url: string, params?: any) => {
-    const idSession = await sessionService.getIdSession();
+    const token = await tokenService.getToken();
 
     return params !== undefined
       ? api({
           url: url,
           method: "get",
           params: params,
           headers: {
-            Authorization: `${idSession}`,
+            Authorization: `${token}`,
           },
         })
       : api({
           url: url,
           method: "get",
           headers: {
-            Authorization: `${idSession}`,
+            Authorization: `${token}`,
           },
         });
   },
   post: async (url: string, params: any) => {
-    const idSession = await sessionService.getIdSession();
+    const token = await tokenService.getToken();
 
     return params !== undefined
       ? api({
           url: url,
           method: "post",
           data: params,
           headers: {
-            Authorization: `${idSession}`,
+            Authorization: `${token}`,
           },
         })
       : api({
           url: url,
           method: "post",
           headers: {
-            Authorization: `${idSession}`,
+            Authorization: `${token}`,
           },
         });
   },
   put: async (url: string, params: any) => {
-    const idSession = await sessionService.getIdSession();
+    const token = await tokenService.getToken();
 
     return params !== undefined
       ? api({
           url: url,
           method: "put",
           params: params,
           headers: {
-            Authorization: `${idSession}`,
+            Authorization: `${token}`,
           },
         })
       : api({
           url: url,
           method: "put",
           headers: {
-            Authorization: `${idSession}`,
+            Authorization: `${token}`,
           },
         });
   },
   delete: async (url: string, params?: any) => {
-    const idSession = await sessionService.getIdSession();
+    const token = await tokenService.getToken();
 
     return params !== undefined
       ? api({
           url: url,
           method: "delete",
           data: params,
           headers: {
-            Authorization: `${idSession}`,
+            Authorization: `${token}`,
           },
         })
       : api({
           url: url,
           method: "delete",
           headers: {
-            Authorization: `${idSession}`,
+            Authorization: `${token}`,
           },
         });
   },