Browse Source

fix broken dep en muilab

amenpunk 2 years ago
parent
commit
80beabb72f

+ 1 - 1
package.json

11
         "@iconify/icons-eva": "^1.1.0",
11
         "@iconify/icons-eva": "^1.1.0",
12
         "@iconify/react": "^3.1.3",
12
         "@iconify/react": "^3.1.3",
13
         "@mui/icons-material": "^5.1.0",
13
         "@mui/icons-material": "^5.1.0",
14
-        "@mui/lab": "^5.0.0-alpha.59",
15
         "@mui/material": "^5.1.0",
14
         "@mui/material": "^5.1.0",
15
+        "@mui/x-date-pickers": "^5.0.17",
16
         "@reduxjs/toolkit": "^1.8.6",
16
         "@reduxjs/toolkit": "^1.8.6",
17
         "@testing-library/jest-dom": "^5.16.1",
17
         "@testing-library/jest-dom": "^5.16.1",
18
         "@testing-library/react": "^11.2.7",
18
         "@testing-library/react": "^11.2.7",

+ 4 - 4
src/Components/Home/Actividades.js

1
 import React, { useState } from 'react'
1
 import React, { useState } from 'react'
2
 import FlightTakeoffIcon from '@mui/icons-material/FlightTakeoff';
2
 import FlightTakeoffIcon from '@mui/icons-material/FlightTakeoff';
3
-import { DesktopDatePicker,LocalizationProvider } from '@mui/lab';
4
 
3
 
5
 import TextField from '@mui/material/TextField';
4
 import TextField from '@mui/material/TextField';
6
 import { Col, Row } from 'react-bootstrap';
5
 import { Col, Row } from 'react-bootstrap';
7
-
8
-import DateFnsUtils from '@date-io/date-fns';
9
-
10
 import { HelpModal } from './HelpAcividades.jsx'
6
 import { HelpModal } from './HelpAcividades.jsx'
11
 import { LastActivitys } from './LastActivitys.jsx'
7
 import { LastActivitys } from './LastActivitys.jsx'
12
 
8
 
9
+import { AdapterDateFns as DateFnsUtils } from '@mui/x-date-pickers/AdapterDateFns';
10
+import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker';
11
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
12
+
13
 export default function Actividades() {
13
 export default function Actividades() {
14
 
14
 
15
     const [value, setValue] = React.useState(new Date());
15
     const [value, setValue] = React.useState(new Date());

+ 3 - 2
src/Components/Modal/AgregarManual.js

4
 import { Modal } from 'react-bootstrap'
4
 import { Modal } from 'react-bootstrap'
5
 import toast, { Toaster } from 'react-hot-toast';
5
 import toast, { Toaster } from 'react-hot-toast';
6
 
6
 
7
-import DateFnsUtils from '@date-io/date-fns';
7
+import { AdapterDateFns as DateFnsUtils } from '@mui/x-date-pickers/AdapterDateFns';
8
-import { DesktopDatePicker, LocalizationProvider } from '@mui/lab';
8
+import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker';
9
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
9
 
10
 
10
 import {
11
 import {
11
   Button, Stack, TextField, MenuItem, FormControl, InputLabel, Select,
12
   Button, Stack, TextField, MenuItem, FormControl, InputLabel, Select,

+ 4 - 2
src/Components/Modal/EditPlaza.js

4
 import { yupResolver } from '@hookform/resolvers/yup';
4
 import { yupResolver } from '@hookform/resolvers/yup';
5
 import * as Yup from 'yup';
5
 import * as Yup from 'yup';
6
 
6
 
7
-import DateFnsUtils from '@date-io/date-fns';
7
+
8
-import { DesktopDatePicker, LocalizationProvider } from '@mui/lab';
9
 import { TabPanel } from './TabPanel'
8
 import { TabPanel } from './TabPanel'
9
+import { AdapterDateFns as DateFnsUtils } from '@mui/x-date-pickers/AdapterDateFns';
10
+import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker';
11
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
10
 
12
 
11
 import {
13
 import {
12
   Button, Stack, TextField, MenuItem, FormControl, InputLabel, Select,
14
   Button, Stack, TextField, MenuItem, FormControl, InputLabel, Select,

+ 3 - 10
src/Components/Password/Operation.jsx

16
 import { useSelector } from 'react-redux'
16
 import { useSelector } from 'react-redux'
17
 
17
 
18
 import { useFormik, Form, FormikProvider } from 'formik';
18
 import { useFormik, Form, FormikProvider } from 'formik';
19
+import { AdapterDateFns as DateFnsUtils } from '@mui/x-date-pickers/AdapterDateFns';
20
+import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker';
21
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
19
 
22
 
20
-import DateFnsUtils from '@date-io/date-fns';
21
-import { DesktopDatePicker, LocalizationProvider } from '@mui/lab';
22
 
23
 
23
 export function Operation(props) {
24
 export function Operation(props) {
24
 
25
 
57
 
58
 
58
   let { data: result } = useQuery('contra', getPassword);
59
   let { data: result } = useQuery('contra', getPassword);
59
   console.log('PWD INFO ', result)
60
   console.log('PWD INFO ', result)
60
-  //
61
-  // const getPuestos = async () => {
62
-  //     let rest = new Service('/plaza/getall')
63
-  //     return rest.getQuery(token.current);
64
-  // }
65
-  //
66
-  // let { data } = useQuery('puestos', getPuestos)
67
-  // let puestos = data ? data.data.map(({ nombrepuesto, id }) => ({ nombrepuesto, id })) : []
68
 
61
 
69
   let initialValues = {
62
   let initialValues = {
70
     id: result?.data?.id,
63
     id: result?.data?.id,

+ 5 - 5
src/Components/Password/Steps/MailTable.jsx

1
 import * as React from 'react';
1
 import * as React from 'react';
2
-import { 
2
+import {
3
-  Table, TableBody,TableCell, TableContainer, TableHead,
3
+  Table, TableBody, TableCell, TableContainer, TableHead,
4
   TableRow, Paper, ButtonBase
4
   TableRow, Paper, ButtonBase
5
 } from '@mui/material'
5
 } from '@mui/material'
6
 
6
 
22
           </TableRow>
22
           </TableRow>
23
         </TableHead>
23
         </TableHead>
24
         <TableBody>
24
         <TableBody>
25
-          {users ? users.map((row,i) => (
25
+          {users ? users.map((row, i) => (
26
             <TableRow key={i} sx={{ '&:last-child td, &:last-child th': { border: 0 } }} >
26
             <TableRow key={i} sx={{ '&:last-child td, &:last-child th': { border: 0 } }} >
27
               <TableCell component="th" scope="row">
27
               <TableCell component="th" scope="row">
28
                 {row.mail}
28
                 {row.mail}
31
               <TableCell align="right">{row.apellidos}</TableCell>
31
               <TableCell align="right">{row.apellidos}</TableCell>
32
               <TableCell align="right">
32
               <TableCell align="right">
33
                 <ButtonBase>
33
                 <ButtonBase>
34
-                  <DisabledByDefault onClick={() => remove(row.mail)} color="primary"/>
34
+                  <DisabledByDefault onClick={() => remove(row.mail)} style={{color:'var(--main)'}} />
35
                 </ButtonBase>
35
                 </ButtonBase>
36
               </TableCell>
36
               </TableCell>
37
             </TableRow>
37
             </TableRow>
38
-          ) ) :  null }
38
+          )) : null}
39
         </TableBody>
39
         </TableBody>
40
       </Table>
40
       </Table>
41
     </TableContainer>
41
     </TableContainer>

+ 7 - 1
src/Components/Password/Steps/candidato.jsx

51
   const { errors, touched, handleSubmit, getFieldProps, values, resetForm,isValid } = formik;
51
   const { errors, touched, handleSubmit, getFieldProps, values, resetForm,isValid } = formik;
52
 
52
 
53
   const addToList = () => {
53
   const addToList = () => {
54
+
55
+    if(!values.nombres || !values.apellidos || !values.mail){
56
+      return toast.error("Completa la informacion del candidato")
57
+    }
58
+
54
     if(!isValid) {
59
     if(!isValid) {
55
       return toast.error("Completa la informacion del candidato")
60
       return toast.error("Completa la informacion del candidato")
56
     }
61
     }
62
+
57
     let user = {
63
     let user = {
58
       'nombres': values.nombres,
64
       'nombres': values.nombres,
59
       'apellidos': values.apellidos,
65
       'apellidos': values.apellidos,
108
             />
114
             />
109
 
115
 
110
             <Button onClick={addToList}>
116
             <Button onClick={addToList}>
111
-              <AddCircle/>
117
+              <AddCircle style={{color:'var(--main)'}}/>
112
             </Button>
118
             </Button>
113
 
119
 
114
           </Stack>
120
           </Stack>

+ 139 - 141
src/Components/Password/Steps/password.jsx

2
 import * as Yup from 'yup';
2
 import * as Yup from 'yup';
3
 import { useFormik, Form, FormikProvider } from 'formik';
3
 import { useFormik, Form, FormikProvider } from 'formik';
4
 
4
 
5
-import {  
5
+import {
6
-    Box, Button,
6
+  Box, Button,
7
-    Stack, TextField, 
7
+  Stack, TextField,
8
 } from '@mui/material';
8
 } from '@mui/material';
9
 
9
 
10
-import DateFnsUtils from '@date-io/date-fns';
10
+import { AdapterDateFns as DateFnsUtils } from '@mui/x-date-pickers/AdapterDateFns';
11
-import { DesktopDatePicker, LocalizationProvider } from '@mui/lab';
11
+import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker';
12
-
12
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
13
 
13
 
14
 export function Password(props) {
14
 export function Password(props) {
15
-    
16
-    // console.log(props.password)
17
 
15
 
18
-    const [uid,setUID] = React.useState(null);
16
+  const [uid, setUID] = React.useState(null);
19
 
17
 
20
-    const PasswordSchema = Yup.object().shape({
18
+  const PasswordSchema = Yup.object().shape({
21
-        pwd: 
19
+    pwd:
22
-        Yup
20
+      Yup
23
         .string()
21
         .string()
24
         .required('Ingresa un identificador válido')
22
         .required('Ingresa un identificador válido')
25
-        .min(5,"Ingresa un identificador válido")
23
+        .min(5, "Ingresa un identificador válido")
26
-        .max(50,"identificador demasiado largo"),
24
+        .max(50, "identificador demasiado largo"),
27
-        deadpwd: Yup.date("Ingresa una fecha válida"),
25
+    deadpwd: Yup.date("Ingresa una fecha válida"),
28
-        dateToActived: Yup.date("Ingresa una fecha válida"),
26
+    dateToActived: Yup.date("Ingresa una fecha válida"),
29
-    });
27
+  });
30
-
28
+
31
-    let {  handleNext, handleBack, password, setPassword } = props
29
+  let { handleNext, handleBack, password, setPassword } = props
32
-
30
+
33
-    const formik = useFormik({
31
+  const formik = useFormik({
34
-        initialValues: {
32
+    initialValues: {
35
-            pwd: password.pwd ,
33
+      pwd: password.pwd,
36
-            deadpwd: password.deadpwd,
34
+      deadpwd: password.deadpwd,
37
-            dateToActived: password.dateToActived,
35
+      dateToActived: password.dateToActived,
38
-        },
36
+    },
39
-        onSubmit: (fields) => {
37
+    onSubmit: (fields) => {
40
-            fields['deadpwd'] = new Date(fields.deadpwd).toISOString();
38
+      fields['deadpwd'] = new Date(fields.deadpwd).toISOString();
41
-            fields['dateToActived'] = new Date(fields.dateToActived).toISOString();
39
+      fields['dateToActived'] = new Date(fields.dateToActived).toISOString();
42
-            setPassword({
40
+      setPassword({
43
-                ...password,
41
+        ...password,
44
-                ...fields
42
+        ...fields
45
-            })
43
+      })
46
-            handleNext()
44
+      handleNext()
47
-        },
45
+    },
48
-        validationSchema: PasswordSchema,
46
+    validationSchema: PasswordSchema,
49
-    });
47
+  });
50
-
48
+
51
-    const {errors, touched, handleSubmit, getFieldProps, values,setValues } = formik;
49
+  const { errors, touched, handleSubmit, getFieldProps, values, setValues } = formik;
52
-
50
+
53
-    return (
51
+  return (
54
-        <FormikProvider style={{ padding : 25, paddingTop : 5 }} value={formik}>
52
+    <FormikProvider style={{ padding: 25, paddingTop: 5 }} value={formik}>
55
-            <Form autoComplete="off" noValidate onSubmit={handleSubmit}>
53
+      <Form autoComplete="off" noValidate onSubmit={handleSubmit}>
56
-                <Stack spacing={3}>
54
+        <Stack spacing={3}>
57
-
55
+
58
-                    <TextField
56
+          <TextField
59
-                        fullWidth
57
+            value={uid ? uid : btoa(values.pwd)}
60
-                        type="text"
58
+            disabled
61
-                        label="Nombre o identificador"
59
+            fullWidth
62
-                        {...getFieldProps('pwd')}
60
+            type="text"
63
-                        onChange={(event)=>{
61
+            label="Identificador Codificado"
64
-                            let value = event.target.value
62
+            variant="standard"
65
-                            setUID(btoa(value));
63
+          />
66
-                            setValues({
64
+
67
-                                ...values,
65
+          <TextField
68
-                                pwd:value
66
+            fullWidth
69
-                            })
67
+            type="text"
70
-                        }}
68
+            label="Nombre o identificador"
71
-                        error={Boolean(touched.pwd && errors.pwd)}
69
+            {...getFieldProps('pwd')}
72
-                        helperText={touched.pwd && errors.pwd}
70
+            onChange={(event) => {
73
-                        />
71
+              let value = event.target.value
74
-                    
72
+              setUID(btoa(value));
75
-                    <TextField
73
+              setValues({
76
-                        value={uid? uid: btoa(values.pwd)}
74
+                ...values,
77
-                        disabled
75
+                pwd: value
78
-                        fullWidth
76
+              })
79
-                        type="text"
77
+            }}
80
-                        label="Identificador Codificado"
78
+            error={Boolean(touched.pwd && errors.pwd)}
81
-                        variant="filled"
79
+            helperText={touched.pwd && errors.pwd}
82
-                        />
80
+          />
83
-
81
+
84
-                    <Stack direction={{ xs: 'column', sm: 'row' }} spacing={2}>
82
+
85
-
83
+          <Stack direction={{ xs: 'column', sm: 'row' }} spacing={2}>
86
-                        <LocalizationProvider
84
+
87
-                            dateAdapter={DateFnsUtils}>
85
+            <LocalizationProvider dateAdapter={DateFnsUtils}>
88
-                            <DesktopDatePicker
86
+
89
-                                label="Fecha de Activación"
87
+              <DesktopDatePicker
90
-                                fullWidth
88
+                label="Fecha de Activación"
91
-                                inputFormat="dd/MM/yyyy"
89
+                fullWidth
92
-                                {...getFieldProps('dateToActived')}
90
+                inputFormat="dd/MM/yyyy"
93
-                                value={values.dateToActived}
91
+                {...getFieldProps('dateToActived')}
94
-                                onChange={(val) => setValues({ ...values, dateToActived: new Date(val) })
92
+                value={values.dateToActived}
95
-                                }
93
+                onChange={(val) => setValues({ ...values, dateToActived: new Date(val) })}
96
-                                renderInput={(params) =>
94
+                renderInput={(params) =>
97
-                                    <TextField
95
+                  <TextField
98
-                                        error={Boolean(touched.dateToActived && errors.dateToActived)}
96
+                    error={Boolean(touched.dateToActived && errors.dateToActived)}
99
-                                        helperText={touched.dateToActived && errors.dateToActived}
97
+                    helperText={touched.dateToActived && errors.dateToActived}
100
-                                        disabled={true}
98
+                    disabled={true}
101
-                                        label="Fecha de Activación"
99
+                    label="Fecha de Activación"
102
-                                        fullWidth
100
+                    fullWidth
103
-                                        {...params}
101
+                    {...params}
104
-                                        />}
102
+                  />}
105
-                                />
103
+              />
106
-                        </LocalizationProvider>
104
+
107
-
105
+              <DesktopDatePicker
108
-                        <LocalizationProvider
106
+                label="Fecha de Caducidad"
109
-                            dateAdapter={DateFnsUtils}>
107
+                fullWidth
110
-                            <DesktopDatePicker
108
+                inputFormat="dd/MM/yyyy"
111
-                                label="Fecha de Caducidad"
109
+                {...getFieldProps('deadpwd')}
112
-                                fullWidth
110
+                value={values.deadpwd}
113
-                                inputFormat="dd/MM/yyyy"
111
+                onChange={(val) => setValues({ ...values, deadpwd: new Date(val) })}
114
-                                {...getFieldProps('deadpwd')}
112
+                renderInput={(params) =>
115
-                                value={values.deadpwd}
113
+                  <TextField
116
-                                onChange={(val) => setValues({ ...values, deadpwd: new Date(val) }) }
114
+                    error={Boolean(touched.deadpwd && errors.deadpwd)}
117
-                                renderInput={(params) =>
115
+                    helperText={touched.deadpwd && errors.deadpwd}
118
-                                    <TextField
116
+                    disabled={true}
119
-                                        error={Boolean(touched.deadpwd && errors.deadpwd)}
117
+                    label="Fecha de Caducidad"
120
-                                        helperText={touched.deadpwd && errors.deadpwd}
118
+                    fullWidth
121
-                                        disabled={true}
119
+                    {...params}
122
-                                        label="Fecha de Caducidad"
120
+                  />}
123
-                                        fullWidth
121
+              />
124
-                                        {...params}
122
+
125
-                                    />}
123
+            </LocalizationProvider>
126
-                                />
124
+
127
-                        </LocalizationProvider>
125
+
128
-                    </Stack>
126
+          </Stack>
129
-
127
+
130
-                    <Box sx={{ mb: 2 }}>
128
+          <Box sx={{ mb: 2 }}>
131
-                        <div style={{ paddingTop  : 15}}>
129
+            <div style={{ paddingTop: 15 }}>
132
-                            <Button
130
+              <Button
133
-                                type="submit"
131
+                type="submit"
134
-                                className="registerBtn" 
132
+                className="registerBtn"
135
-                                variant="contained"
133
+                variant="contained"
136
-                                sx={{ mt: 1, mr: 1 }}
134
+                sx={{ mt: 1, mr: 1 }}
137
-                            >
135
+              >
138
-                                {'Siguiente'}
136
+                {'Siguiente'}
139
-                            </Button>
137
+              </Button>
140
-                            <Button
138
+              <Button
141
-                                disabled={false}
139
+                disabled={false}
142
-                                onClick={handleBack}
140
+                onClick={handleBack}
143
-                                sx={{ mt: 1, mr: 1 }}
141
+                sx={{ mt: 1, mr: 1 }}
144
-                            >
142
+              >
145
-                                Regresar
143
+                Regresar
146
-                            </Button>
144
+              </Button>
147
-                        </div>
145
+            </div>
148
-                    </Box>
146
+          </Box>
149
-
147
+
150
-                </Stack>
148
+        </Stack>
151
-            </Form>
149
+      </Form>
152
-        </FormikProvider>
150
+    </FormikProvider>
153
-    );
151
+  );
154
 }
152
 }

+ 44 - 47
src/temp.js

1
 import * as React from 'react';
1
 import * as React from 'react';
2
-import Table from '@mui/material/Table';
2
+import dayjs from 'dayjs';
3
-import TableBody from '@mui/material/TableBody';
3
+import Stack from '@mui/material/Stack';
4
-import TableCell from '@mui/material/TableCell';
4
+import TextField from '@mui/material/TextField';
5
-import TableContainer from '@mui/material/TableContainer';
5
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
6
-import TableHead from '@mui/material/TableHead';
6
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
7
-import TableRow from '@mui/material/TableRow';
7
+import { TimePicker } from '@mui/x-date-pickers/TimePicker';
8
-import Paper from '@mui/material/Paper';
8
+import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker';
9
+import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker';
10
+import { MobileDatePicker } from '@mui/x-date-pickers/MobileDatePicker';
9
 
11
 
10
-function createData(name, calories, fat, carbs, protein) {
12
+export default function MaterialUIPickers() {
11
-  return { name, calories, fat, carbs, protein };
13
+  const [value, setValue] = React.useState(dayjs('2014-08-18T21:11:54'));
12
-}
13
 
14
 
14
-const rows = [
15
+  const handleChange = (newValue) => {
15
-  createData('Frozen yoghurt', 159, 6.0, 24, 4.0),
16
+    setValue(newValue);
16
-  createData('Ice cream sandwich', 237, 9.0, 37, 4.3),
17
+  };
17
-  createData('Eclair', 262, 16.0, 24, 6.0),
18
-  createData('Cupcake', 305, 3.7, 67, 4.3),
19
-  createData('Gingerbread', 356, 16.0, 49, 3.9),
20
-];
21
 
18
 
22
-export default function DenseTable() {
23
   return (
19
   return (
24
-    <TableContainer component={Paper}>
20
+    <LocalizationProvider dateAdapter={AdapterDayjs}>
25
-      <Table sx={{ minWidth: 650 }} size="small" aria-label="a dense table">
21
+      <Stack spacing={3}>
26
-        <TableHead>
22
+        <DesktopDatePicker
27
-          <TableRow>
23
+          label="Date desktop"
28
-            <TableCell>Dessert (100g serving)</TableCell>
24
+          inputFormat="MM/DD/YYYY"
29
-            <TableCell align="right">Calories</TableCell>
25
+          value={value}
30
-            <TableCell align="right">Fat&nbsp;(g)</TableCell>
26
+          onChange={handleChange}
31
-            <TableCell align="right">Carbs&nbsp;(g)</TableCell>
27
+          renderInput={(params) => <TextField {...params} />}
32
-            <TableCell align="right">Protein&nbsp;(g)</TableCell>
28
+        />
33
-          </TableRow>
29
+        <MobileDatePicker
34
-        </TableHead>
30
+          label="Date mobile"
35
-        <TableBody>
31
+          inputFormat="MM/DD/YYYY"
36
-          {rows.map((row) => (
32
+          value={value}
37
-            <TableRow
33
+          onChange={handleChange}
38
-              key={row.name}
34
+          renderInput={(params) => <TextField {...params} />}
39
-              sx={{ '&:last-child td, &:last-child th': { border: 0 } }}
35
+        />
40
-            >
36
+        <TimePicker
41
-              <TableCell component="th" scope="row">
37
+          label="Time"
42
-                {row.name}
38
+          value={value}
43
-              </TableCell>
39
+          onChange={handleChange}
44
-              <TableCell align="right">{row.calories}</TableCell>
40
+          renderInput={(params) => <TextField {...params} />}
45
-              <TableCell align="right">{row.fat}</TableCell>
41
+        />
46
-              <TableCell align="right">{row.carbs}</TableCell>
42
+        <DateTimePicker
47
-              <TableCell align="right">{row.protein}</TableCell>
43
+          label="Date&Time picker"
48
-            </TableRow>
44
+          value={value}
49
-          ))}
45
+          onChange={handleChange}
50
-        </TableBody>
46
+          renderInput={(params) => <TextField {...params} />}
51
-      </Table>
47
+        />
52
-    </TableContainer>
48
+      </Stack>
49
+    </LocalizationProvider>
53
   );
50
   );
54
 }
51
 }