amenpunk 3 rokov pred
rodič
commit
d0b40b3f2d

+ 15 - 1
src/App.css

@@ -283,6 +283,20 @@
 .card_test{
     padding : 15px;
 }
-
+#start_title{
+    padding-bottom:20px;
+}
+.prueba_body{
+  padding: 15px;
+  background-color:red;
+  width : '100%';
+  min-height: 95vh;
+  display:flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: center;
+  align-items: center;
+  align-content: space-around;
+}
 
 

+ 0 - 2
src/Components/Dashboard.js

@@ -103,9 +103,7 @@ function DashboardContent() {
 
     return (
         <ThemeProvider theme={mdTheme}>
-
             <MenuMovil anchor={anchorElMovil} control={setAnchorElMov} />
-
             <Box sx={{ display: 'flex' }}>
                 <AppBar style={{ backgroundColor: '#fff', boxShadow: 'None' }} position="absolute" open={open}>
                     <Toolbar sx={{ pr: '24px', borderBottom: "1px solid #ec5e69" }} >

+ 6 - 2
src/Components/HomeUser/TestCard.jsx

@@ -5,10 +5,12 @@ import {
 } from '@mui/material'
 
 import QA from '../../Images/puesto.jpg'
+import { Link } from 'react-router-dom'
 
 export function TestCard(props) {
 
     let { test } = props;
+    console.log('TEST: ', test)
     return (
         <Card className="card_test" elevation={0} sx={{ maxWidth: 500, maxHeight : 500 }}>
             <CardActionArea>
@@ -28,9 +30,11 @@ export function TestCard(props) {
                 </CardContent>
             </CardActionArea>
             <CardActions>
+              <Link to={`/user/prueba/${test.id}`}>
                 <Button size="small" color="primary">
-                    Realizar
-                </Button>
+                      Realizar
+                  </Button>
+              </Link>
             </CardActions>
         </Card>
     )

+ 0 - 2
src/Components/Navigation/listItems.js

@@ -2,7 +2,6 @@ import * as React from 'react';
 import { Nav } from 'react-bootstrap';
 
 import { Fingerprint, ExpandLess, ExpandMore } from '@mui/icons-material/'
-
 import { useNavigate, useResolvedPath, useMatch } from 'react-router-dom'
 import { Collapse,ListItem, List ,ListItemIcon,ListItemText,ListSubheader } from '@mui/material/'
 
@@ -24,7 +23,6 @@ function NavItem (props) {
         setOpen(false);
     }
 
-
     return(
         <ListItem
             sx={{ color : '#25344f'}}

+ 44 - 45
src/Components/Routes.js

@@ -8,8 +8,7 @@ import { LoginCs } from '../Pages/Logincs'
 import { Register } from '../Pages/Register'
 import { Home } from '../Pages/Home'
 import { Puestos } from '../Pages/Puestos'
-// import { Contras  } from '../Pages/Contras'
-import { Contrasv2  as Contras } from '../Pages/ContrasV2'
+import { Contrasv2 as Contras } from '../Pages/ContrasV2'
 import { Expedientes } from '../Pages/Expedientes'
 import { Resultados } from '../Pages/Resultados'
 import { Configuracion } from '../Pages/Configuracion'
@@ -22,57 +21,57 @@ import { Profile } from '../Pages/Profile'
 import { RestorePassword } from '../Pages/RestorePassword'
 
 import { HomeUser } from '../Pages/HomeUser'
+import { Prueba } from '../Pages/Prueba.jsx'
 
 import RequireAuth from '../Components/PrivateRoute'
 
-export default function MyRoutes () {
+export default function MyRoutes() {
 
-    return(
-        <Routes>
+  return (
+    <Routes>
 
-            <Route path="/" element={<Navigate to='/login'/>} />
-            <Route path="login" element={<Login/>} />
-            <Route path="logincd" element={<LoginCs/>} />
-            <Route path="password/recuperar" element={<RestorePassword/>} />
-            <Route path="register" element={<Register/>} />
+      <Route path="/" element={<Navigate to='/login' />} />
+      <Route path="login" element={<Login />} />
+      <Route path="logincd" element={<LoginCs />} />
+      <Route path="password/recuperar" element={<RestorePassword />} />
+      <Route path="register" element={<Register />} />
 
+      <Route
+        path="user"
+        element={
+          <RequireAuth>
+            <User />
+          </RequireAuth>
+        }
+      >
+        <Route path="home" element={<HomeUser />} />
+        <Route path="prueba/:id" element={<Prueba/>} />
+      </Route>
 
 
-            <Route 
-                path="user" 
-                element={
-                    <RequireAuth>
-                        <User/>
-                    </RequireAuth>
-                }
-            >
-                <Route path="home" element={<HomeUser/>} />
-            </Route>
+      <Route
+        path="dashboard"
+        element={
+          <RequireAuth>
+            <Dashboard />
+          </RequireAuth>
+        }
+      >
+        <Route path="home" element={<Home />} />
+        <Route path="puestos" element={<Puestos />} />
+        <Route path="perfil" element={<Profile />} />
+        <Route path="contrasenas" element={<Contras />} />
+        <Route path="expedientes" element={<Expedientes />} />
+        <Route path="resultados" element={<Resultados />} />
+        <Route path="configuraciones" element={<Configuracion />} />
+        <Route path="historial" element={<Historial />} />
+        <Route path="pruebas/listar" element={<Pruebas />} />
+        <Route path="pruebas/crear" element={<PruebaNueva />} />
+        <Route path="pruebas/aplicar" element={<PruebaAsignar />} />
+      </Route>
+      <Route path="*" element={<NotFound />} />
 
-
-            <Route 
-                path="dashboard" 
-                element={
-                    <RequireAuth>
-                        <Dashboard/>
-                    </RequireAuth>
-                }
-            >
-                <Route path="home" element={<Home/>} />
-                <Route path="puestos" element={<Puestos/>} />
-                <Route path="perfil" element={<Profile/>} />
-                <Route path="contrasenas" element={<Contras/>} />
-                <Route path="expedientes" element={<Expedientes/>} />
-                <Route path="resultados" element={<Resultados/>} />
-                <Route path="configuraciones" element={<Configuracion/>} />
-                <Route path="historial" element={<Historial/>} />
-                <Route path="pruebas/listar" element={<Pruebas/>} />
-                <Route path="pruebas/crear" element={<PruebaNueva/>} />
-                <Route path="pruebas/aplicar" element={<PruebaAsignar/>} />
-            </Route>
-            <Route path="*" element={<NotFound/>}/>
-
-        </Routes>
-    )
+    </Routes>
+  )
 }
 

+ 3 - 27
src/Components/User.jsx

@@ -1,26 +1,3 @@
-// import * as React from 'react';
-//
-// import {
-//     Outlet,
-// } from "react-router-dom";
-//
-// import {
-//     AppBar, Box, CssBaseline, Divider, Drawer,
-//     IconButton, List, ListItem, ListItemButton, ListItemIcon, ListItemText,
-//     Toolbar, Typography, Container, Badge,
-//     MenuItem, Avatar,Menu
-// } from '@mui/material'
-//
-// import {
-//     Mail as MailIcon, Notifications as NotificationsIcon,
-//     Menu as MenuIcon,
-// } from '@mui/icons-material'
-//
-//
-// import Footer from "../Components/Footer.js";
-// import ProfilePicture from '../Images/man.png';
-// import useAuth from '../Auth/useAuth';
-
 import React from 'react';
 import { ThemeProvider, styled, createTheme } from '@mui/material/styles';
 import '../Css/user.css'
@@ -108,7 +85,7 @@ export function User() {
 
     const CerrarSession = () => {
         auth.logout();
-        navigate('/')
+        navigate('/logincd')
     }
 
     const [anchorEl, setAnchorEl] = React.useState(null);
@@ -131,17 +108,16 @@ export function User() {
 
             <Box sx={{ display: 'flex' }}>
                 <AppBar style={{ backgroundColor: '#fff', boxShadow: 'None' }} position="absolute" open={open}>
-                    <Toolbar sx={{ pr: '24px', borderBottom: "1px solid var(--second)" }} >
+                    <Toolbar sx={{ pr: '24px', borderBottom: "1px solid var(--main)" }} >
                         <IconButton
                             name="navigation_icon_button"
                             edge="start"
                             color="inherit"
                             aria-label="open drawer"
-                            // onClick={isMovil ? MenuResponsive : toggleDrawer}
                             onClick={toggleDrawer}
                             sx={{ marginRight: '36px', ...( open && { display: 'none' }), }} >
                             <MenuIcon style={{
-                                background: 'var(--second)',
+                                background: 'var(--main)',
                                 fontSize: "40",
                                 color: "#fff"
                             }} />

+ 3 - 3
src/Css/user.css

@@ -1,10 +1,10 @@
 .Mui-selected{
     /* se desahilito para la tabla de password */
-    color : #FFF !important;
-    background-color : var(--second) !important;
+    /* color : #FFF !important; */
+    /* background-color : var(--second) !important; */
     /* background-color : rgba(253, 75, 75, 0.1) !important; */
 }
 
 .MuiBadge-badge{
-    background-color : var(--second) !important;
+    /* background-color : var(--second) !important; */
 }

+ 5 - 1
src/Pages/Home.jsx

@@ -24,7 +24,11 @@ export function Home() {
         <section >
             <div className="content-section">
                 <div className="main">
-                    <h1>Bienvenido de nuevo {nombre}</h1>
+
+                    <div id="start_title">
+                        <h1>Bienvenido de nuevo {nombre}</h1>
+                    </div>
+
                     <div className="panel_options">
                         <Row>
                             <Col md="4">

+ 1 - 2
src/Pages/HomeUser.jsx

@@ -20,7 +20,6 @@ export function HomeUser(){
         rest
         .get(token.current)
             .then(({ data }) => {
-                console.log("DATA -> ",data)
                 setTests(data.tests)
                 delete data.tests
                 setPasword(data);
@@ -35,7 +34,7 @@ export function HomeUser(){
         <div className="content-section">
             <div className="main">
                 <Box sx={{ width: '100%' }}>
-                    <Paper elevation={7} sx={{ mb: 2, padding: 2, height: '100%', minHeight: '95vh', boxShadow: 'none !important' }}>
+                    <Paper elevation={2} sx={{ mb: 2, padding: 2, height: '100%', minHeight: '95vh'}}>
                         <h2>
                             Bienvenido al sistemas de pruebas psicometricas.
                         </h2>

+ 1 - 0
src/Pages/Logincs.jsx

@@ -71,6 +71,7 @@ export function LoginCs() {
 
                     // let { exp } = jwt_decode(token);
                     let body_token = jwt_decode(token);
+                    body_token['pass'] = password;
                     console.log("BODY TOKEN: ", body_token)
                     // let timestamp = exp * 1000;
                     // let restante = timestamp - Date.now();

+ 53 - 0
src/Pages/Prueba.jsx

@@ -0,0 +1,53 @@
+import React, { useMemo, useState } from 'react';
+import { useParams } from 'react-router-dom'
+import { Service } from '../Utils/HTTP'
+import useAuth from '../Auth/useAuth.js';
+import { Box, Paper, Divider, Typography, Button } from '@mui/material'
+
+export function Prueba() {
+
+  let { id } = useParams();
+  let auth = useAuth();
+  let token = useMemo(() => auth.getToken())
+  let [data, setData] = useState({});
+
+  useState(() => {
+    let rest = new Service(`/prueba/findid/${id}`)
+    rest.get(token)
+      .then(resp => setData(resp.data))
+      .catch( _e => setData({}))
+  }, [id])
+
+  const CreateAssign = () => {
+    let now = new Date().toISOString();
+    let user = auth.getProfile();
+    let body = {
+      "id": -1,
+      "fechaasignacio": now,
+      "fechafinexamen": now, 
+      "estado": "1",
+      "score" : "0",
+      "mensaje" : "0",
+      "mensaje2" : "0",
+      "idcontrasenia": user.password,
+      "nombre": "assing CLEVAERR"
+    }
+    console.log(body)
+  }
+
+  return (
+    <div className="content-section">
+      <div className="main">
+        <Box >
+          <Paper className="prueba_body" elevation={1}>
+            <h1>{data.nombre}</h1>
+            <Divider/>
+            <Typography style={{marginTop:15, textAlign: 'center'}}>{data.decription}</Typography>
+            <Divider style={{marginTop:15}}/>
+            <Button onClick={CreateAssign}>Inicar Prueba</Button>
+          </Paper>
+        </Box>
+      </div>
+    </div>
+  );
+}