diff --git a/Frontend/public/NavBar/HUDOFF.svg b/Frontend/public/NavBar/HUDOFF.svg deleted file mode 100755 index adbeab1..0000000 --- a/Frontend/public/NavBar/HUDOFF.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Frontend/public/NavBar/HUDON.svg b/Frontend/public/NavBar/HUDON.svg deleted file mode 100755 index e989aaa..0000000 --- a/Frontend/public/NavBar/HUDON.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Frontend/src/App.jsx b/Frontend/src/App.jsx index 922532b..c015600 100755 --- a/Frontend/src/App.jsx +++ b/Frontend/src/App.jsx @@ -3,7 +3,6 @@ import { Outlet } from "react-router-dom"; import Navbar from "./components/navbar"; import Footer from "./components/footer"; -import Hud from "./components/Hud/Hud"; import { GameTick } from "./components/GameTick"; import { GameSync } from "./components/GameSync"; @@ -13,7 +12,6 @@ import "./scss/components/footer.scss"; import navData from "./data/NavBarData.json"; function App() { - const [isVisible, setIsVisible] = useState(false); const [toggleRain, setToggleRain] = useState(false); return ( @@ -22,12 +20,9 @@ function App() { -
diff --git a/Frontend/src/components/Hud/Hud.jsx b/Frontend/src/components/Hud/Hud.jsx deleted file mode 100755 index 6c73758..0000000 --- a/Frontend/src/components/Hud/Hud.jsx +++ /dev/null @@ -1,43 +0,0 @@ -// Hud.jsx — Stats HUD (Zustand) -import { useGameStore } from "../../store/useGameStore"; -import { formatNumber } from "../../utils/formatNumber"; - -const formatTime = (time) => { - const hours = Math.floor(time / 3600); - const minutes = Math.floor((time % 3600) / 60); - const secs = time % 60; - return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}:${String(secs).padStart(2, "0")}`; -}; - -function Hud({ isVisible }) { - const resources = useGameStore((s) => s.state.resources); - const clickMultiplier = useGameStore((s) => s.state.clickMultiplier); - const productionPerSecond = useGameStore((s) => s.productionPerSecond); - const playSeconds = useGameStore((s) => s.playSeconds); - - if (isVisible) return null; - - return ( -
-
-
- Temps - {formatTime(playSeconds)} -
-
- Têtards/s - {formatNumber(productionPerSecond)} -
-
- Ponte - {clickMultiplier} -
-
-
- {formatNumber(resources)} -
-
- ); -} - -export default Hud; diff --git a/Frontend/src/components/navbar.jsx b/Frontend/src/components/navbar.jsx index 904bf6c..12e1a32 100755 --- a/Frontend/src/components/navbar.jsx +++ b/Frontend/src/components/navbar.jsx @@ -7,38 +7,14 @@ import "../scss/root.scss"; import PrimaryButton from "./buttons/PrimaryButton"; import Burger from "./burger"; import { useAuth } from "../context/AuthContext"; -import HUDON from "../../public/NavBar/HUDON.svg"; -import HUDOFF from "../../public/NavBar/HUDOFF.svg"; import SnowOn from "../../public/NavBar/SnowOn.svg"; import SnowOff from "../../public/NavBar/SnowOff.svg"; import { useState } from "react"; -export default function Navbar({ - navData, - isVisible, - setIsVisible, - toggleRain, - setToggleRain, -}) { - Navbar.propTypes = { - isVisible: PropTypes.bool, - setIsVisible: PropTypes.function, - setToggleRain: PropTypes.function, - toggleRain: PropTypes.bool, - }.isRequired; - +export default function Navbar({ navData, toggleRain, setToggleRain }) { const { user, logout } = useAuth(); - const [imageSrc, setImageSrc] = useState(HUDON); const [snowImageSrc, setSnowImageSrc] = useState(SnowOff); - const toggleHud = () => { - if (!isVisible) { - setIsVisible(true); - setImageSrc(HUDOFF); - } else { - setIsVisible(false); - setImageSrc(HUDON); - } - }; + function toggleRainBtn() { if (toggleRain === false) { setToggleRain(true); @@ -48,6 +24,7 @@ export default function Navbar({ setSnowImageSrc(SnowOff); } } + return (