FairClip/memowake-front
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 登录页优化

Browse Source
This commit is contained in:
jinyaqiu 2025-08-01 16:05:27 +08:00
parent ef70e2f83a
commit e6a8faa610
3 changed files with 376 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/(tabs)/login.tsx
View File

@ -81,7 +81,7 @@ const LoginScreen = () => {
}} }}
> >
{ {
showPassword (showPassword || showSecondPassword)
? ?
<LoginIP2 /> <LoginIP2 />
: :

84
components/login/forgetPwd.tsx
View File

@ -2,7 +2,7 @@ import { fetchApi } from "@/lib/server-api-util";
import { User } from "@/types/user"; import { User } from "@/types/user";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { ActivityIndicator, TextInput, TouchableOpacity, View } from "react-native"; import { ActivityIndicator, StyleSheet, TextInput, TouchableOpacity, View } from "react-native";
import { ThemedText } from "../ThemedText"; import { ThemedText } from "../ThemedText";
interface LoginProps { interface LoginProps {
@ -15,12 +15,10 @@ interface LoginProps {
const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => { const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
const [loading, setLocading] = useState(false); const [loading, setLocading] = useState(false);
// 发送邮箱后把按钮变为disabled
const [isDisabled, setIsDisabled] = useState(false); const [isDisabled, setIsDisabled] = useState(false);
const [email, setEmail] = useState(''); const [email, setEmail] = useState('');
const [countdown, setCountdown] = useState(0); const [countdown, setCountdown] = useState(0);
// 倒计时效果
useEffect(() => { useEffect(() => {
if (countdown > 0) { if (countdown > 0) {
const timer = setTimeout(() => setCountdown(countdown - 1), 1000); const timer = setTimeout(() => setCountdown(countdown - 1), 1000);
@ -30,7 +28,6 @@ const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
} }
}, [countdown, isDisabled]); }, [countdown, isDisabled]);
// 发送邮件
const handleSubmit = () => { const handleSubmit = () => {
if (!email) { if (!email) {
setError(t('auth.forgetPwd.emailPlaceholder', { ns: 'login' })); setError(t('auth.forgetPwd.emailPlaceholder', { ns: 'login' }));
@ -41,7 +38,7 @@ const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
const body = { const body = {
email: email, email: email,
} }
// 调接口确定邮箱是否正确，是否有该用户邮箱权限
fetchApi<User>('/iam/reset-password-session', { fetchApi<User>('/iam/reset-password-session', {
method: 'POST', method: 'POST',
body: JSON.stringify(body), body: JSON.stringify(body),
@ -50,19 +47,17 @@ const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
} }
}) })
.then((_) => { .then((_) => {
// console.log("Password reset email sent successfully");
setIsDisabled(true); setIsDisabled(true);
setCountdown(60); // 开始60秒倒计时 setCountdown(60);
}) })
.catch((error) => { .catch((error) => {
// console.error('Failed to send reset email:', error);
setError(t('auth.forgetPwd.sendEmailError', { ns: 'login' })); setError(t('auth.forgetPwd.sendEmailError', { ns: 'login' }));
}) })
.finally(() => { .finally(() => {
setLocading(false); setLocading(false);
}); });
}; };
// 返回登陆
const handleBackToLogin = () => { const handleBackToLogin = () => {
if (setIsSignUp) { if (setIsSignUp) {
setIsSignUp('login'); setIsSignUp('login');
@ -72,14 +67,14 @@ const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
} }
} }
return <View> return (
{/* 邮箱输入框 */} <View style={styles.container}>
<View className="mb-5"> <View style={styles.inputContainer}>
<ThemedText className="text-base !text-textPrimary mb-2 ml-2"> <ThemedText style={styles.inputLabel}>
{t('auth.forgetPwd.title', { ns: 'login' })} {t('auth.forgetPwd.title', { ns: 'login' })}
</ThemedText> </ThemedText>
<TextInput <TextInput
className="border border-gray-300 rounded-2xl p-3 text-base bg-inputBackground" style={styles.textInput}
placeholder={t('auth.forgetPwd.emailPlaceholder', { ns: 'login' })} placeholder={t('auth.forgetPwd.emailPlaceholder', { ns: 'login' })}
placeholderTextColor="#ccc" placeholderTextColor="#ccc"
value={email} value={email}
@ -88,34 +83,79 @@ const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
autoCapitalize="none" autoCapitalize="none"
/> />
</View> </View>
{/* 发送重置密码邮件 */}
<TouchableOpacity <TouchableOpacity
className={`w-full bg-[#E2793F] rounded-full p-4 items-center ${isDisabled ? 'opacity-50' : ''}`} style={[
styles.submitButton,
(isDisabled || loading) && styles.disabledButton
]}
onPress={handleSubmit} onPress={handleSubmit}
disabled={isDisabled || loading} disabled={isDisabled || loading}
> >
{loading ? ( {loading ? (
<ActivityIndicator color="#fff" /> <ActivityIndicator color="#fff" />
) : ( ) : (
<ThemedText className="!text-white font-semibold"> <ThemedText style={styles.buttonText}>
{isDisabled {isDisabled
? `${t("auth.forgetPwd.sendEmailBtnDisabled", { ns: "login" })} (${countdown}s)` ? `${t("auth.forgetPwd.sendEmailBtnDisabled", { ns: "login" })} (${countdown}s)`
: t("auth.forgetPwd.sendEmailBtn", { ns: "login" })} : t("auth.forgetPwd.sendEmailBtn", { ns: "login" })}
</ThemedText> </ThemedText>
)} )}
</TouchableOpacity> </TouchableOpacity>
{/* 返回登陆 */}
<TouchableOpacity <TouchableOpacity
className="self-center mt-6" style={styles.backButton}
onPress={handleBackToLogin} onPress={handleBackToLogin}
> >
<ThemedText className="!text-textPrimary text-sm"> <ThemedText style={styles.backButtonText}>
{t('auth.forgetPwd.goback', { ns: 'login' })} {t('auth.forgetPwd.goback', { ns: 'login' })}
</ThemedText> </ThemedText>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
);
} }
const styles = StyleSheet.create({
container: {
width: '100%',
},
inputContainer: {
marginBottom: 20,
},
inputLabel: {
fontSize: 16,
color: '#1F2937',
marginBottom: 8,
marginLeft: 8,
},
textInput: {
borderRadius: 12,
padding: 12,
fontSize: 16,
backgroundColor: '#FFF8DE',
},
submitButton: {
width: '100%',
backgroundColor: '#E2793F',
borderRadius: 28,
padding: 16,
alignItems: 'center',
},
disabledButton: {
opacity: 0.5,
},
buttonText: {
color: '#FFFFFF',
fontWeight: '600',
},
backButton: {
alignSelf: 'center',
marginTop: 24,
},
backButtonText: {
color: '#1F2937',
fontSize: 14,
},
});
export default ForgetPwd export default ForgetPwd;

187
components/login/signUp.tsx
View File

@ -2,7 +2,7 @@ import { Ionicons } from "@expo/vector-icons";
import { useLocalSearchParams, useRouter } from "expo-router"; import { useLocalSearchParams, useRouter } from "expo-router";
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { ActivityIndicator, TextInput, TouchableOpacity, View } from 'react-native'; import { ActivityIndicator, StyleSheet, TextInput, TouchableOpacity, View } from 'react-native';
import { useAuth } from "../../contexts/auth-context"; import { useAuth } from "../../contexts/auth-context";
import { fetchApi } from "../../lib/server-api-util"; import { fetchApi } from "../../lib/server-api-util";
import { User } from "../../types/user"; import { User } from "../../types/user";
@ -143,15 +143,16 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setSh
setShowSecondPassword(false) setShowSecondPassword(false)
}, []) }, [])
return <View className="w-full"> return (
<View style={styles.container}>
{/* 邮箱输入 */} {/* 邮箱输入 */}
<View className="mb-4"> <View style={styles.inputContainer}>
<ThemedText className="text-base !text-textPrimary mb-2 ml-2"> <ThemedText style={styles.inputLabel}>
{t('auth.login.email', { ns: 'login' })} {t('auth.login.email', { ns: 'login' })}
</ThemedText> </ThemedText>
<View className="border border-gray-300 rounded-2xl bg-inputBackground overflow-hidden"> <View style={styles.inputWrapper}>
<TextInput <TextInput
className="p-3 text-base flex-1" style={styles.textInput}
placeholder={t('auth.login.accountPlaceholder', { ns: 'login' })} placeholder={t('auth.login.accountPlaceholder', { ns: 'login' })}
placeholderTextColor="#ccc" placeholderTextColor="#ccc"
value={email} value={email}
@ -166,13 +167,13 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setSh
</View> </View>
{/* 密码输入 */} {/* 密码输入 */}
<View className="mb-4"> <View style={styles.inputContainer}>
<ThemedText className="text-base !text-textPrimary mb-2 ml-2"> <ThemedText style={styles.inputLabel}>
{t('auth.login.password', { ns: 'login' })} {t('auth.login.password', { ns: 'login' })}
</ThemedText> </ThemedText>
<View className="border border-gray-300 rounded-2xl bg-inputBackground overflow-hidden flex-row items-center"> <View style={styles.passwordInputContainer}>
<TextInput <TextInput
className="p-3 text-base flex-1" style={[styles.textInput, { flex: 1 }]}
placeholder={t('auth.login.passwordPlaceholder', { ns: 'login' })} placeholder={t('auth.login.passwordPlaceholder', { ns: 'login' })}
placeholderTextColor="#ccc" placeholderTextColor="#ccc"
value={password} value={password}
@ -184,7 +185,7 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setSh
/> />
<TouchableOpacity <TouchableOpacity
onPress={() => setShowPassword(!showPassword)} onPress={() => setShowPassword(!showPassword)}
className="px-3 py-2" style={styles.eyeIcon}
> >
<Ionicons <Ionicons
name={showPassword ? 'eye' : 'eye-off'} name={showPassword ? 'eye' : 'eye-off'}
@ -196,13 +197,13 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setSh
</View> </View>
{/* 确认密码 */} {/* 确认密码 */}
<View className="mb-6"> <View style={[styles.inputContainer, { marginBottom: 24 }]}>
<ThemedText className="text-base !text-textPrimary mb-2 ml-2"> <ThemedText style={styles.inputLabel}>
{t('auth.signup.confirmPassword', { ns: 'login' })} {t('auth.signup.confirmPassword', { ns: 'login' })}
</ThemedText> </ThemedText>
<View className="border border-gray-300 rounded-2xl bg-inputBackground overflow-hidden flex-row items-center"> <View style={styles.passwordInputContainer}>
<TextInput <TextInput
className="p-3 text-base flex-1" style={[styles.textInput, { flex: 1 }]}
placeholder={t('auth.signup.confirmPasswordPlaceholder', { ns: 'login' })} placeholder={t('auth.signup.confirmPasswordPlaceholder', { ns: 'login' })}
placeholderTextColor="#ccc" placeholderTextColor="#ccc"
value={confirmPassword} value={confirmPassword}
@ -214,7 +215,7 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setSh
/> />
<TouchableOpacity <TouchableOpacity
onPress={() => setShowSecondPassword(!showSecondPassword)} onPress={() => setShowSecondPassword(!showSecondPassword)}
className="px-3 py-2" style={styles.eyeIcon}
> >
<Ionicons <Ionicons
name={showSecondPassword ? 'eye' : 'eye-off'} name={showSecondPassword ? 'eye' : 'eye-off'}
@ -227,19 +228,19 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setSh
{/* 注册按钮 */} {/* 注册按钮 */}
<TouchableOpacity <TouchableOpacity
className={`w-full bg-[#E2793F] rounded-full p-4 items-center ${loading ? 'opacity-70' : ''}`} style={[styles.signupButton, loading && { opacity: 0.7 }]}
onPress={handleSubmit} onPress={handleSubmit}
disabled={loading} disabled={loading}
> >
{loading ? ( {loading ? (
<ActivityIndicator color="#fff" /> <ActivityIndicator color="#fff" />
) : ( ) : (
<ThemedText className="!text-white font-semibold"> <ThemedText style={styles.signupButtonText}>
{t("auth.signup.signupButton", { ns: 'login' })} {t("auth.signup.signupButton", { ns: 'login' })}
</ThemedText> </ThemedText>
)} )}
</TouchableOpacity> </TouchableOpacity>
<View style={{ flexDirection: 'row', alignItems: 'center', marginVertical: 10 }}> <View style={styles.termsContainer}>
<TouchableOpacity <TouchableOpacity
onPress={() => { onPress={() => {
const newValue = !checked; const newValue = !checked;
@ -252,81 +253,74 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setSh
} }
}} }}
style={{ style={[
width: 20, styles.checkbox,
height: 20, checked && styles.checkboxChecked
borderRadius: 10, ]}
borderWidth: 2,
borderColor: checked ? '#E2793F' : '#ccc',
backgroundColor: checked ? '#E2793F' : 'transparent',
justifyContent: 'center',
alignItems: 'center',
marginRight: 8,
}}
> >
{checked && ( {checked && (
<Ionicons name="checkmark" size={14} color="white" /> <Ionicons name="checkmark" size={14} color="white" />
)} )}
</TouchableOpacity> </TouchableOpacity>
<View style={{ flexDirection: 'row', flexWrap: 'wrap', flex: 1 }}> <View style={styles.termsTextContainer}>
<ThemedText className="text-sm !text-textPrimary"> <ThemedText style={styles.termsText}>
{t("auth.telLogin.agree", { ns: 'login' })} {t("auth.telLogin.agree", { ns: 'login' })}
</ThemedText> </ThemedText>
<TouchableOpacity onPress={() => { <TouchableOpacity onPress={() => {
setModalType('terms'); setModalType('terms');
setPrivacyModalVisible(true); setPrivacyModalVisible(true);
}}> }}>
<ThemedText className="text-sm !text-[#E2793F]"> <ThemedText style={styles.termsLink}>
{t("auth.telLogin.terms", { ns: 'login' })} {t("auth.telLogin.terms", { ns: 'login' })}
</ThemedText> </ThemedText>
</TouchableOpacity> </TouchableOpacity>
<ThemedText className="text-sm !text-textPrimary"> <ThemedText style={styles.termsText}>
{t("auth.telLogin.and", { ns: 'login' })} {t("auth.telLogin.and", { ns: 'login' })}
</ThemedText> </ThemedText>
<TouchableOpacity onPress={() => { <TouchableOpacity onPress={() => {
setModalType('privacy'); setModalType('privacy');
setPrivacyModalVisible(true); setPrivacyModalVisible(true);
}}> }}>
<ThemedText className="text-sm !text-[#E2793F]"> <ThemedText style={styles.termsLink}>
{t("auth.telLogin.privacyPolicy", { ns: 'login' })} {t("auth.telLogin.privacyPolicy", { ns: 'login' })}
</ThemedText> </ThemedText>
</TouchableOpacity> </TouchableOpacity>
<ThemedText className="text-sm !text-textPrimary"> <ThemedText style={styles.termsText}>
{t("auth.telLogin.and", { ns: 'login' })} {t("auth.telLogin.and", { ns: 'login' })}
</ThemedText> </ThemedText>
<TouchableOpacity onPress={() => { <TouchableOpacity onPress={() => {
setModalType('user'); setModalType('user');
setPrivacyModalVisible(true); setPrivacyModalVisible(true);
}}> }}>
<ThemedText className="text-sm !text-[#E2793F]"> <ThemedText style={styles.termsLink}>
{t("auth.telLogin.userAgreement", { ns: 'login' })} {t("auth.telLogin.userAgreement", { ns: 'login' })}
</ThemedText> </ThemedText>
</TouchableOpacity> </TouchableOpacity>
<ThemedText className="text-sm !text-textPrimary"> <ThemedText style={styles.termsText}>
{t("auth.telLogin.and", { ns: 'login' })} {t("auth.telLogin.and", { ns: 'login' })}
</ThemedText> </ThemedText>
<TouchableOpacity onPress={() => { <TouchableOpacity onPress={() => {
setModalType('ai'); setModalType('ai');
setPrivacyModalVisible(true); setPrivacyModalVisible(true);
}}> }}>
<ThemedText className="text-sm !text-[#E2793F]"> <ThemedText style={styles.termsLink}>
{t("auth.telLogin.aiAgreement", { ns: 'login' })} {t("auth.telLogin.aiAgreement", { ns: 'login' })}
</ThemedText> </ThemedText>
</TouchableOpacity> </TouchableOpacity>
<ThemedText className="text-sm !text-textPrimary"> <ThemedText style={styles.termsText}>
{t("auth.telLogin.agreement", { ns: 'login' })} {t("auth.telLogin.agreement", { ns: 'login' })}
</ThemedText> </ThemedText>
<ThemedText className="text-sm !text-[#E2793F]"> <ThemedText style={styles.termsLink}>
{t("common.name")} {t("common.name")}
</ThemedText> </ThemedText>
<ThemedText className="text-sm !text-textPrimary"> <ThemedText style={styles.termsText}>
{t("auth.telLogin.getPhone", { ns: 'login' })} {t("auth.telLogin.getPhone", { ns: 'login' })}
</ThemedText> </ThemedText>
</View> </View>
</View> </View>
{/* 已有账号 */} {/* 已有账号 */}
<View className="flex-row justify-center mt-6"> <View style={styles.loginContainer}>
<ThemedText className="text-sm !text-textPrimary"> <ThemedText style={styles.loginText}>
{t("auth.signup.haveAccount", { ns: 'login' })} {t("auth.signup.haveAccount", { ns: 'login' })}
</ThemedText> </ThemedText>
<TouchableOpacity <TouchableOpacity
@ -334,7 +328,7 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setSh
updateUrlParam("status", "login"); updateUrlParam("status", "login");
}} }}
> >
<ThemedText className="!text-[#E2793F] text-sm font-semibold ml-1"> <ThemedText style={styles.loginLink}>
{t("auth.signup.login", { ns: 'login' })} {t("auth.signup.login", { ns: 'login' })}
</ThemedText> </ThemedText>
</TouchableOpacity> </TouchableOpacity>
@ -343,6 +337,105 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setSh
{/* 协议弹窗 */} {/* 协议弹窗 */}
<PrivacyModal modalVisible={privacyModalVisible} setModalVisible={setPrivacyModalVisible} type={modalType} /> <PrivacyModal modalVisible={privacyModalVisible} setModalVisible={setPrivacyModalVisible} type={modalType} />
</View> </View>
} );
};
export default SignUp const styles = StyleSheet.create({
container: {
width: '100%',
},
inputContainer: {
marginBottom: 16,
},
inputWrapper: {
borderRadius: 12,
backgroundColor: '#FFF8DE',
overflow: 'hidden',
},
inputLabel: {
fontSize: 16,
color: '#1F2937',
marginBottom: 8,
marginLeft: 8,
},
textInput: {
padding: 12,
fontSize: 16,
color: '#1F2937',
},
passwordInputContainer: {
flexDirection: 'row',
alignItems: 'center',
borderRadius: 12,
backgroundColor: '#FFF8DE',
overflow: 'hidden',
},
eyeIcon: {
paddingHorizontal: 12,
paddingVertical: 8,
},
signupButton: {
width: '100%',
backgroundColor: '#E2793F',
borderRadius: 28,
padding: 16,
alignItems: 'center',
marginBottom: 16,
},
signupButtonText: {
color: '#FFFFFF',
fontWeight: '600',
},
termsContainer: {
flexDirection: 'row',
alignItems: 'flex-start',
marginVertical: 10,
},
checkbox: {
width: 20,
height: 20,
borderRadius: 10,
borderWidth: 2,
borderColor: '#E5E7EB',
justifyContent: 'center',
alignItems: 'center',
marginRight: 8,
marginTop: 2,
},
checkboxChecked: {
backgroundColor: '#E2793F',
borderColor: '#E2793F',
},
termsTextContainer: {
flexDirection: 'row',
flexWrap: 'wrap',
flex: 1,
},
termsText: {
fontSize: 14,
color: '#1F2937',
lineHeight: 20,
},
termsLink: {
fontSize: 14,
color: '#E2793F',
lineHeight: 20,
},
loginContainer: {
flexDirection: 'row',
justifyContent: 'center',
marginTop: 24,
},
loginText: {
fontSize: 14,
color: '#1F2937',
},
loginLink: {
color: '#E2793F',
fontSize: 14,
fontWeight: '600',
marginLeft: 4,
},
});
export default SignUp;