From 84ceea673b8734111590327b9c37c56d0a87459d Mon Sep 17 00:00:00 2001 From: Al Garcia Date: Mon, 10 Oct 2022 17:58:37 -0500 Subject: [PATCH] version estable router, interceptos, menu --- src/App.tsx | 2 + src/Components/Catalogos/CatUsuarios.tsx | 120 +++++++++++++++++++++ src/Components/Home/Home.tsx | 12 --- src/Components/Login/Login.tsx | 14 +-- src/Components/Operaciones/Viaje/Viaje.tsx | 2 +- src/css/generalStyles.css | 5 + 6 files changed, 132 insertions(+), 23 deletions(-) create mode 100644 src/Components/Catalogos/CatUsuarios.tsx diff --git a/src/App.tsx b/src/App.tsx index f6ff178..9dc4019 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -16,6 +16,7 @@ import { CatUbicaciones } from './Components/Catalogos/CatUbicaciones' import { CatRutas } from './Components/Catalogos/CatRutas' import { OpMonitor } from './Components/Operaciones/OpMonitor' import { CatServicios } from './Components/Catalogos/CatServicios' +import { CatUsuarios } from './Components/Catalogos/CatUsuarios' function App() { const UserLogued = useSelector((state: RootState) => state.UserProfile.UserProfile.logueado) @@ -49,6 +50,7 @@ function App() { } /> } /> } /> + } /> } /> diff --git a/src/Components/Catalogos/CatUsuarios.tsx b/src/Components/Catalogos/CatUsuarios.tsx new file mode 100644 index 0000000..b088cf7 --- /dev/null +++ b/src/Components/Catalogos/CatUsuarios.tsx @@ -0,0 +1,120 @@ +import React, { FC, useState } from 'react' +import { Card, Col, FloatingLabel, Form, Row } from 'react-bootstrap' +import { useSelector } from 'react-redux' +import { RootState } from '../../store/store' + +interface IProps {} + +export const CatUsuarios: FC = (props) => { + const mCatClientes = useSelector((state: RootState) => state.CatClientes.CatClientes) + const mCatProveedores = useSelector((state: RootState) => state.CatProveedores.CatProveedores) + const [Usuario, setUsuario] = useState('') + const [TipoUsuario, setTipoUsuario] = useState(0) + const [Search, setSearch] = useState('') + + return ( +
+
+ + + + + + + + + + + + + + + { + setTipoUsuario(parseInt(e.target.value)) + }} + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + setSearch(e.target.value) + }} + /> + + + + +
+ {TipoUsuario === 2 + ? mCatClientes + .filter((c) => c.cliente.toLocaleLowerCase().includes(Search.toLocaleLowerCase())) + .map((c) => { + return ( + + ) + }) + : null} + {TipoUsuario === 3 + ? mCatProveedores + .filter((c) => c.proveedor.toLocaleLowerCase().includes(Search.toLocaleLowerCase())) + .map((c) => { + return ( + + ) + }) + : null} +
+ +
+
+
+ +
+
+
+
+ ) +} diff --git a/src/Components/Home/Home.tsx b/src/Components/Home/Home.tsx index 0bd30b9..47c7835 100644 --- a/src/Components/Home/Home.tsx +++ b/src/Components/Home/Home.tsx @@ -64,9 +64,6 @@ export const Home: FC = (props) => { const validateToken = () => { DSAuth.Validate() .then((response) => { - // dispatch(populateMenuItems(JSON.parse(menuStr))) - // dispatch(populateUserProfile(token)) - alert('token valido') loadCatalogs() navigate('/', { replace: true }) }) @@ -75,15 +72,6 @@ export const Home: FC = (props) => { }) } - useEffect(() => { - // if (!UserLogued) - // validateToken() - }, []) - - useEffect(() => { - alert('token: ' + token) - }, [token]) - return (
diff --git a/src/Components/Login/Login.tsx b/src/Components/Login/Login.tsx index 2e6c9dd..47a60f5 100644 --- a/src/Components/Login/Login.tsx +++ b/src/Components/Login/Login.tsx @@ -18,7 +18,6 @@ import { populateMenuItems } from '../../store/features/Auth/MenuItemsSlice' import { RootState } from '../../store/store' import Leyend from '../../images/leyend.png' import jwt_decode from 'jwt-decode' -import IjwtStructure from '../../Interfaces/Auth/IjwtStructure' interface IProps {} @@ -48,8 +47,6 @@ export const Login: FC = (props) => { localStorage.setItem('tokenInfo', JSON.stringify(jwt_decode(response.data.token))) dispatch(populateMenuItems(response.data.menu)) dispatch(populateUserProfile(response.data.token)) - //loadCatalogs() - //alert(localStorage.getItem('token')) navigate('/', { replace: true }) }) .catch((e: Error) => { @@ -88,9 +85,6 @@ export const Login: FC = (props) => { const validateToken = () => { DSAuth.Validate() .then((response) => { - // dispatch(populateMenuItems(JSON.parse(menuStr))) - // dispatch(populateUserProfile(token)) - //alert('token valido') loadCatalogs() navigate('/', { replace: true }) }) @@ -106,11 +100,11 @@ export const Login: FC = (props) => { }, [token]) useEffect(() => { - //alert('user logued:' + UserLogued) - if (UserLogued) { - //loadCatalogs() + if (menuStr) { + dispatch(populateMenuItems(JSON.parse(menuStr))) + dispatch(populateUserProfile(token)) } - }, [UserLogued]) + }, [menuStr]) return (