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.

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

SKRF-111 design: Login Page 디자인 #10

Merged
merged 4 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
52 changes: 52 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"dependencies": {
"@emotion/css": "^11.11.2",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@tanstack/react-query": "^4.36.1",
"axios": "^1.5.1",
"react": "^18.2.0",
Expand Down
9 changes: 9 additions & 0 deletions src/constants/LoginPage.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const LogoText = {
SPACE_CLUB: 'Space Club',
};

const Message = {
WELCOME: '스페이스 클럽에 오신 걸 환영합니다!',
};

export { LogoText, Message };
69 changes: 69 additions & 0 deletions src/pages/LoginPage/LoginPage.style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import styled from '@emotion/styled';

const PageContainerStyled = styled.div`
display: flex;
height: 100vh;
`;

const LogoAreaStyled = styled.div`
display: flex;
justify-content: center;
align-items: center;
width: 50%;
min-width: 30rem;
height: 100vh;
min-height: 30rem;
`;

const LogoCircleStyled = styled.div`
width: 28rem;
height: 28rem;
border-radius: 50%;
background: linear-gradient(
139deg,
#012a36 10.1%,
rgba(50, 51, 96, 0.78) 46.84%,
rgba(113, 42, 124, 0.51) 69.53%,
rgba(0, 221, 49, 0.15) 88.79%
);
overflow: hidden;
`;

const LogoTextStyled = styled.h1`
display: flex;
flex-direction: column;
position: relative;
top: 1rem;
right: 3rem;
color: #ffffff;
text-align: end;
font-size: 6.25rem;
font-family: 'LogoFont';
`;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

font-style, font-weight 적용되는지 확인 부탁드립니당:)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

확인 결과 적용 안 됩니다...!


const LoginAreaStyled = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 50%;
min-width: 30rem;
height: 100vh;
min-height: 30rem;
font-family: 'MainBold';
`;

const TitleStyled = styled.h1`
padding: 0 10% 3rem 10%;
font-weight: bold;
font-size: large;
`;

export {
PageContainerStyled as ContainerStyled,
LogoAreaStyled,
LogoCircleStyled,
LogoTextStyled,
LoginAreaStyled,
TitleStyled,
};
28 changes: 28 additions & 0 deletions src/pages/LoginPage/LoginPage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { LogoText, Message } from '@/constants/LoginPage';

import {
ContainerStyled,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p2;
무엇을 위한 컨테이너인지 표시해주시면 좋을것 같아요!
ex) LogoContainerStyled

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요거는 그대로 가시나요?

LoginAreaStyled,
LogoAreaStyled,
LogoCircleStyled,
LogoTextStyled,
TitleStyled,
} from './LoginPage.style';

const LoginPage = () => {
return (
<ContainerStyled>
<LogoAreaStyled>
<LogoCircleStyled>
<LogoTextStyled>{LogoText.SPACE_CLUB}</LogoTextStyled>
</LogoCircleStyled>
</LogoAreaStyled>
<LoginAreaStyled>
<TitleStyled>{Message.WELCOME}</TitleStyled>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p2;
TitleStyled도 h1으로 감싸기!

<button>Login with Kakao</button>
</LoginAreaStyled>
</ContainerStyled>
);
};

export default LoginPage;
8 changes: 7 additions & 1 deletion src/pages/MainPage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import React from 'react';

import LoginPage from './LoginPage/LoginPage';

const MainPage = () => {
return <div>main</div>;
return (
<div>
<LoginPage />
</div>
);
};

export default MainPage;
2 changes: 1 addition & 1 deletion src/pages/RegisterPage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

const RegisterPage = () => {
return <div></div>;
return <div>register</div>;
};

export default RegisterPage;
5 changes: 5 additions & 0 deletions src/routes/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import App from '@/App';
import Layout from '@/pages/Layout';
import LoginPage from '@/pages/LoginPage/LoginPage';
import MainPage from '@/pages/MainPage';
import NotFoundPage from '@/pages/NotFoundPage';
import ProfilePage from '@/pages/ProfilePage';
Expand All @@ -26,6 +27,10 @@ const router = createBrowserRouter([
path: 'register',
element: <RegisterPage />,
},
{
path: 'login',
element: <LoginPage />,
},
{
path: '',
element: <Layout />,
Expand Down