瀏覽代碼

some fixes

amenpunk 1 年之前
父節點
當前提交
4472292732

+ 8 - 5
src/App.css

1
 :root {
1
 :root {
2
   --main: #fd4b4b;
2
   --main: #fd4b4b;
3
   --second: #2ec5d3;
3
   --second: #2ec5d3;
4
+  --gray: #f1f1f1;
4
 }
5
 }
5
 
6
 
6
 .main{
7
 .main{
409
 .pwd_info{
410
 .pwd_info{
410
   border-right:1px solid #f1f1f1;
411
   border-right:1px solid #f1f1f1;
411
   display: grid;
412
   display: grid;
412
-  justify-items:stretch;
413
-  align-items: center;
413
+  justify-items: stretch;
414
+  align-items: stretch;
414
 }
415
 }
415
 .btn_pwd{
416
 .btn_pwd{
416
-  color:white !important;
417
-  background:var(--main) !important;
417
+  color: black !important;
418
+background: rgb(253,75,75) !important;
419
+background: none !important;
420
+  box-shadow: none !important;
418
 }
421
 }
419
 
422
 
420
 .headert_pwdu{
423
 .headert_pwdu{
426
 .bbottom{
429
 .bbottom{
427
   margin:0 !important;
430
   margin:0 !important;
428
   padding:0 !important;
431
   padding:0 !important;
429
-  border-top: 1px solid var(--bs-gray-200);
432
+  /* border-top: 1px solid var(--bs-gray-200); */
430
 }
433
 }
431
 .cardmedia_puesto{
434
 .cardmedia_puesto{
432
   background-color: var(--second);
435
   background-color: var(--second);

+ 1 - 1
src/Components/Home/Candidato.jsx

151
 
151
 
152
         <Col className="pwd_info pwd_name_candi" onClick={props.onClick} md="3" sm="12">
152
         <Col className="pwd_info pwd_name_candi" onClick={props.onClick} md="3" sm="12">
153
           <Button className="btn_pwd" variant="contained">
153
           <Button className="btn_pwd" variant="contained">
154
-            <u><p><b style={{ color: 'white' }}>{password?.toUpperCase()}</b></p></u>
154
+            <u><p><b>{password?.toUpperCase()}</b></p></u>
155
           </Button>
155
           </Button>
156
         </Col>
156
         </Col>
157
 
157
 

+ 1 - 1
src/Components/Puestos/Card.jsx

40
                     Editar
40
                     Editar
41
                 </Button>
41
                 </Button>
42
                 <Button size="small"
42
                 <Button size="small"
43
-                    onClick={() => props.toggle("DEL", plaza)} >
43
+                    onClick={() => console.log("eliminar plaza")} >
44
                     Eliminar
44
                     Eliminar
45
                 </Button>
45
                 </Button>
46
             </CardActions>
46
             </CardActions>

+ 3 - 3
src/Components/Puestos/ListMode.jsx

69
           </tbody>
69
           </tbody>
70
           <tfoot>
70
           <tfoot>
71
             <tr>
71
             <tr>
72
-              <th className="text-center">Nombre de la plaza</th>
72
+              <th className="text-center">Nombre</th>
73
               <th className="text-center">Descripción</th>
73
               <th className="text-center">Descripción</th>
74
-              <th className="text-center">Salario</th>
75
-              <th className="text-center">Acciones</th>
74
+              <th className="text-center">Creación</th>
75
+              <th className="text-center">Acción</th>
76
             </tr>
76
             </tr>
77
           </tfoot>
77
           </tfoot>
78
         </Table>
78
         </Table>

+ 19 - 34
src/Components/Register/AuthLayout.js

1
 import PropTypes from 'prop-types';
1
 import PropTypes from 'prop-types';
2
 import { Link as RouterLink } from 'react-router-dom';
2
 import { Link as RouterLink } from 'react-router-dom';
3
-// material
4
 import { styled } from '@mui/material/styles';
3
 import { styled } from '@mui/material/styles';
5
 import { Typography } from '@mui/material';
4
 import { Typography } from '@mui/material';
6
-// components
7
-import Logo  from '../../Images/logo.png'
5
+import Logo from '../../Images/evaluacion.jpeg'
8
 import Image from 'react-bootstrap/Image'
6
 import Image from 'react-bootstrap/Image'
9
 // ----------------------------------------------------------------------
7
 // ----------------------------------------------------------------------
10
 
8
 
11
 const HeaderStyle = styled('header')(({ theme }) => ({
9
 const HeaderStyle = styled('header')(({ theme }) => ({
12
-    // top: 0,
13
-    // zIndex: 9,
14
-    // lineHeight: 0,
15
-    // width: '100%',
16
-    // display: 'flex',
17
-    // alignItems: 'center',
18
-    // position: 'absolute',
19
-    // padding: theme.spacing(3),
20
-    // justifyContent: 'space-between',
21
-    // [theme.breakpoints.up('md')]: {
22
-        // alignItems: 'flex-start',
23
-        // padding: theme.spacing(7, 5, 0, 7)
24
-    // }
25
 }));
10
 }));
26
 
11
 
27
 // ----------------------------------------------------------------------
12
 // ----------------------------------------------------------------------
28
 
13
 
29
 AuthLayout.propTypes = {
14
 AuthLayout.propTypes = {
30
-    children: PropTypes.node
15
+  children: PropTypes.node
31
 };
16
 };
32
 
17
 
33
 export default function AuthLayout({ children }) {
18
 export default function AuthLayout({ children }) {
34
-    return (
35
-        <HeaderStyle>
36
-            <RouterLink to="/">
37
-                <Image style={{ width : '70%'}} fluid={true} alt="register logo" src={Logo}/>
38
-            </RouterLink>
19
+  return (
20
+    <HeaderStyle>
21
+      <RouterLink to="/">
22
+        <Image style={{ width: '85%' }} fluid={true} alt="register logo" src={Logo} />
23
+      </RouterLink>
39
 
24
 
40
-            <div>
41
-                <Typography
42
-                    variant="body2"
43
-                    sx={{
44
-                        mt: { md: -2 }
45
-                    }}
46
-                >
47
-                    {children}
48
-                </Typography>
49
-            </div>
50
-        </HeaderStyle>
51
-    );
25
+      <div>
26
+        <Typography
27
+          variant="body2"
28
+          sx={{
29
+            mt: { md: -2 }
30
+          }}
31
+        >
32
+          {children}
33
+        </Typography>
34
+      </div>
35
+    </HeaderStyle>
36
+  );
52
 }
37
 }

+ 5 - 6
src/Css/all.css

321
     margin-bottom: 24px;
321
     margin-bottom: 24px;
322
 }
322
 }
323
 .body-table {
323
 .body-table {
324
-    /* padding: 40px; */
325
-    padding: 15px;
324
+  padding: 15px;
325
+  border-radius: 2px;
326
     /* background: #24344d; */
326
     /* background: #24344d; */
327
-    border-radius: 2px;
328
-    box-shadow: 0 1px 2px rgba(0,0,0,.15), 0 -1px 0 rgba(0,0,0,.02); 
327
+    /* box-shadow: 0 1px 2px rgba(0,0,0,.15), 0 -1px 0 rgba(0,0,0,.02);  */
329
 }
328
 }
330
 .body-table-responsive {
329
 .body-table-responsive {
331
     font-size:13px;
330
     font-size:13px;
340
     font-weight: bold;
339
     font-weight: bold;
341
     border-left: none!important;
340
     border-left: none!important;
342
     border-right: none!important;
341
     border-right: none!important;
343
-    border-bottom: 1px solid #2e3f5b!important;
344
-    border-top: 1px solid #2e3f5b!important;
342
+    border-bottom: 1px solid var(--gray) !important;
343
+    border-top: 1px solid var(--gray) !important;
345
     /* color: rgba(225,235,245,.8); */
344
     /* color: rgba(225,235,245,.8); */
346
 }
345
 }
347
 .body-table tr {
346
 .body-table tr {

+ 5 - 5
src/Pages/Register.jsx

5
   Box, Link, Container, Typography, Card,
5
   Box, Link, Container, Typography, Card,
6
   StepLabel, Step, Stepper, Button, Paper, StepContent
6
   StepLabel, Step, Stepper, Button, Paper, StepContent
7
 } from '@mui/material';
7
 } from '@mui/material';
8
-import jwt_decode from "jwt-decode";
8
+// import jwt_decode from "jwt-decode";
9
 
9
 
10
 import { RegisterForm } from '../Components/Register/RegisterForm';
10
 import { RegisterForm } from '../Components/Register/RegisterForm';
11
 import { PersonalInfo } from '../Components/Register/PersonalInfo';
11
 import { PersonalInfo } from '../Components/Register/PersonalInfo';
25
 
25
 
26
   React.useEffect(() => {
26
   React.useEffect(() => {
27
     if (auth.token) {
27
     if (auth.token) {
28
-      let body_token = jwt_decode(auth.token);
29
-      if (body_token.authorities.includes("Reclutador")) {
30
-        return navigate('/dashboard/home')
31
-      }
28
+      // let body_token = jwt_decode(auth.token);
29
+      // if (body_token.authorities.includes("Reclutador")) {
30
+      return navigate('/dashboard/home')
31
+      // }
32
     }
32
     }
33
   }, [auth, navigate])
33
   }, [auth, navigate])
34
 
34