From 611e278ae46f5155664bdb31493cdad4cab319cc Mon Sep 17 00:00:00 2001
From: hyeonjiroh <sonamu6509@naver.com>
Date: Wed, 21 May 2025 22:39:26 +0900
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EC=9D=B8=EC=A6=9D=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EB=A6=AC=EB=8B=A4?=
 =?UTF-8?q?=EC=9D=B4=EB=A0=89=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(auth)/layout.tsx  | 25 +++++++++++++++++++++++++
 src/app/(board)/layout.tsx | 17 +++++++++++++++++
 src/app/(team)/layout.tsx  | 17 +++++++++++++++++
 src/app/(user)/layout.tsx  | 17 +++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 src/app/(auth)/layout.tsx
 create mode 100644 src/app/(board)/layout.tsx
 create mode 100644 src/app/(team)/layout.tsx
 create mode 100644 src/app/(user)/layout.tsx

diff --git a/src/app/(auth)/layout.tsx b/src/app/(auth)/layout.tsx
new file mode 100644
index 00000000..85e72811
--- /dev/null
+++ b/src/app/(auth)/layout.tsx
@@ -0,0 +1,25 @@
+import { cookies } from 'next/headers';
+import { redirect } from 'next/navigation';
+import { ROUTES } from '@/constants/routes';
+import { getUserGroups } from '@/lib/apis/user';
+
+export default async function AuthLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const accessToken = cookies().get('accessToken')?.value;
+
+  if (accessToken) {
+    const userGroupsData = await getUserGroups({});
+    const firstGroupId = userGroupsData?.[0]?.id;
+
+    if (firstGroupId) {
+      redirect(ROUTES.TEAM(firstGroupId));
+    } else {
+      redirect(ROUTES.TEAM_NO);
+    }
+  }
+
+  return <>{children}</>;
+}
diff --git a/src/app/(board)/layout.tsx b/src/app/(board)/layout.tsx
new file mode 100644
index 00000000..41589148
--- /dev/null
+++ b/src/app/(board)/layout.tsx
@@ -0,0 +1,17 @@
+import { cookies } from 'next/headers';
+import { redirect } from 'next/navigation';
+import { ROUTES } from '@/constants/routes';
+
+export default async function BoardLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const accessToken = cookies().get('accessToken')?.value;
+
+  if (!accessToken) {
+    redirect(ROUTES.LOGIN);
+  }
+
+  return <>{children}</>;
+}
diff --git a/src/app/(team)/layout.tsx b/src/app/(team)/layout.tsx
new file mode 100644
index 00000000..67ebf2d3
--- /dev/null
+++ b/src/app/(team)/layout.tsx
@@ -0,0 +1,17 @@
+import { cookies } from 'next/headers';
+import { redirect } from 'next/navigation';
+import { ROUTES } from '@/constants/routes';
+
+export default async function TeamLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const accessToken = cookies().get('accessToken')?.value;
+
+  if (!accessToken) {
+    redirect(ROUTES.LOGIN);
+  }
+
+  return <>{children}</>;
+}
diff --git a/src/app/(user)/layout.tsx b/src/app/(user)/layout.tsx
new file mode 100644
index 00000000..ae6ac2af
--- /dev/null
+++ b/src/app/(user)/layout.tsx
@@ -0,0 +1,17 @@
+import { cookies } from 'next/headers';
+import { redirect } from 'next/navigation';
+import { ROUTES } from '@/constants/routes';
+
+export default async function UserLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const accessToken = cookies().get('accessToken')?.value;
+
+  if (!accessToken) {
+    redirect(ROUTES.LOGIN);
+  }
+
+  return <>{children}</>;
+}

From c3035004f069c636961fb10dba5e65dfc72d6409 Mon Sep 17 00:00:00 2001
From: hyeonjiroh <sonamu6509@naver.com>
Date: Thu, 22 May 2025 13:44:22 +0900
Subject: [PATCH 2/3] =?UTF-8?q?design:=20=EB=B0=98=EC=9D=91=ED=98=95=20?=
 =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_components/LoginForm/OpenPasswordResetModal.tsx     | 2 +-
 src/app/(auth)/login/_components/LoginForm/index.tsx     | 4 ++--
 .../(auth)/login/_components/NavigateToSignUp/index.tsx  | 9 +++++++--
 src/app/(auth)/login/_components/SocialLogin/index.tsx   | 2 +-
 src/app/(auth)/login/page.tsx                            | 4 ++--
 src/app/(auth)/signup/SignupForm.tsx                     | 6 +++---
 src/app/(auth)/signup/page.tsx                           | 4 ++--
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/app/(auth)/login/_components/LoginForm/OpenPasswordResetModal.tsx b/src/app/(auth)/login/_components/LoginForm/OpenPasswordResetModal.tsx
index 1669e7a5..d2d547a4 100644
--- a/src/app/(auth)/login/_components/LoginForm/OpenPasswordResetModal.tsx
+++ b/src/app/(auth)/login/_components/LoginForm/OpenPasswordResetModal.tsx
@@ -63,7 +63,7 @@ export default function OpenPasswordResetModal({ ...props }) {
   return (
     <div className="mt-3 mb-10 flex justify-end">
       <button
-        className="leading-normal font-medium text-emerald-500 underline"
+        className="text-md-medium tablet:text-lg-medium leading-6 text-emerald-500 underline"
         type="button"
         onClick={() => {
           openModal(
diff --git a/src/app/(auth)/login/_components/LoginForm/index.tsx b/src/app/(auth)/login/_components/LoginForm/index.tsx
index 3e400966..c9bcf90d 100644
--- a/src/app/(auth)/login/_components/LoginForm/index.tsx
+++ b/src/app/(auth)/login/_components/LoginForm/index.tsx
@@ -188,7 +188,7 @@ export default function LoginForm() {
 
   return (
     <form onSubmit={handleFormSubmit}>
-      <h1 className="text-4xl-medium mb-20 text-center">로그인</h1>
+      <h1 className="text-4xl-medium tablet:mb-20 mb-10 text-center">로그인</h1>
 
       <div className="flex flex-col gap-6">
         <InputWithLabel
@@ -212,7 +212,7 @@ export default function LoginForm() {
         variant="primary"
         styleType="filled"
         radius="sm"
-        className="w-[460px]"
+        className="w-full"
         disabled={!isFormValid}
       >
         로그인
diff --git a/src/app/(auth)/login/_components/NavigateToSignUp/index.tsx b/src/app/(auth)/login/_components/NavigateToSignUp/index.tsx
index e3acf5c4..d3737db2 100644
--- a/src/app/(auth)/login/_components/NavigateToSignUp/index.tsx
+++ b/src/app/(auth)/login/_components/NavigateToSignUp/index.tsx
@@ -3,8 +3,13 @@ import Link from 'next/link';
 export default function NavigateToSignUp() {
   return (
     <div className="mt-6 flex items-center justify-center gap-3">
-      <span className="text-lg-medium">아직 계정이 없으신가요?</span>
-      <Link href={'/signup'} className="font-medium text-emerald-500 underline">
+      <span className="text-md-medium tablet:text-lg-medium">
+        아직 계정이 없으신가요?
+      </span>
+      <Link
+        href={'/signup'}
+        className="text-md-medium tablet:text-lg-medium text-emerald-500 underline"
+      >
         가입하기
       </Link>
     </div>
diff --git a/src/app/(auth)/login/_components/SocialLogin/index.tsx b/src/app/(auth)/login/_components/SocialLogin/index.tsx
index 304d60d4..7ff90f1c 100644
--- a/src/app/(auth)/login/_components/SocialLogin/index.tsx
+++ b/src/app/(auth)/login/_components/SocialLogin/index.tsx
@@ -13,7 +13,7 @@ export default function SocialLogin() {
       </div>
 
       {/*social login*/}
-      <div className="flex items-center justify-between">
+      <div className="flex items-center justify-between pb-20">
         <span className="text-lg-medium">간편 로그인하기</span>
         <button>
           <Icons.KakaoLoginIcon
diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
index b339f0f4..de7f1bb0 100644
--- a/src/app/(auth)/login/page.tsx
+++ b/src/app/(auth)/login/page.tsx
@@ -4,8 +4,8 @@ import SocialLogin from '@/app/(auth)/login/_components/SocialLogin';
 
 export default function LoginPage() {
   return (
-    <div className="flex h-[calc(100vh-60px)] items-center justify-center">
-      <div className="flex flex-col">
+    <div className="laptop:py-[140px] tablet:py-[100px] h-[calc(100vh-60px)] px-4 py-20">
+      <div className="m-auto flex max-w-[460px] flex-col">
         <LoginForm />
         <NavigateToSignUp />
         <SocialLogin />
diff --git a/src/app/(auth)/signup/SignupForm.tsx b/src/app/(auth)/signup/SignupForm.tsx
index 174145c5..f1c4a146 100644
--- a/src/app/(auth)/signup/SignupForm.tsx
+++ b/src/app/(auth)/signup/SignupForm.tsx
@@ -240,13 +240,13 @@ export default function SignupForm() {
         />
       </div>
 
-      <div className="flex max-w-[460px] gap-3">
+      <div className="mb-20 flex gap-3">
         <Button
           size="lg"
           variant="primary"
           styleType="filled"
           radius="sm"
-          className="mb-4 w-[460px] basis-1/3"
+          className="basis-1/3"
           onClick={() => {
             router.back();
           }}
@@ -260,7 +260,7 @@ export default function SignupForm() {
           variant="primary"
           styleType="filled"
           radius="sm"
-          className="w-[460px] basis-2/3"
+          className="basis-2/3"
           disabled={!isFormValid}
         >
           회원가입
diff --git a/src/app/(auth)/signup/page.tsx b/src/app/(auth)/signup/page.tsx
index 65e59fb1..6edd26b1 100644
--- a/src/app/(auth)/signup/page.tsx
+++ b/src/app/(auth)/signup/page.tsx
@@ -2,8 +2,8 @@ import SignupForm from '@/app/(auth)/signup/SignupForm';
 
 export default function SignupPage() {
   return (
-    <div className="flex h-[calc(100vh-60px)] items-center justify-center">
-      <div className="flex flex-col">
+    <div className="tablet:py-[100px] h-[calc(100vh-60px)] px-4 py-20">
+      <div className="m-auto flex max-w-[460px] flex-col">
         <SignupForm />
       </div>
     </div>

From 1b719fe26e35a13bd9b57c5d5c921161db0e897e Mon Sep 17 00:00:00 2001
From: hyeonjiroh <sonamu6509@naver.com>
Date: Thu, 22 May 2025 14:05:09 +0900
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=8B=9C=20=ED=8C=80=20=EC=86=8C=EC=86=8D=20=EC=97=AC=EB=B6=80?=
 =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=A6=AC=EB=8B=A4=EC=9D=B4?=
 =?UTF-8?q?=EB=A0=89=EC=85=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(auth)/login/_components/LoginForm/index.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/(auth)/login/_components/LoginForm/index.tsx b/src/app/(auth)/login/_components/LoginForm/index.tsx
index c9bcf90d..660e964f 100644
--- a/src/app/(auth)/login/_components/LoginForm/index.tsx
+++ b/src/app/(auth)/login/_components/LoginForm/index.tsx
@@ -3,6 +3,7 @@
 import InputWithLabel from '@/components/auth/InputWithLabel';
 import Button from '@/components/common/Button';
 import { signIn } from '@/lib/apis/auth';
+import { getUserGroups } from '@/lib/apis/user';
 import {
   validateEmail,
   validateName,
@@ -12,9 +13,9 @@ import {
 import { useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 import Cookies from 'js-cookie';
-
 import { z } from 'zod';
 import { useRouter } from 'next/navigation';
+import { ROUTES } from '@/constants/routes';
 import { InputType } from '@/components/auth/type';
 import OpenPasswordResetModal from '@/app/(auth)/login/_components/LoginForm/OpenPasswordResetModal';
 
@@ -165,7 +166,14 @@ export default function LoginForm() {
       });
 
       toast.success('로그인 되었습니다.');
-      router.push('/no-team');
+      const userGroupsData = await getUserGroups({});
+      const firstGroupId = userGroupsData?.[0]?.id;
+
+      if (firstGroupId) {
+        router.push(ROUTES.TEAM(firstGroupId));
+      } else {
+        router.push(ROUTES.TEAM_NO);
+      }
     } catch (error) {
       if (error instanceof Error) {
         const errorMessage = error.message;