From 40aaecb33211e1879bfd0d6c665d279aebc9d0f0 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Jun 2023 16:08:12 -0500 Subject: [PATCH] Ultima version --- .../ZincInternacional/Rpt1868Facturas.tsx | 13 +-- src/Components/Login/PIN.tsx | 37 +++---- src/Components/Login/ResetCredentials.tsx | 27 ++--- src/Components/Login/login.tsx | 9 +- .../resetCredentials/resetCredentials.tsx | 99 ------------------- .../{zincinternacional.css => Company.css} | 11 ++- src/index.tsx | 3 +- 7 files changed, 52 insertions(+), 147 deletions(-) delete mode 100644 src/Components/resetCredentials/resetCredentials.tsx rename src/css/{zincinternacional.css => Company.css} (94%) diff --git a/src/Components/Clientes/ZincInternacional/Rpt1868Facturas.tsx b/src/Components/Clientes/ZincInternacional/Rpt1868Facturas.tsx index 86a2264..2a9115f 100644 --- a/src/Components/Clientes/ZincInternacional/Rpt1868Facturas.tsx +++ b/src/Components/Clientes/ZincInternacional/Rpt1868Facturas.tsx @@ -1,25 +1,19 @@ -import { FC, useEffect, useState } from 'react' +import { useEffect, useState } from 'react' import { Alert, Button, Card, Col, Form, Modal, Row, Table } from 'react-bootstrap' import { IconContext } from 'react-icons' import { BsCloudArrowUpFill, BsFileEarmarkExcel, BsFilePdfFill, BsFillPencilFill, BsSearch } from 'react-icons/bs' import { MsgInformativo } from '../../Utils/Toast/msgInformativo' import { FaPeopleArrows, FaRegFile, FaWarehouse } from 'react-icons/fa' - import I1868CatClaveSAT from './Interfaces/I1868CatClaveSAT' import I1868CatDestinos from './Interfaces/I1868CatDestinos' import I1868FacturaDetalle from './Interfaces/I1868FacturaDetalle' - import DTO1868Factura from './DTO/DTO1868Factura' import DTO1868ReporteFactura from './DTO/DTO1868ReporteFactura' import DTO1868Clientes from './DTO/DTO1868Clientes' -import DTO1868FacturaDetalle from './DTO/DTO1868FacturaDetalle' - import FService from './Services/Facturas.Services' import FileManager from '../../Utils/FileManager/FileManager' - import { Cat1868Destinos } from './Catalogos/Cat1868Destinos' import { Cat1868Responsables } from './Catalogos/Cat1868Responsables' - import { useDispatch, useSelector } from 'react-redux' import { RootState } from '../../../store/store' import { populateCatResponsables } from '../../../store/features/Clientes/1868/Cat1868ResponsablesSlice' @@ -27,9 +21,8 @@ import { populateCatClaveSAT } from '../../../store/features/Clientes/1868/Cat18 import { populateCatDestinos } from '../../../store/features/Clientes/1868/Cat1868DestinosSlice' import { populateFacturaDetalle, toggleRow } from '../../../store/features/Clientes/1868/Data1868FacturaDetalleSlice' import * as XLSX from 'xlsx' -import '../../../css/zincinternacional.css' +import '../../../css/Company.css' import { Rpt1868FacturasDetalle } from './Rpt1868FacturasDetalle' -import FileManagerDS from '../../../Services/Utils/FileManager.Services' import { MdCloudUpload } from 'react-icons/md' interface IProps {} @@ -38,7 +31,6 @@ export default function Rpt1868Facturas (props:IProps) { const dispatch = useDispatch() const mCatDestinos = useSelector((state: RootState) => state.Cat1868Destinos.Cat1868Destinos) const mCatResponsables = useSelector((state: RootState) => state.Cat1868Responsables.Cat1868Responsables) - //const mDataFacturaDetalle = useSelector((state: RootState) => state.Data1868FacturaDetalle.Data1868FacturaDetalle) const [UserId, setUserId] = useState(() => { const stickyValue = window.localStorage.getItem('UserId') return stickyValue !== null ? JSON.parse(stickyValue) : 0 @@ -69,7 +61,6 @@ export default function Rpt1868Facturas (props:IProps) { const [IDDestino, setIDDestino] = useState(0) const [IDResponsable, setIDResponsable] = useState(0) const [Responsable, setResponsable] = useState('') - //const [Referencia, setReferencia] = useState('') const [show, setShowMsg] = useState(false) const [ShowModal, setShowModal] = useState(false) const [header, setHeader] = useState('') diff --git a/src/Components/Login/PIN.tsx b/src/Components/Login/PIN.tsx index 29e5cf7..ee3c2e8 100644 --- a/src/Components/Login/PIN.tsx +++ b/src/Components/Login/PIN.tsx @@ -1,12 +1,11 @@ import * as React from 'react' import { Button, Card, Col, Form, Row } from 'react-bootstrap' -import logo from '../../images/GEMCO_logo_min.png' +import logo from '../../images/GEMCO.png' import { MsgInformativo } from '../Utils/Toast/msgInformativo' import AuthDS from '../../Services/Auth/Auth.Service' import { useState } from 'react' import { DTOPINUsuario } from '../../DTO/DTOPINUsuario' import { useNavigate } from 'react-router-dom' -import { AxiosError } from 'axios' export interface IPINProps {} @@ -32,7 +31,7 @@ export default function PIN(props: IPINProps) { } const data: DTOPINUsuario = { pin: parseInt(PIN), - usuario: Usuario, + usuario: Usuario } console.log(JSON.stringify(data)) AuthDS.validatePIN(data) @@ -57,17 +56,19 @@ export default function PIN(props: IPINProps) {   -
- +
+ - - + + + ZINC Internacional + alt="GEMCO" + style={{ width: '80%', textAlign: 'center' }} + /> + @@ -75,13 +76,13 @@ export default function PIN(props: IPINProps) {   -
+ { setPIN(e.target.value) @@ -94,11 +95,11 @@ export default function PIN(props: IPINProps) {
-
-
+
+
- -
-
-
-
- - - - ) -} diff --git a/src/css/zincinternacional.css b/src/css/Company.css similarity index 94% rename from src/css/zincinternacional.css rename to src/css/Company.css index bc31fcd..515c21e 100644 --- a/src/css/zincinternacional.css +++ b/src/css/Company.css @@ -112,4 +112,13 @@ .zui-table-min { height: 0px; -} \ No newline at end of file +} + +.Color1 { + border-color: #002f87; + } + +.btn-customColor { + background-color: #002f87; + color: white; + } diff --git a/src/index.tsx b/src/index.tsx index 78b5544..c207277 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -16,7 +16,7 @@ import CatTabuladores from './Components/Catalogos/CatTabulador/CatTabulador' import DashboardCorresponsales from './Components/Dashboard/DashboardCorresponsales' import Dashboard from './Components/Dashboard/Dashboard' import Logout from './Components/Logout/logout' -import ResetCredentials from './Components/resetCredentials/resetCredentials' +import ResetCredentials from './Components/Login/ResetCredentials' import Register from './Components/Register/register' import RegisterPermisoClientes from './Components/registerPermisoClientes/registerPermisoClientes' import FotosBodega from './Components/Bodega/FotosBodega' @@ -53,6 +53,7 @@ import RptCasaCuervoCOVEs from './Components/Clientes/CasaCuervo/Reportes/RptCas import RptAmazonInvoiceStatus from './Components/Clientes/Amazon/Reportes/Estatus/RtpAmazonInvoiceStatus' import ForgotPassword from './Components/Login/ForgotPassword' import PIN from './Components/Login/PIN' + require (`./css/${process.env.REACT_APP_ENVIRONMENT}-home.css`) function PageNotFound() {