Skip to content

Commit ed6b525

Browse files
berry-13danny-avila
authored andcommitted
changed to useLocalize
1 parent 6ee672a commit ed6b525

File tree

11 files changed

+130
-143
lines changed

11 files changed

+130
-143
lines changed

client/src/components/Auth/Login.tsx

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@ import React, { useEffect } from 'react';
22
import LoginForm from './LoginForm';
33
import { useAuthContext } from '~/hooks/AuthContext';
44
import { useNavigate } from 'react-router-dom';
5-
6-
import { useRecoilValue } from 'recoil';
7-
import store from '~/store';
8-
import { localize } from '~/localization/Translation';
5+
import { useLocalize } from '~/hooks';
96
import { useGetStartupConfig } from 'librechat-data-provider';
107
import { GoogleIcon, OpenIDIcon, GithubIcon, DiscordIcon } from '~/components';
118

129
function Login() {
1310
const { login, error, isAuthenticated } = useAuthContext();
1411
const { data: startupConfig } = useGetStartupConfig();
15-
16-
const lang = useRecoilValue(store.lang);
12+
const localize = useLocalize();
1713

1814
const navigate = useNavigate();
1915

@@ -27,23 +23,23 @@ function Login() {
2723
<div className="flex min-h-screen flex-col items-center justify-center bg-white pt-6 sm:pt-0">
2824
<div className="mt-6 w-96 overflow-hidden bg-white px-6 py-4 sm:max-w-md sm:rounded-lg">
2925
<h1 className="mb-4 text-center text-3xl font-semibold">
30-
{localize(lang, 'com_auth_welcome_back')}
26+
{localize('com_auth_welcome_back')}
3127
</h1>
3228
{error && (
3329
<div
3430
className="relative mt-4 rounded border border-red-400 bg-red-100 px-4 py-3 text-red-700"
3531
role="alert"
3632
>
37-
{localize(lang, 'com_auth_error_login')}
33+
{localize('com_auth_error_login')}
3834
</div>
3935
)}
4036
<LoginForm onSubmit={login} />
4137
{startupConfig?.registrationEnabled && (
4238
<p className="my-4 text-center text-sm font-light text-gray-700">
4339
{' '}
44-
{localize(lang, 'com_auth_no_account')}{' '}
40+
{localize('com_auth_no_account')}{' '}
4541
<a href="/register" className="p-1 text-green-500 hover:underline">
46-
{localize(lang, 'com_auth_sign_up')}
42+
{localize('com_auth_sign_up')}
4743
</a>
4844
</p>
4945
)}
@@ -64,7 +60,7 @@ function Login() {
6460
href={`${startupConfig.serverDomain}/oauth/google`}
6561
>
6662
<GoogleIcon />
67-
<p>{localize(lang, 'com_auth_google_login')}</p>
63+
<p>{localize('com_auth_google_login')}</p>
6864
</a>
6965
</div>
7066
</>
@@ -96,7 +92,7 @@ function Login() {
9692
href={`${startupConfig.serverDomain}/oauth/github`}
9793
>
9894
<GithubIcon />
99-
<p>{localize(lang, 'com_auth_github_login')}</p>
95+
<p>{localize('com_auth_github_login')}</p>
10096
</a>
10197
</div>
10298
</>
@@ -110,7 +106,7 @@ function Login() {
110106
href={`${startupConfig.serverDomain}/oauth/discord`}
111107
>
112108
<DiscordIcon />
113-
<p>{localize(lang, 'com_auth_discord_login')}</p>
109+
<p>{localize('com_auth_discord_login')}</p>
114110
</a>
115111
</div>
116112
</>

client/src/components/Auth/LoginForm.tsx

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
import { useForm } from 'react-hook-form';
2-
import { useRecoilValue } from 'recoil';
3-
import store from '~/store';
4-
import { localize } from '~/localization/Translation';
2+
import { useLocalize } from '~/hooks';
53
import { TLoginUser } from 'librechat-data-provider';
64

75
type TLoginFormProps = {
86
onSubmit: (data: TLoginUser) => void;
97
};
108

119
function LoginForm({ onSubmit }: TLoginFormProps) {
12-
const lang = useRecoilValue(store.lang);
10+
const localize = useLocalize();
1311

1412
const {
1513
register,
@@ -30,20 +28,20 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
3028
type="text"
3129
id="email"
3230
autoComplete="email"
33-
aria-label={localize(lang, 'com_auth_email')}
31+
aria-label={localize('com_auth_email')}
3432
{...register('email', {
35-
required: localize(lang, 'com_auth_email_required'),
33+
required: localize('com_auth_email_required'),
3634
minLength: {
3735
value: 3,
38-
message: localize(lang, 'com_auth_email_min_length'),
36+
message: localize('com_auth_email_min_length'),
3937
},
4038
maxLength: {
4139
value: 120,
42-
message: localize(lang, 'com_auth_email_max_length'),
40+
message: localize('com_auth_email_max_length'),
4341
},
4442
pattern: {
4543
value: /\S+@\S+\.\S+/,
46-
message: localize(lang, 'com_auth_email_pattern'),
44+
message: localize('com_auth_email_pattern'),
4745
},
4846
})}
4947
aria-invalid={!!errors.email}
@@ -54,7 +52,7 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
5452
htmlFor="email"
5553
className="absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-gray-500 duration-300 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500"
5654
>
57-
{localize(lang, 'com_auth_email_address')}
55+
{localize('com_auth_email_address')}
5856
</label>
5957
</div>
6058
{errors.email && (
@@ -70,16 +68,16 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
7068
type="password"
7169
id="password"
7270
autoComplete="current-password"
73-
aria-label={localize(lang, 'com_auth_password')}
71+
aria-label={localize('com_auth_password')}
7472
{...register('password', {
75-
required: localize(lang, 'com_auth_password_required'),
73+
required: localize('com_auth_password_required'),
7674
minLength: {
7775
value: 8,
78-
message: localize(lang, 'com_auth_password_min_length'),
76+
message: localize('com_auth_password_min_length'),
7977
},
8078
maxLength: {
8179
value: 40,
82-
message: localize(lang, 'com_auth_password_max_length'),
80+
message: localize('com_auth_password_max_length'),
8381
},
8482
})}
8583
aria-invalid={!!errors.password}
@@ -90,7 +88,7 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
9088
htmlFor="password"
9189
className="absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-gray-500 duration-300 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500"
9290
>
93-
{localize(lang, 'com_auth_password')}
91+
{localize('com_auth_password')}
9492
</label>
9593
</div>
9694

@@ -102,7 +100,7 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
102100
)}
103101
</div>
104102
<a href="/forgot-password" className="text-sm text-green-500 hover:underline">
105-
{localize(lang, 'com_auth_password_forgot')}
103+
{localize('com_auth_password_forgot')}
106104
</a>
107105
<div className="mt-6">
108106
<button
@@ -111,7 +109,7 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
111109
type="submit"
112110
className="w-full transform rounded-sm bg-green-500 px-4 py-3 tracking-wide text-white transition-colors duration-200 hover:bg-green-600 focus:bg-green-600 focus:outline-none"
113111
>
114-
{localize(lang, 'com_auth_continue')}
112+
{localize('com_auth_continue')}
115113
</button>
116114
</div>
117115
</form>

0 commit comments

Comments
 (0)