amenpunk 3 anni fa
parent
commit
6d1619727a

+ 4 - 9
src/Components/Dashboard.js

@@ -11,7 +11,7 @@ import {
     Fullscreen as FullscreenIcon,
     Menu as MenuIcon,
     KeyboardDoubleArrowLeft as LeftKey,
-    Mail as MailIcon, Notifications as NotificationsIcon,
+    Notifications as NotificationsIcon,
 } from '@mui/icons-material'
 
 import Logo from '../Images/evaluacion.jpeg';
@@ -141,11 +141,7 @@ function DashboardContent() {
             </Typography>
 
             <Box sx={{ display: { xs: 'none', md: 'flex' } }}>
-              <IconButton size="large" aria-label="show 4 new mails" color="inherit">
-                <Badge badgeContent={4} color="error">
-                  <MailIcon style={{ color : '#212529' }} />
-                </Badge>
-              </IconButton>
+
               <IconButton
                 size="large"
                 aria-label="show 17 new notifications"
@@ -174,9 +170,8 @@ function DashboardContent() {
                 open={open_profile}
                 onClose={handleClose}
                 MenuListProps={{ 'aria-labelledby': 'basic-button', }}>
-                <MenuItem onClick={() => navigate('dashboard/perfil') }>Profile</MenuItem>
-                <MenuItem onClick={() => console.log('opcion 2')}>My account</MenuItem>
-                <MenuItem onClick={CerrarSession}>Logout</MenuItem>
+                <MenuItem onClick={() => navigate('/dashboard/configuraciones') }>Perfil</MenuItem>
+                <MenuItem onClick={CerrarSession}>Cerrar Sesion</MenuItem>
               </Menu>
             </Box>
 

+ 11 - 5
src/Components/Navigation/MenuMovil.jsx

@@ -9,14 +9,20 @@ import {
     SwipeableDrawer
 } from '@mui/material/'
 
-// import { useSelector } from 'react-redux';
-
-// import useAuth from '../../Auth/useAuth'
+import { useDispatch } from 'react-redux';
+import { useNavigate } from 'react-router';
+import { removeToken } from '../../Slices/tokenSlice';
 
 export function MenuMovil(props) {
 
   let { anchor, control } = props;
-  // const auth = useSelector((state) => state.token)
+  const dispatch = useDispatch();
+  const navigate = useNavigate()
+
+  const CerrarSession = () => {
+    dispatch(removeToken())
+    navigate('/')
+  }
 
   return (
     <React.Fragment >
@@ -40,7 +46,7 @@ export function MenuMovil(props) {
         </List>
         <Divider />
         <List>
-          <Nav onClick ={() => console.log('logout')}>
+          <Nav onClick ={CerrarSession}>
             <ListItem>
               <ListItemIcon>
                 <Logout/>

+ 1 - 1
src/Components/Password/Steps/resume.jsx

@@ -150,7 +150,7 @@ export function Resume(props) {
             </tr>
             <tr>
               <td className="title_td">{"Empresa:"}</td>
-              <td colSpan={2}>{profile.nombre}</td>
+              <td colSpan={2}>{profile ? profile.nombre : ""}</td>
             </tr>
             <tr>
               <td className="title_td">{"Fecha Activación:"}</td>

+ 6 - 1
src/Components/Routes.js

@@ -64,7 +64,12 @@ export default function MyRoutes() {
         <Route path="perfil" element={<Profile />} />
         <Route path="contrasenas" element={<Contras />} />
         <Route path="expedientes" element={<Expedientes />} />
-        <Route path="resultados/:id" element={<Resultados />} />
+
+        <Route path="resultados" >
+          <Route path="id" element={<Resultados />} />
+          <Route path="" element={<Resultados />} />
+        </Route>
+
         <Route path="configuraciones" element={<Configuracion />} />
         <Route path="historial" element={<Historial />} />
         <Route path="pruebas/listar" element={<Pruebas />} />

+ 3 - 0
src/Pages/Login.jsx

@@ -70,6 +70,9 @@ export function Login() {
           let restante = timestamp - Date.now();
 
           setTimeout(() => alert("Token Expirado") , restante )
+
+          console.log({empresa,body_token})
+
           dispatch(setProfile(empresa))
           dispatch(setRole(body_token))
 

+ 94 - 93
src/Utils/MenuItems.js

@@ -1,113 +1,114 @@
 import React from 'react';
 import {
-    Home,Work, VisibilityOff, PeopleAlt,
-    Equalizer, OndemandVideo, SupportAgent, Star,
-    MiscellaneousServices, History,
-    AssignmentTurnedIn
+  Home, Work, VisibilityOff,
+  Equalizer, OndemandVideo, SupportAgent, Star,
+  MiscellaneousServices,
+  AssignmentTurnedIn
+  //PeopleAlt, History
 } from '@mui/icons-material'
 
 export const UserItems = [
-    {
-        icon : <Home/>,
-        route : 'home',
-        title : 'Inicio'
-    },
-    {
-        icon : <AssignmentTurnedIn/>,
-        route : 'pruebas',
-        title : 'Pruebas'
-    },
-    {
-        icon : <Star/>,
-        route : 'prueba/:id' ,
-        title : 'Test Actual'
-    },
+  {
+    icon: <Home />,
+    route: 'home',
+    title: 'Inicio'
+  },
+  {
+    icon: <AssignmentTurnedIn />,
+    route: 'pruebas',
+    title: 'Pruebas'
+  },
+  {
+    icon: <Star />,
+    route: 'prueba/:id',
+    title: 'Test Actual'
+  },
 ]
 
 
 export const MainItems = [
-    {
-        icon : <Home/>,
-        route : 'home',
-        title : 'Inicio'
-    },
-    {
-        icon : <Work/>,
-        route : 'puestos',
-        title : 'Puestos'
-    },
-    {
-        icon : <VisibilityOff/>,
-        route : 'contrasenas',
-        title : 'Contraseñas'
-    },
-    {
-        icon : <PeopleAlt/>,
-        route : 'expedientes',
-        title : 'Expedientes'
-    },
-    {
-        icon : <Equalizer/>,
-        route : 'resultados',
-        title : 'Resultados'
-    },
-    {
-        icon : <MiscellaneousServices/>,
-        route : 'configuraciones',
-        title : 'Configuraciones'
-    },
-    {
-        icon : <History/>,
-        route : 'historial',
-        title : 'Historial'
-    },
+  {
+    icon: <Home />,
+    route: 'home',
+    title: 'Inicio'
+  },
+  {
+    icon: <Work />,
+    route: 'puestos',
+    title: 'Puestos'
+  },
+  {
+    icon: <VisibilityOff />,
+    route: 'contrasenas',
+    title: 'Contraseñas'
+  },
+  // {
+  //     icon : <PeopleAlt/>,
+  //     route : 'expedientes',
+  //     title : 'Expedientes'
+  // },
+  {
+    icon: <Equalizer />,
+    route: 'resultados',
+    title: 'Resultados'
+  },
+  {
+    icon: <MiscellaneousServices />,
+    route: 'configuraciones',
+    title: 'Configuraciones'
+  },
+  // {
+  //     icon : <History/>,
+  //     route : 'historial',
+  //     title : 'Historial'
+  // },
 ]
 
 export const ExtraItems = [
-    {
-        icon : <Star/>,
-        route : 'work',
-        title : 'Elementos'
-    },
-    {
-        icon : <OndemandVideo/>,
-        route : 'worktwo',
-        title : 'Tutoriales'
-    },
-    {
-        icon : <SupportAgent/>,
-        route : 'worktree',
-        title : 'Asistencia Técnica'
-    },
+  {
+    icon: <Star />,
+    route: 'work',
+    title: 'Elementos'
+  },
+  {
+    icon: <OndemandVideo />,
+    route: 'worktwo',
+    title: 'Tutoriales'
+  },
+  {
+    icon: <SupportAgent />,
+    route: 'worktree',
+    title: 'Asistencia Técnica'
+  },
 ]
 
 export const PruebaItems = [
-    {
-        route:"pruebas/crear",
-        title:"Crear Prueba",
-    },
-    {
-        route:"pruebas/listar",
-        title:"Listado de pruebas",
-    },
-    {
-        route:"pruebas/aplicar",
-        title:"Aplicar",
-    },
-    {
-        route:"pruebas/respuestas",
-        title:"Respuestas",
-    },
-    {
-        route:"pruebas/calificaciones",
-        title:"Calificaciones",
-    },
+  {
+    route: "pruebas/crear",
+    title: "Crear Prueba",
+  },
+  {
+    route: "pruebas/listar",
+    title: "Listado de pruebas",
+  },
+  {
+    route: "pruebas/aplicar",
+    title: "Aplicar",
+  },
+  {
+    route: "pruebas/respuestas",
+    title: "Respuestas",
+  },
+  {
+    route: "pruebas/calificaciones",
+    title: "Calificaciones",
+  },
 ]
 
 export const TxTStyle = {
-    fontSize: 12,
-    ' .css-10hburv-MuiTypography-root' : {
-        fontSize : '.875rem'
-    },
+  fontSize: 12,
+  ' .css-10hburv-MuiTypography-root': {
+    fontSize: '.875rem'
+  },
 }