Merge pull request #53 from keepgoingLikelion/feature/42-build-setting

[Feat] #42 -
keepgoingLikelion · Feb 21, 2024 · f147bde · f147bde
2 parents 6d2503b + 84747b2
commit f147bde
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 47 deletions.
diff --git a/dist/assets/index-B2GMnS08.js → dist/assets/index-CuyJAMme.js b/dist/assets/index-B2GMnS08.js → dist/assets/index-CuyJAMme.js
diff --git a/dist/index.html b/dist/index.html
@@ -16,7 +16,7 @@
     <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>머랭?!</title>
-    <script type="module" crossorigin src="/meringue-FE/assets/index-B2GMnS08.js"></script>
+    <script type="module" crossorigin src="/meringue-FE/assets/index-CuyJAMme.js"></script>
     <link rel="stylesheet" crossorigin href="/meringue-FE/assets/index-Bx_8Ul5v.css">
   </head>
   <body>

diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
+  "homepage": "https://keepgoinglikelion.github.io/meringue-FE/",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build --base=/meringue-FE",

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,5 +1,6 @@
 import './App.css';
 import {
+  BrowserRouter,
   BrowserRouter as Router, Route, Routes,
 } from 'react-router-dom';
 import axios from 'axios';
@@ -35,27 +36,29 @@ function App() {
   }, []);
 
   return (
-    <Router>
-      {!todayPost && (
-        <div>
-          <LuLoader
-            style={{ color: '#FFFBF2', width: '30px', height: '30px' }}
-          />
-        </div>
-      )}
-      <Routes>
-        <Route path="/" element={<LoginView />} />
-        <Route path="/main" element={todayPost && <div><MainPage /></div>} />
-        <Route path="/newpost" element={<TodayPostView setType={setType} />} />
-        <Route path="/start" element={<StartView type={type} />} />
-        <Route path="/post/:postId" element={todayPost && <StickerView />} />
-        <Route path="/mypage" element={<UserPage />} />
-        <Route path="/mylog/:emotionType" element={<UserLog />} />
-        <Route path="/post/:postId" element={<PostDetail />} />
-        <Route path="/myLikedPost/:postId" element={<LikedPostDetail />} />
-        <Route path="/post/today" element={<TodayPostDetail />} />
-      </Routes>
-    </Router>
+    <BrowserRouter basename={process.env.PUBLIC_URL}>
+      <Router>
+        {!todayPost && (
+          <div>
+            <LuLoader
+              style={{ color: '#FFFBF2', width: '30px', height: '30px' }}
+            />
+          </div>
+        )}
+        <Routes>
+          <Route path="/" element={<LoginView />} />
+          <Route path="/main" element={todayPost && <div><MainPage /></div>} />
+          <Route path="/newpost" element={<TodayPostView setType={setType} />} />
+          <Route path="/start" element={<StartView type={type} />} />
+          <Route path="/post/:postId" element={todayPost && <StickerView />} />
+          <Route path="/mypage" element={<UserPage />} />
+          <Route path="/mylog/:emotionType" element={<UserLog />} />
+          <Route path="/post/:postId" element={<PostDetail />} />
+          <Route path="/myLikedPost/:postId" element={<LikedPostDetail />} />
+          <Route path="/post/today" element={<TodayPostDetail />} />
+        </Routes>
+      </Router>
+    </BrowserRouter>
   );
 }
 

diff --git a/src/main.tsx b/src/main.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { BrowserRouter } from 'react-router-dom';
 import ReactDOM from 'react-dom/client';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
@@ -11,9 +10,7 @@ const queryClient = new QueryClient();
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <QueryClientProvider client={queryClient}>
-      <BrowserRouter basename="https://keepgoinglikelion.github.io/meringue-FE/">
-        <App />
-      </BrowserRouter>
+      <App />
     </QueryClientProvider>
   </React.StrictMode>,
 );
diff --git a/src/pages/UserPage/UserPage.tsx b/src/pages/UserPage/UserPage.tsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { LuLoader } from 'react-icons/lu';
 import { format } from 'date-fns';
 import { Link } from 'react-router-dom';
+import axios from 'axios';
 import MenuBar from '../../components/Menu/Menu';
 import styles from '../../styles/Layout.module.css';
 import Calendar from '../../components/Calendar/Container';
@@ -23,9 +24,11 @@ function Mypage() {
   const [userName, setUserName] = useState('');
 
   useEffect(() => {
-    setTodayDate(new Date());
-    fetchTodayPost();
-    fetchUserNickname().then((nickname) => setUserName(nickname ?? ''));
+    if (axios.defaults.headers.common.Authorization) {
+      setTodayDate(new Date());
+      fetchTodayPost();
+      fetchUserNickname().then((nickname) => setUserName(nickname ?? ''));
+    }
   }, [currentDate, fetchTodayPost]);
 
   if (!todayPost) {