From 579aee6efc9d26cbaed4793957fac5d96d3c4e42 Mon Sep 17 00:00:00 2001 From: wuzhenyu <13802417831@163.com> Date: Fri, 29 Aug 2025 17:33:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E5=86=8C=E5=92=8C?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=96=87=E6=9C=AC=EF=BC=8C=E8=B0=83=E6=95=B4=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E9=80=BB=E8=BE=91=EF=BC=8C=E6=9B=B4=E6=96=B0=20packag?= =?UTF-8?q?e.json=20=E4=BB=A5=E6=94=AF=E6=8C=81=20Node=2022.12.0=EF=BC=8C?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=20logo=20=E5=9B=BE=E7=89=87=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.jsx | 16 ++ assets/images/logo.png | Bin 3466 -> 1691 bytes assets/styles/css.js | 13 +- locales/en.json | 30 ++- locales/zh.json | 27 ++- package.json | 3 + views/AccountInfo/Components/Citizenship.jsx | 96 ++++++++ views/AccountInfo/index.jsx | 176 ++++++++++++++ views/Guide/index.jsx | 26 +- views/Login/index.jsx | 186 ++++++++------ views/Signup/index.jsx | 240 +++++++++++++++++++ 11 files changed, 707 insertions(+), 106 deletions(-) create mode 100644 views/AccountInfo/Components/Citizenship.jsx create mode 100644 views/AccountInfo/index.jsx create mode 100644 views/Signup/index.jsx diff --git a/App.jsx b/App.jsx index c62452e..9f3cd54 100644 --- a/App.jsx +++ b/App.jsx @@ -23,10 +23,12 @@ import { AuthProvider, useContextHook } from './components/AuthContext/index'; import Login from '@/views/Login/index'; +import Signup from '@/views/Signup/index'; import Guide from '@/views/Guide/index'; import HomeIndex from '@/views/Home/Index/index'; import HomeInventory from '@/views/Home/Inventory/index'; import HomeProfile from '@/views/Home/Profile/index'; +import AccountInfo from '@/views/AccountInfo/index'; const Tab = createBottomTabNavigator(); @@ -107,6 +109,13 @@ function RootStack() { }} component={Login} /> + + ); } diff --git a/assets/images/logo.png b/assets/images/logo.png index 3031eaa96e8fc681bd0ef36d07490a651fb9cc2f..039b2e2b719936fb546a996471099ba17f2b4a39 100644 GIT binary patch delta 1689 zcmV;K24?w+8=DOwiBL{Q4GJ0x0000DNk~Le0001J0001J2nGNE0395)p^+gMe+ErS zL_t(|ob8=WZrer_$Nz6ACoYl}>Iq8s0-;p|Xu7Fe)`v6@&pdNgxE_0Wks)>Nov+W+V*k zL~p65yDv^qMi_7afyV;qOcQb)%t%;bEs818)vtvY6b9TR4_gE@b+o5j(!vS~1NMc$ zE(oFSwlhhqQA}yxwuGK8%@<*VJ3?S!LJj~B!50D@Ep6#&WL^jZt_y*Ee^X*EkjfEO z@uNRMXRyaO(2il59Dj|rtRDycZYkfr{l@J8N1KVB5NaYfCbT(KCL8M`0e@qL6J)O}5TQvz` zz;yskF|N`aPmLuKInG_Bx2e<&1Fj1Xf0*p=EHIF~JfRic?G~EN4g>ayuuX)=mx=?u zkKw%D;1q;MRahgZ7WpGpC8U^;@t_y~uQAxRKAyV|AaO zR5CVAoSvJ7N|s$|A_ZYj-bXj;=ijEbbd-lkLwy4~+L0ewG4AJrD8OJtSolauKudAjW$TzB2lZ z8xVx&FHZE-e+JmX=qSX5x&F^714acAJ3)CdDo9E_wPA~lQ9)5mDZ@ok9*oa~ne-M> zEE>iIMaR^4QKU{GYe^SH>J%a<8rLbi34;QKWn<(BZD=?WxM&n6D2geSgmzKSs|tnY zGoxebgRxoUGv}Sc6V3;3sS7u0m>DZO0td&m?ILM5f2?iU9K5BjT*8W*INXfYJ+uR$FVNKU@cw3Zah;v+x6I61XppxSRl^iFi za7~7 zP}MGopByy-+QJMUMyeEq2+Vu*?2*=Ky*5GII`UDYeU#|dDNFP*+ zHyiM1;N$=RnyAr$pT5y@e_ief;wQg$0I{p1e>2rXZql>wa^0bjOHlT{DgFrjT)}I3 z-b>1YxOL>iqq+Y!f^irLMt4_LXL;)Hpqkila%OC zyDKVDq!vNq)YuIo6{QYws`R-uML|^5ci^gnN8hXbnc_Q$7HU^h3sP;3s3?f5a*IfD ze<-HCTsFHn3Kdl9y9KI*njq#6+Iv!cl)fdTCdl1?pnz1`mr@fXouFGoYL@^i3R;fb zd*~Jr5}Yj;Cup3qU{~-yE6mS}PnHgsyC7FTJrzQNn)>Hzlm$_5H3hRfb2<&?HvO!= z{he!}nr%e6lXBN0H}e*e+!@sI_h~TBd{Z?G7$p)2B)GpEQ`byo jsl(xLI2;a#V;=brl(X+q_l#fB00000NkvXXu0mjfi*fjN literal 3466 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 { +export const getColor = ( + color = { brandPrimary: '#6B39F4', brandPrimaryTap: '#ff6600', checkbox_border: '#888888', fill_body: '#ffffff',fill_base: '#f5f5f9' }, +) => { const brandPrimary = color.brandPrimary || '#108ee9'; - const brandPrimaryTap = color.brandPrimaryTap || '#1284d6'; + const brandPrimaryTap = color.brandPrimaryTap || '#1284d6'; return { - transparent: 'transparent', - brandPrimary, - brandPrimaryTap, + brandPrimary, + brandPrimaryTap, // 文字色 color_text_base: color.color_text_base || '#000000', // 基本 @@ -124,7 +125,7 @@ export const getColor = (color = {brandPrimary: '#ff6600', brandPrimaryTap: '#ff primary_button_fill_tap: color.primary_button_fill_tap || brandPrimaryTap, ghost_button_color: color.ghost_button_color || brandPrimary, // 同时应用于背景、文字颜色、边框色 - ghost_button_fill_tap: color.ghost_button_fill_tap || `${brandPrimary}99`, // alpha 60% + ghost_button_fill_tap: color.ghost_button_fill_tap || `${brandPrimary}99`, // alpha 60% warning_button_fill: color.warning_button_fill || '#e94f4f', warning_button_fill_tap: color.warning_button_fill_tap || '#d24747', diff --git a/locales/en.json b/locales/en.json index c2be406..babf7ae 100644 --- a/locales/en.json +++ b/locales/en.json @@ -1,10 +1,28 @@ { - "welcome": "Welcome", - "greeting": "Hello, {{name}}!", - "login": "Login123", - "username": "Username", - "password": "Password", + "Welcome_Back": "Welcome Back!", + "Sign_in_to_your_account": "Sign in to your account", + "Sign_In": "Sign In", + "Remember_me": "Remember me", + "Forgot_password": "Forgot password?", + "Do_not_have_an_account": "Don’t have an account?", + "Sign_Up": "Sign Up", + "Or_sign_in_with": "Or sign in with", + "Email": "Email", + "Password": "Password", + "Please_enter_email": "Please enter email", + "Please_enter_password": "Please enter password", + "loading": "Loading...", "login_success": "Login Success", "login_failed": "Login Failed", - "login_error_message": "Login Failed, Please Try Again" + "login_error_message": "Login Failed, Please Try Again", + "Create_your_account": "Create your account", + "Let_us_get_started_with_a_free_Financy_account": "Let us get started with a free Financy account.", + "Full_name": "Full name", + "I_certify_that_I_am_18_years_of_age_or_older": "I certify that I’m 18 years of age or older", + "agree_to_the": "agree to the", + "User_Agreement": "User Agreement", + "Privacy_Policy": "Privacy Policy.", + "What’s_your_citizenship": "What’s your citizenship?", + "If_you’re_a_citizen_of_more_than_one_country,_please_pick_one": "If you’re a citizen of more than one country, please pick one.", + "Citizenship": "Citizenship" } diff --git a/locales/zh.json b/locales/zh.json index 5180482..93842b6 100644 --- a/locales/zh.json +++ b/locales/zh.json @@ -1,10 +1,21 @@ { - "welcome": "欢迎", - "greeting": "你好, {{name}}!", - "login": "登录", - "username": "用户名", - "password": "密码", - "login_success": "登录成功", - "login_failed": "登录失败", - "login_error_message": "登录失败，请重试" + "Welcome_Back": "Welcome Back!", + "Sign_in_to_your_account": "Sign in to your account", + "Sign_In": "Sign In", + "Remember_me": "Remember me", + "Forgot_password": "Forgot password?", + "Do_not_have_an_account": "Don't have an account?", + "Sign_up": "Sign up", + "Or_sign_in_with": "Or sign in with", + "Email": "Email", + "Password": "Password", + "Please_enter_email": "Please enter email", + "Please_enter_password": "Please enter password", + "loading": "Loading...", + "login_success": "Login Success", + "login_failed": "Login Failed", + "login_error_message": "Login Failed, Please Try Again", + "Create_your_account": "Create your account", + "Let_us_get_started_with_a_free_Financy_account": "Let us get started with a free Financy account", + "Full_name": "Full name" } diff --git a/package.json b/package.json index fb2cc43..43fbc0c 100644 --- a/package.json +++ b/package.json @@ -53,5 +53,8 @@ }, "engines": { "node": ">=18" + }, + "volta": { + "node": "22.12.0" } } diff --git a/views/AccountInfo/Components/Citizenship.jsx b/views/AccountInfo/Components/Citizenship.jsx new file mode 100644 index 0000000..8091f66 --- /dev/null +++ b/views/AccountInfo/Components/Citizenship.jsx @@ -0,0 +1,96 @@ +import { useState, useEffect } from 'react'; +import { + TouchableOpacity, +} from 'react-native'; + +import { + Checkbox, + Input, + Grid, + Icon, + View, + Text, + Toast, + Button, + Carousel +} from '@ant-design/react-native'; + +import { useTranslation } from 'react-i18next'; +import { useContextHook } from '@/components/AuthContext/index'; + +import AsyncStorage from '@/storage/index'; +import { useRouter } from '@/hooks/useRouter'; + +import { + statusBarHeight, + paddingTopStatusBarHeight, + flexRow, + flexColumn, + flexSub, + flexShrink, + flexWrap, + flexnoWrap, + justifyStart, + justifyEnd, + justifyCenter, + justifyBetween, + justifyAround, + justifyEvenly, + alignItemsStart, + alignItemsEnd, + alignItemsCenter, + alignItemsStretch, + positionRelative, + positionAbsolute, + useStyles, +} from '@/assets/styles/css'; + +const inputItem = useStyles({ + height: 56, + width: '100%', + borderRadius: 10, + paddingHorizontal: 16, + paddingVertical: 8, + }); + +const Index = () => { + + const { themeColor } = useContextHook(); + const { t, i18n } = useTranslation(); + + const { linkTo, resetAllRoutes, isFocused } = useRouter(); + useEffect(() => { + // 这里请求配置后，再跳转 + }, [isFocused]); + + return ( + + + {t('What’s_your_citizenship')}? + + + {t('If_you’re_a_citizen_of_more_than_one_country,_please_pick_one')} + + + + {t('Citizenship')}? + + + + {t('Citizenship')}? + + + + + + + + {t('Do_not_have_an_account')} + linkTo('Login')}> + {t('Sign_In')} + + + + ); +}; +export default Index; diff --git a/views/AccountInfo/index.jsx b/views/AccountInfo/index.jsx new file mode 100644 index 0000000..7a72797 --- /dev/null +++ b/views/AccountInfo/index.jsx @@ -0,0 +1,176 @@ +import { useState, useEffect, useRef } from 'react'; +import { + TextInput, + TouchableOpacity, + Image, + StyleSheet, + Alert, + StatusBar, +} from 'react-native'; + +import { + Checkbox, + Input, + Grid, + Icon, + View, + Text, + Toast, + Button, + Carousel +} from '@ant-design/react-native'; + + +import { useContextHook } from '@/components/AuthContext'; +import { useTranslation } from 'react-i18next'; +import { useRouter } from '@/hooks/useRouter'; + +import Citizenship from './Components/Citizenship'; + +import { + statusBarHeight, + paddingTopStatusBarHeight, + flexRow, + flexColumn, + flexSub, + flexShrink, + flexWrap, + flexnoWrap, + justifyStart, + justifyEnd, + justifyCenter, + justifyBetween, + justifyAround, + justifyEvenly, + alignItemsStart, + alignItemsEnd, + alignItemsCenter, + alignItemsStretch, + positionRelative, + positionAbsolute, + useStyles, +} from '@/assets/styles/css'; + + +const inputItem = useStyles({ + height: 56, + width: '100%', + borderRadius: 10, + paddingHorizontal: 16, + paddingVertical: 8, +}); + +const LoginScreen = () => { + const { themeColor } = useContextHook(); + const { t, i18n } = useTranslation(); + console.log('🚀 ~ LoginScreen ~ i18n:', i18n) + + const { linkTo } = useRouter(); + const [language, setLanguage] = useState('en'); + + + const [fullName, setFullName] = useState(''); + const [email, setEmail] = useState(''); + const [password, setPassword] = useState(''); + const [loading, setLoading] = useState(false); + const [showPassword, setShowPassword] = useState(false); + + const [checked, setChecked] = useState(false); + const onChangeCheckbox = (e) => { + console.log('checked = ', e.target.checked) + setChecked(e.target.checked) + } + + const handleLogin = () => { + if (!email) { + Toast.show({ + content: t('Please enter email'), + position: 'center', + mask: true, + }); + return; + } + if (!password) { + Toast.show({ + content: t('Please enter password'), + position: 'center', + mask: true, + }); + return; + } + const key = Toast.show({ + icon: 'loading', + content: t('loading'), + position: 'center', + mask: true, + duration: 0, + }); + console.log(123, 123); + // login({ username, password }) + // .then(res => { + // Toast.remove(key); + // setTimeout(() => { + // Toast.show({ + // content: t('login success'), //i18n.t('login_success'), + // position: 'center', + // mask: true, + // onClose: () => { + // // 设置全局的用户信息 + // setUser(res.user) + // AsyncStorage.setItem('appToken', { + // appToken: res.token, + // user: res.user, + // }).then(() => { + // linkTo('Home'); + // }); + // }, + // }); + // }, 200); + // }) + // .catch(err => { + // Toast.remove(key); + // setTimeout(() => { + // Toast.show({ + // content: t('login_failed'), // i18n.t('login_failed'), + // position: 'center', + // mask: true, + // }); + // }, 200); + // // i18n.t('login_error_message') + // }); + }; + + const carouselRef = useRef(null); + const [selectedIndex, setSelectedIndex] = useState(0); + + return ( + + + + + + + + + + + Carousel 2 + + + + ); +}; +export default LoginScreen; diff --git a/views/Guide/index.jsx b/views/Guide/index.jsx index 611cb7e..cbeabf3 100644 --- a/views/Guide/index.jsx +++ b/views/Guide/index.jsx @@ -51,7 +51,7 @@ const Index = () => { if (user && user.token) { resetAllRoutes('Home'); } else { - resetAllRoutes('Login'); + resetAllRoutes('AccountInfo'); } }, 1000); }, [isFocused]); @@ -65,21 +65,25 @@ const Index = () => { alignItemsCenter, flexRow ]}> + - login111 + Finix - ); diff --git a/views/Login/index.jsx b/views/Login/index.jsx index e641e61..8eb004c 100644 --- a/views/Login/index.jsx +++ b/views/Login/index.jsx @@ -1,20 +1,30 @@ import { useState, useEffect } from 'react'; import { - View, - Text, TextInput, TouchableOpacity, Image, StyleSheet, Alert, + StatusBar, } from 'react-native'; -import { Provider, Toast } from '@ant-design/react-native'; - -import AsyncStorage from '@/storage/index'; +import { + Checkbox, + Input, + Grid, + Icon, + View, + Text, + Toast, + Button, +} from '@ant-design/react-native'; + + +import AsyncStorage from '@/storage/index'; import { useNavigation, useIsFocused } from '@react-navigation/native'; import { useContextHook } from '@/components/AuthContext'; import { useTranslation } from 'react-i18next'; +import { useRouter } from '@/hooks/useRouter'; import { statusBarHeight, @@ -42,13 +52,11 @@ import { const inputItem = useStyles({ - width: '80%', - height: 40, - borderColor: 'gray', - borderWidth: 1, - borderRadius: 5, - paddingHorizontal: 10, - marginBottom: 20, + height: 56, + width: '100%', + borderRadius: 10, + paddingHorizontal: 16, + paddingVertical: 8, }); const LoginScreen = () => { @@ -56,22 +64,18 @@ const LoginScreen = () => { const { t, i18n } = useTranslation(); console.log('🚀 ~ LoginScreen ~ i18n:', i18n) - const router = useNavigation(); + const { linkTo } = useRouter(); const [language, setLanguage] = useState('en'); - const isFocused = useIsFocused(); - - const [username, setUsername] = useState(''); + const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); const [loading, setLoading] = useState(false); - useEffect(() => { - - }, [isFocused]); + const [showPassword, setShowPassword] = useState(false); const handleLogin = () => { - if (!username) { + if (!email) { Toast.show({ - content: t('Please enter user name'), + content: t('Please enter email'), position: 'center', mask: true, }); @@ -92,7 +96,7 @@ const LoginScreen = () => { mask: true, duration: 0, }); - console.log(123,123); + console.log(123, 123); // login({ username, password }) // .then(res => { // Toast.remove(key); @@ -108,7 +112,7 @@ const LoginScreen = () => { // appToken: res.token, // user: res.user, // }).then(() => { - // router.replace('Home'); + // linkTo('Home'); // }); // }, // }); @@ -131,64 +135,96 @@ const LoginScreen = () => { - - + + + + + + + + {t('Welcome_Back')} + + + {t('Sign_in_to_your_account')} + + + + + - - {t('login')} - - - - - + setShowPassword(!showPassword)}> + + + } + /> + + + + + + + + {t('Remember_me')} + + + + linkTo('ForgotPassword')}> + {t('Forgot_password')} + + + + {/* + + {t('Or_sign_in_with')} + + */} + + + + {t('Do_not_have_an_account')} + linkTo('Signup')}> + {t('Sign_up')} + + ); }; diff --git a/views/Signup/index.jsx b/views/Signup/index.jsx new file mode 100644 index 0000000..8876c56 --- /dev/null +++ b/views/Signup/index.jsx @@ -0,0 +1,240 @@ +import { useState, useEffect } from 'react'; +import { + TextInput, + TouchableOpacity, + Image, + StyleSheet, + Alert, + StatusBar, +} from 'react-native'; + +import { + Checkbox, + Input, + Grid, + Icon, + View, + Text, + Toast, + Button, +} from '@ant-design/react-native'; + + +import AsyncStorage from '@/storage/index'; +import { useContextHook } from '@/components/AuthContext'; +import { useTranslation } from 'react-i18next'; +import { useRouter } from '@/hooks/useRouter'; + +import { + statusBarHeight, + paddingTopStatusBarHeight, + flexRow, + flexColumn, + flexSub, + flexShrink, + flexWrap, + flexnoWrap, + justifyStart, + justifyEnd, + justifyCenter, + justifyBetween, + justifyAround, + justifyEvenly, + alignItemsStart, + alignItemsEnd, + alignItemsCenter, + alignItemsStretch, + positionRelative, + positionAbsolute, + useStyles, +} from '@/assets/styles/css'; + + +const inputItem = useStyles({ + height: 56, + width: '100%', + borderRadius: 10, + paddingHorizontal: 16, + paddingVertical: 8, +}); + +const LoginScreen = () => { + const { themeColor } = useContextHook(); + const { t, i18n } = useTranslation(); + console.log('🚀 ~ LoginScreen ~ i18n:', i18n) + + const { linkTo } = useRouter(); + const [language, setLanguage] = useState('en'); + + + const [fullName, setFullName] = useState(''); + const [email, setEmail] = useState(''); + const [password, setPassword] = useState(''); + const [loading, setLoading] = useState(false); + const [showPassword, setShowPassword] = useState(false); + + const [checked, setChecked] = useState(false); + const onChangeCheckbox = (e) => { + console.log('checked = ', e.target.checked) + setChecked(e.target.checked) + } + + const handleLogin = () => { + if (!email) { + Toast.show({ + content: t('Please enter email'), + position: 'center', + mask: true, + }); + return; + } + if (!password) { + Toast.show({ + content: t('Please enter password'), + position: 'center', + mask: true, + }); + return; + } + const key = Toast.show({ + icon: 'loading', + content: t('loading'), + position: 'center', + mask: true, + duration: 0, + }); + console.log(123, 123); + // login({ username, password }) + // .then(res => { + // Toast.remove(key); + // setTimeout(() => { + // Toast.show({ + // content: t('login success'), //i18n.t('login_success'), + // position: 'center', + // mask: true, + // onClose: () => { + // // 设置全局的用户信息 + // setUser(res.user) + // AsyncStorage.setItem('appToken', { + // appToken: res.token, + // user: res.user, + // }).then(() => { + // linkTo('Home'); + // }); + // }, + // }); + // }, 200); + // }) + // .catch(err => { + // Toast.remove(key); + // setTimeout(() => { + // Toast.show({ + // content: t('login_failed'), // i18n.t('login_failed'), + // position: 'center', + // mask: true, + // }); + // }, 200); + // // i18n.t('login_error_message') + // }); + }; + + return ( + + + + + + + + {t('Create_your_account')} + + + {t('Let_us_get_started_with_a_free_Financy_account')} + + + + + + + + + + setShowPassword(!showPassword)}> + + + } + /> + + + + + + + + + + {setChecked(!checked)}}> + {t('I_certify_that_I_am_18_years_of_age_or_older')} + + + {t('agree_to_the')} + linkTo('UserAgreement')}> + {t('User_Agreement')} + + {t('and')} + linkTo('UserAgreement')}> + {t('Privacy_Policy')} + + + + + + + + + {t('Do_not_have_an_account')} + linkTo('Login')}> + {t('Sign_In')} + + + + ); +}; +export default LoginScreen;