Skip to content

Commit d9c176a

Browse files
yummjinyummjin
authored
Merge pull request #4 from ByteCrew-Uscode/feature/3
[FEAT] : 사진으로 예약 기능 구현
2 parents d5c1e42 + e29a713 commit d9c176a

63 files changed

Lines changed: 728 additions & 36 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎favicon/favicon.ico‎

15 KB
Binary file not shown.

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
5+
<link rel="icon" type="image/svg+xml" href="/favicon/favicon.ico" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>농기구온</title>
88
</head>

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
"@tailwindcss/vite": "^4.1.11",
1818
"@tanstack/react-query": "^5.81.5",
1919
"axios": "^1.10.0",
20+
"class-variance-authority": "^0.7.1",
2021
"clsx": "^2.1.1",
2122
"daisyui": "^5.0.43",
23+
"framer-motion": "^12.19.2",
2224
"prettier": "^3.6.2",
2325
"react": "^19.1.0",
2426
"react-dom": "^19.1.0",

‎pnpm-lock.yaml‎

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/app/App.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Stack } from "./stackflow";
1+
import { Stack } from './stackflow';
22

33
export default function App() {
44
return (
55
<div className="size-screen">
6-
<div className="scrollbar-hide container-mobile fixed inset-0 overflow-hidden">
6+
<div className="scrollbar-hide container-mobile fixed inset-0 overflow-hidden tracking-wide">
77
<Stack />
88
</div>
99
</div>

‎src/app/stackflow/Stack.tsx‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
import { CompleteScreen } from '@/screen/complete';
2+
import { FormScreen } from '@/screen/form/ui';
13
import { HomeScreen } from '@/screen/home/ui';
24
import { JoinScreen } from '@/screen/join/ui';
5+
import { PhotoLoadingScreen } from '@/screen/photo-loading/ui';
6+
import { PhotoResultScreen } from '@/screen/photo-result/ui';
7+
import { PhotoUploadScreen } from '@/screen/photo-upload/ui';
8+
import { fetchSessionData } from '@/shared/utils';
39
import { basicUIPlugin } from '@stackflow/plugin-basic-ui';
410
import { basicRendererPlugin } from '@stackflow/plugin-renderer-basic';
511
import { stackflow } from '@stackflow/react';
@@ -9,12 +15,20 @@ export const { Stack, useFlow } = stackflow({
915
activities: {
1016
JoinScreen,
1117
HomeScreen,
18+
PhotoUploadScreen,
19+
FormScreen,
20+
CompleteScreen,
21+
PhotoLoadingScreen,
22+
PhotoResultScreen,
1223
},
1324
plugins: [
1425
basicRendererPlugin(),
1526
basicUIPlugin({
1627
theme: 'cupertino',
1728
}),
1829
],
19-
initialActivity: () => 'HomeScreen',
30+
initialActivity: () => {
31+
if (fetchSessionData('userInfo')) return 'HomeScreen';
32+
return 'JoinScreen';
33+
},
2034
});

‎src/assets/icons/icon-bell.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎src/assets/icons/icon-checked.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎src/assets/icons/icon-help.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎src/assets/icons/icon-search.svg‎

Lines changed: 4 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)