From 505d6701e387a018de78f48464526e6b70a53684 Mon Sep 17 00:00:00 2001 From: kangminguu Date: Tue, 10 Dec 2024 01:53:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?style=20:=20=EB=A9=94=EC=9D=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../\353\254\264\354\235\270\353\217\204.svg" | 32 ++++++++++++ "public/\353\254\274\352\262\260.svg" | 29 +++++++++++ ..._\354\234\240\353\246\254\353\263\221.svg" | 51 +++++++++++++++++++ src/components/Common/Container/Container.tsx | 14 ++++- src/components/HomePage/HomeBottle.tsx | 9 ++++ src/components/HomePage/HomeBottleLetter.tsx | 9 ++-- .../LetterContainer/LetterContainer.tsx | 16 +++--- .../WelcomeMessageContainer.tsx | 2 +- src/index.css | 11 ++++ src/pages/Home/HomePage.tsx | 2 +- 10 files changed, 163 insertions(+), 12 deletions(-) create mode 100644 "public/\353\254\264\354\235\270\353\217\204.svg" create mode 100644 "public/\353\254\274\352\262\260.svg" create mode 100644 "public/\355\231\210_\354\234\240\353\246\254\353\263\221.svg" create mode 100644 src/components/HomePage/HomeBottle.tsx diff --git "a/public/\353\254\264\354\235\270\353\217\204.svg" "b/public/\353\254\264\354\235\270\353\217\204.svg" new file mode 100644 index 00000000..df2a2e8d --- /dev/null +++ "b/public/\353\254\264\354\235\270\353\217\204.svg" @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git "a/public/\353\254\274\352\262\260.svg" "b/public/\353\254\274\352\262\260.svg" new file mode 100644 index 00000000..ee198e46 --- /dev/null +++ "b/public/\353\254\274\352\262\260.svg" @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git "a/public/\355\231\210_\354\234\240\353\246\254\353\263\221.svg" "b/public/\355\231\210_\354\234\240\353\246\254\353\263\221.svg" new file mode 100644 index 00000000..1db5edbc --- /dev/null +++ "b/public/\355\231\210_\354\234\240\353\246\254\353\263\221.svg" @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Common/Container/Container.tsx b/src/components/Common/Container/Container.tsx index 2bb5c874..e16707a2 100644 --- a/src/components/Common/Container/Container.tsx +++ b/src/components/Common/Container/Container.tsx @@ -1,4 +1,5 @@ import React from 'react'; +import { useLocation } from 'react-router-dom'; interface ContainerProps { px?: number; @@ -6,9 +7,20 @@ interface ContainerProps { children?: React.ReactNode; } +const gradientStyle = { + background: + 'linear-gradient(to top, rgb(102, 177, 255), rgba(122, 208, 252, 0.3))' +}; + export const Container: React.FC = ({ px = 0, children }) => { + const location = useLocation(); + const isHomePage = location.pathname === '/'; + return ( -
+
{children}
); diff --git a/src/components/HomePage/HomeBottle.tsx b/src/components/HomePage/HomeBottle.tsx new file mode 100644 index 00000000..836d6d07 --- /dev/null +++ b/src/components/HomePage/HomeBottle.tsx @@ -0,0 +1,9 @@ +import React from 'react'; + +export const HomeBottle = () => { + return ( +
+ +
+ ); +}; diff --git a/src/components/HomePage/HomeBottleLetter.tsx b/src/components/HomePage/HomeBottleLetter.tsx index 6151de0a..f43771cb 100644 --- a/src/components/HomePage/HomeBottleLetter.tsx +++ b/src/components/HomePage/HomeBottleLetter.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { Bottle } from '../Common/BottleLetter/Bottle/Bottle'; import { Label } from '../Common/BottleLetter/Label/Label'; import { useNavigate } from 'react-router-dom'; +import { HomeBottle } from './HomeBottle'; interface HomeBottleLetterProps { letterType: 'LETTER' | 'REPLY_LETTER'; @@ -32,9 +32,12 @@ export const HomeBottleLetter = ({
- +
-
+
diff --git a/src/components/HomePage/LetterContainer/LetterContainer.tsx b/src/components/HomePage/LetterContainer/LetterContainer.tsx index d50edaea..2772b104 100644 --- a/src/components/HomePage/LetterContainer/LetterContainer.tsx +++ b/src/components/HomePage/LetterContainer/LetterContainer.tsx @@ -24,8 +24,11 @@ type LetterContainerProps = { export const LetterContainer = ({ letters }: LetterContainerProps) => { const hasLetters = ( -
-
+
+ +
+ +
@@ -64,10 +67,11 @@ export const LetterContainer = ({ letters }: LetterContainerProps) => { ); const noLetters = ( -
-
- -
+
+ {/* */} + +
+
); diff --git a/src/components/HomePage/WelcomeMessageContainer/WelcomeMessageContainer.tsx b/src/components/HomePage/WelcomeMessageContainer/WelcomeMessageContainer.tsx index baa3c5bf..52c678e9 100644 --- a/src/components/HomePage/WelcomeMessageContainer/WelcomeMessageContainer.tsx +++ b/src/components/HomePage/WelcomeMessageContainer/WelcomeMessageContainer.tsx @@ -37,7 +37,7 @@ export const WelcomeMessageContainer = ({
{message}

{messageBody}

-

{subMessage}

+

{subMessage}

); }; diff --git a/src/index.css b/src/index.css index 2ae945d7..9c06d91a 100644 --- a/src/index.css +++ b/src/index.css @@ -92,3 +92,14 @@ font-weight: normal; font-style: normal; } + +.custom-mask { + -webkit-mask-image: linear-gradient( + to bottom, + rgba(0, 0, 0, 0), + rgba(0, 0, 0, 1) + ); + mask-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1)); + -webkit-mask-size: cover; + mask-size: cover; +} diff --git a/src/pages/Home/HomePage.tsx b/src/pages/Home/HomePage.tsx index 5d4a1632..9a1e9946 100644 --- a/src/pages/Home/HomePage.tsx +++ b/src/pages/Home/HomePage.tsx @@ -144,7 +144,7 @@ export const HomePage = () => { onClick={() => { setOpen(true); }} - className="w-full h-[49px] text-sample-blue flex-center rounded-full border" + className="w-full h-[49px] text-white flex-center rounded-full bg-sample-blue" > 키워드 설정 From fefd835063d21338a0d630c309c7b447df44ab78 Mon Sep 17 00:00:00 2001 From: kangminguu Date: Tue, 10 Dec 2024 01:59:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore=20:=20=EC=9E=98=EB=AA=BB=20=EB=93=A4?= =?UTF-8?q?=EC=96=B4=EA=B0=84=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HomePage/LetterContainer/LetterContainer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HomePage/LetterContainer/LetterContainer.tsx b/src/components/HomePage/LetterContainer/LetterContainer.tsx index 2772b104..ea41bc75 100644 --- a/src/components/HomePage/LetterContainer/LetterContainer.tsx +++ b/src/components/HomePage/LetterContainer/LetterContainer.tsx @@ -70,7 +70,7 @@ export const LetterContainer = ({ letters }: LetterContainerProps) => {
{/* */} -
+
);