Dev -> Main (#412)

second-hand-team-01 · Nov 24, 2023 · 41facd5 · 41facd5
2 parents 4650ffd + 9724c67
commit 41facd5
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 16 deletions.
diff --git a/fe/src/pages/AuthPage/AuthPage.tsx b/fe/src/pages/AuthPage/AuthPage.tsx
@@ -39,10 +39,11 @@ export const AuthPage = () => {
     const userInfoData = await getGithubLoginToken(queryCode);
     if (!userInfoData) {
       return;
-    } // TODO: 에러처리
+    }
 
     const token = userInfoData.data.token;
     const memberInfo = userInfoData.data.memberInfo;
+    console.log(memberInfo);
     localStorage.setItem('loginToken', token);
     userInfoDispatch &&
       userInfoDispatch({
@@ -72,10 +73,16 @@ export const AuthPage = () => {
         },
       });
 
-    localStorage.setItem(
-      USER_INFO_KEY,
-      JSON.stringify(userInfoData.memberInfo)
-    );
+    userInfoDispatch &&
+      userInfoDispatch({
+        type: 'SET_USER_SELECTED_LOCATION',
+        payload: {
+          locationIdx: userLocationInfo.data.main.locationIdx,
+          town: userLocationInfo.data.main.town,
+        },
+      });
+
+    localStorage.setItem(USER_INFO_KEY, JSON.stringify(memberInfo));
 
     navigate('/');
   };

diff --git a/fe/src/pages/DetailsPage/DetailsPage.tsx b/fe/src/pages/DetailsPage/DetailsPage.tsx
@@ -31,7 +31,7 @@ export const DetailsPage = () => {
   const param = useParams();
   const itemIdxStr = param.itemIdx;
   const navigate = useNavigate();
-  const { pathname } = useLocation();
+  const prevPathname = useLocation().state;
 
   const [details, setDetails] = useState<ItemDetail | null>(null);
   const [loading, setLoading] = useState(true);
@@ -140,7 +140,6 @@ export const DetailsPage = () => {
         onClick: () => {
           changeStatusItemsAPI(Number(itemIdxStr), '판매완료');
           setStatusDropdownOpen(false);
-          navigate(pathname, { replace: true });
           window.location.reload();
         },
       },
@@ -176,7 +175,7 @@ export const DetailsPage = () => {
           leftBtn: (
             <NavbarBtn
               icon="arrowLeft"
-              path="back"
+              path={prevPathname}
               color="accentText"
             ></NavbarBtn>
           ),
@@ -260,7 +259,8 @@ export const DetailsPage = () => {
             state: 'default',
             color: 'systemDefault',
             name: '게시글 수정',
-            onClick: () => navigate(`/edit/${itemIdxStr}`),
+            onClick: () =>
+              navigate(`/edit/${itemIdxStr}`, { state: prevPathname }),
           },
           {
             shape: 'large',

diff --git a/fe/src/pages/HomePage/HomeList/HomeList.tsx b/fe/src/pages/HomePage/HomeList/HomeList.tsx
@@ -63,7 +63,6 @@ const Contents = ({
           );
           return { ...data, pages: newPages };
         },
-        staleTime: 10000,
         cacheTime: 12000,
       }
     );

diff --git a/fe/src/pages/LoginPage/LoginPage.tsx b/fe/src/pages/LoginPage/LoginPage.tsx
@@ -107,6 +107,15 @@ export const LoginPage = () => {
           },
         });
 
+      userInfoDispatch &&
+        userInfoDispatch({
+          type: 'SET_USER_SELECTED_LOCATION',
+          payload: {
+            locationIdx: userLocationInfo.data.main.locationIdx,
+            town: userLocationInfo.data.main.town,
+          },
+        });
+
       localStorage.setItem(
         USER_INFO_KEY,
         JSON.stringify(userInfoData.memberInfo)

diff --git a/fe/src/pages/SalesHistoryPage/SalesHistoryPage.tsx b/fe/src/pages/SalesHistoryPage/SalesHistoryPage.tsx
@@ -1,6 +1,6 @@
 import * as S from './SalesHistoryPageStyle';
 import { useContext, useEffect, useState } from 'react';
-import { Navigate, useNavigate } from 'react-router-dom';
+import { Navigate, useLocation, useNavigate } from 'react-router-dom';
 import { Layout, ListItem, Loading } from '@components/commons';
 import { useFetch } from '@hooks/useFetch/useFetch';
 import { getSalesItemsAPI } from '@services/items/items';
@@ -11,6 +11,7 @@ import { UserInfoContext } from '@stores/UserContext';
 
 export const SalesHistoryPage = () => {
   const navigate = useNavigate();
+  const { pathname } = useLocation();
   const [status, setStatus] = useState<ItemStatus>('판매중');
   const [{ data, error, loading }, fetch] = useFetch(
     getSalesItemsAPI.bind(null, status),
@@ -51,7 +52,7 @@ export const SalesHistoryPage = () => {
         {...item}
         moreBtn={true}
         onClick={() => {
-          navigate(`/item/${item.itemIdx}`);
+          navigate(`/item/${item.itemIdx}`, { state: pathname });
         }}
       ></ListItem>
     ));

diff --git a/fe/src/pages/WritePage/WritePage.tsx b/fe/src/pages/WritePage/WritePage.tsx
@@ -37,8 +37,8 @@ import { getAllLocationData } from '@services/locations/locations';
 
 export const WritePage = ({ type }: { type: 'write' | 'edit' }) => {
   const navigate = useNavigate();
-  const { pathname } = useLocation();
   const { itemIdx } = useParams();
+  const prevPathName = useLocation().state;
 
   const [title, setTitle] = useState<string>('');
   const [categoryState] = useFetch(getCategoryAPI, [], true);
@@ -133,12 +133,12 @@ export const WritePage = ({ type }: { type: 'write' | 'edit' }) => {
       ? !uploadState.data && uploadState.error
         ? setDialogOpen(false)
         : navigate(`/item/${uploadState.data?.itemIdx}`, {
-            state: pathname,
+            state: prevPathName,
           })
       : editState.error
       ? setDialogOpen(false)
       : navigate(`/item/${itemIdx}`, {
-          state: pathname,
+          state: prevPathName,
         });
   };
 
@@ -216,7 +216,6 @@ export const WritePage = ({ type }: { type: 'write' | 'edit' }) => {
         navbarOptions: {
           title: '내 물건 팔기',
           leftBtn: <NavbarBtn text="닫기" path="back" />,
-          /* path 수정하기 기존 유입 경로 넣기 */
           rightBtn: (
             <Button
               title="완료"

diff --git a/fe/src/stores/UserContext.tsx b/fe/src/stores/UserContext.tsx
@@ -72,6 +72,10 @@ export const reducer = (state: UserInfo, { type, payload }) => {
           locationIdx: null,
           town: null,
         },
+        selectedLocation: {
+          locationIdx: null,
+          town: null,
+        },
       };
     default:
       throw new Error('user state: 타입이 지정되지 않았어요.');