diff --git a/package.json b/package.json index 08dd4e7..fba384e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", "predeploy": "npm run build", - "deploy": "gh-pages -d build" + "deploy": "gh-pages -d build", + "fastDeploy": "del build && del dist && yarn build && ren dist build && yarn deploy" }, "dependencies": { "chart.js": "^4.4.2", diff --git a/src/App.jsx b/src/App.jsx index 2f88922..c30f230 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,6 +1,15 @@ import { RouterProvider } from "react-router-dom"; import routes from "./routes"; +import { useSharedWindowHeight } from "./hooks"; export default function App() { + //======================================================= + // Estado para observar o tamanho da janela + const { setWindowHeight } = useSharedWindowHeight(); + window.addEventListener("resize", function () { + setWindowHeight(this.window.innerHeight); + }); + + //======================================================= return ; } diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index 0316f0f..a498135 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -40,7 +40,7 @@ export default function Footer() { ); } - //========================Return========================= + //=========================Return========================= return (
{renderFooter()} diff --git a/src/components/Header/index.jsx b/src/components/Header/index.jsx index 227db73..c9b4ebe 100644 --- a/src/components/Header/index.jsx +++ b/src/components/Header/index.jsx @@ -6,7 +6,7 @@ import Colors from "../../styles/Colors"; import { useSharedMenu } from "../../hooks"; -export default function Header({ page }) { +export default function Header({ page, innerRef }) { const { menu, openMenu, closeMenu } = useSharedMenu(); function renderTopElements() { @@ -38,7 +38,7 @@ export default function Header({ page }) { } //========================Return========================= return ( -
+
{renderTopElements()} {renderBottomElements()}
diff --git a/src/components/Header/index.module.css b/src/components/Header/index.module.css index 64ed53e..fc38551 100644 --- a/src/components/Header/index.module.css +++ b/src/components/Header/index.module.css @@ -6,8 +6,10 @@ justify-content: center; gap: 1rem; padding: var(--header-padding) 0; - position: relative; + position: fixed; padding: 2rem; + width: 100%; + z-index: 2; } .topHeaderWrapper { diff --git a/src/components/Menu/index.jsx b/src/components/Menu/index.jsx index 4e35f4b..fdacc18 100644 --- a/src/components/Menu/index.jsx +++ b/src/components/Menu/index.jsx @@ -1,4 +1,5 @@ import React from "react"; +import Colors from "../../styles/Colors"; export default function Menu() { return ( @@ -6,13 +7,50 @@ export default function Menu() { style={{ display: "flex", flexDirection: "column", - // position: "relative", - overflowX: "auto", + background: Colors.white, }} >

Menu

Menu

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

+

Menu

); } diff --git a/src/components/ObservatorioIFTMLogo/index.jsx b/src/components/ObservatorioIFTMLogo/index.jsx index 560d9ed..41fccff 100644 --- a/src/components/ObservatorioIFTMLogo/index.jsx +++ b/src/components/ObservatorioIFTMLogo/index.jsx @@ -24,7 +24,7 @@ export default memo(function ObservatorioIFTMLogo({ black }) { }; return ( - +
.p-chart { diff --git a/src/hooks/index.jsx b/src/hooks/index.jsx index 1c9d999..cb57646 100644 --- a/src/hooks/index.jsx +++ b/src/hooks/index.jsx @@ -1,6 +1,7 @@ import { useCallback, useState } from "react"; import { useBetween } from "use-between"; +//======================================================= const useMenu = () => { const [menu, setMenu] = useState(false); const openMenu = useCallback(() => setMenu(true), []); @@ -11,5 +12,14 @@ const useMenu = () => { closeMenu, }; }; - export const useSharedMenu = () => useBetween(useMenu); + +//======================================================= +const useWindowHeight = () => { + const [windowHeight, setWindowHeight] = useState(0); + return { + windowHeight, + setWindowHeight, + }; +}; +export const useSharedWindowHeight = () => useBetween(useWindowHeight); diff --git a/src/pages/Home/index.jsx b/src/pages/Home/index.jsx index 937eb92..d367f5b 100644 --- a/src/pages/Home/index.jsx +++ b/src/pages/Home/index.jsx @@ -6,6 +6,54 @@ export default memo(function Home() { return ( +

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

+

Vite + React

Vite + React