-
Notifications
You must be signed in to change notification settings - Fork 0
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
feat/loginpage : 로그인페이지 퍼블리싱 및 버그픽스 #35
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,17 @@ | ||
import React from "react"; | ||
import SignUp from "#pages/SignUp"; | ||
import Login from "#pages/Login"; | ||
import MainPage from "#pages/MainPage"; | ||
import { Route, Routes } from "react-router-dom"; | ||
|
||
function App() { | ||
return <SignUp />; | ||
return ( | ||
<Routes> | ||
<Route path="/" element={<MainPage />} /> | ||
<Route path="signup" element={<SignUp />} /> | ||
<Route path="login" element={<Login />} /> | ||
</Routes> | ||
); | ||
} | ||
|
||
export default App; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
import styled from "styled-components"; | ||
import { COLOR } from "styles/color"; | ||
|
||
export const LogoWrapper = styled.div` | ||
color: ${COLOR.BLACK}; | ||
width: 90%; | ||
height: 29px; | ||
font-size: 2.4rem; | ||
font-weight: bold; | ||
font-family: "Noto Sans KR"; | ||
margin: auto; | ||
margin-top: 10rem; | ||
padding: 5rem; | ||
text-align: center; | ||
`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
import React, { useCallback } from "react"; | ||
import { useNavigate } from "react-router-dom"; | ||
import Header from "#components/Header/Header"; | ||
import Input from "#components/Input/Input"; | ||
import Button from "#components/Button/Button"; | ||
import useInput from "#hooks/useInput"; | ||
import axios from "axios"; | ||
import { PLACEHOLDER } from "#constants/constants"; | ||
import { idValidator, passwordValidator } from "#utils/valitationUtils"; | ||
|
||
import { InputWrapper, OptionsWrapper } from "./SignUp.styles"; | ||
|
||
import { LogoWrapper } from "./Login.styles"; | ||
|
||
const Login = () => { | ||
const [userId, onChangeUserId, userIdError] = useInput(idValidator); | ||
const [password, onChangePassword, passwordError] = useInput(passwordValidator); | ||
|
||
const navigate = useNavigate(); | ||
|
||
const checkFormValidation = useCallback(() => { | ||
return userIdError || passwordError; | ||
}, [userIdError, passwordError]); | ||
|
||
const onSubmitLogin = () => { | ||
if (checkFormValidation()) return; | ||
axios | ||
.post("http://localhost:4000/auth/login", { | ||
userId, | ||
password, | ||
}) | ||
.then((res) => res.status === 201 && navigate("/", { replace: true })) | ||
.catch(console.log); | ||
}; | ||
|
||
return ( | ||
<> | ||
<Header text="로그인" /> | ||
<LogoWrapper>RunWithMe</LogoWrapper> | ||
<InputWrapper> | ||
<Input placeholder={PLACEHOLDER.ID} type="text" onChange={onChangeUserId}></Input> | ||
<span>{userIdError}</span> | ||
<Input placeholder={PLACEHOLDER.PASSWORD} type="password" onChange={onChangePassword}></Input> | ||
<span>{passwordError}</span> | ||
<Button width="fill" onClick={onSubmitLogin}> | ||
로그인 | ||
</Button> | ||
</InputWrapper> | ||
<OptionsWrapper> | ||
<div> | ||
<span onClick={() => navigate("/pwInquiry")}>비밀번호 찾기</span> | ||
</div> | ||
<div> | ||
<span onClick={() => navigate("/signup")}>회원가입</span> | ||
</div> | ||
</OptionsWrapper> | ||
</> | ||
); | ||
}; | ||
|
||
export default Login; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import React from "react"; | ||
import { useNavigate } from "react-router-dom"; | ||
|
||
/* | ||
임시 메인페이지입니다 (라우팅 / 내비게이션 테스팅용) | ||
*/ | ||
const MainPage = () => { | ||
const navigate = useNavigate(); | ||
const handleLoginClick = () => { | ||
navigate("/login"); | ||
}; | ||
const handleSignUpClick = () => { | ||
navigate("/signup"); | ||
}; | ||
|
||
return ( | ||
<> | ||
<button onClick={handleLoginClick}>로그인</button> | ||
<button onClick={handleSignUpClick}>회원가입 </button> | ||
</> | ||
); | ||
}; | ||
|
||
export default MainPage; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
감사합니다🙇♂️