()(
+ devtools(
+ immer((set, get) => ({
+ providers: [],
+ setProviders: (providers: any) =>
+ set((state) => {
+ state.providers = providers;
+ }),
+ })),
+ ),
+);
+
+export default useAuthStore;
From 7c634a9c82584f157785a9b054c5269f1dc8d28f Mon Sep 17 00:00:00 2001
From: walle233 <2310005663@qq.com>
Date: Sun, 19 Mar 2023 21:30:34 +0800
Subject: [PATCH 4/5] chore(web auth): impl i18n and fix code styles
---
web/.env | 2 +-
web/public/locales/en/translation.json | 31 +++++++++---
web/public/locales/zh-CN/translation.json | 9 +++-
web/public/locales/zh/translation.json | 19 ++++++-
web/src/pages/auth/service.ts | 50 +++++++++----------
.../mods/LoginByPasswordPanel/index.tsx | 6 +--
.../signin/mods/LoginByPhonePanel/index.tsx | 10 ++--
web/src/pages/auth/signup/index.tsx | 29 +++++------
web/src/routes/index.tsx | 10 ----
9 files changed, 97 insertions(+), 69 deletions(-)
diff --git a/web/.env b/web/.env
index e708128ac7..f49f5855bd 100644
--- a/web/.env
+++ b/web/.env
@@ -3,4 +3,4 @@ VITE_SERVER_BASE_URL=
# this only used for dev environment, change it to your local api server url if needed
# don't change it directly, you should create a .env.local file and set it there
-VITE_DEV_SERVER_URL=http://api.sunlong-dev.lafyun.com/
+VITE_DEV_SERVER_URL=http://api.dev.laf.run/
diff --git a/web/public/locales/en/translation.json b/web/public/locales/en/translation.json
index 1c0e71bd1f..8c97391a12 100644
--- a/web/public/locales/en/translation.json
+++ b/web/public/locales/en/translation.json
@@ -285,14 +285,31 @@
},
"star-us-on-github": "Star us on GitHub",
"AuthPanel": {
- "Phone": "Mobile number",
- "PhoneTip": "Please enter a valid Mobile phone number",
- "ValidationCode": "Validation code",
- "getValidationCode": "Get validation code",
+ "Phone": "Phone Number",
+ "PhoneTip": "Please input a valid phone number",
+ "PhonePlaceholder": "Please input your phone number",
+ "ValidationCode": "Verification Code",
+ "getValidationCode": "Get Verification Code",
"Login": "Login",
- "LoginTip": "Please enter a valid Mobile phone number and validation code",
- "LoginWithGithub": "Login with Github",
- "ValidationCodeTip": "Please enter validation code"
+ "LoginTip": "Please input your phone number and verification code",
+ "LoginWithGithub": "Login with GitHub",
+ "ValidationCodeTip": "Please input the verification code",
+ "ForgotPassword": "Forgot Password",
+ "Register": "Register",
+ "ToRegister": "Go to Register",
+ "ToLogin": "Go to Login",
+ "PasswordLogin": "Password Login",
+ "PhoneLogin": "Login with Phone Verification Code",
+ "Account": "Username",
+ "AccountPlaceholder": "Please input your username",
+ "Password": "Password",
+ "PasswordPlaceholder": "Please input your password",
+ "ConfirmPassword": "Confirm Password",
+ "ConfirmPasswordPlaceholder": "Please input your password again",
+ "PasswordNotMatch": "The two passwords you entered do not match",
+ "SmsCodeSendSuccess": "Verification code sent successfully",
+ "ValidationCodePlaceholder": "Please input the verification code",
+ "SignupSuccess": "Sign up successfully"
},
"Time": "Time",
"CreateTime": "Created",
diff --git a/web/public/locales/zh-CN/translation.json b/web/public/locales/zh-CN/translation.json
index c4ec5dd3a6..bdc84c5561 100644
--- a/web/public/locales/zh-CN/translation.json
+++ b/web/public/locales/zh-CN/translation.json
@@ -287,6 +287,7 @@
"AuthPanel": {
"Phone": "手机号",
"PhoneTip": "请输入有效的手机号码",
+ "PhonePlaceholder": "请输入手机号",
"ValidationCode": "验证码",
"getValidationCode": "获取验证码",
"Login": "登录",
@@ -302,7 +303,13 @@
"Account": "用户名",
"AccountPlaceholder": "请输入用户名",
"Password": "密码",
- "ConfirmPassword": "确认密码"
+ "PasswordPlaceholder": "请输入密码",
+ "ConfirmPassword": "确认密码",
+ "ConfirmPasswordPlaceholder": "请再次输入密码",
+ "PasswordNotMatch": "两次输入的密码不一致",
+ "SmsCodeSendSuccess": "验证码发送成功",
+ "ValidationCodePlaceholder": "请输入验证码",
+ "SignupSuccess": "注册成功"
},
"Time": "时间",
"CreateTime": "创建时间",
diff --git a/web/public/locales/zh/translation.json b/web/public/locales/zh/translation.json
index 68674a131b..1f6ca5d454 100644
--- a/web/public/locales/zh/translation.json
+++ b/web/public/locales/zh/translation.json
@@ -287,12 +287,29 @@
"AuthPanel": {
"Phone": "手机号",
"PhoneTip": "请输入有效的手机号码",
+ "PhonePlaceholder": "请输入手机号",
"ValidationCode": "验证码",
"getValidationCode": "获取验证码",
"Login": "登录",
"LoginTip": "请输入手机号和验证码",
"LoginWithGithub": "GitHub 登录",
- "ValidationCodeTip": "请输入验证码"
+ "ValidationCodeTip": "请输入验证码",
+ "ForgotPassword": "忘记密码",
+ "Register": "注册",
+ "ToRegister": "去注册",
+ "ToLogin": "去登录",
+ "PasswordLogin": "密码登录",
+ "PhoneLogin": "手机验证码登录",
+ "Account": "用户名",
+ "AccountPlaceholder": "请输入用户名",
+ "Password": "密码",
+ "PasswordPlaceholder": "请输入密码",
+ "ConfirmPassword": "确认密码",
+ "ConfirmPasswordPlaceholder": "请再次输入密码",
+ "PasswordNotMatch": "两次输入的密码不一致",
+ "SmsCodeSendSuccess": "验证码发送成功",
+ "ValidationCodePlaceholder": "请输入验证码",
+ "SignupSuccess": "注册成功"
},
"Time": "时间",
"CreateTime": "创建时间",
diff --git a/web/src/pages/auth/service.ts b/web/src/pages/auth/service.ts
index 87695bb764..af4b047bd6 100644
--- a/web/src/pages/auth/service.ts
+++ b/web/src/pages/auth/service.ts
@@ -19,96 +19,96 @@ const queryKeys = {
useGetProvidersQuery: ["useGetProvidersQuery"],
};
-export const useSigninByPasswordMutation = (config?: { onSuccess: (data: any) => void }) => {
+export const useSigninByPasswordMutation = (config?: { onSuccess: (result: any) => void }) => {
const globalStore = useGlobalStore();
return useMutation(
(values: any) => {
return AuthControllerSigninByPassword(values);
},
{
- onSuccess: async (data) => {
- if (data.error) {
- globalStore.showError(data.error);
+ onSuccess: async (result) => {
+ if (result.error) {
+ globalStore.showError(result.error);
} else {
- localStorage.setItem("token", data?.data);
- config?.onSuccess(data);
+ localStorage.setItem("token", result?.data);
+ config?.onSuccess(result);
}
},
},
);
};
-export const useSigninBySmsCodeMutation = (config?: { onSuccess: (data: any) => void }) => {
+export const useSigninBySmsCodeMutation = (config?: { onSuccess: (result: any) => void }) => {
const globalStore = useGlobalStore();
return useMutation(
(values: any) => {
return AuthControllerSigninBySmsCode(values);
},
{
- onSuccess: async (data) => {
- if (data.error) {
- globalStore.showError(data.error);
+ onSuccess: async (result) => {
+ if (result.error) {
+ globalStore.showError(result.error);
} else {
- localStorage.setItem("token", data?.data);
- config?.onSuccess(data);
+ localStorage.setItem("token", result?.data);
+ config?.onSuccess(result);
}
},
},
);
};
-export const useSignupMutation = (config?: { onSuccess: (data: any) => void }) => {
+export const useSignupMutation = (config?: { onSuccess: (result: any) => void }) => {
const globalStore = useGlobalStore();
return useMutation(
(values: any) => {
return AuthControllerSignup(values);
},
{
- onSuccess: async (data) => {
- if (data.error) {
- globalStore.showError(data.error);
+ onSuccess: async (result) => {
+ if (result.error) {
+ globalStore.showError(result.error);
} else {
- config?.onSuccess(data);
+ config?.onSuccess(result);
}
},
},
);
};
-export const useSendSmsCodeMutation = (config?: { onSuccess: (data: any) => void }) => {
+export const useSendSmsCodeMutation = (config?: { onSuccess: (result: any) => void }) => {
return useMutation(
(values: any) => {
return AuthControllerSendSmsCode(values);
},
{
- onSuccess: async (data) => {
- config?.onSuccess(data);
+ onSuccess: async (result) => {
+ config?.onSuccess(result);
},
},
);
};
-export const useResetPasswordMutation = (config?: { onSuccess: (data: any) => void }) => {
+export const useResetPasswordMutation = (config?: { onSuccess: (result: any) => void }) => {
return useMutation(
(values: any) => {
return AuthControllerResetPassword(values);
},
{
- onSuccess: async (data) => {
- config?.onSuccess(data);
+ onSuccess: async (result) => {
+ config?.onSuccess(result);
},
},
);
};
-export const useGetProvidersQuery = (onSuccess: (data: any) => void) => {
+export const useGetProvidersQuery = (onSuccess: (result: any) => void) => {
return useQuery(
queryKeys.useGetProvidersQuery,
() => {
return AuthControllerGetProviders({});
},
{
- onSuccess: onSuccess,
+ onSuccess,
},
);
};
diff --git a/web/src/pages/auth/signin/mods/LoginByPasswordPanel/index.tsx b/web/src/pages/auth/signin/mods/LoginByPasswordPanel/index.tsx
index 0bc5e4b0a2..00a0e7ae64 100644
--- a/web/src/pages/auth/signin/mods/LoginByPasswordPanel/index.tsx
+++ b/web/src/pages/auth/signin/mods/LoginByPasswordPanel/index.tsx
@@ -59,7 +59,7 @@ export default function LoginByPasswordPanel({
{...register("account", { required: true })}
type="text"
id="account"
- placeholder="请输入用户名"
+ placeholder={t("AuthPanel.AccountPlaceholder") || ""}
/>
@@ -73,7 +73,7 @@ export default function LoginByPasswordPanel({
required: true,
})}
id="password"
- placeholder="请输入密码"
+ placeholder={t("AuthPanel.PasswordPlaceholder") || ""}
/>
{isShowPassword ? (
@@ -88,7 +88,7 @@ export default function LoginByPasswordPanel({
+