From 12c90ff1209cfbcad436c8293f5014dd30c79319 Mon Sep 17 00:00:00 2001 From: Luis Felipe Cadavid Date: Tue, 24 Sep 2024 17:35:35 -0500 Subject: [PATCH] ref: change auth setting in Login Screen --- app/account/login/page.tsx | 56 ++- app/home/page.tsx | 6 +- app/layout.tsx | 2 +- app/page.tsx | 22 +- env.mjs | 1 + next.config.mjs | 5 +- package.json | 1 + package/components/atoms/Input.tsx | 4 +- package/components/atoms/Label.tsx | 9 +- .../organisms/ForgotPasswordForm.tsx | 56 +++ package/components/organisms/Header.tsx | 87 ++-- package/components/organisms/LoginForm.tsx | 30 +- package/components/organisms/Navbar.tsx | 39 +- package/config/ApiPath.tsx | 3 + package/config/FetchData.tsx | 14 +- package/config/ReturnService.tsx | 8 + .../config/api/Admin/auth/GetToken/page.tsx | 19 + package/config/api/Admin/auth/Login/page.tsx | 68 +++ .../api/Admin/auth/ResetPassword/page.tsx | 66 +++ .../api/Admin/user/GetTypeUsers/page.tsx | 75 ++++ .../config/api/Admin/user/GetUsers/page.tsx | 78 ++++ .../config/api/Admin/user/SaveUser/page.tsx | 72 ++++ package/config/api/Auth/page.tsx | 33 ++ package/utils/Constants.tsx | 18 + package/utils/Utilities.tsx | 402 ++++++++++++++++++ package/utils/language/i18n.tsx | 74 +++- 26 files changed, 1149 insertions(+), 99 deletions(-) create mode 100644 package/components/organisms/ForgotPasswordForm.tsx create mode 100644 package/config/api/Admin/auth/GetToken/page.tsx create mode 100644 package/config/api/Admin/auth/Login/page.tsx create mode 100644 package/config/api/Admin/auth/ResetPassword/page.tsx create mode 100644 package/config/api/Admin/user/GetTypeUsers/page.tsx create mode 100644 package/config/api/Admin/user/GetUsers/page.tsx create mode 100644 package/config/api/Admin/user/SaveUser/page.tsx create mode 100644 package/config/api/Auth/page.tsx create mode 100644 package/utils/Constants.tsx create mode 100644 package/utils/Utilities.tsx diff --git a/app/account/login/page.tsx b/app/account/login/page.tsx index ad0e900..8f7e29e 100644 --- a/app/account/login/page.tsx +++ b/app/account/login/page.tsx @@ -1,26 +1,46 @@ -"use client" -import LoginForm from "@organisms/LoginForm" -import React from "react" +"use client"; +import React, { useState } from "react"; +import { useTranslation } from "react-i18next"; +import ForgotPasswordForm from "@organisms/ForgotPasswordForm"; +import LoginForm from "@organisms/LoginForm"; const LoginPage: React.FC = () => { + const { t } = useTranslation(); + const [showForgotPassword, setShowForgotPassword] = useState(false); // Nuevo estado para alternar entre Login y Recuperación de contraseña + return (
-

Iniciar Sesión

- - - -
- -
+ {showForgotPassword ? ( + <> +

{t("lbl_reset_password")}

+ +
+ +
+ + ) : ( + <> +

{t("lbl_login")}

+ +
+ +
+ + )}
- ) -} + ); +}; -export default LoginPage +export default LoginPage; diff --git a/app/home/page.tsx b/app/home/page.tsx index 3795f24..585e90d 100644 --- a/app/home/page.tsx +++ b/app/home/page.tsx @@ -1,12 +1,10 @@ -import CheckoutScreen from "@app/selfcheckout/CheckoutScreen" -import LoyaltyProgramScreen from "@app/selfcheckout/LoyaltyProgramScreen" -import PreCheckoutScreen from "@app/selfcheckout/PreCheckoutScreen" import React from "react" +import PreCheckoutScreen from "@app/selfcheckout/precheckout/page" const HomeAfterLogin: React.FC = () => { return (
- +
) } diff --git a/app/layout.tsx b/app/layout.tsx index 022117c..d9f075e 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,6 +1,6 @@ +import React from "react"; import "@package/styles/tailwind.css"; import Navbar from "@organisms/Navbar"; -import React from "react"; export default function RootLayout({ children }: { children: React.ReactNode }) { diff --git a/app/page.tsx b/app/page.tsx index bdb071d..31e320f 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -2,10 +2,13 @@ import Grid from "@mui/material/Grid2" import Image from "next/image" import { useRouter } from "next/navigation" +import { useTranslation } from "react-i18next" import Button from "@package/components/atoms/Button" const HomePage: React.FC = () => { - const router = useRouter() + + const { t } = useTranslation() + const router = useRouter() const handleLoginClick = () => { router.push("/account/login") @@ -40,23 +43,24 @@ const HomePage: React.FC = () => { -

SELF CHECKOUT

+

{t('tle_self_checkout')}

-

Mejorando la experiencia en tienda

+

{t('msj_improving_in_store_experience')}

- +