From a4a1f7c4f4e916ca4d825c9c0c6fa2f8940e906f Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 14:32:38 +0900 Subject: [PATCH 1/9] =?UTF-8?q?chore:=20=EB=9E=9C=EB=94=A9=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(home)/page.tsx | 4 ++-- src/app/components/layout/Header.tsx | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/(home)/page.tsx b/src/app/(home)/page.tsx index ce27314b..f222e93e 100644 --- a/src/app/(home)/page.tsx +++ b/src/app/(home)/page.tsx @@ -273,7 +273,7 @@ export default function LandingPage() { src={slides[currentSlide].blackAreaImage || ""} alt={slides[currentSlide].blackAreaTitle || ""} fill - className="object-contain transition-transform duration-500 hover:scale-105" + className="object-contain transition-transform duration-500" sizes="(max-width: 768px) 100vw, 600px" /> @@ -488,7 +488,7 @@ export default function LandingPage() { src={slides[currentSlide].image} alt={slides[currentSlide].title} fill - className="object-contain transition-transform duration-500 hover:scale-105" + className="object-contain transition-transform duration-500" sizes="(max-width: 768px) 100vw, 600px" /> diff --git a/src/app/components/layout/Header.tsx b/src/app/components/layout/Header.tsx index 6f8554c3..805b540d 100644 --- a/src/app/components/layout/Header.tsx +++ b/src/app/components/layout/Header.tsx @@ -27,16 +27,22 @@ export default function Header() {
워크 채널 워크톡 + + 로그인 +
From 3e86100429b0207ade21fdbe998f9d2fcc92b8d3 Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 14:33:00 +0900 Subject: [PATCH 2/9] =?UTF-8?q?chore:=20button=20hover=20=EC=8B=9C=20?= =?UTF-8?q?=EC=A7=84=ED=95=98=EA=B2=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/components/button/default/Button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/button/default/Button.tsx b/src/app/components/button/default/Button.tsx index 3749a854..6b6c9bfb 100644 --- a/src/app/components/button/default/Button.tsx +++ b/src/app/components/button/default/Button.tsx @@ -41,7 +41,7 @@ const Button = ({ const colorStyles = { orange: { solid: - "bg-primary-orange-300 text-white hover:bg-primary-orange-200 focus:ring-1 focus:ring-primary-orange-200 focus:outline-none disabled:bg-primary-orange-100 disabled:cursor-not-allowed", + "bg-primary-orange-300 text-white hover:bg-primary-orange-450 focus:ring-1 focus:ring-primary-orange-200 focus:outline-none disabled:bg-primary-orange-100 disabled:cursor-not-allowed", outlined: "border-2 border-primary-orange-300 text-primary-orange-300 hover:border-primary-orange-200 hover:text-primary-orange-200 focus:ring-1 focus:ring-primary-orange-200 focus:outline-none disabled:border-primary-orange-100 disabled:text-grayscale-100 disabled:cursor-not-allowed disabled:hover:bg-transparent", }, From b5ebc5b90b9fbf7dd81f4b5fd3c98ddf87c54fe1 Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 14:44:03 +0900 Subject: [PATCH 3/9] =?UTF-8?q?chore:=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=84=A0=EC=96=B8=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(auth)/login/page.tsx | 2 +- src/app/(auth)/signup/page.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx index ecdbd3d9..474a2693 100644 --- a/src/app/(auth)/login/page.tsx +++ b/src/app/(auth)/login/page.tsx @@ -19,7 +19,7 @@ export default function LoginPage() { // 로그인 훅과 로딩 상태 관리 const { login, isPending } = useLogin(); const [isSocialLogin, setIsSocialLogin] = useState(false); - const [currentProvider, setCurrentProvider] = useState(oauthProviders.GOOGLE); + const [, setCurrentProvider] = useState(oauthProviders.GOOGLE); // 폼 유효성 검사 및 상태 관리 const { diff --git a/src/app/(auth)/signup/page.tsx b/src/app/(auth)/signup/page.tsx index 32549cdc..0eefa096 100644 --- a/src/app/(auth)/signup/page.tsx +++ b/src/app/(auth)/signup/page.tsx @@ -22,7 +22,7 @@ export default function SignupPage() { {/* 지원자 회원가입 카드 */}
@@ -41,7 +41,7 @@ export default function SignupPage() { {/* 사장님 회원가입 카드 */}
From ea5bd0ca8427b2403cebb5dc491d156769fc1a2b Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 14:51:10 +0900 Subject: [PATCH 4/9] =?UTF-8?q?chore:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8,=20?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=B0=B0=EA=B2=BD=EC=83=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/components/button/default/Button.tsx | 2 +- src/app/components/layout/auth/Background.tsx | 2 +- tailwind.config.ts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/components/button/default/Button.tsx b/src/app/components/button/default/Button.tsx index 6b6c9bfb..75f61f30 100644 --- a/src/app/components/button/default/Button.tsx +++ b/src/app/components/button/default/Button.tsx @@ -41,7 +41,7 @@ const Button = ({ const colorStyles = { orange: { solid: - "bg-primary-orange-300 text-white hover:bg-primary-orange-450 focus:ring-1 focus:ring-primary-orange-200 focus:outline-none disabled:bg-primary-orange-100 disabled:cursor-not-allowed", + "bg-primary-orange-300 text-white hover:bg-primary-orange-350 focus:ring-1 focus:ring-primary-orange-200 focus:outline-none disabled:bg-primary-orange-100 disabled:cursor-not-allowed", outlined: "border-2 border-primary-orange-300 text-primary-orange-300 hover:border-primary-orange-200 hover:text-primary-orange-200 focus:ring-1 focus:ring-primary-orange-200 focus:outline-none disabled:border-primary-orange-100 disabled:text-grayscale-100 disabled:cursor-not-allowed disabled:hover:bg-transparent", }, diff --git a/src/app/components/layout/auth/Background.tsx b/src/app/components/layout/auth/Background.tsx index 6d59b6e1..fb47fa23 100644 --- a/src/app/components/layout/auth/Background.tsx +++ b/src/app/components/layout/auth/Background.tsx @@ -1,6 +1,6 @@ export default function Background({ children }: { children: React.ReactNode }) { return ( -
+
{children}
); diff --git a/tailwind.config.ts b/tailwind.config.ts index c4991970..8e64a627 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -34,6 +34,7 @@ const config: Config = { 100: "#bde3bf", 200: "#94d597", 300: "#5ebd63", // 사용자 브랜드 색상 + 350: "#41a14a", 400: "#4b9f4d", 500: "#008957", }, From 0978cb4ce990d31d1f80523fe1c7cb52c1776126 Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 14:53:09 +0900 Subject: [PATCH 5/9] =?UTF-8?q?chore:=20header=20hover=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/components/layout/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/layout/Header.tsx b/src/app/components/layout/Header.tsx index 805b540d..85ec9693 100644 --- a/src/app/components/layout/Header.tsx +++ b/src/app/components/layout/Header.tsx @@ -68,7 +68,7 @@ export default function Header() { return cn( "font-medium transition-colors h-16 flex items-center", - "hover:text-lime-900 hover:font-bold hover:opacity-70", + "hover:font-bold hover:text-primary-orange-300", isActive ? "text-lime-900 text-sm md:text-base lg:text-lg font-bold" : "text-primary-orange-400 text-sm md:text-base" From bd0f4d182aedc1f14a222997b5b93a169747a342 Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 15:10:41 +0900 Subject: [PATCH 6/9] =?UTF-8?q?chore:=20signup=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(auth)/login/page.tsx | 2 +- src/app/(auth)/signup/page.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx index 474a2693..d00fe6e1 100644 --- a/src/app/(auth)/login/page.tsx +++ b/src/app/(auth)/login/page.tsx @@ -86,7 +86,7 @@ export default function LoginPage() {
로그인

아직 계정이 없으신가요?{" "} - + 회원가입하기

diff --git a/src/app/(auth)/signup/page.tsx b/src/app/(auth)/signup/page.tsx index 0eefa096..246dd8d2 100644 --- a/src/app/(auth)/signup/page.tsx +++ b/src/app/(auth)/signup/page.tsx @@ -12,7 +12,7 @@ export default function SignupPage() {

회원 유형 선택

이미 계정이 있으신가요?{" "} - + 로그인하기

@@ -22,7 +22,7 @@ export default function SignupPage() { {/* 지원자 회원가입 카드 */}
From c29549e0eeb43394fa3d71bea3f7f97de024b61b Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 15:11:30 +0900 Subject: [PATCH 7/9] chore: signup bg color fix --- src/app/components/layout/auth/Background.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/layout/auth/Background.tsx b/src/app/components/layout/auth/Background.tsx index fb47fa23..4b8438b2 100644 --- a/src/app/components/layout/auth/Background.tsx +++ b/src/app/components/layout/auth/Background.tsx @@ -1,6 +1,6 @@ export default function Background({ children }: { children: React.ReactNode }) { return ( -
+
{children}
); From 44abedb2ee0e00a56dd6cc8c9b8eb1197e3ee912 Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 15:18:02 +0900 Subject: [PATCH 8/9] =?UTF-8?q?chore:=20=EB=9E=9C=EB=94=A9=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=9B=84?= =?UTF-8?q?=EC=97=90=EB=8A=94=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=88=A8?= =?UTF-8?q?=EA=B8=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/components/layout/Header.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/components/layout/Header.tsx b/src/app/components/layout/Header.tsx index 85ec9693..c31e0ad9 100644 --- a/src/app/components/layout/Header.tsx +++ b/src/app/components/layout/Header.tsx @@ -37,12 +37,14 @@ export default function Header() { > 워크톡 - - 로그인 - + {!user && !isLoading && ( + + 로그인 + + )}
From 5616e6293f7327055b796a30e1dd62e2407a2a01 Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 15:21:36 +0900 Subject: [PATCH 9/9] =?UTF-8?q?chore:=20=EB=9E=9C=EB=94=A9=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20header=20left:0=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/components/layout/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/layout/Header.tsx b/src/app/components/layout/Header.tsx index c31e0ad9..a20c50f3 100644 --- a/src/app/components/layout/Header.tsx +++ b/src/app/components/layout/Header.tsx @@ -22,7 +22,7 @@ export default function Header() { if (pathname === "/") { return ( -
+