Browse Source

stable version fixes

amenpunk 3 years ago
parent
commit
f6f8561256

+ 8 - 0
psicoadmin/src/App.css

@@ -148,3 +148,11 @@
148 148
     align-content: stretch;
149 149
     justify-content: flex-start;
150 150
 }
151
+
152
+.MuiButton-root:hover{
153
+    background-color : #fd4b4b !important;
154
+}
155
+.css-ghsjzk-MuiInputBase-root-MuiInput-root:before{
156
+    border : none !important;
157
+}
158
+

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

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

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

@@ -124,14 +124,21 @@ export const MainListItems = (props) =>  {
124 124
         }
125 125
 
126 126
         if( SubMenuList.includes(selectedIndex) && !open ){
127
-            return setOpen(true)
128
-        }else if( !SubMenuList.includes(selectedIndex ) ){
129
-            return setOpen(false)
127
+            if(props.AppBarVisible){
128
+                console.log('yes show')
129
+                return setOpen(false)
130
+            }else{
131
+                console.log('not show')
132
+                return setOpen(true)
133
+            }
130 134
         }
131 135
 
136
+        if( !SubMenuList.includes(selectedIndex) && !props.AppBarVisible ){
137
+            return setOpen(false)
138
+        }
132 139
         
133 140
 
134
-    }, [props, selectedIndex])
141
+    }, [props, selectedIndex, open])
135 142
 
136 143
     const showPruebas = () => {
137 144
         if(!props.AppBarVisible){

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

@@ -1860,11 +1860,13 @@ li.cabecera_li {
1860 1860
 }
1861 1861
 .filtros_history .col-md-4 input {
1862 1862
     width: 100%;
1863
-    /*border: 1px solid #eceff1*/
1863
+    border: 1px solid whitesmoke;
1864 1864
     font-size: 14px;
1865 1865
     padding: 1px 10px;
1866 1866
 }
1867 1867
 .filtros_history .col-md-4 label {
1868
+    padding : 10px;
1869
+    padding-left : 0px;
1868 1870
     font-size: 14px;
1869 1871
     color: #25344f;
1870 1872
 }
@@ -1905,7 +1907,7 @@ label {
1905 1907
     width: 100%;
1906 1908
     font-size: 14px;
1907 1909
     position: relative;
1908
-    top: 27px;
1910
+    /* top: 27px; */
1909 1911
     cursor: pointer;
1910 1912
     transition: all 0.3s;
1911 1913
 }

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

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

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

@@ -1,5 +1,5 @@
1 1
 import { useEffect, useState } from 'react'
2
-import { Container, Row, Col, Card } from 'react-bootstrap'
2
+import { Container, Row, Card } from 'react-bootstrap'
3 3
 import Skeleton from '@mui/material/Skeleton';
4 4
 import Stack from '@mui/material/Stack';
5 5
 
@@ -73,21 +73,22 @@ export function Historial () {
73 73
     
74 74
 
75 75
     return(
76
-        <Container >
77
-            <Row style={{ marginBottom : 15 }}>
78
-                <Col>
79
-                    <h1>Pruebas Psicometricas</h1>
80
-                </Col>
81
-            </Row>
82
-            <Row style={{ display : 'flex', flexWrap : 'wrap', justifyContent: "center" }}>
83
-                {
84
-                    !character.length ?
85
-                        <Preview/>
86
-                    :
87
-                    character.map( (person, i) => <CardChar remove={Remove} key={i} proto={person} id={i}/> )
88
-                }
89
-            </Row>
90
-        </Container>
76
+        <section>
77
+            <div className="content-section">
78
+                <div className="main">
79
+                    <Container >
80
+                        <Row style={{ display : 'flex', flexWrap : 'wrap', justifyContent: "center" }}>
81
+                            {
82
+                                !character.length ?
83
+                                    <Preview/>
84
+                                    :
85
+                                    character.map( (person, i) => <CardChar remove={Remove} key={i} proto={person} id={i}/> )
86
+                            }
87
+                        </Row>
88
+                    </Container>
89
+                </div>
90
+            </div>
91
+        </section>
91 92
     )
92 93
 
93 94
 }

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

@@ -1,29 +1,3 @@
1
-// import { useNavigate } from 'react-router-dom'
2
-// import useAuth from '../Auth/useAuth';
3
-// import {Button} from 'react-bootstrap'
4
-//
5
-// export function Login () {
6
-//     
7
-//     let auth = useAuth();
8
-//     let navigate = useNavigate()
9
-//
10
-//
11
-//     function In () {
12
-//         auth.login({ name : 'edgar', id : 1 })
13
-//         console.log('is logged ? ',auth.isLogged())
14
-//         return navigate('/dashboard/home')
15
-//     }
16
-//
17
-//     return(
18
-//         <>
19
-//             <h1>Bienvenido</h1>
20
-//             <Button onClick={In}>
21
-//                 Iniciar Session
22
-//             </Button>
23
-//         </>
24
-//     )
25
-// }
26
-
27 1
 import * as React from 'react';
28 2
 import Avatar from '@mui/material/Avatar';
29 3
 import Button from '@mui/material/Button';

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

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