Ultima version

develop
unknown 1 year ago
parent b66da76e39
commit 40aaecb332
  1. 13
      src/Components/Clientes/ZincInternacional/Rpt1868Facturas.tsx
  2. 37
      src/Components/Login/PIN.tsx
  3. 27
      src/Components/Login/ResetCredentials.tsx
  4. 9
      src/Components/Login/login.tsx
  5. 99
      src/Components/resetCredentials/resetCredentials.tsx
  6. 11
      src/css/Company.css
  7. 3
      src/index.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 { Alert, Button, Card, Col, Form, Modal, Row, Table } from 'react-bootstrap'
import { IconContext } from 'react-icons' import { IconContext } from 'react-icons'
import { BsCloudArrowUpFill, BsFileEarmarkExcel, BsFilePdfFill, BsFillPencilFill, BsSearch } from 'react-icons/bs' import { BsCloudArrowUpFill, BsFileEarmarkExcel, BsFilePdfFill, BsFillPencilFill, BsSearch } from 'react-icons/bs'
import { MsgInformativo } from '../../Utils/Toast/msgInformativo' import { MsgInformativo } from '../../Utils/Toast/msgInformativo'
import { FaPeopleArrows, FaRegFile, FaWarehouse } from 'react-icons/fa' import { FaPeopleArrows, FaRegFile, FaWarehouse } from 'react-icons/fa'
import I1868CatClaveSAT from './Interfaces/I1868CatClaveSAT' import I1868CatClaveSAT from './Interfaces/I1868CatClaveSAT'
import I1868CatDestinos from './Interfaces/I1868CatDestinos' import I1868CatDestinos from './Interfaces/I1868CatDestinos'
import I1868FacturaDetalle from './Interfaces/I1868FacturaDetalle' import I1868FacturaDetalle from './Interfaces/I1868FacturaDetalle'
import DTO1868Factura from './DTO/DTO1868Factura' import DTO1868Factura from './DTO/DTO1868Factura'
import DTO1868ReporteFactura from './DTO/DTO1868ReporteFactura' import DTO1868ReporteFactura from './DTO/DTO1868ReporteFactura'
import DTO1868Clientes from './DTO/DTO1868Clientes' import DTO1868Clientes from './DTO/DTO1868Clientes'
import DTO1868FacturaDetalle from './DTO/DTO1868FacturaDetalle'
import FService from './Services/Facturas.Services' import FService from './Services/Facturas.Services'
import FileManager from '../../Utils/FileManager/FileManager' import FileManager from '../../Utils/FileManager/FileManager'
import { Cat1868Destinos } from './Catalogos/Cat1868Destinos' import { Cat1868Destinos } from './Catalogos/Cat1868Destinos'
import { Cat1868Responsables } from './Catalogos/Cat1868Responsables' import { Cat1868Responsables } from './Catalogos/Cat1868Responsables'
import { useDispatch, useSelector } from 'react-redux' import { useDispatch, useSelector } from 'react-redux'
import { RootState } from '../../../store/store' import { RootState } from '../../../store/store'
import { populateCatResponsables } from '../../../store/features/Clientes/1868/Cat1868ResponsablesSlice' 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 { populateCatDestinos } from '../../../store/features/Clientes/1868/Cat1868DestinosSlice'
import { populateFacturaDetalle, toggleRow } from '../../../store/features/Clientes/1868/Data1868FacturaDetalleSlice' import { populateFacturaDetalle, toggleRow } from '../../../store/features/Clientes/1868/Data1868FacturaDetalleSlice'
import * as XLSX from 'xlsx' import * as XLSX from 'xlsx'
import '../../../css/zincinternacional.css' import '../../../css/Company.css'
import { Rpt1868FacturasDetalle } from './Rpt1868FacturasDetalle' import { Rpt1868FacturasDetalle } from './Rpt1868FacturasDetalle'
import FileManagerDS from '../../../Services/Utils/FileManager.Services'
import { MdCloudUpload } from 'react-icons/md' import { MdCloudUpload } from 'react-icons/md'
interface IProps {} interface IProps {}
@ -38,7 +31,6 @@ export default function Rpt1868Facturas (props:IProps) {
const dispatch = useDispatch() const dispatch = useDispatch()
const mCatDestinos = useSelector((state: RootState) => state.Cat1868Destinos.Cat1868Destinos) const mCatDestinos = useSelector((state: RootState) => state.Cat1868Destinos.Cat1868Destinos)
const mCatResponsables = useSelector((state: RootState) => state.Cat1868Responsables.Cat1868Responsables) const mCatResponsables = useSelector((state: RootState) => state.Cat1868Responsables.Cat1868Responsables)
//const mDataFacturaDetalle = useSelector((state: RootState) => state.Data1868FacturaDetalle.Data1868FacturaDetalle)
const [UserId, setUserId] = useState(() => { const [UserId, setUserId] = useState(() => {
const stickyValue = window.localStorage.getItem('UserId') const stickyValue = window.localStorage.getItem('UserId')
return stickyValue !== null ? JSON.parse(stickyValue) : 0 return stickyValue !== null ? JSON.parse(stickyValue) : 0
@ -69,7 +61,6 @@ export default function Rpt1868Facturas (props:IProps) {
const [IDDestino, setIDDestino] = useState(0) const [IDDestino, setIDDestino] = useState(0)
const [IDResponsable, setIDResponsable] = useState(0) const [IDResponsable, setIDResponsable] = useState(0)
const [Responsable, setResponsable] = useState('') const [Responsable, setResponsable] = useState('')
//const [Referencia, setReferencia] = useState('')
const [show, setShowMsg] = useState(false) const [show, setShowMsg] = useState(false)
const [ShowModal, setShowModal] = useState(false) const [ShowModal, setShowModal] = useState(false)
const [header, setHeader] = useState('') const [header, setHeader] = useState('')

@ -1,12 +1,11 @@
import * as React from 'react' import * as React from 'react'
import { Button, Card, Col, Form, Row } from 'react-bootstrap' 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 { MsgInformativo } from '../Utils/Toast/msgInformativo'
import AuthDS from '../../Services/Auth/Auth.Service' import AuthDS from '../../Services/Auth/Auth.Service'
import { useState } from 'react' import { useState } from 'react'
import { DTOPINUsuario } from '../../DTO/DTOPINUsuario' import { DTOPINUsuario } from '../../DTO/DTOPINUsuario'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import { AxiosError } from 'axios'
export interface IPINProps {} export interface IPINProps {}
@ -32,7 +31,7 @@ export default function PIN(props: IPINProps) {
} }
const data: DTOPINUsuario = { const data: DTOPINUsuario = {
pin: parseInt(PIN), pin: parseInt(PIN),
usuario: Usuario, usuario: Usuario
} }
console.log(JSON.stringify(data)) console.log(JSON.stringify(data))
AuthDS.validatePIN(data) AuthDS.validatePIN(data)
@ -57,17 +56,19 @@ export default function PIN(props: IPINProps) {
<Row> <Row>
<Col xs={5}>&nbsp;</Col> <Col xs={5}>&nbsp;</Col>
<Col xs={2}> <Col xs={2}>
<div className='shadow-lg bg-white rounded'> <div className="shadow-lg bg-white rounded">
<Card style={{ width: '135%' }} className='Color1'> <Card style={{ width: '135%' }} className="Color1">
<Card.Header> <Card.Header>
<Row style={{ backgroundColor: '#002f87' }}> <Row>
<Col xs={12}> <Col xs={4}></Col>
<Col xs={4}>
<img <img
src={logo} src={logo}
alt='ZINC Internacional' alt="GEMCO"
style={{ width: '70%' }} style={{ width: '80%', textAlign: 'center' }}
></img> />
</Col> </Col>
<Col xs={4}></Col>
</Row> </Row>
</Card.Header> </Card.Header>
<Card.Body> <Card.Body>
@ -75,13 +76,13 @@ export default function PIN(props: IPINProps) {
<Row> <Row>
<Col xs={12}>&nbsp;</Col> <Col xs={12}>&nbsp;</Col>
</Row> </Row>
<Form id='login-form' className='form'> <Form id="login-form" className="form">
<Row> <Row>
<Col xs={12}> <Col xs={12}>
<Form.Control <Form.Control
id='PIN' id="PIN"
className='form-control' className="form-control"
placeholder='PIN' placeholder="PIN"
value={PIN} value={PIN}
onChange={(e) => { onChange={(e) => {
setPIN(e.target.value) setPIN(e.target.value)
@ -94,11 +95,11 @@ export default function PIN(props: IPINProps) {
</Row> </Row>
</Form> </Form>
</Card.Text> </Card.Text>
<div className='d-grid gap-1'></div> <div className="d-grid gap-1"></div>
<div className='d-grid gap-1'> <div className="d-grid gap-1">
<Button <Button
variant='customColor' variant="customColor"
size='lg' size="lg"
onClick={() => { onClick={() => {
validatePIN() validatePIN()
}} }}

@ -10,7 +10,7 @@ import {
} from 'react-bootstrap' } from 'react-bootstrap'
import { MsgInformativo } from '../Utils/Toast/msgInformativo' import { MsgInformativo } from '../Utils/Toast/msgInformativo'
import DTOUsuario from '../../DTO/DTOUsuario' import DTOUsuario from '../../DTO/DTOUsuario'
import logo from '../../images/grupo-promax-b.png' import logo from '../../images/GEMCO.png'
import AuthDS from '../../Services/Auth/Auth.Service' import AuthDS from '../../Services/Auth/Auth.Service'
import { DTOResetPassword } from '../../DTO/DTOResetPassword' import { DTOResetPassword } from '../../DTO/DTOResetPassword'
@ -84,15 +84,17 @@ export default function ResetCredentials(props: IProps) {
<div className='shadow-lg bg-white rounded'> <div className='shadow-lg bg-white rounded'>
<Card style={{ width: '100%' }} className='Color1'> <Card style={{ width: '100%' }} className='Color1'>
<Card.Header> <Card.Header>
<Row style={{ backgroundColor: '#002f87' }}> <Row>
<Col xs={12}> <Col xs={4}></Col>
<img <Col xs={4}>
src={logo} <img
alt='ZINC Internacional' src={logo}
style={{ width: '70%' }} alt="GEMCO"
></img> style={{ width: '80%', textAlign: 'center' }}
</Col> />
</Row> </Col>
<Col xs={4}></Col>
</Row>
</Card.Header> </Card.Header>
<Card.Body> <Card.Body>
<Card.Text> <Card.Text>
@ -100,10 +102,11 @@ export default function ResetCredentials(props: IProps) {
style={{ style={{
backgroundColor: '#002f87', backgroundColor: '#002f87',
color: '#ffffff', color: '#ffffff',
fontSize: '19px', fontSize: '17px',
textAlign: 'center'
}} }}
> >
<Col xs={12}>Proporcione su nueva contraseña?</Col> <Col xs={12}>Proporcione su nueva contraseña</Col>
</Row> </Row>
<Row> <Row>
<Col xs={12}>&nbsp;</Col> <Col xs={12}>&nbsp;</Col>

@ -2,7 +2,6 @@ import * as React from 'react'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import { Formik, Form, Field } from 'formik' import { Formik, Form, Field } from 'formik'
import { useSelector, useDispatch } from 'react-redux' import { useSelector, useDispatch } from 'react-redux'
//import { RootState } from '../../store/store'
import { logued } from '../../store/features/userStatusSlice/userStatusSlice' import { logued } from '../../store/features/userStatusSlice/userStatusSlice'
import ILogin from '../../Interfaces/Ilogin' import ILogin from '../../Interfaces/Ilogin'
import authDataService from '../../Services/Auth/Auth.Service' import authDataService from '../../Services/Auth/Auth.Service'
@ -14,7 +13,7 @@ import { AxiosError } from 'axios'
import { MsgInformativo } from '../Utils/Toast/msgInformativo' import { MsgInformativo } from '../Utils/Toast/msgInformativo'
import logo from '../../images/GEMCO_mini.png' import logo from '../../images/GEMCO_mini.png'
import Dashboard from '../Dashboard/Dashboard' import Dashboard from '../Dashboard/Dashboard'
import { Alert, Card, Nav } from 'react-bootstrap' import { Nav } from 'react-bootstrap'
export const Login: React.FC<{}> = () => { export const Login: React.FC<{}> = () => {
const dispatch = useDispatch() const dispatch = useDispatch()
@ -98,12 +97,12 @@ export const Login: React.FC<{}> = () => {
<img <img
src={logo} src={logo}
alt='GEMCO' alt='GEMCO'
width='150px' width='100px'
height='150px' height='100px'
></img> ></img>
</div> </div>
<br /> <br />
<h3 className='text-center text-info'>Bienvenido</h3> {/* <h3 className='text-center text-info'>Bienvenido</h3> */}
<div className='form-group'> <div className='form-group'>
<label htmlFor='username'>Usuario</label> <label htmlFor='username'>Usuario</label>
<Field <Field

@ -1,99 +0,0 @@
import React, { FC } from 'react'
import { Button, Form, Toast, ToastContainer } from 'react-bootstrap'
import { MsgInformativo } from '../Utils/Toast/msgInformativo'
import DTOUsuario from '../../DTO/DTOUsuario'
import usuariosServices from '../../Services/Catalogos/Usuarios.Services'
interface IProps {}
export default function ResetCredentials(props: IProps) {
const [header, setHerader] = React.useState('Error!')
const [msgColor, setMsgColor] = React.useState('Primary')
const [showMsg, setShowMsg] = React.useState(false)
const [msg, setMsg] = React.useState('')
const [usuario, setUsuario] = React.useState('')
const [contrasena, setContrasena] = React.useState('')
const [confirmaContrasena, setConfirmaContrasena] = React.useState('')
const validaFormulario = () => {
if (contrasena != confirmaContrasena) {
setMsg('Contrasena no coincide con su confirmacion!')
setShowMsg(true)
return
}
const data: DTOUsuario = {
Usuario: usuario,
Contrasena: contrasena,
}
usuariosServices
.resetPassword(data)
.then((response) => {
if (response.status == 200) alert('La contrasena se reseteo exisosamente')
if (response.status == 204) alert('Usuario no existe')
console.log(response.data)
})
.catch((e: Error) => {
console.log(e)
//alert(e);
let message = e.message
setMsg(message)
if (message.includes('400')) setMsg('Usuario no encontrado')
setShowMsg(true)
})
}
const closeToast = (show: boolean): void => {
setShowMsg(false)
}
return (
<div>
{' '}
<div id='login'>
<div className='container'>
<div id='login-row' className='row justify-content-center align-items-center'>
<div id='login-column' className='col-md-4'>
<div id='login-box' className='col-md-12'>
<Form id='login-form' className='form'>
<h3 className='text-center text-info'>Olvido su contraseña</h3>
<Form.Group className='mb-3 control-label' controlId='formBasicEmail'>
<Form.Label>Usuario</Form.Label>
<Form.Control placeholder='Usuario' onChange={(e) => setUsuario(e.currentTarget.value)} />
</Form.Group>
<Form.Group className='mb-3 control-label' controlId='formBasicPassword'>
<Form.Label>Nueva contraseña</Form.Label>
<Form.Control
type='password'
placeholder='Contraseña'
onChange={(e) => setContrasena(e.currentTarget.value)}
/>
</Form.Group>
<Form.Group className='mb-3 control-label' controlId='formBasicPassword'>
<Form.Label>Confirme su nueva contraseña</Form.Label>
<Form.Control
type='password'
placeholder='Confirme su contraseña'
onChange={(e) => setConfirmaContrasena(e.currentTarget.value)}
/>
</Form.Group>
<Button
variant='primary'
onClick={() => {
validaFormulario()
}}
>
Submit
</Button>
</Form>
</div>
</div>
</div>
</div>
<MsgInformativo show={showMsg} msg={msg} header={header} msgColor={msgColor} closeToast={closeToast} />
</div>
</div>
)
}

@ -112,4 +112,13 @@
.zui-table-min { .zui-table-min {
height: 0px; height: 0px;
} }
.Color1 {
border-color: #002f87;
}
.btn-customColor {
background-color: #002f87;
color: white;
}

@ -16,7 +16,7 @@ import CatTabuladores from './Components/Catalogos/CatTabulador/CatTabulador'
import DashboardCorresponsales from './Components/Dashboard/DashboardCorresponsales' import DashboardCorresponsales from './Components/Dashboard/DashboardCorresponsales'
import Dashboard from './Components/Dashboard/Dashboard' import Dashboard from './Components/Dashboard/Dashboard'
import Logout from './Components/Logout/logout' 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 Register from './Components/Register/register'
import RegisterPermisoClientes from './Components/registerPermisoClientes/registerPermisoClientes' import RegisterPermisoClientes from './Components/registerPermisoClientes/registerPermisoClientes'
import FotosBodega from './Components/Bodega/FotosBodega' 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 RptAmazonInvoiceStatus from './Components/Clientes/Amazon/Reportes/Estatus/RtpAmazonInvoiceStatus'
import ForgotPassword from './Components/Login/ForgotPassword' import ForgotPassword from './Components/Login/ForgotPassword'
import PIN from './Components/Login/PIN' import PIN from './Components/Login/PIN'
require (`./css/${process.env.REACT_APP_ENVIRONMENT}-home.css`) require (`./css/${process.env.REACT_APP_ENVIRONMENT}-home.css`)
function PageNotFound() { function PageNotFound() {

Loading…
Cancel
Save