diff --git a/src/components/card/lookCard/lookCard.css.ts b/src/components/card/lookCard/lookCard.css.ts index 598b3d16..4eeeb05f 100644 --- a/src/components/card/lookCard/lookCard.css.ts +++ b/src/components/card/lookCard/lookCard.css.ts @@ -8,6 +8,7 @@ export const cardWrapper = style({ height: '33.1rem', borderRadius: 8, padding: '2rem', + marginTop: '1.2rem', }); export const textBox = style({ diff --git a/src/components/card/mapCard/map.css.ts b/src/components/card/mapCard/map.css.ts index de7d9713..397e393c 100644 --- a/src/components/card/mapCard/map.css.ts +++ b/src/components/card/mapCard/map.css.ts @@ -1,9 +1,10 @@ import { style } from '@vanilla-extract/css'; +import mapImage from 'src/assets/images/home_card_map.png'; const mapStyle = style({ width: '28.9rem', height: '40.8rem', - backgroundImage: 'url(src/assets/images/home_card_map.png)', + backgroundImage: `url(${mapImage})`, backgroundSize: 'cover', backgroundPosition: 'center', position: 'relative', diff --git a/src/components/card/mapCard/mapCard.css.ts b/src/components/card/mapCard/mapCard.css.ts index be20818d..d5e6f83d 100644 --- a/src/components/card/mapCard/mapCard.css.ts +++ b/src/components/card/mapCard/mapCard.css.ts @@ -10,6 +10,7 @@ export const mapWrapper = style({ flexDirection: 'column', alignItems: 'center', justifyContent: 'center', + marginTop: '1.4rem', }); export const titleBox = style({ diff --git a/src/components/carousel/curationCarousel/curationCarousel.css.ts b/src/components/carousel/curationCarousel/curationCarousel.css.ts index 31513d96..5708ff6a 100644 --- a/src/components/carousel/curationCarousel/curationCarousel.css.ts +++ b/src/components/carousel/curationCarousel/curationCarousel.css.ts @@ -10,7 +10,6 @@ export const carouselWrapper = style({ width: '37.5rem', overflow: 'hidden', display: 'flex', - marginLeft: '-2rem', }); export const carouselContainer = style({ diff --git a/src/components/carousel/popularCarousel/carouselIndex.css.ts b/src/components/carousel/popularCarousel/carouselIndex.css.ts index f6f11dd7..0de2ed6f 100644 --- a/src/components/carousel/popularCarousel/carouselIndex.css.ts +++ b/src/components/carousel/popularCarousel/carouselIndex.css.ts @@ -25,6 +25,7 @@ const indexStyle = recipe({ export const indexContainer = style({ display: 'flex', gap: '0.4rem', + marginTop: '0.8rem', }); export default indexStyle; diff --git a/src/components/footer/footer.css.ts b/src/components/footer/footer.css.ts index c827a1a4..67bd8519 100644 --- a/src/components/footer/footer.css.ts +++ b/src/components/footer/footer.css.ts @@ -5,7 +5,6 @@ export const footerContainer = style({ width: '37.5rem', height: '18.7rem', padding: '2rem', - marginLeft: '-2rem', position: 'absolute', bottom: 0, backgroundColor: theme.COLORS.gray1, diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx deleted file mode 100644 index b2f0bf4e..00000000 --- a/src/pages/HomePage.tsx +++ /dev/null @@ -1,5 +0,0 @@ -const HomePage = () => { - return
HomePage
; -}; - -export default HomePage; diff --git a/src/pages/homePage/HomePage.tsx b/src/pages/homePage/HomePage.tsx new file mode 100644 index 00000000..adbb5ecf --- /dev/null +++ b/src/pages/homePage/HomePage.tsx @@ -0,0 +1,32 @@ +import LookCard from '@components/card/lookCard/LookCard'; +import MapCard from '@components/card/mapCard/MapCard'; +import CurationCarousel from '@components/carousel/curationCarousel/CurationCarousel'; +import CarouselIndex from '@components/carousel/popularCarousel/CarouselIndex'; +import PopularCarousel from '@components/carousel/popularCarousel/PopularCarousel'; +import DetailTitle from '@components/detailTitle/DetailTitle'; +import Footer from '@components/footer/Footer'; +import Header from '@components/header/Header'; + +import * as styles from './homePage.css'; + +const HomePage = () => { + return ( +
+
+ + +
+ + +
+
+ + + +
+
+ ); +}; + +export default HomePage; diff --git a/src/pages/homePage/homePage.css.ts b/src/pages/homePage/homePage.css.ts new file mode 100644 index 00000000..70091435 --- /dev/null +++ b/src/pages/homePage/homePage.css.ts @@ -0,0 +1,26 @@ +import { style } from '@vanilla-extract/css'; + +const flexCenterColumn = style({ + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + justifyContent: 'center', +}); + +export const homeWrapper = flexCenterColumn; + +export const curationCarouselStyle = style([ + flexCenterColumn, + { + gap: '0.8rem', + marginTop: '5.4rem', + }, +]); + +export const popularCarouselStyle = style([ + flexCenterColumn, + { + gap: '0.8rem', + margin: '5.4rem 0 28rem 0', + }, +]); diff --git a/src/router/Router.tsx b/src/router/Router.tsx index c24f02aa..3464efd0 100644 --- a/src/router/Router.tsx +++ b/src/router/Router.tsx @@ -5,7 +5,7 @@ import { createBrowserRouter, RouterProvider, Navigate } from 'react-router-dom' import App from 'src/App'; import PrivateRoute from 'src/router/PrivateRoute'; -const HomePage = lazy(() => import('@pages/HomePage')); +const HomePage = lazy(() => import('@pages/homePage/HomePage')); const SearchPage = lazy(() => import('@pages/searchPage/SearchPage')); const ErrorPage = lazy(() => import('@pages/ErrorPage')); const MyPage = lazy(() => import('@pages/myPage/MyPage')); diff --git a/src/stories/HomePage.stories.ts b/src/stories/HomePage.stories.ts new file mode 100644 index 00000000..8ee030bd --- /dev/null +++ b/src/stories/HomePage.stories.ts @@ -0,0 +1,17 @@ +import HomePage from '@pages/homePage/HomePage'; +import type { Meta, StoryObj } from '@storybook/react'; + +const meta = { + title: 'Page/HomePage', + component: HomePage, + parameters: { + layout: 'centered', + }, + tags: ['autodocs'], +} satisfies Meta; + +export default meta; + +type Story = StoryObj; + +export const Default: Story = {};