Skip to content

Commit 35f3b17

Browse files
committed
Merge branch 'develop' of https://github.com/prgrms-web-devcourse-final-project/WEB2_3_9crops_FE into 3-design-login-landing
2 parents 0a34498 + 59d89d4 commit 35f3b17

36 files changed

+803
-39
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"react": "^18.3.1",
1919
"react-dom": "^18.3.1",
2020
"react-router": "^7.1.5",
21+
"swiper": "^11.2.4",
2122
"tailwind-merge": "^3.0.1",
2223
"tailwindcss": "^4.0.6",
2324
"zustand": "^5.0.3"

pnpm-lock.yaml

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

src/assets/icons/cloud.svg

Lines changed: 8 additions & 0 deletions
Loading

src/assets/icons/color-siren.svg

Lines changed: 8 additions & 0 deletions
Loading

src/assets/icons/index.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
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?react';
45
import DeleteIcon from './delete.svg?react';
56
import EnvelopeIcon from './envelope.svg?react';
67
import GoogleIcon from './google.svg?react';
@@ -11,9 +12,13 @@ import LikeOutlinedIcon from './like-outlined.svg?react';
1112
import NaverIcon from './naver.svg?react';
1213
import NoticeIcon from './notice.svg?react';
1314
import PersonIcon from './person.svg?react';
15+
import RestartIcon from './restart.svg';
1416
import SirenFilledIcon from './siren-filled.svg?react';
1517
import SirenOutlinedIcon from './siren-outlined.svg?react';
18+
import SnowIcon from './snow.svg?react';
1619
import StampIcon from './stamp.svg?react';
20+
import ThermostatIcon from './thermostat.svg?react';
21+
import WarmIcon from './warm.svg?react';
1722

1823
export {
1924
NaverIcon,
@@ -24,10 +29,15 @@ export {
2429
PersonIcon,
2530
ArrowLeftIcon,
2631
InformationIcon,
27-
SirenFilledIcon,
28-
SirenOutlinedIcon,
2932
EnvelopeIcon,
3033
BoardIcon,
34+
RestartIcon,
35+
CloudIcon,
36+
SnowIcon,
37+
ThermostatIcon,
38+
WarmIcon,
39+
SirenFilledIcon,
40+
SirenOutlinedIcon,
3141
NoticeIcon,
3242
LikeFilledIcon,
3343
LikeOutlinedIcon,

src/assets/icons/restart.svg

Lines changed: 8 additions & 0 deletions
Loading

src/assets/icons/snow.svg

Lines changed: 8 additions & 0 deletions
Loading

src/assets/icons/thermostat.svg

Lines changed: 8 additions & 0 deletions
Loading

src/assets/icons/warm.svg

Lines changed: 8 additions & 0 deletions
Loading
43.7 KB
Loading

0 commit comments

Comments
 (0)