소스 검색

release v2

amenpunk 4 년 전
부모
커밋
ef94f93b9c

+ 1 - 0
package.json

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

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

@@ -47,7 +47,7 @@ export default function Edit(props) {
                 <h4 className="modal-title">Editar plaza</h4>
             </Modal.Header>
 
-           <Modal.Body classNameName="modal-body">
+           <Modal.Body className="modal-body">
                 <Formik
 
                     initialValues={{

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

@@ -8,24 +8,24 @@ export default function Eliminar(props) {
     return(
         <Modal size="lg" aria-labelledby="contained-modal-title-vcenter" centered  show={visible} onHide={onClose}>
             <Modal.Header>
-                <button onClick={onClose} type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">¡Atención!</h4>
+                <button onClick={onClose} type="button" className="close" data-dismiss="modal">&times;</button>
+                <h4 className="modal-title">¡Atención!</h4>
             </Modal.Header>
             <Modal.Body className="modal-body">
 
-                <h1 class="alert">¿Estás seguro que deseas eliminar esta plaza?</h1>
-                <p class="text-alert">Una vez eliminado no será posible recuperarla</p>
+                <h1 className="alert">¿Estás seguro que deseas eliminar esta plaza?</h1>
+                <p className="text-alert">Una vez eliminado no será posible recuperarla</p>
                 <Row>
                     <Col md="6">
-                        <div class="cancel_producto_confirm">
-                            <div class="btn_cancelar">
+                        <div className="cancel_producto_confirm">
+                            <div className="btn_cancelar">
                                 <a href="/" type="submit">Cancelar</a>
                             </div>
                         </div>
                     </Col>
                     <Col md="6">
-                        <div class="delet_producto_confirm">
-                            <div class="btn_delete_producto_confirm">
+                        <div className="delet_producto_confirm">
+                            <div className="btn_delete_producto_confirm">
                                 <a  href="/" onClick={() => console.log('ID >> ',puesto.id)} type="submit">Eliminar</a>
                             </div>
                         </div>

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Modal } from 'react-bootstrap'
+import { Modal, Col, Row } from 'react-bootstrap'
 import NotFound from '../../Images/not_found.png';
 
 export default function Mostrar(props) {
@@ -14,19 +14,19 @@ export default function Mostrar(props) {
             </Modal.Header>
             <Modal.Body className="modal-body">
 
-                <div class="data_product">
-                    <div class="row">
-                        <div class="col-md-4">
-                            <div class="img-container">
+                <div className="data_product">
+                    <Row >
+                        <Col md="4">
+                            <div className="img-container">
                                 <img alt='not found cooo' src={NotFound}/>
                             </div>
-                        </div>
-                        <div class="col-md-8">
+                        </Col>
+                        <Col md="8">
                             <input value={puesto.id + " - "+ puesto.nombre} type="text" name="nombre" placeholder="Nombre de la plaza" readOnly/>
                             <input value={puesto.description} type="text" name="descript" placeholder="Descripción" readOnly/>
                             <input value={puesto.salario} type="text" name="sku" placeholder="3500" readOnly/>
-                        </div>
-                    </div>
+                        </Col>
+                    </Row>
                 </div>
 
             </Modal.Body>

+ 27 - 35
src/Components/listItems.js

@@ -1,31 +1,17 @@
 import * as React from 'react';
-import ListItem from '@mui/material/ListItem';
-import List from '@mui/material/List';
-
-import ListItemIcon from '@mui/material/ListItemIcon';
-import ListItemText from '@mui/material/ListItemText';
-import ListSubheader from '@mui/material/ListSubheader';
 
 import { Nav } from 'react-bootstrap';
 
-import HomeIcon from '@mui/icons-material/Home'
-import WorkIcon from '@mui/icons-material/Work';
-import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
-import PeopleAltIcon from '@mui/icons-material/PeopleAlt';
-import HistoryIcon from '@mui/icons-material/History';
-import EqualizerIcon from '@mui/icons-material/Equalizer';
-import FingerprintIcon from '@mui/icons-material/Fingerprint';
-
-import MiscellaneousServicesIcon from '@mui/icons-material/MiscellaneousServices';
+import { 
+    Home, Fingerprint, History, MiscellaneousServices , 
+    Work, VisibilityOff, PeopleAlt, Equalizer,
+    OndemandVideo, SupportAgent, Star,
+    ExpandLess, ExpandMore
+} from '@mui/icons-material/'
 
-import OndemandVideoIcon from '@mui/icons-material/OndemandVideo';
-import StarIcon from '@mui/icons-material/Star';
-import SupportAgentIcon from '@mui/icons-material/SupportAgent';
 
-import Collapse from '@mui/material/Collapse';
-import ExpandLess from '@mui/icons-material/ExpandLess';
-import ExpandMore from '@mui/icons-material/ExpandMore';
 import { useNavigate, useResolvedPath, useMatch } from 'react-router-dom'
+import { Collapse,ListItem, List ,ListItemIcon,ListItemText,ListSubheader } from '@mui/material/'
 
 function NavItem (props) {
     
@@ -33,10 +19,12 @@ function NavItem (props) {
     let resolved = useResolvedPath(props.route);
     let match = useMatch({ path: resolved.pathname, end: true });
 
+    console.log(match,typeof(match))
+
     return(
         <ListItem
             sx={{ color : '#25344f'}}
-            selected={match}
+            selected={ match && typeof(match) === "object" }
             onClick={() => navigate(props.route) } 
             button
         >
@@ -59,6 +47,11 @@ function NavItem (props) {
 
 export const MainListItems = (props) =>  {
 
+    /* TODO
+     *
+     *
+     */
+
     const [open, setOpen] = React.useState(false);
 
     const showPruebas = () => {
@@ -73,16 +66,15 @@ export const MainListItems = (props) =>  {
 
             <ListSubheader inset>MENÚ</ListSubheader>
 
-            <NavItem icon={<HomeIcon/>} title="Inicio" route="home" />
-            <NavItem icon={<WorkIcon/>} title="Puestos" route="puestos" />
-            <NavItem icon={<VisibilityOffIcon/>}   index={2} title="Contraseñas" route="contrasenas" />
-            <NavItem icon={<PeopleAltIcon/>}  title="Expedientes" route="expedientes" />
-            <NavItem icon={<EqualizerIcon/>} title="Resultados" route="resultados" />
+            <NavItem icon={<Home/>} title="Inicio" route="home" />
+            <NavItem icon={<Work/>} title="Puestos" route="puestos" />
+            <NavItem icon={<VisibilityOff/>} title="Contraseñas" route="contrasenas" />
+            <NavItem icon={<PeopleAlt/>}  title="Expedientes" route="expedientes" />
+            <NavItem icon={<Equalizer/>} title="Resultados" route="resultados" />
 
-            {/*<ListItem selected={false} onClick={showPruebas}>*/}
-            <ListItem onClick={showPruebas}>
+            <ListItem selected={open} onClick={showPruebas}>
                 <ListItemIcon>
-                    <FingerprintIcon />
+                    <Fingerprint />
                 </ListItemIcon>
 
 
@@ -111,8 +103,8 @@ export const MainListItems = (props) =>  {
                 </List>
             </Collapse>
 
-            <NavItem icon={<MiscellaneousServicesIcon/>} title="Configuraciones" route="configuraciones" />
-            <NavItem icon={<HistoryIcon/>} title="Historial" route="historial" />
+            <NavItem icon={<MiscellaneousServices/>} title="Configuraciones" route="configuraciones" />
+            <NavItem icon={<History/>} title="Historial" route="historial" />
         </List>
     )
 };
@@ -120,8 +112,8 @@ export const MainListItems = (props) =>  {
 export const secondaryListItems = (
     <Nav>
         <ListSubheader inset>EXTRAS</ListSubheader>
-        <NavItem selected={false} icon={<StarIcon/>} title="Elementos" route="/work" />
-        <NavItem selected={false} icon={<OndemandVideoIcon/>} title="Tutoriales" route="/work" />
-        <NavItem selected={false} icon={<SupportAgentIcon/>} title="Asistencia Técnica" route="/work" />
+        <NavItem icon={<Star/>} title="Elementos" route="/work" />
+        <NavItem icon={<OndemandVideo/>} title="Tutoriales" route="/worktwo" />
+        <NavItem icon={<SupportAgent/>} title="Asistencia Técnica" route="/worktree" />
     </Nav>
 );

+ 1 - 1
src/Pages/PruebaAsignar.jsx

@@ -14,7 +14,7 @@ var ID = idMaker();
 
 function CardPrueba(props){
 
-    let id = ID.next().value;
+    let id = ID.next().value * 2105981203;
 
     return(
         <Col key={id} md="4">

+ 1 - 1
src/Pages/Pruebas.jsx

@@ -26,7 +26,7 @@ function Pagination () {
 function CardPrueba(props){
     let {index, prueba} = props
     return(
-        <Col className="prueba_item" key={index} md="3">
+        <Col className="prueba_item" key={index * 129319023888882} md="3">
             <div className="body_prueba_list">
                 <div className="botones_edicion">
                     <div className="contenedor_botones">

+ 0 - 4
src/Pages/Puestos.jsx

@@ -214,10 +214,6 @@ export function Puestos() {
     let [del, setDelete] = React.useState(false);
     let [show, setShow] = React.useState(false);
 
-    React.useEffect(() => {
-        console.log('puesto >>>', puesto.id)
-    }, [puesto])
-
     return (
         <div className="content-section">