From 9a42f91aec085ce957589fc871e0ceb3d7006a28 Mon Sep 17 00:00:00 2001 From: Lizeth Lopez Date: Wed, 31 Jan 2024 16:48:52 -0500 Subject: [PATCH] modificaciones login y correccion de mensajes --- .../assets/images/logo/WhatsApp-Logo.wine.svg | 1 + src/@mock-api/api/auth-api.ts | 10 ++-- src/app/main/sign-in/SignInPage.tsx | 50 +++++-------------- src/app/main/sign-in/tabs/JwtSignInTab.tsx | 10 ++-- src/app/main/sign-up/SignUpPage.tsx | 17 +++++-- src/app/main/sign-up/tabs/JwSignUpTab.tsx | 24 ++++----- 6 files changed, 49 insertions(+), 63 deletions(-) create mode 100644 public/assets/images/logo/WhatsApp-Logo.wine.svg diff --git a/public/assets/images/logo/WhatsApp-Logo.wine.svg b/public/assets/images/logo/WhatsApp-Logo.wine.svg new file mode 100644 index 0000000..fde5da2 --- /dev/null +++ b/public/assets/images/logo/WhatsApp-Logo.wine.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/@mock-api/api/auth-api.ts b/src/@mock-api/api/auth-api.ts index 8c53cee..659a316 100644 --- a/src/@mock-api/api/auth-api.ts +++ b/src/@mock-api/api/auth-api.ts @@ -31,14 +31,14 @@ export const authApiMocks = (mock: ExtendedMockAdapter) => { if (!user) { error.push({ type: 'email', - message: 'Check your email address' + message: 'Verifique su correo' }); } if (user && user.password !== password) { error.push({ type: 'password', - message: 'Check your password' + message: 'Contraseña incorrecta' }); } @@ -67,7 +67,7 @@ export const authApiMocks = (mock: ExtendedMockAdapter) => { return [200, null, { 'New-Access-Token': access_token }]; } - const error = 'Invalid access token detected or user not found'; + const error = 'Acceso inválido o usario no encontrado'; return [401, { data: error }]; }); @@ -81,7 +81,7 @@ export const authApiMocks = (mock: ExtendedMockAdapter) => { return [200, user, { 'New-Access-Token': access_token }]; } - const error = 'Invalid access token detected or user not found'; + const error = 'Acceso inválido o usario no encontrado'; return [401, { error }]; }); @@ -123,7 +123,7 @@ export const authApiMocks = (mock: ExtendedMockAdapter) => { if (isEmailExists) { error.push({ type: 'email', - message: 'The email address is already in use' + message: 'El correo ya ha sido usado para registrarse' }); } diff --git a/src/app/main/sign-in/SignInPage.tsx b/src/app/main/sign-in/SignInPage.tsx index f7b4022..40b5537 100644 --- a/src/app/main/sign-in/SignInPage.tsx +++ b/src/app/main/sign-in/SignInPage.tsx @@ -23,13 +23,6 @@ import FirebaseSignInTab from './tabs/FirebaseSignInTab'; /** * Form Validation Schema */ -const schema = z.object({ - email: z.string().email('You must enter a valid email').nonempty('You must enter an email'), - password: z - .string() - .min(8, 'Password is too short - must be at least 8 chars.') - .nonempty('Please enter your password.') -}); const tabs = [ { @@ -46,21 +39,7 @@ const tabs = [ } ]; -type FormType = { - email: string; - password: string; - remember?: boolean; -}; -const defaultValues = { - email: '', - password: '', - remember: true -}; - -/** - * The full screen reversed sign in page. - */ function SignInPage() { const [selectedTabId, setSelectedTabId] = useState(tabs[0].id); @@ -68,18 +47,6 @@ function SignInPage() { setSelectedTabId("jwt"); } - const { control, formState, handleSubmit, reset } = useForm({ - mode: 'onChange', - defaultValues, - resolver: zodResolver(schema) - }); - - const { isValid, dirtyFields, errors } = formState; - - function onSubmit() { - reset(defaultValues); - } - return (
@@ -199,11 +166,20 @@ function SignInPage() { src="assets/images/empresa/logoAlphaWC.svg" alt="logo" /> -
-
Bienvenido
+
+
Bienvenido al sistema que se encarga de tu facturación electrónica.
-
- Al sistema que se encarga de tu facturación electrónica. +
+
¿Necesitas ayuda? Comunícate con nosotros.
+
+
+
Soporte técnico: 0967722226
+ + Chat WhatsApp + +
+
+
Correo eletrónico: info@qsoftec.com
diff --git a/src/app/main/sign-in/tabs/JwtSignInTab.tsx b/src/app/main/sign-in/tabs/JwtSignInTab.tsx index 15a479a..bb83553 100644 --- a/src/app/main/sign-in/tabs/JwtSignInTab.tsx +++ b/src/app/main/sign-in/tabs/JwtSignInTab.tsx @@ -16,11 +16,11 @@ import { zodResolver } from '@hookform/resolvers/zod'; * Form Validation Schema */ const schema = z.object({ - email: z.string().email('You must enter a valid email').nonempty('You must enter an email'), + email: z.string().email('Debe ingresar un correo válido').nonempty('Debe ingresar un correo'), password: z .string() - .min(4, 'Password is too short - must be at least 4 chars.') - .nonempty('Please enter your password.') + .min(4, 'La contraseña es muy corta, debe ingresar almenos 4 caracteres.') + .nonempty('Por favor ingrese su contraseña.') }); type FormType = { @@ -95,7 +95,7 @@ function jwtSignInTab() { -
-
Bienvenido
+
+
Bienvenido al sistema que se encarga de tu facturación electrónica.
-
- Al sistema que se encarga de tu facturación electrónica. +
+
¿Necesitas ayuda? Comunícate con nosotros.
+
+
+
Soporte técnico: 0967722226
+ + Chat WhatsApp + +
+
+
Correo eletrónico: info@qsoftec.com
diff --git a/src/app/main/sign-up/tabs/JwSignUpTab.tsx b/src/app/main/sign-up/tabs/JwSignUpTab.tsx index e9b3286..00d483e 100644 --- a/src/app/main/sign-up/tabs/JwSignUpTab.tsx +++ b/src/app/main/sign-up/tabs/JwSignUpTab.tsx @@ -15,17 +15,17 @@ import { SignUpPayload, useAuth } from '../../../auth/AuthRouteProvider'; */ const schema = z .object({ - displayName: z.string().nonempty('You must enter your name'), - email: z.string().email('You must enter a valid email').nonempty('You must enter an email'), + displayName: z.string().nonempty('Debe ingresar un nombre de usuario'), + email: z.string().email('Debe ingresar un correo válido').nonempty('Debe ingresar un correo'), password: z .string() - .nonempty('Please enter your password.') - .min(8, 'Password is too short - should be 8 chars minimum.'), - passwordConfirm: z.string().nonempty('Password confirmation is required'), - acceptTermsConditions: z.boolean().refine((val) => val === true, 'The terms and conditions must be accepted.') + .nonempty('Por favor ingrese su contraseña.') + .min(4, 'La contraseña es muy corta, debe ingresar almenos 4 caracteres'), + passwordConfirm: z.string().nonempty('Debe ingresar su contraseña'), + acceptTermsConditions: z.boolean().refine((val) => val === true, 'Debe aceptar los términos y condiciones') }) .refine((data) => data.password === data.passwordConfirm, { - message: 'Passwords must match', + message: 'Contraseñas no coinciden', path: ['passwordConfirm'] }); @@ -80,7 +80,7 @@ function JwtSignUpTab() {