mudando desigb

ipti · Sep 26, 2023 · 5e12b57 · 5e12b57
1 parent 81f96a1
commit 5e12b57
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 57 deletions.
diff --git a/public/favLupa.ico b/public/favLupa.ico
diff --git a/public/index.html b/public/index.html
@@ -3,12 +3,13 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" href="%PUBLIC_URL%/favLupa.ico" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="Web site created using create-react-app"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/lupaLogo.png" />
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/ipti/br.tag@dev/sass/css/main.css">
     <!--
       manifest.json provides metadata used when your web app is installed on a

diff --git a/public/lupaLogo.png b/public/lupaLogo.png
diff --git a/public/manifest.json b/public/manifest.json
@@ -16,6 +16,11 @@
       "src": "logo512.png",
       "type": "image/png",
       "sizes": "512x512"
+    },
+    {
+      "src": "lupaLogo.png",
+      "type": "image/png",
+      "sizes": "512x512"
     }
   ],
   "start_url": ".",

diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css
@@ -55,15 +55,20 @@ body {
   width: 100%;
   border: none;
   padding: 10.5px;
+  background-color: #0077B6;
+
+  :hover {
+    background-color: #00B4D8;
+  }
 }
 
 
-.row{
+.row {
   width: 100%;
 }
 
 
-  /* input[type="text"],
+/* input[type="text"],
   input[type="password"],
   input[type="datetime"],
   input[type="datetime-local"],
@@ -88,6 +93,4 @@ body {
     -moz-transition: border linear .2s, box-shadow linear .2s;
     -o-transition: border linear .2s, box-shadow linear .2s;
     transition: border linear .2s, box-shadow linear .2s;
-  } */
-
-
+  } */
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
diff --git a/src/assets/images/lupaLogo.svg b/src/assets/images/lupaLogo.svg
diff --git a/src/components/Layouts/Header.js b/src/components/Layouts/Header.js
@@ -6,17 +6,18 @@ import AppBar from "@material-ui/core/AppBar";
 import IconButton from "@material-ui/core/IconButton";
 import Menu from "@material-ui/core/Menu";
 import MenuItem from "@material-ui/core/MenuItem";
-import Toolbar from "@material-ui/core/Toolbar";
 import { makeStyles } from "@material-ui/core/styles";
 import { MenuTwoTone } from "@material-ui/icons";
 import AccountCircle from "@material-ui/icons/AccountCircle";
 import { useHistory } from "react-router-dom";
+import logo from "../../assets/images/logo.png";
 import { isAuthenticated } from "../../services/auth";
 import styleBase from "../../styles";
+import { Column, Row } from "../../styles/style";
+
 
 
 
-
 const useStyles = makeStyles({
   root: {
     flexGrow: 1,
@@ -74,55 +75,57 @@ const Header = ({ setIsSidebar, isSidebar }) => {
 
   return (
     <AppBar classes={{ root: classes.root }} position="static">
-      <Toolbar className={classes.tooBar} disableGutters>
-        {matches ? <MenuTwoTone onClick={
-          () => {
-            if (isSidebar) {
-              setIsSidebar(false)
-            } else {
-              setIsSidebar(true)
+      <Column>
+        <Row>
+          {matches ? <MenuTwoTone onClick={
+            () => {
+              if (isSidebar) {
+                setIsSidebar(false)
+              } else {
+                setIsSidebar(true)
+              }
             }
           }
-        }
-
-          style={{ color: 'black', marginLeft: '10px' }} /> : null}
-        <h2 className={classes.title}>Matrícula</h2>
-        <>
-          {isAuthenticated() && (
-            <>
-              <IconButton
-                aria-label="account of current user"
-                aria-controls="menu-appbar"
-                aria-haspopup="true"
-                onClick={handleMenu}
-                fontSize="large"
-                className={classes.accountButton}
-              >
-                <AccountCircle />
-              </IconButton>
-              <Menu
-                id="menu-appbar"
-                anchorEl={anchorEl}
-                anchorOrigin={{
-                  vertical: "top",
-                  horizontal: "left"
-                }}
-                keepMounted
-                transformOrigin={{
-                  vertical: "top",
-                  horizontal: "left"
-                }}
-                open={open}
-                onClose={handleClose}
-              >
-                <MenuItem value="sair" onClick={handleLogout}>Sair</MenuItem>
-              </Menu>
-            </>
-          )}
-        </>
-
-
-      </Toolbar>
+            style={{ color: 'black', marginLeft: '10px' }} /> : null}
+          <Column id="center" >
+            <img style={{ width: "15%", padding: "4px 16px" }} alt="" src={logo} />
+          </Column>
+          <>
+            {isAuthenticated() && (
+              <>
+                <IconButton
+                  aria-label="account of current user"
+                  aria-controls="menu-appbar"
+                  aria-haspopup="true"
+                  onClick={handleMenu}
+                  fontSize="large"
+                  style={{ marginLeft: "auto" }}
+                  className={classes.accountButton}
+                >
+                  <AccountCircle />
+                </IconButton>
+                <Menu
+                  id="menu-appbar"
+                  anchorEl={anchorEl}
+                  anchorOrigin={{
+                    vertical: "top",
+                    horizontal: "left"
+                  }}
+                  keepMounted
+                  transformOrigin={{
+                    vertical: "top",
+                    horizontal: "left"
+                  }}
+                  open={open}
+                  onClose={handleClose}
+                >
+                  <MenuItem value="sair" onClick={handleLogout}>Sair</MenuItem>
+                </Menu>
+              </>
+            )}
+          </>
+        </Row>
+      </Column>
     </AppBar>
   );
 };

diff --git a/src/styles/colors.js b/src/styles/colors.js
@@ -11,8 +11,8 @@ const color = {
   red: "#ED5A68",
   green: "#05ec02",
   blueClear: "#dcefed",
-  colorsBaseProductNormal: "#3f45ea",
-  colorsBaseProductNormalHover: "#2e33b7",
+  colorsBaseProductNormal: "#0077B6",
+  colorsBaseProductNormalHover: "#00B4D8",
   colorsBaseInkNormal: "#252A31",
   colorsBaseInkLight: "#5F738C",
   colorsBaseCloudNormal: "#EFF2F5",