Browse Source

release v2

amenpunk 3 years ago
parent
commit
ef94f93b9c

+ 1 - 0
package.json

1
 {
1
 {
2
   "name": "psicoadmin",
2
   "name": "psicoadmin",
3
+  "homepage": "http://clubdit.ditca.org/psicoadmin/",
3
   "version": "0.1.0",
4
   "version": "0.1.0",
4
   "private": true,
5
   "private": true,
5
   "dependencies": {
6
   "dependencies": {

+ 1 - 1
src/Components/Modal/EditPlaza.js

47
                 <h4 className="modal-title">Editar plaza</h4>
47
                 <h4 className="modal-title">Editar plaza</h4>
48
             </Modal.Header>
48
             </Modal.Header>
49
 
49
 
50
-           <Modal.Body classNameName="modal-body">
50
+           <Modal.Body className="modal-body">
51
                 <Formik
51
                 <Formik
52
 
52
 
53
                     initialValues={{
53
                     initialValues={{

+ 8 - 8
src/Components/Modal/EliminarPlaza.js

8
     return(
8
     return(
9
         <Modal size="lg" aria-labelledby="contained-modal-title-vcenter" centered  show={visible} onHide={onClose}>
9
         <Modal size="lg" aria-labelledby="contained-modal-title-vcenter" centered  show={visible} onHide={onClose}>
10
             <Modal.Header>
10
             <Modal.Header>
11
-                <button onClick={onClose} type="button" class="close" data-dismiss="modal">&times;</button>
12
-                <h4 class="modal-title">¡Atención!</h4>
11
+                <button onClick={onClose} type="button" className="close" data-dismiss="modal">&times;</button>
12
+                <h4 className="modal-title">¡Atención!</h4>
13
             </Modal.Header>
13
             </Modal.Header>
14
             <Modal.Body className="modal-body">
14
             <Modal.Body className="modal-body">
15
 
15
 
16
-                <h1 class="alert">¿Estás seguro que deseas eliminar esta plaza?</h1>
17
-                <p class="text-alert">Una vez eliminado no será posible recuperarla</p>
16
+                <h1 className="alert">¿Estás seguro que deseas eliminar esta plaza?</h1>
17
+                <p className="text-alert">Una vez eliminado no será posible recuperarla</p>
18
                 <Row>
18
                 <Row>
19
                     <Col md="6">
19
                     <Col md="6">
20
-                        <div class="cancel_producto_confirm">
21
-                            <div class="btn_cancelar">
20
+                        <div className="cancel_producto_confirm">
21
+                            <div className="btn_cancelar">
22
                                 <a href="/" type="submit">Cancelar</a>
22
                                 <a href="/" type="submit">Cancelar</a>
23
                             </div>
23
                             </div>
24
                         </div>
24
                         </div>
25
                     </Col>
25
                     </Col>
26
                     <Col md="6">
26
                     <Col md="6">
27
-                        <div class="delet_producto_confirm">
28
-                            <div class="btn_delete_producto_confirm">
27
+                        <div className="delet_producto_confirm">
28
+                            <div className="btn_delete_producto_confirm">
29
                                 <a  href="/" onClick={() => console.log('ID >> ',puesto.id)} type="submit">Eliminar</a>
29
                                 <a  href="/" onClick={() => console.log('ID >> ',puesto.id)} type="submit">Eliminar</a>
30
                             </div>
30
                             </div>
31
                         </div>
31
                         </div>

+ 9 - 9
src/Components/Modal/MostrarPlaza.js

1
 import React from 'react';
1
 import React from 'react';
2
-import { Modal } from 'react-bootstrap'
2
+import { Modal, Col, Row } from 'react-bootstrap'
3
 import NotFound from '../../Images/not_found.png';
3
 import NotFound from '../../Images/not_found.png';
4
 
4
 
5
 export default function Mostrar(props) {
5
 export default function Mostrar(props) {
14
             </Modal.Header>
14
             </Modal.Header>
15
             <Modal.Body className="modal-body">
15
             <Modal.Body className="modal-body">
16
 
16
 
17
-                <div class="data_product">
18
-                    <div class="row">
19
-                        <div class="col-md-4">
20
-                            <div class="img-container">
17
+                <div className="data_product">
18
+                    <Row >
19
+                        <Col md="4">
20
+                            <div className="img-container">
21
                                 <img alt='not found cooo' src={NotFound}/>
21
                                 <img alt='not found cooo' src={NotFound}/>
22
                             </div>
22
                             </div>
23
-                        </div>
24
-                        <div class="col-md-8">
23
+                        </Col>
24
+                        <Col md="8">
25
                             <input value={puesto.id + " - "+ puesto.nombre} type="text" name="nombre" placeholder="Nombre de la plaza" readOnly/>
25
                             <input value={puesto.id + " - "+ puesto.nombre} type="text" name="nombre" placeholder="Nombre de la plaza" readOnly/>
26
                             <input value={puesto.description} type="text" name="descript" placeholder="Descripción" readOnly/>
26
                             <input value={puesto.description} type="text" name="descript" placeholder="Descripción" readOnly/>
27
                             <input value={puesto.salario} type="text" name="sku" placeholder="3500" readOnly/>
27
                             <input value={puesto.salario} type="text" name="sku" placeholder="3500" readOnly/>
28
-                        </div>
29
-                    </div>
28
+                        </Col>
29
+                    </Row>
30
                 </div>
30
                 </div>
31
 
31
 
32
             </Modal.Body>
32
             </Modal.Body>

+ 27 - 35
src/Components/listItems.js

1
 import * as React from 'react';
1
 import * as React from 'react';
2
-import ListItem from '@mui/material/ListItem';
3
-import List from '@mui/material/List';
4
-
5
-import ListItemIcon from '@mui/material/ListItemIcon';
6
-import ListItemText from '@mui/material/ListItemText';
7
-import ListSubheader from '@mui/material/ListSubheader';
8
 
2
 
9
 import { Nav } from 'react-bootstrap';
3
 import { Nav } from 'react-bootstrap';
10
 
4
 
11
-import HomeIcon from '@mui/icons-material/Home'
12
-import WorkIcon from '@mui/icons-material/Work';
13
-import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
14
-import PeopleAltIcon from '@mui/icons-material/PeopleAlt';
15
-import HistoryIcon from '@mui/icons-material/History';
16
-import EqualizerIcon from '@mui/icons-material/Equalizer';
17
-import FingerprintIcon from '@mui/icons-material/Fingerprint';
18
-
19
-import MiscellaneousServicesIcon from '@mui/icons-material/MiscellaneousServices';
5
+import { 
6
+    Home, Fingerprint, History, MiscellaneousServices , 
7
+    Work, VisibilityOff, PeopleAlt, Equalizer,
8
+    OndemandVideo, SupportAgent, Star,
9
+    ExpandLess, ExpandMore
10
+} from '@mui/icons-material/'
20
 
11
 
21
-import OndemandVideoIcon from '@mui/icons-material/OndemandVideo';
22
-import StarIcon from '@mui/icons-material/Star';
23
-import SupportAgentIcon from '@mui/icons-material/SupportAgent';
24
 
12
 
25
-import Collapse from '@mui/material/Collapse';
26
-import ExpandLess from '@mui/icons-material/ExpandLess';
27
-import ExpandMore from '@mui/icons-material/ExpandMore';
28
 import { useNavigate, useResolvedPath, useMatch } from 'react-router-dom'
13
 import { useNavigate, useResolvedPath, useMatch } from 'react-router-dom'
14
+import { Collapse,ListItem, List ,ListItemIcon,ListItemText,ListSubheader } from '@mui/material/'
29
 
15
 
30
 function NavItem (props) {
16
 function NavItem (props) {
31
     
17
     
33
     let resolved = useResolvedPath(props.route);
19
     let resolved = useResolvedPath(props.route);
34
     let match = useMatch({ path: resolved.pathname, end: true });
20
     let match = useMatch({ path: resolved.pathname, end: true });
35
 
21
 
22
+    console.log(match,typeof(match))
23
+
36
     return(
24
     return(
37
         <ListItem
25
         <ListItem
38
             sx={{ color : '#25344f'}}
26
             sx={{ color : '#25344f'}}
39
-            selected={match}
27
+            selected={ match && typeof(match) === "object" }
40
             onClick={() => navigate(props.route) } 
28
             onClick={() => navigate(props.route) } 
41
             button
29
             button
42
         >
30
         >
59
 
47
 
60
 export const MainListItems = (props) =>  {
48
 export const MainListItems = (props) =>  {
61
 
49
 
50
+    /* TODO
51
+     *
52
+     *
53
+     */
54
+
62
     const [open, setOpen] = React.useState(false);
55
     const [open, setOpen] = React.useState(false);
63
 
56
 
64
     const showPruebas = () => {
57
     const showPruebas = () => {
73
 
66
 
74
             <ListSubheader inset>MENÚ</ListSubheader>
67
             <ListSubheader inset>MENÚ</ListSubheader>
75
 
68
 
76
-            <NavItem icon={<HomeIcon/>} title="Inicio" route="home" />
77
-            <NavItem icon={<WorkIcon/>} title="Puestos" route="puestos" />
78
-            <NavItem icon={<VisibilityOffIcon/>}   index={2} title="Contraseñas" route="contrasenas" />
79
-            <NavItem icon={<PeopleAltIcon/>}  title="Expedientes" route="expedientes" />
80
-            <NavItem icon={<EqualizerIcon/>} title="Resultados" route="resultados" />
69
+            <NavItem icon={<Home/>} title="Inicio" route="home" />
70
+            <NavItem icon={<Work/>} title="Puestos" route="puestos" />
71
+            <NavItem icon={<VisibilityOff/>} title="Contraseñas" route="contrasenas" />
72
+            <NavItem icon={<PeopleAlt/>}  title="Expedientes" route="expedientes" />
73
+            <NavItem icon={<Equalizer/>} title="Resultados" route="resultados" />
81
 
74
 
82
-            {/*<ListItem selected={false} onClick={showPruebas}>*/}
83
-            <ListItem onClick={showPruebas}>
75
+            <ListItem selected={open} onClick={showPruebas}>
84
                 <ListItemIcon>
76
                 <ListItemIcon>
85
-                    <FingerprintIcon />
77
+                    <Fingerprint />
86
                 </ListItemIcon>
78
                 </ListItemIcon>
87
 
79
 
88
 
80
 
111
                 </List>
103
                 </List>
112
             </Collapse>
104
             </Collapse>
113
 
105
 
114
-            <NavItem icon={<MiscellaneousServicesIcon/>} title="Configuraciones" route="configuraciones" />
115
-            <NavItem icon={<HistoryIcon/>} title="Historial" route="historial" />
106
+            <NavItem icon={<MiscellaneousServices/>} title="Configuraciones" route="configuraciones" />
107
+            <NavItem icon={<History/>} title="Historial" route="historial" />
116
         </List>
108
         </List>
117
     )
109
     )
118
 };
110
 };
120
 export const secondaryListItems = (
112
 export const secondaryListItems = (
121
     <Nav>
113
     <Nav>
122
         <ListSubheader inset>EXTRAS</ListSubheader>
114
         <ListSubheader inset>EXTRAS</ListSubheader>
123
-        <NavItem selected={false} icon={<StarIcon/>} title="Elementos" route="/work" />
124
-        <NavItem selected={false} icon={<OndemandVideoIcon/>} title="Tutoriales" route="/work" />
125
-        <NavItem selected={false} icon={<SupportAgentIcon/>} title="Asistencia Técnica" route="/work" />
115
+        <NavItem icon={<Star/>} title="Elementos" route="/work" />
116
+        <NavItem icon={<OndemandVideo/>} title="Tutoriales" route="/worktwo" />
117
+        <NavItem icon={<SupportAgent/>} title="Asistencia Técnica" route="/worktree" />
126
     </Nav>
118
     </Nav>
127
 );
119
 );

+ 1 - 1
src/Pages/PruebaAsignar.jsx

14
 
14
 
15
 function CardPrueba(props){
15
 function CardPrueba(props){
16
 
16
 
17
-    let id = ID.next().value;
17
+    let id = ID.next().value * 2105981203;
18
 
18
 
19
     return(
19
     return(
20
         <Col key={id} md="4">
20
         <Col key={id} md="4">

+ 1 - 1
src/Pages/Pruebas.jsx

26
 function CardPrueba(props){
26
 function CardPrueba(props){
27
     let {index, prueba} = props
27
     let {index, prueba} = props
28
     return(
28
     return(
29
-        <Col className="prueba_item" key={index} md="3">
29
+        <Col className="prueba_item" key={index * 129319023888882} md="3">
30
             <div className="body_prueba_list">
30
             <div className="body_prueba_list">
31
                 <div className="botones_edicion">
31
                 <div className="botones_edicion">
32
                     <div className="contenedor_botones">
32
                     <div className="contenedor_botones">

+ 0 - 4
src/Pages/Puestos.jsx

214
     let [del, setDelete] = React.useState(false);
214
     let [del, setDelete] = React.useState(false);
215
     let [show, setShow] = React.useState(false);
215
     let [show, setShow] = React.useState(false);
216
 
216
 
217
-    React.useEffect(() => {
218
-        console.log('puesto >>>', puesto.id)
219
-    }, [puesto])
220
-
221
     return (
217
     return (
222
         <div className="content-section">
218
         <div className="content-section">
223
 
219