Merge branch 'main' into #114/dept/reserve-api

public/favicon/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

public/favicon/manifest.json

@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

public/index.html

@@ -8,11 +8,24 @@
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
 
   <!-- Favicon -->
-  <link rel="icon" href="%PUBLIC_URL%/favicon/favicon.ico">
-  <link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon/favicon-16x16.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/favicon/favicon-32x32.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/favicon/apple-touch-icon.png">
-
+  <link rel="apple-touch-icon" sizes="57x57" href="/favicon/apple-icon-57x57.png">
+  <link rel="apple-touch-icon" sizes="60x60" href="/favicon/apple-icon-60x60.png">
+  <link rel="apple-touch-icon" sizes="72x72" href="/favicon/apple-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="/favicon/apple-icon-76x76.png">
+  <link rel="apple-touch-icon" sizes="114x114" href="/favicon/apple-icon-114x114.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="/favicon/apple-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="/favicon/apple-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="/favicon/apple-icon-152x152.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-icon-180x180.png">
+  <link rel="icon" type="image/png" sizes="192x192"  href="/favicon/android-icon-192x192.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="/favicon/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
+  <link rel="manifest" href="/favicon/manifest.json">
+  <meta name="msapplication-TileColor" content="#ffffff">
+  <meta name="msapplication-TileImage" content="/favicon/ms-icon-144x144.png">
+  <meta name="theme-color" content="#ffffff">
+
   <!-- Using Google Font -->
   <link rel="preconnect" href="https://fonts.googleapis.com" />
   <link rel="preconnect" href="https://fonts.gstatic.com" />

src/_mock/_reserve.ts

@@ -9,33 +9,21 @@ export const RESERVE_STATUS_OPTIONS = [
   { value: '자동취소', label: '자동취소' },
 ];
 
-const ITEMS = [...Array(3)].map((_, index) => ({
+export const _reserve = [...Array(0)].map((_, index) => ({
   id: _mock.id(index),
-  sku: `16H9UR${index}`,
-  quantity: index + 1,
-  name: _mock.productName(index),
-  coverUrl: _mock.image.product(index),
-  price: _mock.number.price(index),
+  spaceName: _mock.spaceName(index),
+  useDate: _mock.useDate(index),
+  startTime: _mock.startTime(index),
+  endTime: _mock.endTime(index),
+  user: _mock.fullName(index),
+  purpose: _mock.purpose(index),
+  // shippingAddress: {
+  //   fullAddress: '19034 Verna Unions Apt. 164 - Honolulu, RI / 87535',
+  //   phoneNumber: '365-374-4961',
+  // },
+  // payment: {
+  //   cardType: 'mastercard',
+  //   cardNumber: '**** **** **** 5678',
+  // },
+  status: (index % 2 && '승인') || (index % 3 && '미승인') || (index % 4 && '거절') || '자동취소',
 }));
-
-export const _reserve = [...Array(0)].map((_, index) => {
-  const createAt = new Date();
-  return {
-    id: _mock.id(index),
-    spaceName: _mock.spaceName(index),
-    useDate: _mock.useDate(index),
-    startTime: _mock.startTime(index),
-    endTime: _mock.endTime(index),
-    user: _mock.fullName(index),
-    purpose: _mock.purpose(index),
-    // shippingAddress: {
-    //   fullAddress: '19034 Verna Unions Apt. 164 - Honolulu, RI / 87535',
-    //   phoneNumber: '365-374-4961',
-    // },
-    // payment: {
-    //   cardType: 'mastercard',
-    //   cardNumber: '**** **** **** 5678',
-    // },
-    status: (index % 2 && '승인') || (index % 3 && '미승인') || (index % 4 && '거절') || '자동취소',
-  };
-});

src/api/reserveApi.ts

@@ -1,7 +1,6 @@
 import axiosInstance, { endpoints } from 'src/utils/axios';
 import { ICalendarEvent } from 'src/types/calendar';
 import { palette as themePalette } from 'src/theme/palette';
-import { isEmpty } from 'lodash';
 import { DailyReserveAdd, RegularReserveAdd } from 'src/types/reserve';
 
 const palette = themePalette('light');

src/auth/context/jwt/auth-provider.tsx

@@ -30,9 +30,8 @@ type Payload = {
   [Types.LOGIN]: {
     user: AuthUserType;
   };
-  [Types.REGISTER]: {
-    user: AuthUserType;
-  };
+  [Types.REGISTER]: undefined;
+
   [Types.LOGOUT]: undefined;
 };
 
@@ -61,7 +60,7 @@ const reducer = (state: AuthStateType, action: ActionsType) => {
   if (action.type === Types.REGISTER) {
     return {
       ...state,
-      user: action.payload.user,
+      user: null,
     };
   }
   if (action.type === Types.LOGOUT) {
@@ -154,28 +153,23 @@ export function AuthProvider({ children }: Props) {
 
   // REGISTER
   const register = useCallback(
-    async (email: string, password: string, firstName: string, lastName: string) => {
+    async (name: string, s_id: string, deptName: string, email: string, password: string) => {
       const data = {
+        name,
+        s_id,
+        deptName,
         email,
         password,
-        firstName,
-        lastName,
       };
 
-      const res = await axiosInstance.post(endpoints.auth.register, data);
+      await axiosInstance.post(endpoints.auth.register, data);
 
-      const { accessToken, user } = res.data;
+      // const { accessToken, user } = res.data;
 
-      sessionStorage.setItem(STORAGE_KEY, accessToken);
+      // sessionStorage.setItem(STORAGE_KEY, accessToken);
 
       dispatch({
         type: Types.REGISTER,
-        payload: {
-          user: {
-            ...user,
-            accessToken,
-          },
-        },
       });
     },
     []

src/auth/types.ts

@@ -26,10 +26,11 @@ export type AuthStateType = {
 type CanRemove = {
   login?: (email: string, password: string) => Promise<void>;
   register?: (
+    name: string,
+    s_id: string,
+    deptName: string,
     email: string,
-    password: string,
-    firstName: string,
-    lastName: string
+    password: string
   ) => Promise<void>;
   //
   loginWithGoogle?: () => Promise<void>;
@@ -52,7 +53,13 @@ export type JWTContextType = CanRemove & {
   authenticated: boolean;
   unauthenticated: boolean;
   login: (email: string, password: string) => Promise<void>;
-  register: (email: string, password: string, firstName: string, lastName: string) => Promise<void>;
+  register: (
+    name: string,
+    s_id: string,
+    deptName: string,
+    email: string,
+    password: string
+  ) => Promise<void>;
   logout: () => Promise<void>;
 };
 
@@ -68,7 +75,13 @@ export type FirebaseContextType = CanRemove & {
   loginWithTwitter: () => Promise<void>;
   forgotPassword?: (email: string) => Promise<void>;
   login: (email: string, password: string) => Promise<void>;
-  register: (email: string, password: string, firstName: string, lastName: string) => Promise<void>;
+  register: (
+    name: string,
+    s_id: string,
+    deptName: string,
+    email: string,
+    password: string
+  ) => Promise<void>;
 };
 
 export type AmplifyContextType = CanRemove & {
@@ -79,10 +92,11 @@ export type AmplifyContextType = CanRemove & {
   unauthenticated: boolean;
   login: (email: string, password: string) => Promise<unknown>;
   register: (
+    name: string,
+    s_id: string,
+    deptName: string,
     email: string,
-    password: string,
-    firstName: string,
-    lastName: string
+    password: string
   ) => Promise<unknown>;
   logout: () => Promise<unknown>;
   confirmRegister: (email: string, code: string) => Promise<void>;

src/layouts/auth/classic.tsx

@@ -86,18 +86,6 @@ export default function AuthClassicLayout({ children, image, title }: Props) {
         {title || 'Hi, Welcome To Hanspace'}
       </Typography>
 
-      {/* <Box
-        component="img"
-        alt="auth"
-        src={image || '/assets/illustrations/illustration_dashboard.png'}
-        sx={{
-          maxWidth: {
-            xs: 480,
-            lg: 560,
-            xl: 720,
-          },
-        }}
-      /> */}
       <Box
         component="img"
         alt="auth"

src/layouts/dashboard/dept-button.tsx

@@ -199,7 +199,7 @@ export default function DeptHeaderButton() {
           onClick={(event) => handleGOAddDept(event)}
         >
           <DeptButton>
-            <Rows>
+            <Container>
               <Avatar
                 alt="+"
                 color="primary.pale"
@@ -208,7 +208,7 @@ export default function DeptHeaderButton() {
                 + {/* TODO : 아바타 이후에 수정하기  */}
               </Avatar>
               새 기관 추가하기
-            </Rows>
+            </Container>
           </DeptButton>
         </MenuItem>
       </Menu>

src/pages/auth/jwt/register.tsx

@@ -8,7 +8,7 @@ export default function RegisterPage() {
   return (
     <>
       <Helmet>
-        <title> Jwt: Register</title>
+        <title> HANSPACE: 회원가입</title>
       </Helmet>
 
       <JwtRegisterView />

src/routes/sections/auth.tsx

@@ -36,7 +36,7 @@ const authJwt = {
     {
       path: 'register',
       element: (
-        <AuthClassicLayout title="Manage the job more effectively with Minimal">
+        <AuthClassicLayout>
           <JwtRegisterPage />
         </AuthClassicLayout>
       ),

src/sections/auth/jwt/jwt-login-view.tsx

@@ -78,7 +78,7 @@ export default function JwtLoginView() {
         <Typography variant="body2">회원이 아니세요?</Typography>
 
         <Link component={RouterLink} href={paths.auth.jwt.register} variant="subtitle2">
-          회원가입
+          회원가입하기
         </Link>
       </Stack>
     </Stack>