소스 검색

stable version fixes

amenpunk 4 년 전
부모
커밋
f6f8561256

+ 8 - 0
psicoadmin/src/App.css

@@ -148,3 +148,11 @@
     align-content: stretch;
     justify-content: flex-start;
 }
+
+.MuiButton-root:hover{
+    background-color : #fd4b4b !important;
+}
+.css-ghsjzk-MuiInputBase-root-MuiInput-root:before{
+    border : none !important;
+}
+

+ 2 - 0
psicoadmin/src/Components/Actividades.js

@@ -122,6 +122,8 @@ export default function Actividades() {
                                     <option>Desbloquear</option>
                                 </select>
                             </Col>
+                        </Row>
+                        <Row style={{ display : 'flex', alignItems : "flex-end" }}>
                             <Col md="4">
                                 <label>Fecha Inicio</label>
                                 <LocalizationProvider dateAdapter={DateFnsUtils}>

+ 11 - 4
psicoadmin/src/Components/listItems.js

@@ -124,14 +124,21 @@ export const MainListItems = (props) =>  {
         }
 
         if( SubMenuList.includes(selectedIndex) && !open ){
-            return setOpen(true)
-        }else if( !SubMenuList.includes(selectedIndex ) ){
-            return setOpen(false)
+            if(props.AppBarVisible){
+                console.log('yes show')
+                return setOpen(false)
+            }else{
+                console.log('not show')
+                return setOpen(true)
+            }
         }
 
+        if( !SubMenuList.includes(selectedIndex) && !props.AppBarVisible ){
+            return setOpen(false)
+        }
         
 
-    }, [props, selectedIndex])
+    }, [props, selectedIndex, open])
 
     const showPruebas = () => {
         if(!props.AppBarVisible){

+ 4 - 2
psicoadmin/src/Css/all.css

@@ -1860,11 +1860,13 @@ li.cabecera_li {
 }
 .filtros_history .col-md-4 input {
     width: 100%;
-    /*border: 1px solid #eceff1*/
+    border: 1px solid whitesmoke;
     font-size: 14px;
     padding: 1px 10px;
 }
 .filtros_history .col-md-4 label {
+    padding : 10px;
+    padding-left : 0px;
     font-size: 14px;
     color: #25344f;
 }
@@ -1905,7 +1907,7 @@ label {
     width: 100%;
     font-size: 14px;
     position: relative;
-    top: 27px;
+    /* top: 27px; */
     cursor: pointer;
     transition: all 0.3s;
 }

+ 1 - 0
psicoadmin/src/Pages/Configuracion.jsx

@@ -42,6 +42,7 @@ export function Configuracion() {
                                         onChange={(event) => {
                                             const files = event.target.files;
                                             console.log('files crud ', files[0])
+                                            setFilename(files[0])
                                         }}
                                         style={{display: 'none'}}
                                     />

+ 17 - 16
psicoadmin/src/Pages/Historial.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { Container, Row, Col, Card } from 'react-bootstrap'
+import { Container, Row, Card } from 'react-bootstrap'
 import Skeleton from '@mui/material/Skeleton';
 import Stack from '@mui/material/Stack';
 
@@ -73,21 +73,22 @@ export function Historial () {
     
 
     return(
-        <Container >
-            <Row style={{ marginBottom : 15 }}>
-                <Col>
-                    <h1>Pruebas Psicometricas</h1>
-                </Col>
-            </Row>
-            <Row style={{ display : 'flex', flexWrap : 'wrap', justifyContent: "center" }}>
-                {
-                    !character.length ?
-                        <Preview/>
-                    :
-                    character.map( (person, i) => <CardChar remove={Remove} key={i} proto={person} id={i}/> )
-                }
-            </Row>
-        </Container>
+        <section>
+            <div className="content-section">
+                <div className="main">
+                    <Container >
+                        <Row style={{ display : 'flex', flexWrap : 'wrap', justifyContent: "center" }}>
+                            {
+                                !character.length ?
+                                    <Preview/>
+                                    :
+                                    character.map( (person, i) => <CardChar remove={Remove} key={i} proto={person} id={i}/> )
+                            }
+                        </Row>
+                    </Container>
+                </div>
+            </div>
+        </section>
     )
 
 }

+ 0 - 26
psicoadmin/src/Pages/Login.jsx

@@ -1,29 +1,3 @@
-// import { useNavigate } from 'react-router-dom'
-// import useAuth from '../Auth/useAuth';
-// import {Button} from 'react-bootstrap'
-//
-// export function Login () {
-//     
-//     let auth = useAuth();
-//     let navigate = useNavigate()
-//
-//
-//     function In () {
-//         auth.login({ name : 'edgar', id : 1 })
-//         console.log('is logged ? ',auth.isLogged())
-//         return navigate('/dashboard/home')
-//     }
-//
-//     return(
-//         <>
-//             <h1>Bienvenido</h1>
-//             <Button onClick={In}>
-//                 Iniciar Session
-//             </Button>
-//         </>
-//     )
-// }
-
 import * as React from 'react';
 import Avatar from '@mui/material/Avatar';
 import Button from '@mui/material/Button';

+ 0 - 1
psicoadmin/src/Pages/PruebaAsignar.jsx

@@ -15,7 +15,6 @@ var ID = idMaker();
 function CardPrueba(props){
 
     let id = ID.next().value;
-    console.log('ID >> ', id)
 
     return(
         <Col key={id} md="4">