diff --git a/src/Components/Home/Home.tsx b/src/Components/Home/Home.tsx index 7b5bb83..0bd30b9 100644 --- a/src/Components/Home/Home.tsx +++ b/src/Components/Home/Home.tsx @@ -32,8 +32,8 @@ export const Home: FC = (props) => { (window.localStorage.getItem('menu') ? window.localStorage.getItem('menu') : '')! ) - const loadCatalogs = () => { - DSCatClientes.Get() + const loadCatalogs = async () => { + await DSCatClientes.Get() .then((response) => { // console.log(response.data) dispatch(populateCatClientes(response.data)) @@ -64,17 +64,25 @@ export const Home: FC = (props) => { const validateToken = () => { DSAuth.Validate() .then((response) => { - dispatch(populateMenuItems(JSON.parse(menuStr))) - dispatch(populateUserProfile(token)) + // dispatch(populateMenuItems(JSON.parse(menuStr))) + // dispatch(populateUserProfile(token)) + alert('token valido') loadCatalogs() navigate('/', { replace: true }) }) - .catch((e: Error) => {}) + .catch((e: Error) => { + console.log('Error: ' + e.message.toString()) + }) } useEffect(() => { - if (!UserLogued) validateToken() - }, [UserLogued]) + // if (!UserLogued) + // validateToken() + }, []) + + useEffect(() => { + alert('token: ' + token) + }, [token]) return (
diff --git a/src/Components/Login/Login.tsx b/src/Components/Login/Login.tsx index 58779bb..2e6c9dd 100644 --- a/src/Components/Login/Login.tsx +++ b/src/Components/Login/Login.tsx @@ -35,7 +35,7 @@ export const Login: FC = (props) => { (window.localStorage.getItem('menu') ? window.localStorage.getItem('menu') : '')! ) - const Login = () => { + const Login = async () => { const data: IAuth = { usuario: Usuario, contrasena: Contrasena, @@ -48,7 +48,8 @@ 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() + //loadCatalogs() + //alert(localStorage.getItem('token')) navigate('/', { replace: true }) }) .catch((e: Error) => { @@ -87,18 +88,30 @@ export const Login: FC = (props) => { const validateToken = () => { DSAuth.Validate() .then((response) => { - dispatch(populateMenuItems(JSON.parse(menuStr))) - dispatch(populateUserProfile(token)) + // dispatch(populateMenuItems(JSON.parse(menuStr))) + // dispatch(populateUserProfile(token)) + //alert('token valido') loadCatalogs() navigate('/', { replace: true }) }) - .catch((e: Error) => {}) + .catch((e: Error) => { + alert('no valido') + }) } useEffect(() => { - if (!UserLogued) validateToken() + if (token.length > 5) { + validateToken() + } }, [token]) + useEffect(() => { + //alert('user logued:' + UserLogued) + if (UserLogued) { + //loadCatalogs() + } + }, [UserLogued]) + return (