Skip to content

Commit 18e9e91

Browse files
authored
Merge pull request #48 from happbob/revert-47-feat/OD-26
Revert "Refactor: 사진 업로드 관련 history 관리"
2 parents 17078e9 + 888a180 commit 18e9e91

38 files changed

Lines changed: 887 additions & 723 deletions

File tree

src/App.tsx

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ import SignUp from './pages/SignUp';
1313
import ProfileViewer from './pages/ProfileViewer';
1414
import Chats from './pages/Chats';
1515
import ChatRoom from './pages/Chats/ChatRoom';
16-
import PostImageSelect from './pages/PostImageSelect';
17-
import PostInstaConnect from './pages/PostInstaConnect';
18-
import PostInstaFeedSelect from './pages/PostInstaFeedSelect';
19-
import PostUpload from './pages/PostUpload';
16+
import Upload from './pages/Upload';
2017
import Post from './pages/Post';
2118
import KakaoCallback from './pages/Login/components/Kakao/KakaoCallback';
2219
import NaverCallback from './pages/Login/components/Naver/NaverCallback';
@@ -37,12 +34,7 @@ const App: React.FC = () => {
3734
<Route path="/Verification" element={<Verification />} />
3835
<Route path="/login" element={<Login />} />
3936
<Route path="/chats" element={<Chats />} />
40-
41-
<Route path="/image-select" element={<PostImageSelect />} />
42-
<Route path="/insta-connect" element={<PostInstaConnect />} />
43-
<Route path="/insta-feed-select" element={<PostInstaFeedSelect />} />
44-
<Route path="/upload" element={<PostUpload />} />
45-
37+
<Route path="/upload" element={<Upload />} />
4638
<Route path="/post/:postId" element={<Post />} />
4739
<Route path="/users/:userId" element={<ProfileViewer />} />
4840
<Route path="signup" element={<SignUp />} />

src/config/constant.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
// JWT를 로컬 스토리지에 저장할 때 사용하는 키. 추후 수정
2-
export const JWT_KEY =
3-
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjIiLCJ1c2VybmFtZSI6IuyehOuvvOyEnCIsImVtYWlsIjoibGltbXMxMjE3QG5hdmVyLmNvbSJ9.QB9vUJiu7YTqzwaA2NYDXC20xDfWWQ7ck2QhDh7Lsqs';
2+
export const JWT_KEY = 'jwt_token';

src/pages/Mypage/index.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ const MyPage: React.FC = () => {
4848
text: '인스타 피드 가져오기',
4949
action: () => {
5050
setIsBottomSheetOpen(false);
51-
navigate('/insta-connect');
51+
handleInstagramSelect();
5252
},
5353
icon: Insta,
5454
},
5555
{
5656
text: '사진 올리기',
5757
action: () => {
5858
setIsBottomSheetOpen(false);
59-
navigate('/image-select');
59+
handlePhotoUploadSelect();
6060
},
6161
icon: Picture,
6262
},
@@ -78,6 +78,14 @@ const MyPage: React.FC = () => {
7878
setIsBottomSheetOpen(true);
7979
};
8080

81+
const handleInstagramSelect = () => {
82+
navigate('/upload', { state: { mode: 'instagram' } });
83+
};
84+
85+
const handlePhotoUploadSelect = () => {
86+
navigate('/upload', { state: { mode: 'image' } });
87+
};
88+
8189
const handlePostClick = (postId: string) => {
8290
navigate(`/my-post/${postId}`);
8391
};

src/pages/PostImageSelect/dto.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/pages/PostImageSelect/index.tsx

Lines changed: 0 additions & 145 deletions
This file was deleted.

src/pages/PostInstaConnect/dto.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/pages/PostInstaFeedSelect/dto.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/pages/PostInstaFeedSelect/index.tsx

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)