amenpunk 3 лет назад
Родитель
Сommit
43ba852895
3 измененных файлов с 20 добавлено и 18 удалено
  1. 18 16
      src/Components/Dashboard.js
  2. 2 2
      src/Css/all.css
  3. BIN
      src/Images/evaluacion.jpeg

+ 18 - 16
src/Components/Dashboard.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ThemeProvider, styled } from '@mui/material/styles';
+import { ThemeProvider, styled, createTheme } from '@mui/material/styles';
 
 import {
     Container, IconButton, Divider,
@@ -11,18 +11,20 @@ import {
     Menu as MenuIcon,
 } from '@mui/icons-material'
 
-import Logo from '../Images/logo.png';
+// import Logo from '../Images/logo.png';
+import Logo from '../Images/evaluacion.jpeg';
 
 import { Outlet } from "react-router-dom";
 import { MenuMovil } from '../Components/Navigation/MenuMovil';
 import Footer from "../Components/Footer";
 
-import { psicotheme } from '../Utils/theme'
+// import { psicotheme } from '../Utils/theme'
 import { Drawer as MuiDrawer, AppBar as MuiAppBar } from "../Components/Navigation/AppBar"
 import { MainListItems, SecondaryListItems } from '../Components/Navigation/listItems';
 import { UserOptions } from '../Components/Navigation/UserOptions'
 
 const drawerWidth = 240;
+const mdTheme = createTheme();
 
 const AppBar = styled(MuiAppBar, {
     shouldForwardProp: (prop) => prop !== 'open',
@@ -43,7 +45,8 @@ const AppBar = styled(MuiAppBar, {
 }));
 
 
-const Drawer = styled(MuiDrawer, { shouldForwardProp: (prop) => prop !== 'open' })(
+const Drawer = styled(MuiDrawer, 
+    { shouldForwardProp: (prop) => prop !== 'open' })(
     ({ theme, open }) => ({
         '& .MuiDrawer-paper': {
             position: 'relative',
@@ -75,8 +78,11 @@ function DashboardContent() {
     const [open, setOpen] = React.useState(false);
 
     const isMovil = Size('(min-width:770px)');
+    const navbar = React.useRef(null);
 
-    const toggleDrawer = () => setOpen(!open);
+    const toggleDrawer = () => {
+        setOpen(!open);
+    }
 
     const [anchorElMovil, setAnchorElMov] = React.useState(false);
     const MenuResponsive = () => {
@@ -86,24 +92,20 @@ function DashboardContent() {
 
 
     return (
-        <ThemeProvider theme={psicotheme}>
+        <ThemeProvider theme={mdTheme}>
 
-            <MenuMovil
-                anchor={anchorElMovil}
-                control={setAnchorElMov} />
+            <MenuMovil anchor={anchorElMovil} control={setAnchorElMov} />
 
             <Box sx={{ display: 'flex' }}>
-                <CssBaseline />
-                <AppBar style={{ backgroundColor: '#fff', boxShadow: 'None' }} position="absolute" open={!isMovil ? open : false}>
+                <AppBar style={{ backgroundColor: '#fff', boxShadow: 'None' }} position="absolute" open={open}>
                     <Toolbar sx={{ pr: '24px', borderBottom: "1px solid #ec5e69" }} >
 
-                        {/* boton para activar navegacion */}
                         <IconButton
                             edge="start"
                             color="inherit"
                             aria-label="open drawer"
-                            onClick={!isMovil ? MenuResponsive : toggleDrawer}
-                            sx={{ marginRight: '36px', ...(!isMovil && open && { display: 'none' }), }} >
+                            onClick={toggleDrawer}
+                            sx={{ marginRight: '36px', ...( open && { display: 'none' }), }} >
                             <MenuIcon style={{
                                 background: '#ec5e69',
                                 fontSize: "40",
@@ -113,7 +115,7 @@ function DashboardContent() {
 
                         <Typography component="h1" variant="h6" color="inherit" noWrap sx={{ flexGrow: 1 }} >
                             {
-                                !isMovil && open ? (
+                                open ? (
                                     <React.Fragment>
 
                                         <IconButton onClick={toggleDrawer}>
@@ -130,7 +132,7 @@ function DashboardContent() {
                         <UserOptions/>
                     </Toolbar>
                 </AppBar>
-                <Drawer variant="permanent" open={open}>
+                <Drawer variant="permanent" open={open} >
                     <Toolbar
                         sx={{
                             display: 'flex',

+ 2 - 2
src/Css/all.css

@@ -83,10 +83,10 @@ a:focus {
     border-bottom: 1px solid #ec5e69;
 }
 .width_img {
-    width: 190px;
+    width: 200px;
     float: left;
     margin: auto;
-    padding: 11px;
+    /* padding: 2px; */
 }
 .width_img_mov {
     float: left;

BIN
src/Images/evaluacion.jpeg