Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: 파비콘 변경, 로그인 레이아웃 조정 #65

Merged
merged 2 commits into from
Jan 4, 2024
Merged

Feat: 파비콘 변경, 로그인 레이아웃 조정 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5654b41
feat: 내정보 누르면 로그인페이지로
LeHiHo Jan 4, 2024
ba8c5c5
Feat: 파비콘 변경, 로그인 레이아웃 조정
LeHiHo Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Binary file removed public/favicon.jpeg
View file
Open in desktop
Binary file not shown.
17 changes: 17 additions & 0 deletions public/favicon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/common/nav/Nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
4 changes: 2 additions & 2 deletions src/pages/signin/signin.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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" />
또는
Expand Down
51 changes: 43 additions & 8 deletions src/pages/signup/signup.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
10 changes: 8 additions & 2 deletions src/router/mainRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
}
Expand Down