Merge pull request #122 from delicious-algorithme/dev

dev into main
delicious-algorithme · Dec 4, 2024 · 12cf7e9 · 12cf7e9
2 parents e575e18 + 3334720
commit 12cf7e9
Show file tree

Hide file tree

Showing 50 changed files with 175 additions and 357 deletions.
diff --git a/public/Logo.svg b/public/Logo.svg
diff --git a/public/index.html b/public/index.html
@@ -3,7 +3,10 @@
     <head>
         <base href="/" />
         <meta charset="utf-8" />
-        <link rel="icon" href="%PUBLIC_URL%/Logo.svg" />
+        <link
+            rel="icon"
+            href="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
+        />
         <meta name="keywords" content="맛알고리즘, 맛집, 식당" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta name="description" content="맛있는 알고리즘으로 찾는 당신의 인생 맛집!" />
@@ -13,9 +16,15 @@
         <meta property="og:url" content="https://matal.store" />
         <meta name="og:title" content="맛있는 알고리즘" />
         <meta name="og:description" content="맛있는 알고리즘으로 찾는 당신의 인생 맛집!" />
-        <meta property="og:image" content="https://matal.store/Logo.svg" />
+        <meta
+            property="og:image"
+            content="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
+        />
         <meta property="og:type" content="website" />
-        <link rel="apple-touch-icon" href="%PUBLIC_URL%/Logo.svg" />
+        <link
+            rel="apple-touch-icon"
+            href="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
+        />
         <title>맛알고리즘</title>
     </head>
     <body>

diff --git a/src/App.jsx b/src/App.jsx
@@ -1,36 +1,45 @@
-import React from 'react';
+import { lazy, Suspense } from 'react';
+import { Loading } from './components/common';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { ReactQueryDevtools } from 'react-query/devtools';
 import { BrowserRouter, Routes, Route } from 'react-router-dom';
 import { GlobalStyle } from './styles';
-import { MainPage, WebMap, SignUpPage, StoreDetailPage, LoginPage, NotFoundPage } from './pages';
 import { HeaderLayout } from './components/common';
-import BookmarkPage from './pages/BookmarkPage';
 import { Terms, PrivacyConsent, Privacy } from './document';
 
 const queryClient = new QueryClient();
 
+const MainPage = lazy(() => import('./pages/MainPage'));
+const LoginPage = lazy(() => import('./pages/LoginPage'));
+const SignUpPage = lazy(() => import('./pages/SignUpPage'));
+const NotFoundPage = lazy(() => import('./pages/NotFoundPage'));
+const StoreDetailPage = lazy(() => import('./pages/StoreDetailPage'));
+const BookmarkPage = lazy(() => import('./pages/BookmarkPage'));
+const WebmapPage = lazy(() => import('./pages/WebMapPage'));
+
 const App = () => {
     return (
         <QueryClientProvider client={queryClient}>
             <div className="App">
                 <GlobalStyle />
                 <BrowserRouter>
-                    <Routes>
-                        <Route element={<HeaderLayout />}>
-                            <Route path="/" element={<MainPage />} />
-                            <Route path="/login" element={<LoginPage />} />
-                            <Route path="/signup" element={<SignUpPage />} />
-                            <Route path="/bookmark" element={<BookmarkPage />} />
-                        </Route>
-                        <Route path="/webmap" element={<WebMap />} />
-                        <Route path="/webmap/storeDetail/:id" element={<StoreDetailPage />} />
-                        <Route path="/terms" element={<Terms />} />
-                        <Route path="/privacyConsent" element={<PrivacyConsent />} />
-                        <Route path="/privacy" element={<Privacy />} />
-                        <Route path="/webmap/storeList/:item" element={<WebMap />} />
-                        <Route path="/*" element={<NotFoundPage />} />
-                    </Routes>
+                    <Suspense fallback={<Loading />}>
+                        <Routes>
+                            <Route element={<HeaderLayout />}>
+                                <Route path="/" element={<MainPage />} />
+                                <Route path="/login" element={<LoginPage />} />
+                                <Route path="/signup" element={<SignUpPage />} />
+                                <Route path="/bookmark" element={<BookmarkPage />} />
+                            </Route>
+                            <Route path="/webmap" element={<WebmapPage />} />
+                            <Route path="/webmap/storeDetail/:id" element={<StoreDetailPage />} />
+                            <Route path="/terms" element={<Terms />} />
+                            <Route path="/privacyConsent" element={<PrivacyConsent />} />
+                            <Route path="/privacy" element={<Privacy />} />
+                            <Route path="/webmap/storeList/:item" element={<WebmapPage />} />
+                            <Route path="/*" element={<NotFoundPage />} />
+                        </Routes>
+                    </Suspense>
                 </BrowserRouter>
             </div>
             <ReactQueryDevtools />

diff --git a/src/assets/Icon/Logo.svg b/src/assets/Icon/Logo.svg
diff --git a/src/assets/Icon/Spinner.svg b/src/assets/Icon/Spinner.svg
diff --git a/src/assets/Icon/arrow/ArrowUp.svg b/src/assets/Icon/arrow/ArrowUp.svg
diff --git a/src/assets/Icon/arrow/FilterArrowDown.svg b/src/assets/Icon/arrow/FilterArrowDown.svg
diff --git a/src/assets/Icon/arrow/Reset.svg b/src/assets/Icon/arrow/Reset.svg
diff --git a/src/assets/Icon/arrow/TopLeftArrow.svg b/src/assets/Icon/arrow/TopLeftArrow.svg
diff --git a/src/assets/Icon/arrow/TopRightArrow.svg b/src/assets/Icon/arrow/TopRightArrow.svg