Merge pull request #65 from FinalDoubleTen/dev

Feat: 파비콘 변경, 로그인 레이아웃 조정
WePlanPlans · Jan 4, 2024 · ba6ab40 · ba6ab40
2 parents 1a09787 + ba8c5c5
commit ba6ab40
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 24 deletions.
diff --git a/index.html b/index.html
@@ -1,14 +1,16 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.jpeg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>TenTen</title>
-  </head>
 
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
-</html>
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>위플플 | 여정 공유 서비스</title>
+</head>
+
+<body>
+  <div id="root"></div>
+  <script type="module" src="/src/main.tsx"></script>
+</body>
+
+</html>
diff --git a/public/favicon.jpeg b/public/favicon.jpeg
diff --git a/public/favicon.svg b/public/favicon.svg
diff --git a/src/components/common/nav/Nav.tsx b/src/components/common/nav/Nav.tsx
@@ -33,7 +33,7 @@ const Nav = () => {
           <p className="caption2 mt-[3px] text-center text-xs/[11px]">찜</p>
         </div>
         <div
-          onClick={() => navigate('/')}
+          onClick={() => navigate('/signin')}
           className="cursor-pointer flex-col items-center justify-center px-1">
           <div className="flex justify-center">
             <UserIcon />

diff --git a/src/pages/signin/signin.page.tsx b/src/pages/signin/signin.page.tsx
@@ -28,7 +28,7 @@ const Signin = () => {
     }
   };
   return (
-    <div>
+    <div className="flex h-[95vh] flex-col">
       <Back />
       <div className="mb-auto">
         <div className="mb-16 mt-14 flex flex-col items-center">
@@ -55,7 +55,7 @@ const Signin = () => {
         </form>
       </div>
 
-      <div>
+      <div className="mt-auto ">
         <div className="body6 mb-5 flex h-4 items-center gap-4 text-gray4">
           <hr className="flex-auto" />
           또는

diff --git a/src/pages/signup/signup.page.tsx b/src/pages/signup/signup.page.tsx
@@ -5,26 +5,61 @@ const Signup = () => {
   const [isActive] = useState<boolean>(false);
 
   return (
-    <div className="relative">
+    <div className="flex h-[95vh] flex-col ">
       <h1 className="title1 my-11">
         위플플 이용을 위해
         <br />
         회원가입을 해주세요
       </h1>
-      <form>
+      <form className="flex h-full flex-col">
         <UserEmailInputBox />
         <UserPwInputBox />
 
         {/* TODO 서지수 | 모든 조건이 만족되어야지만 활성화되도록 수정 */}
-        <button
-          className={`bottom-5 h-14 w-full rounded-lg ${
-            isActive ? 'bg-main1' : 'bg-gray3'
-          } headline1 relative text-white`}>
-          다음
-        </button>
+        <div className="mt-auto">
+          <button
+            className={`bottom-5 h-14 w-full rounded-lg ${
+              isActive ? 'bg-main1' : 'bg-gray3'
+            } headline1 relative text-white`}>
+            다음
+          </button>
+        </div>
       </form>
     </div>
   );
 };
 
 export default Signup;
+
+// import { UserEmailInputBox, UserPwInputBox } from '@components/user';
+// import { useState } from 'react';
+
+// const Signup = () => {
+//   const [isActive, setIsActive] = useState<boolean>(false);
+
+//   return (
+//     <div className="flex h-[95vh] flex-col ">
+//       <h1 className="title1 my-11">
+//         위플플 이용을 위해
+//         <br />
+//         회원가입을 해주세요
+//       </h1>
+//       <form className="flex h-full flex-col">
+//         <UserEmailInputBox />
+//         <UserPwInputBox />
+
+//         {/* TODO 서지수 | 모든 조건이 만족되어야지만 활성화되도록 수정 */}
+//         <div className="mt-auto">
+//           <button
+//             className={`bottom-5 h-14 w-full rounded-lg ${
+//               isActive ? 'bg-main1' : 'bg-gray3'
+//             } headline1 relative text-white`}>
+//             다음
+//           </button>
+//         </div>
+//       </form>
+//     </div>
+//   );
+// };
+
+// export default Signup;
diff --git a/src/router/mainRouter.tsx b/src/router/mainRouter.tsx
@@ -12,13 +12,19 @@ import Signup from '@pages/signup/signup.page';
 import Signin from '@pages/signin/signin.page';
 
 export function MainLayout() {
+  const location = useLocation();
+  const hideNavPaths = ['/signup', '/signin'];
+  const showNav = !hideNavPaths.some((path) =>
+    location.pathname.includes(path),
+  );
+
   return (
     <div className="mx-auto my-0 flex min-h-[100vh] max-w-[412px] flex-col bg-white ">
       <Header />
-      <div className="mb-auto px-[20px] py-0">
+      <div className="px-[20px] py-0">
         <Outlet />
       </div>
-      <Nav />
+      {showNav && <Nav />}
     </div>
   );
 }