Skip to content

Commit 6e91f8c

Browse files
committed
Merge branch 'develop' of https://github.com/prgrms-web-devcourse-final-project/WEB2_3_9crops_FE into 12-design-random-letter
2 parents b64bdc3 + 401c902 commit 6e91f8c

40 files changed

+786
-47
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"preview": "vite preview"
1111
},
1212
"dependencies": {
13+
"@egjs/react-infinitegrid": "^4.12.0",
1314
"@mui/icons-material": "^6.4.4",
1415
"@tailwindcss/vite": "^4.0.6",
1516
"@tanstack/react-query": "^5.66.0",

pnpm-lock.yaml

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

src/App.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,15 @@ const App = () => {
3131
<Route path=":id" element={<LetterDetailPage />} />
3232
</Route>
3333
<Route path="board">
34-
<Route path="letter" element={<LetterBoardPage />} />
34+
<Route element={<Layout />}>
35+
<Route path="rolling/:id" element={<RollingPaperPage />} />
36+
<Route path="letter" element={<LetterBoardPage />} />
37+
</Route>
3538
<Route path="letter/:id" element={<LetterBoardDetailPage />} />
36-
<Route path="rolling/:id" element={<RollingPaperPage />} />
3739
</Route>
3840
<Route path="mypage" element={<Layout />}>
3941
<Route index element={<MyPage />} />
42+
<Route path="board" element={<LetterBoardPage />} />
4043
<Route path="notifications" element={<NotificationsPage />} />
4144
</Route>
4245
</Route>

src/assets/.gitkeep

Whitespace-only changes.

src/assets/icons/delete.svg

Lines changed: 8 additions & 0 deletions
Loading

src/assets/icons/index.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
import AlarmIcon from './alarm.svg?react';
22
import ArrowLeftIcon from './arrow-left.svg?react';
33
import BoardIcon from './board.svg?react';
4+
import CloudIcon from './cloud.svg';
5+
import ColorSirenIcon from './color-siren.svg';
6+
import DeleteIcon from './delete.svg?react';
47
import EnvelopeIcon from './envelope.svg?react';
8+
import LikeFilledIcon from './like-filled.svg?react';
9+
import LikeOutlinedIcon from './like-outlined.svg?react';
10+
import NoticeIcon from './notice.svg?react';
511
import PersonIcon from './person.svg?react';
612
import restartIcon from './restart.svg';
13+
import SirenFilledIcon from './siren-filled.svg?react';
14+
import SirenOutlinedIcon from './siren-outlined.svg?react';
715
import SirenIcon from './siren.svg?react';
8-
import CloudIcon from './cloud.svg';
916
import SnowIcon from './snow.svg';
1017
import ThermostatIcon from './thermostat.svg';
1118
import WarmIcon from './warm.svg';
12-
import ColorSirenIcon from './color-siren.svg';
1319

1420
export {
1521
AlarmIcon,
@@ -24,4 +30,10 @@ export {
2430
ThermostatIcon,
2531
WarmIcon,
2632
ColorSirenIcon,
33+
SirenFilledIcon,
34+
SirenOutlinedIcon,
35+
NoticeIcon,
36+
LikeFilledIcon,
37+
LikeOutlinedIcon,
38+
DeleteIcon,
2739
};

src/assets/icons/like-filled.svg

Lines changed: 8 additions & 0 deletions
Loading

src/assets/icons/like-outlined.svg

Lines changed: 8 additions & 0 deletions
Loading

src/assets/icons/notice.svg

Lines changed: 8 additions & 0 deletions
Loading
File renamed without changes.

0 commit comments

Comments
 (0)