浏览代码

fix routes

amenpunk 2 年之前
父节点
当前提交
6d1619727a

+ 4 - 9
src/Components/Dashboard.js

@@ -11,7 +11,7 @@ import {
11 11
     Fullscreen as FullscreenIcon,
12 12
     Menu as MenuIcon,
13 13
     KeyboardDoubleArrowLeft as LeftKey,
14
-    Mail as MailIcon, Notifications as NotificationsIcon,
14
+    Notifications as NotificationsIcon,
15 15
 } from '@mui/icons-material'
16 16
 
17 17
 import Logo from '../Images/evaluacion.jpeg';
@@ -141,11 +141,7 @@ function DashboardContent() {
141 141
             </Typography>
142 142
 
143 143
             <Box sx={{ display: { xs: 'none', md: 'flex' } }}>
144
-              <IconButton size="large" aria-label="show 4 new mails" color="inherit">
145
-                <Badge badgeContent={4} color="error">
146
-                  <MailIcon style={{ color : '#212529' }} />
147
-                </Badge>
148
-              </IconButton>
144
+
149 145
               <IconButton
150 146
                 size="large"
151 147
                 aria-label="show 17 new notifications"
@@ -174,9 +170,8 @@ function DashboardContent() {
174 170
                 open={open_profile}
175 171
                 onClose={handleClose}
176 172
                 MenuListProps={{ 'aria-labelledby': 'basic-button', }}>
177
-                <MenuItem onClick={() => navigate('dashboard/perfil') }>Profile</MenuItem>
178
-                <MenuItem onClick={() => console.log('opcion 2')}>My account</MenuItem>
179
-                <MenuItem onClick={CerrarSession}>Logout</MenuItem>
173
+                <MenuItem onClick={() => navigate('/dashboard/configuraciones') }>Perfil</MenuItem>
174
+                <MenuItem onClick={CerrarSession}>Cerrar Sesion</MenuItem>
180 175
               </Menu>
181 176
             </Box>
182 177
 

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

@@ -9,14 +9,20 @@ import {
9 9
     SwipeableDrawer
10 10
 } from '@mui/material/'
11 11
 
12
-// import { useSelector } from 'react-redux';
13
-
14
-// import useAuth from '../../Auth/useAuth'
12
+import { useDispatch } from 'react-redux';
13
+import { useNavigate } from 'react-router';
14
+import { removeToken } from '../../Slices/tokenSlice';
15 15
 
16 16
 export function MenuMovil(props) {
17 17
 
18 18
   let { anchor, control } = props;
19
-  // const auth = useSelector((state) => state.token)
19
+  const dispatch = useDispatch();
20
+  const navigate = useNavigate()
21
+
22
+  const CerrarSession = () => {
23
+    dispatch(removeToken())
24
+    navigate('/')
25
+  }
20 26
 
21 27
   return (
22 28
     <React.Fragment >
@@ -40,7 +46,7 @@ export function MenuMovil(props) {
40 46
         </List>
41 47
         <Divider />
42 48
         <List>
43
-          <Nav onClick ={() => console.log('logout')}>
49
+          <Nav onClick ={CerrarSession}>
44 50
             <ListItem>
45 51
               <ListItemIcon>
46 52
                 <Logout/>

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

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

+ 6 - 1
src/Components/Routes.js

@@ -64,7 +64,12 @@ export default function MyRoutes() {
64 64
         <Route path="perfil" element={<Profile />} />
65 65
         <Route path="contrasenas" element={<Contras />} />
66 66
         <Route path="expedientes" element={<Expedientes />} />
67
-        <Route path="resultados/:id" element={<Resultados />} />
67
+
68
+        <Route path="resultados" >
69
+          <Route path="id" element={<Resultados />} />
70
+          <Route path="" element={<Resultados />} />
71
+        </Route>
72
+
68 73
         <Route path="configuraciones" element={<Configuracion />} />
69 74
         <Route path="historial" element={<Historial />} />
70 75
         <Route path="pruebas/listar" element={<Pruebas />} />

+ 3 - 0
src/Pages/Login.jsx

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

+ 94 - 93
src/Utils/MenuItems.js

@@ -1,113 +1,114 @@
1 1
 import React from 'react';
2 2
 import {
3
-    Home,Work, VisibilityOff, PeopleAlt,
4
-    Equalizer, OndemandVideo, SupportAgent, Star,
5
-    MiscellaneousServices, History,
6
-    AssignmentTurnedIn
3
+  Home, Work, VisibilityOff,
4
+  Equalizer, OndemandVideo, SupportAgent, Star,
5
+  MiscellaneousServices,
6
+  AssignmentTurnedIn
7
+  //PeopleAlt, History
7 8
 } from '@mui/icons-material'
8 9
 
9 10
 export const UserItems = [
10
-    {
11
-        icon : <Home/>,
12
-        route : 'home',
13
-        title : 'Inicio'
14
-    },
15
-    {
16
-        icon : <AssignmentTurnedIn/>,
17
-        route : 'pruebas',
18
-        title : 'Pruebas'
19
-    },
20
-    {
21
-        icon : <Star/>,
22
-        route : 'prueba/:id' ,
23
-        title : 'Test Actual'
24
-    },
11
+  {
12
+    icon: <Home />,
13
+    route: 'home',
14
+    title: 'Inicio'
15
+  },
16
+  {
17
+    icon: <AssignmentTurnedIn />,
18
+    route: 'pruebas',
19
+    title: 'Pruebas'
20
+  },
21
+  {
22
+    icon: <Star />,
23
+    route: 'prueba/:id',
24
+    title: 'Test Actual'
25
+  },
25 26
 ]
26 27
 
27 28
 
28 29
 export const MainItems = [
29
-    {
30
-        icon : <Home/>,
31
-        route : 'home',
32
-        title : 'Inicio'
33
-    },
34
-    {
35
-        icon : <Work/>,
36
-        route : 'puestos',
37
-        title : 'Puestos'
38
-    },
39
-    {
40
-        icon : <VisibilityOff/>,
41
-        route : 'contrasenas',
42
-        title : 'Contraseñas'
43
-    },
44
-    {
45
-        icon : <PeopleAlt/>,
46
-        route : 'expedientes',
47
-        title : 'Expedientes'
48
-    },
49
-    {
50
-        icon : <Equalizer/>,
51
-        route : 'resultados',
52
-        title : 'Resultados'
53
-    },
54
-    {
55
-        icon : <MiscellaneousServices/>,
56
-        route : 'configuraciones',
57
-        title : 'Configuraciones'
58
-    },
59
-    {
60
-        icon : <History/>,
61
-        route : 'historial',
62
-        title : 'Historial'
63
-    },
30
+  {
31
+    icon: <Home />,
32
+    route: 'home',
33
+    title: 'Inicio'
34
+  },
35
+  {
36
+    icon: <Work />,
37
+    route: 'puestos',
38
+    title: 'Puestos'
39
+  },
40
+  {
41
+    icon: <VisibilityOff />,
42
+    route: 'contrasenas',
43
+    title: 'Contraseñas'
44
+  },
45
+  // {
46
+  //     icon : <PeopleAlt/>,
47
+  //     route : 'expedientes',
48
+  //     title : 'Expedientes'
49
+  // },
50
+  {
51
+    icon: <Equalizer />,
52
+    route: 'resultados',
53
+    title: 'Resultados'
54
+  },
55
+  {
56
+    icon: <MiscellaneousServices />,
57
+    route: 'configuraciones',
58
+    title: 'Configuraciones'
59
+  },
60
+  // {
61
+  //     icon : <History/>,
62
+  //     route : 'historial',
63
+  //     title : 'Historial'
64
+  // },
64 65
 ]
65 66
 
66 67
 export const ExtraItems = [
67
-    {
68
-        icon : <Star/>,
69
-        route : 'work',
70
-        title : 'Elementos'
71
-    },
72
-    {
73
-        icon : <OndemandVideo/>,
74
-        route : 'worktwo',
75
-        title : 'Tutoriales'
76
-    },
77
-    {
78
-        icon : <SupportAgent/>,
79
-        route : 'worktree',
80
-        title : 'Asistencia Técnica'
81
-    },
68
+  {
69
+    icon: <Star />,
70
+    route: 'work',
71
+    title: 'Elementos'
72
+  },
73
+  {
74
+    icon: <OndemandVideo />,
75
+    route: 'worktwo',
76
+    title: 'Tutoriales'
77
+  },
78
+  {
79
+    icon: <SupportAgent />,
80
+    route: 'worktree',
81
+    title: 'Asistencia Técnica'
82
+  },
82 83
 ]
83 84
 
84 85
 export const PruebaItems = [
85
-    {
86
-        route:"pruebas/crear",
87
-        title:"Crear Prueba",
88
-    },
89
-    {
90
-        route:"pruebas/listar",
91
-        title:"Listado de pruebas",
92
-    },
93
-    {
94
-        route:"pruebas/aplicar",
95
-        title:"Aplicar",
96
-    },
97
-    {
98
-        route:"pruebas/respuestas",
99
-        title:"Respuestas",
100
-    },
101
-    {
102
-        route:"pruebas/calificaciones",
103
-        title:"Calificaciones",
104
-    },
86
+  {
87
+    route: "pruebas/crear",
88
+    title: "Crear Prueba",
89
+  },
90
+  {
91
+    route: "pruebas/listar",
92
+    title: "Listado de pruebas",
93
+  },
94
+  {
95
+    route: "pruebas/aplicar",
96
+    title: "Aplicar",
97
+  },
98
+  {
99
+    route: "pruebas/respuestas",
100
+    title: "Respuestas",
101
+  },
102
+  {
103
+    route: "pruebas/calificaciones",
104
+    title: "Calificaciones",
105
+  },
105 106
 ]
106 107
 
107 108
 export const TxTStyle = {
108
-    fontSize: 12,
109
-    ' .css-10hburv-MuiTypography-root' : {
110
-        fontSize : '.875rem'
111
-    },
109
+  fontSize: 12,
110
+  ' .css-10hburv-MuiTypography-root': {
111
+    fontSize: '.875rem'
112
+  },
112 113
 }
113 114