From 846f19d45e0bc7af2eeb22861f50a802bb34f6ea Mon Sep 17 00:00:00 2001 From: suyeon Date: Sun, 18 Jun 2023 23:24:16 +0900 Subject: [PATCH 01/13] =?UTF-8?q?[Fix]=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 오타 수정 --- src/screens/SignUpScreen.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/screens/SignUpScreen.js b/src/screens/SignUpScreen.js index 0b9f012..24c34b9 100644 --- a/src/screens/SignUpScreen.js +++ b/src/screens/SignUpScreen.js @@ -15,7 +15,7 @@ import Logo from '../components/Logo'; import { useNavigation } from '@react-navigation/native'; import { AuthRoutes } from '../navigations/routes'; -const SignInScreen = () => { +const SignUpScreen = () => { const [name, setName] = useState(''); const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); @@ -56,7 +56,6 @@ const SignInScreen = () => { setName(name.trim())} @@ -82,7 +81,7 @@ const SignInScreen = () => { setPassword(password.trim())} @@ -103,10 +102,9 @@ const SignInScreen = () => { title={'회원가입'} onPress={() => { onSubmit; - navigation.goBack(); + navigation.navigate(AuthRoutes.SIGN_IN); }} disabled={disabled} - // onPress={() => navigation.navigate(AuthRoutes.CALENDAR_View)} /> @@ -167,4 +165,4 @@ const styles = StyleSheet.create({ }, }); -export default SignInScreen; +export default SignUpScreen; From 631f2df9a3542097087ba3413963913f702a81fe Mon Sep 17 00:00:00 2001 From: suyeon Date: Sun, 18 Jun 2023 23:24:45 +0900 Subject: [PATCH 02/13] =?UTF-8?q?[Feat]=20=EB=A1=9C=EA=B3=A0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20Navigation=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 이미지에서 로고 컴포넌트로 변경, navigation 추가 --- src/screens/SignInScreen.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/screens/SignInScreen.js b/src/screens/SignInScreen.js index 43cf33e..2469a5c 100644 --- a/src/screens/SignInScreen.js +++ b/src/screens/SignInScreen.js @@ -1,5 +1,4 @@ import { - // Image, Keyboard, KeyboardAvoidingView, Platform, @@ -40,10 +39,6 @@ const SignInScreen = () => { - {/* */} { console.log('비밀번호 찾기 화면으로 전환')} - // navigation.navigate(AuthRoutes.Account)} + onPress={() => navigation.navigate(AuthRoutes.Find_PW)} > 비밀번호 찾기 From 19e434f93aa1ef3790e9b63cf8d99ae2b7223d60 Mon Sep 17 00:00:00 2001 From: suyeon Date: Sun, 18 Jun 2023 23:25:21 +0900 Subject: [PATCH 03/13] =?UTF-8?q?[Feat]=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD,=20=EC=B0=BE=EA=B8=B0=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 비밀번호 변경, 찾기 화면 구현 및 navigation추가 --- src/navigations/AuthStack.js | 4 ++ src/navigations/routes.js | 2 + src/screens/ChangePWScreen.js | 122 ++++++++++++++++++++++++++++++++++ src/screens/FindPWScreen.js | 85 +++++++++++++++++++++++ 4 files changed, 213 insertions(+) create mode 100644 src/screens/ChangePWScreen.js create mode 100644 src/screens/FindPWScreen.js diff --git a/src/navigations/AuthStack.js b/src/navigations/AuthStack.js index c879e03..81de70a 100644 --- a/src/navigations/AuthStack.js +++ b/src/navigations/AuthStack.js @@ -3,6 +3,8 @@ import { WHITE } from '../colors'; import SettingScreen from '../screens/SettingScreen'; import SignInScreen from '../screens/SignInScreen'; import SignUpScreen from '../screens/SignUpScreen'; +import FindPWScreen from '../screens/FindPWScreen'; +import ChangePWScreen from '../screens/ChangePWScreen'; import AccountScreen from '../screens/AccountScreen'; import NoticeScreen from '../screens/NoticeScreen'; import InformationScreen from '../screens/InformationScreen'; @@ -21,6 +23,8 @@ const AuthStack = () => { > + + diff --git a/src/navigations/routes.js b/src/navigations/routes.js index fc6beaf..0b113f0 100644 --- a/src/navigations/routes.js +++ b/src/navigations/routes.js @@ -1,6 +1,8 @@ export const AuthRoutes = { SIGN_IN: 'SignIn', SIGN_UP: 'SignUp', + Find_PW: 'FindPW', + Change_PW: 'ChangePW', Setting: 'Setting', Account: 'Account', Notice: 'Notice', diff --git a/src/screens/ChangePWScreen.js b/src/screens/ChangePWScreen.js new file mode 100644 index 0000000..7f299f0 --- /dev/null +++ b/src/screens/ChangePWScreen.js @@ -0,0 +1,122 @@ +import { + Keyboard, + KeyboardAvoidingView, + Platform, + Pressable, + StyleSheet, + View, +} from 'react-native'; +import Input, { KeyboardTypes, ReturnKeyTypes } from '../components/Input'; +import { useEffect, useState } from 'react'; +import Button from '../components/Button'; +import Logo from '../components/Logo'; +import { useNavigation } from '@react-navigation/native'; +import { AuthRoutes } from '../navigations/routes'; + +const ChangePWScreen = () => { + const [name, setName] = useState(''); + const [email, setEmail] = useState(''); + const [password, setPassword] = useState(''); + const [newPassword, setNewPassword] = useState(''); + const [newPasswordCheck, setNewPasswordCheck] = useState(''); + const [disabled, setDisabled] = useState(true); + const navigation = useNavigation(); + + useEffect(() => { + setDisabled( + !( + name.trim() && + email.trim() && + password.trim() && + newPassword.trim() && + newPasswordCheck.trim() + ) + ); + }, [name, email, password, newPassword, newPasswordCheck]); + + const onSubmit = () => { + Keyboard.dismiss(); + console.log(name, email, password, newPassword, newPasswordCheck); + }; + + return ( + + Keyboard.dismiss()}> + + + + + setName(name.trim())} + /> + setEmail(email.trim())} + /> + setPassword(password.trim())} + // onSubmitEditing={onSubmit} + /> + setNewPassword(newPassword.trim())} + // onSubmitEditing={onSubmit} + /> + + setNewPasswordCheck(newPasswordCheck.trim()) + } + onSubmitEditing={onSubmit} + /> + + + + {/*