diff --git a/index.html b/index.html index df4b0b24..ebf673eb 100644 --- a/index.html +++ b/index.html @@ -1,14 +1,16 @@ - - - - - TenTen - - -
- - - + + + + + 위플플 | 여정 공유 서비스 + + + +
+ + + + \ No newline at end of file diff --git a/public/favicon.jpeg b/public/favicon.jpeg deleted file mode 100644 index f5e900bd..00000000 Binary files a/public/favicon.jpeg and /dev/null differ diff --git a/public/favicon.svg b/public/favicon.svg new file mode 100644 index 00000000..7f62c66f --- /dev/null +++ b/public/favicon.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/components/common/nav/Nav.tsx b/src/components/common/nav/Nav.tsx index 1071b6d1..cf531adb 100644 --- a/src/components/common/nav/Nav.tsx +++ b/src/components/common/nav/Nav.tsx @@ -33,7 +33,7 @@ const Nav = () => {

찜

navigate('/')} + onClick={() => navigate('/signin')} className="cursor-pointer flex-col items-center justify-center px-1">
diff --git a/src/pages/signin/signin.page.tsx b/src/pages/signin/signin.page.tsx index 1b465178..af031953 100644 --- a/src/pages/signin/signin.page.tsx +++ b/src/pages/signin/signin.page.tsx @@ -28,7 +28,7 @@ const Signin = () => { } }; return ( -
+
@@ -55,7 +55,7 @@ const Signin = () => {
-
+
또는 diff --git a/src/pages/signup/signup.page.tsx b/src/pages/signup/signup.page.tsx index 67322569..45cd03f5 100644 --- a/src/pages/signup/signup.page.tsx +++ b/src/pages/signup/signup.page.tsx @@ -5,26 +5,61 @@ const Signup = () => { const [isActive] = useState(false); return ( -
+

위플플 이용을 위해
회원가입을 해주세요

-
+ {/* TODO 서지수 | 모든 조건이 만족되어야지만 활성화되도록 수정 */} - +
+ +
); }; export default Signup; + +// import { UserEmailInputBox, UserPwInputBox } from '@components/user'; +// import { useState } from 'react'; + +// const Signup = () => { +// const [isActive, setIsActive] = useState(false); + +// return ( +//
+//

+// 위플플 이용을 위해 +//
+// 회원가입을 해주세요 +//

+//
+// +// + +// {/* TODO 서지수 | 모든 조건이 만족되어야지만 활성화되도록 수정 */} +//
+// +//
+// +//
+// ); +// }; + +// export default Signup; diff --git a/src/router/mainRouter.tsx b/src/router/mainRouter.tsx index 0ea543ee..a1f594eb 100644 --- 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 (
-
+
-
); }