From d237e56896bca10edd641514517f1047a8d86814 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Sat, 6 Jan 2024 17:56:38 +0900 Subject: [PATCH 01/15] =?UTF-8?q?feat:=20Home/Main=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/.gitkeep | 0 src/Home/components/Main/Main.style.ts | 39 ++++++++++++++++++++++++++ src/Home/components/Main/index.tsx | 28 ++++++++++++++++++ src/Router.tsx | 4 +-- 4 files changed, 69 insertions(+), 2 deletions(-) delete mode 100644 src/Home/components/.gitkeep create mode 100644 src/Home/components/Main/Main.style.ts create mode 100644 src/Home/components/Main/index.tsx diff --git a/src/Home/components/.gitkeep b/src/Home/components/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/Main/Main.style.ts new file mode 100644 index 00000000..22b053a5 --- /dev/null +++ b/src/Home/components/Main/Main.style.ts @@ -0,0 +1,39 @@ +import styled from '@emotion/styled'; + +export type ButtonStyle = 'making' | 'mypage'; + +export const MainWrapper = styled.div` + background-color: ${({ theme }) => theme.colors.background}; + width: 100%; + height: 34.7rem; +`; + +export const IconWrapper = styled.section` + display: flex; + width: 100%; + padding: 6rem 1.6rem 5rem 1.6rem; + gap: 15.7rem; +`; + +export const ButtonWrapper = styled.section` + display: flex; + flex-direction: column; + gap: 1rem; +`; + +export const Button = styled.button<{ variant: ButtonStyle }>` + width: 28rem; + height: 6.4rem; + + background-color: ${({ theme, variant }) => + variant === 'making' ? theme.colors.white : theme.colors.BG}; + + color: ${({ theme, variant }) => + variant === 'making' ? theme.colors.BG : theme.colors.white}; + + border: 0.1rem solid ${({ theme }) => theme.colors.BG}; + border-left: none; + border-radius: 0 0.2rem 0.2rem 0; + + ${({ theme }) => theme.fonts.Title1_SB_16} +`; diff --git a/src/Home/components/Main/index.tsx b/src/Home/components/Main/index.tsx new file mode 100644 index 00000000..6f641e9b --- /dev/null +++ b/src/Home/components/Main/index.tsx @@ -0,0 +1,28 @@ +import { IcNotice, ImgLogoLecue } from '../../../assets'; +import * as S from './Main.style'; + +function Main() { + return ( + + + + + + + + + 레큐북 만들기 + + + 내 기록 보러가기 + + + + ); +} + +export default Main; diff --git a/src/Router.tsx b/src/Router.tsx index 16e4af3a..d0902a02 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -1,12 +1,12 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; -import HomePage from './Home/page/HomePage'; +import Home from './Home/page'; function Router() { return ( - } /> + } /> ); From 67586d5f96f830c265a5fdf4630b13319aabae22 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Sat, 6 Jan 2024 18:09:30 +0900 Subject: [PATCH 02/15] =?UTF-8?q?chore:=20stylelint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/Main/Main.style.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/Main/Main.style.ts index 22b053a5..8455511d 100644 --- a/src/Home/components/Main/Main.style.ts +++ b/src/Home/components/Main/Main.style.ts @@ -3,21 +3,24 @@ import styled from '@emotion/styled'; export type ButtonStyle = 'making' | 'mypage'; export const MainWrapper = styled.div` - background-color: ${({ theme }) => theme.colors.background}; width: 100%; height: 34.7rem; + + background-color: ${({ theme }) => theme.colors.background}; `; export const IconWrapper = styled.section` display: flex; + width: 100%; - padding: 6rem 1.6rem 5rem 1.6rem; + padding: 6rem 1.6rem 5rem; gap: 15.7rem; `; export const ButtonWrapper = styled.section` display: flex; flex-direction: column; + gap: 1rem; `; @@ -25,15 +28,13 @@ export const Button = styled.button<{ variant: ButtonStyle }>` width: 28rem; height: 6.4rem; + border: 0.1rem solid ${({ theme }) => theme.colors.BG}; + border-radius: 0 0.2rem 0.2rem 0; + border-left: none; background-color: ${({ theme, variant }) => variant === 'making' ? theme.colors.white : theme.colors.BG}; - color: ${({ theme, variant }) => variant === 'making' ? theme.colors.BG : theme.colors.white}; - border: 0.1rem solid ${({ theme }) => theme.colors.BG}; - border-left: none; - border-radius: 0 0.2rem 0.2rem 0; - ${({ theme }) => theme.fonts.Title1_SB_16} `; From 60a5991651b80fd7cd91d827d808f726968fd469 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Sat, 6 Jan 2024 18:10:50 +0900 Subject: [PATCH 03/15] =?UTF-8?q?chore:=20stylelint=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=20(font=20=EA=B0=9C=ED=96=89=20=EC=88=98=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/Main/Main.style.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/Main/Main.style.ts index 8455511d..0e0099c4 100644 --- a/src/Home/components/Main/Main.style.ts +++ b/src/Home/components/Main/Main.style.ts @@ -35,6 +35,5 @@ export const Button = styled.button<{ variant: ButtonStyle }>` variant === 'making' ? theme.colors.white : theme.colors.BG}; color: ${({ theme, variant }) => variant === 'making' ? theme.colors.BG : theme.colors.white}; - ${({ theme }) => theme.fonts.Title1_SB_16} `; From 4fc2569b9d815ec1f1e8a0b14850f62f7bc2ddfd Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 00:32:00 +0900 Subject: [PATCH 04/15] =?UTF-8?q?feat:=20Home/LequeBookList=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LecueBookList/LecueBookList.style.ts | 59 +++++++++++ src/Home/components/LecueBookList/index.tsx | 97 +++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 src/Home/components/LecueBookList/LecueBookList.style.ts create mode 100644 src/Home/components/LecueBookList/index.tsx diff --git a/src/Home/components/LecueBookList/LecueBookList.style.ts b/src/Home/components/LecueBookList/LecueBookList.style.ts new file mode 100644 index 00000000..04ec0361 --- /dev/null +++ b/src/Home/components/LecueBookList/LecueBookList.style.ts @@ -0,0 +1,59 @@ +import styled from '@emotion/styled'; + +export const LecueBookListWrapper = styled.div` + display: flex; + flex-direction: column; + + width: 100%; +`; + +export const Title = styled.header` + width: 100%; + padding: 1.5rem 0; + + border-color: ${({ theme }) => theme.colors.BG}; + border-width: 0.1rem 0; + border-style: solid; + color: ${({ theme }) => theme.colors.BG}; + ${({ theme }) => theme.fonts.Title1_SB_16}; + + text-align: center; +`; + +export const LecueBookList = styled.section` + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 2.2rem; + + width: 100%; + padding: 3rem 1.6rem 2.2rem; + + background-color: ${({ theme }) => theme.colors.key}; +`; + +export const LecueBook = styled.li` + display: flex; + align-items: center; + flex-direction: column; + + width: 10rem; + height: 14rem; + gap: 1rem; +`; + +export const BookImage = styled.img` + width: 9.8rem; + height: 9.8rem; + + border-radius: 50%; +`; + +export const BookTitle = styled.p` + width: 80%; + + ${({ theme }) => theme.fonts.E_Body1_SB_14}; + + text-align: center; + word-wrap: normal; + word-break: keep-all; +`; diff --git a/src/Home/components/LecueBookList/index.tsx b/src/Home/components/LecueBookList/index.tsx new file mode 100644 index 00000000..a0b69b3a --- /dev/null +++ b/src/Home/components/LecueBookList/index.tsx @@ -0,0 +1,97 @@ +import * as S from './LecueBookList.style'; +function LecueBookList() { + return ( + + 인기 레큐북 구경하기 + + {BOOK_LIST.map((book) => ( + + + {book.favoriteName} + + ))} + ; + + + ); +} + +export default LecueBookList; + +const BOOK_LIST = [ + { + bookId: 0, + favoriteName: 'SOPT', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=1', + }, + { + bookId: 1, + favoriteName: '환승연애 출연진', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=2', + }, + { + bookId: 2, + favoriteName: 'Vanner', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=3', + }, + { + bookId: 3, + favoriteName: '침착맨 생카 데이쥬', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=4', + }, + { + bookId: 4, + favoriteName: '빠니보틀', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=5', + }, + { + bookId: 5, + favoriteName: '레오제이', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=6', + }, + { + bookId: 6, + favoriteName: '곽튜브', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=7', + }, + { + bookId: 7, + favoriteName: '재롱잔치', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=8', + }, + { + bookId: 8, + favoriteName: '주호다', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=9', + }, + { + bookId: 9, + favoriteName: '1분요리 뚝딱이형', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=10', + }, + { + bookId: 10, + favoriteName: '송이송이', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=11', + }, + { + bookId: 11, + favoriteName: '상윤쓰', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=12', + }, + { + bookId: 12, + favoriteName: '1분요리 뚝딱이형', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=13', + }, + { + bookId: 13, + favoriteName: '송이송이', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=14', + }, + { + bookId: 14, + favoriteName: '상윤쓰', + favoriteImage: 'https://source.unsplash.com/random/98x98?sig=15', + }, +]; From f6b67b74229b938b3594f5f1cf62dcd742a27908 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 00:36:21 +0900 Subject: [PATCH 05/15] =?UTF-8?q?feat:=20=ED=99=88=20=EB=B7=B0=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/page/HomePage.tsx | 10 ---------- src/Home/page/index.tsx | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 src/Home/page/HomePage.tsx create mode 100644 src/Home/page/index.tsx diff --git a/src/Home/page/HomePage.tsx b/src/Home/page/HomePage.tsx deleted file mode 100644 index 991219a8..00000000 --- a/src/Home/page/HomePage.tsx +++ /dev/null @@ -1,10 +0,0 @@ -function HomePage() { - return ( -
-

HomePage

-

HomeHome

-
- ); -} - -export default HomePage; diff --git a/src/Home/page/index.tsx b/src/Home/page/index.tsx new file mode 100644 index 00000000..fe795347 --- /dev/null +++ b/src/Home/page/index.tsx @@ -0,0 +1,15 @@ +import React from 'react'; + +import LecueBookList from '../components/LecueBookList'; +import Main from '../components/Main'; + +function Home() { + return ( + +
+ + + ); +} + +export default Home; From 60ea8d88b1acaa776db3e8e526fabce466b028b5 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 00:39:27 +0900 Subject: [PATCH 06/15] =?UTF-8?q?chore:=20=EA=B0=9C=ED=96=89=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/LecueBookList/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Home/components/LecueBookList/index.tsx b/src/Home/components/LecueBookList/index.tsx index a0b69b3a..191e2973 100644 --- a/src/Home/components/LecueBookList/index.tsx +++ b/src/Home/components/LecueBookList/index.tsx @@ -1,4 +1,5 @@ import * as S from './LecueBookList.style'; + function LecueBookList() { return ( From b4585c05ba024aa3ec630d750f0039b54e2f4acc Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 01:05:27 +0900 Subject: [PATCH 07/15] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B3=A0,=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=ED=81=B4=EB=A6=AD=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/Main/Main.style.ts | 1 + src/Home/components/Main/index.tsx | 33 ++++++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/Main/Main.style.ts index 0e0099c4..d79e0d4b 100644 --- a/src/Home/components/Main/Main.style.ts +++ b/src/Home/components/Main/Main.style.ts @@ -11,6 +11,7 @@ export const MainWrapper = styled.div` export const IconWrapper = styled.section` display: flex; + align-items: baseline; width: 100%; padding: 6rem 1.6rem 5rem; diff --git a/src/Home/components/Main/index.tsx b/src/Home/components/Main/index.tsx index 6f641e9b..323486ba 100644 --- a/src/Home/components/Main/index.tsx +++ b/src/Home/components/Main/index.tsx @@ -2,22 +2,41 @@ import { IcNotice, ImgLogoLecue } from '../../../assets'; import * as S from './Main.style'; function Main() { + const handleClickMakingBtn = () => { + // 로그인 여부 판별 후 레큐북 생성으로 이동 + alert('레큐북 만들기 버튼 클릭'); + }; + + const handleClickMypageBtn = () => { + // 로그인 여부 판별 후 마이페이지로 이동 + alert('내 기록 보러가기 버튼 클릭'); + }; + return ( - - + - + 레큐북 만들기 - + 내 기록 보러가기 From fd711e5b370a970f2d8af8c0d92ab732de336530 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 01:17:11 +0900 Subject: [PATCH 08/15] =?UTF-8?q?feat:=20=EC=9D=B8=EA=B8=B0=EB=A0=88?= =?UTF-8?q?=ED=81=90=EB=B6=81=20=EC=9A=94=EC=86=8C=20=EB=B3=84=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/LecueBookList/LecueBookList.style.ts | 2 ++ src/Home/components/LecueBookList/index.tsx | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Home/components/LecueBookList/LecueBookList.style.ts b/src/Home/components/LecueBookList/LecueBookList.style.ts index 04ec0361..3cfa1820 100644 --- a/src/Home/components/LecueBookList/LecueBookList.style.ts +++ b/src/Home/components/LecueBookList/LecueBookList.style.ts @@ -39,6 +39,8 @@ export const LecueBook = styled.li` width: 10rem; height: 14rem; gap: 1rem; + + cursor: pointer; `; export const BookImage = styled.img` diff --git a/src/Home/components/LecueBookList/index.tsx b/src/Home/components/LecueBookList/index.tsx index 191e2973..42713c66 100644 --- a/src/Home/components/LecueBookList/index.tsx +++ b/src/Home/components/LecueBookList/index.tsx @@ -1,12 +1,19 @@ import * as S from './LecueBookList.style'; function LecueBookList() { + const handleClickLecueBook = (bookName: string) => { + alert(`${bookName} 선택되었습니다.`); + }; + return ( 인기 레큐북 구경하기 {BOOK_LIST.map((book) => ( - + handleClickLecueBook(book.favoriteName)} + > {book.favoriteName} From 6addf5e1f52ee922abf2ac2716ec323f7303d55d Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 19:40:43 +0900 Subject: [PATCH 09/15] =?UTF-8?q?chore:=20=ED=95=84=EC=9A=94=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/LecueBookList/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Home/components/LecueBookList/index.tsx b/src/Home/components/LecueBookList/index.tsx index 42713c66..eae43468 100644 --- a/src/Home/components/LecueBookList/index.tsx +++ b/src/Home/components/LecueBookList/index.tsx @@ -18,7 +18,6 @@ function LecueBookList() { {book.favoriteName} ))} - ; ); From 8494f595618ac7da374cd9804cca98b4aa5dc300 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 19:53:10 +0900 Subject: [PATCH 10/15] =?UTF-8?q?feat:=20BookTitle=20style=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/LecueBookList/LecueBookList.style.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Home/components/LecueBookList/LecueBookList.style.ts b/src/Home/components/LecueBookList/LecueBookList.style.ts index 3cfa1820..6d88bd28 100644 --- a/src/Home/components/LecueBookList/LecueBookList.style.ts +++ b/src/Home/components/LecueBookList/LecueBookList.style.ts @@ -51,11 +51,11 @@ export const BookImage = styled.img` `; export const BookTitle = styled.p` - width: 80%; + width: 100%; ${({ theme }) => theme.fonts.E_Body1_SB_14}; text-align: center; word-wrap: normal; - word-break: keep-all; + word-break: break-all; `; From b83f392679fdcc8f138f10d5a4efbbf9bfeffc94 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 19:54:00 +0900 Subject: [PATCH 11/15] =?UTF-8?q?feat:=20theme=20=EB=B3=80=EA=B2=BD(E=5FBo?= =?UTF-8?q?dy1=5FSB=5F14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/theme.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/theme.ts b/src/styles/theme.ts index 1e052ae4..6380a961 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -120,7 +120,7 @@ const fonts = { fontStyle: 'normal', fontWeight: 600, fontSize: '1.4rem', - lineHeight: 'auto', + lineHeight: '120%', letterSpacing: '0', }, E_Body2_R_14: { From 712980564dc98c11f1d1f9afeb6a50f6386914f0 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 20:10:13 +0900 Subject: [PATCH 12/15] =?UTF-8?q?feat:=20a=ED=83=9C=EA=B7=B8=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/Main/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Home/components/Main/index.tsx b/src/Home/components/Main/index.tsx index 323486ba..a69d1cfa 100644 --- a/src/Home/components/Main/index.tsx +++ b/src/Home/components/Main/index.tsx @@ -19,6 +19,7 @@ function Main() { From 0e087e4101b6b2fdeb6a18738a4ea94360a7b42d Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Tue, 9 Jan 2024 13:17:03 +0900 Subject: [PATCH 13/15] =?UTF-8?q?refactor:=20type=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/Main/Main.style.ts | 8 +++----- src/Home/components/Main/index.tsx | 12 ++---------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/Main/Main.style.ts index d79e0d4b..5af2a3f0 100644 --- a/src/Home/components/Main/Main.style.ts +++ b/src/Home/components/Main/Main.style.ts @@ -1,7 +1,5 @@ import styled from '@emotion/styled'; -export type ButtonStyle = 'making' | 'mypage'; - export const MainWrapper = styled.div` width: 100%; height: 34.7rem; @@ -25,7 +23,7 @@ export const ButtonWrapper = styled.section` gap: 1rem; `; -export const Button = styled.button<{ variant: ButtonStyle }>` +export const Button = styled.button<{ variant?: boolean }>` width: 28rem; height: 6.4rem; @@ -33,8 +31,8 @@ export const Button = styled.button<{ variant: ButtonStyle }>` border-radius: 0 0.2rem 0.2rem 0; border-left: none; background-color: ${({ theme, variant }) => - variant === 'making' ? theme.colors.white : theme.colors.BG}; + variant ? theme.colors.white : theme.colors.BG}; color: ${({ theme, variant }) => - variant === 'making' ? theme.colors.BG : theme.colors.white}; + variant ? theme.colors.BG : theme.colors.white}; ${({ theme }) => theme.fonts.Title1_SB_16} `; diff --git a/src/Home/components/Main/index.tsx b/src/Home/components/Main/index.tsx index a69d1cfa..e24d28c6 100644 --- a/src/Home/components/Main/index.tsx +++ b/src/Home/components/Main/index.tsx @@ -26,18 +26,10 @@ function Main() { - + 레큐북 만들기 - + 내 기록 보러가기 From 1cc92267d63bc7f8dc3c6223453297fcefde52d9 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Wed, 10 Jan 2024 05:45:25 +0900 Subject: [PATCH 14/15] =?UTF-8?q?refactor:=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EB=B0=98=EC=98=81,=20Wrapper=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NavigateLecueBook.style.ts} | 3 ++- .../components/{Main => NavigateLecueBook}/index.tsx | 6 +++--- src/Home/page/Home.style.ts | 10 ++++++++++ src/Home/page/index.tsx | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) rename src/Home/components/{Main/Main.style.ts => NavigateLecueBook/NavigateLecueBook.style.ts} (96%) rename src/Home/components/{Main => NavigateLecueBook}/index.tsx (89%) create mode 100644 src/Home/page/Home.style.ts diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/NavigateLecueBook/NavigateLecueBook.style.ts similarity index 96% rename from src/Home/components/Main/Main.style.ts rename to src/Home/components/NavigateLecueBook/NavigateLecueBook.style.ts index 5af2a3f0..83864970 100644 --- a/src/Home/components/Main/Main.style.ts +++ b/src/Home/components/NavigateLecueBook/NavigateLecueBook.style.ts @@ -2,7 +2,6 @@ import styled from '@emotion/styled'; export const MainWrapper = styled.div` width: 100%; - height: 34.7rem; background-color: ${({ theme }) => theme.colors.background}; `; @@ -20,6 +19,8 @@ export const ButtonWrapper = styled.section` display: flex; flex-direction: column; + padding: 0 9.5rem 4.9rem 0; + gap: 1rem; `; diff --git a/src/Home/components/Main/index.tsx b/src/Home/components/NavigateLecueBook/index.tsx similarity index 89% rename from src/Home/components/Main/index.tsx rename to src/Home/components/NavigateLecueBook/index.tsx index e24d28c6..3de2cebe 100644 --- a/src/Home/components/Main/index.tsx +++ b/src/Home/components/NavigateLecueBook/index.tsx @@ -1,7 +1,7 @@ import { IcNotice, ImgLogoLecue } from '../../../assets'; -import * as S from './Main.style'; +import * as S from './NavigateLecueBook.style'; -function Main() { +function NavigateLecueBook() { const handleClickMakingBtn = () => { // 로그인 여부 판별 후 레큐북 생성으로 이동 alert('레큐북 만들기 버튼 클릭'); @@ -37,4 +37,4 @@ function Main() { ); } -export default Main; +export default NavigateLecueBook; diff --git a/src/Home/page/Home.style.ts b/src/Home/page/Home.style.ts new file mode 100644 index 00000000..e3c719f3 --- /dev/null +++ b/src/Home/page/Home.style.ts @@ -0,0 +1,10 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; + align-items: center; + flex-direction: column; + + width: 100vw; + height: 100dvh; +`; diff --git a/src/Home/page/index.tsx b/src/Home/page/index.tsx index fe795347..711aa5be 100644 --- a/src/Home/page/index.tsx +++ b/src/Home/page/index.tsx @@ -1,12 +1,12 @@ import React from 'react'; import LecueBookList from '../components/LecueBookList'; -import Main from '../components/Main'; +import NavigateLecueBook from '../components/NavigateLecueBook'; function Home() { return ( -
+ ); From 8aedea85dfbd1cabd5939810a9b535fa148d8c09 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 15 Jan 2024 16:33:40 +0900 Subject: [PATCH 15/15] =?UTF-8?q?chore:=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/page/HomePage.tsx | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 src/Home/page/HomePage.tsx diff --git a/src/Home/page/HomePage.tsx b/src/Home/page/HomePage.tsx deleted file mode 100644 index d37c9029..00000000 --- a/src/Home/page/HomePage.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import Header from '../../components/common/Header'; - -function HomePage() { - return ( -
-
-
- ); -} - -export default HomePage;