JECT-Study
diff --git a/‎.eslintrc.json‎
Lines changed: 5 additions & 1 deletion b/‎.eslintrc.json‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/App.tsx‎
Lines changed: 23 additions & 1 deletion b/‎src/App.tsx‎
Lines changed: 23 additions & 1 deletion
diff --git a/‎src/api/mypages.ts‎
Lines changed: 0 additions & 7 deletions b/‎src/api/mypages.ts‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎src/assets/images/random-black-frame.png‎
2.88 KB b/‎src/assets/images/random-black-frame.png‎
2.88 KB
diff --git a/‎src/assets/images/random-blue-frame.png‎
3.57 KB b/‎src/assets/images/random-blue-frame.png‎
3.57 KB
diff --git a/‎src/assets/images/random-green-frame.png‎
2.35 KB b/‎src/assets/images/random-green-frame.png‎
2.35 KB
diff --git a/‎src/assets/images/random-pink-frame.png‎
3.11 KB b/‎src/assets/images/random-pink-frame.png‎
3.11 KB
diff --git a/‎src/assets/images/random-purple-frame.png‎
2.77 KB b/‎src/assets/images/random-purple-frame.png‎
2.77 KB
diff --git a/‎src/assets/images/random-teal-frame.png‎
2.65 KB b/‎src/assets/images/random-teal-frame.png‎
2.65 KB
diff --git a/‎src/assets/index.ts‎
Lines changed: 6 additions & 0 deletions b/‎src/assets/index.ts‎
Lines changed: 6 additions & 0 deletions
@@ -71,6 +71,10 @@
           "htmlFor"
         ]
       }
-    ]
+    ],
+    "no-param-reassign": ["error", {
+      "props": true,
+      "ignorePropertyModificationsFor": ["state"]
+    }]
   }
 }
@@ -7,6 +7,15 @@ import { Route, Routes, useLocation, useNavigate } from 'react-router-dom';
 import MyPage from '@/pages/MyPage/MyPage';
 import SearchGamePage from '@/pages/SearchResultsPage/SearchGamePage';
 import SearchTalkPickPage from '@/pages/SearchResultsPage/SearchTalkPickPage';
+import BalanceGameLayout from '@/pages/MyPage/BalanceGameLayout';
+import TalkPickLayout from '@/pages/MyPage/TalkPickLayout';
+import TalkPickBookmarks from '@/pages/MyPage/TalkPick/TalkPickBookmarks';
+import TalkPickWritten from '@/pages/MyPage/TalkPick/TalkPickWritten';
+import BalanceGameVotes from '@/pages/MyPage/BalanceGame/BalanceGameVotes';
+import BalanceGameBookmarks from '@/pages/MyPage/BalanceGame/BalanceGameBookmarks';
+import TalkPickVotes from '@/pages/MyPage/TalkPick/TalkPickVotes';
+import TalkPickComments from '@/pages/MyPage/TalkPick/TalkPickComments';
+import BalanceGameWritten from '@/pages/MyPage/BalanceGame/BalanceGameWritten';
 import BalanceGameEditPage from '@/pages/BalanceGameEditPage/BalanceGameEditPage';
 import ProtectedRoutes from './components/Routes/ProtectedRoutes';
 import { PATH } from './constants/path';
@@ -96,7 +105,20 @@ const App: React.FC = () => {
 
         <Route element={<ProtectedRoutes isLoggedIn={isLoggedIn} />}>
           <Route path={PATH.MYPAGE} element={<LayoutNoFooter />}>
-            <Route index element={<MyPage />} />
+            <Route element={<MyPage />}>
+              <Route path="talkpick" element={<TalkPickLayout />}>
+                <Route path="bookmarks" element={<TalkPickBookmarks />} />
+                <Route path="written" element={<TalkPickWritten />} />
+                <Route path="votes" element={<TalkPickVotes />} />
+                <Route path="comments" element={<TalkPickComments />} />
+              </Route>
+              <Route path="balancegame" element={<BalanceGameLayout />}>
+                <Route path="bookmarks" element={<BalanceGameBookmarks />} />
+                <Route path="votes" element={<BalanceGameVotes />} />
+                <Route path="written" element={<BalanceGameWritten />} />
+              </Route>
+              <Route index element={<TalkPickBookmarks />} />
+            </Route>
           </Route>
           <Route path="/" element={<Layout />}>
             <Route path={PATH.CREATE.TALK_PICK} element={<CreatePostPage />} />
 
@@ -6,10 +6,8 @@ import {
   MyComment,
   MyVote,
   MyWritten,
-  SideBar,
 } from '@/types/mypages';
 import { END_POINT } from '@/constants/api';
-import { Id } from '@/types/api';
 import { axiosInstance } from './interceptor';
 
 export const getMyWritten = async (page: number, size: number) => {
@@ -60,8 +58,3 @@ export const getGameBookmark = async (page: number, size: number) => {
   );
   return data;
 };
-
-export const getMyInfo = async (memberId: Id): Promise<SideBar> => {
-  const { data } = await axiosInstance.get<SideBar>(`/members/${memberId}`);
-  return data;
-};
@@ -126,6 +126,12 @@ export { default as MobileGameBannerFirst } from './images/mo-game-banner-first.
 export { default as MobileGameBannerSecond } from './images/mo-game-banner-second.png';
 export { default as RedCheckIcon } from './svg/red-check-icon.svg';
 export { default as BlueCheckIcon } from './svg/blue-check-icon.svg';
+export { default as RandomBlackFrame } from './images/random-black-frame.png';
+export { default as RandomBlueFrame } from './images/random-blue-frame.png';
+export { default as RandomGreenFrame } from './images/random-green-frame.png';
+export { default as RandomPinkFrame } from './images/random-pink-frame.png';
+export { default as RandomPurpleFrame } from './images/random-purple-frame.png';
+export { default as RandomTealFrame } from './images/random-teal-frame.png';
 export { default as StatusNotRequired } from './svg/status-not-required.svg';
 export { default as StatusFail } from './svg/status-fail.svg';
 export { default as SadEmoji } from './svg/sad-emoji.svg';
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@`
`71`	`71`	`"htmlFor"`
`72`	`72`	`]`
`73`	`73`	`}`
`74`		`- ]`
	`74`	`+ ],`
	`75`	`+ "no-param-reassign": ["error", {`
	`76`	`+ "props": true,`
	`77`	`+ "ignorePropertyModificationsFor": ["state"]`
	`78`	`+ }]`
`75`	`79`	`}`
`76`	`80`	`}`