From 912537f5761510c8396f4a11d87e403c39edeb41 Mon Sep 17 00:00:00 2001
From: aronmal <aron@mal-noh.de>
Date: Wed, 25 Oct 2023 18:15:05 +0200
Subject: [PATCH] Fix in navbar

---
 src/components/de/Navbar.tsx | 12 +++++++++---
 src/components/en/Navbar.tsx | 12 +++++++++---
 src/routes/de/overview.tsx   |  2 +-
 src/routes/en/overview.tsx   |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/de/Navbar.tsx b/src/components/de/Navbar.tsx
index 756efac..0b9be9d 100644
--- a/src/components/de/Navbar.tsx
+++ b/src/components/de/Navbar.tsx
@@ -5,7 +5,7 @@ import {
   faXmark,
 } from "@fortawesome/pro-regular-svg-icons";
 import { createSignal } from "solid-js";
-import { A, useNavigate } from "solid-start";
+import { A, useLocation, useNavigate } from "solid-start";
 import { FontAwesomeIcon } from "../FontAwesomeIcon";
 
 export const [lightMode, setLightMode] = createSignal(false);
@@ -13,6 +13,7 @@ const [menu, setMenu] = createSignal(false);
 
 function Navbar() {
   const navigate = useNavigate();
+  const location = useLocation();
   return (
     <>
       <div id="navbar" style={{ visibility: menu() ? "visible" : "hidden" }}>
@@ -79,7 +80,12 @@ function Navbar() {
           {lightMode() ? "Dark Mode " : "Light Mode "}
           <FontAwesomeIcon icon={faCircleHalfStroke} />
         </button>
-        <button onClick={() => navigate("/en/overview")}>
+        <button
+          onClick={() => {
+            navigate("/en" + location.pathname.slice(3), { scroll: false });
+            setMenu(false);
+          }}
+        >
           Englisch <FontAwesomeIcon icon={faGlobe} />
         </button>
         <button onClick={() => setMenu(false)}>
@@ -92,7 +98,7 @@ function Navbar() {
         style={{ visibility: menu() ? "hidden" : "visible" }}
       >
         <button onClick={() => navigate(-1)}>Zurück</button>
-        <A href="#start">Start</A>
+        <button onClick={() => navigate("/de/overview")}>Start</button>
         <button onClick={() => setMenu(true)}>Menu</button>
       </div>
     </>
diff --git a/src/components/en/Navbar.tsx b/src/components/en/Navbar.tsx
index c5f6b4c..d74ddad 100644
--- a/src/components/en/Navbar.tsx
+++ b/src/components/en/Navbar.tsx
@@ -5,7 +5,7 @@ import {
   faXmark,
 } from "@fortawesome/pro-regular-svg-icons";
 import { createSignal } from "solid-js";
-import { A, useNavigate } from "solid-start";
+import { A, useLocation, useNavigate } from "solid-start";
 import { FontAwesomeIcon } from "../FontAwesomeIcon";
 
 export const [lightMode, setLightMode] = createSignal(false);
@@ -13,6 +13,7 @@ const [menu, setMenu] = createSignal(false);
 
 function Navbar() {
   const navigate = useNavigate();
+  const location = useLocation();
   return (
     <>
       <div id="navbar" style={{ visibility: menu() ? "visible" : "hidden" }}>
@@ -79,7 +80,12 @@ function Navbar() {
           {lightMode() ? "Dark Mode " : "Light Mode "}
           <FontAwesomeIcon icon={faCircleHalfStroke} />
         </button>
-        <button onClick={() => navigate("/de/overview")}>
+        <button
+          onClick={() => {
+            navigate("/de" + location.pathname.slice(3), { scroll: false });
+            setMenu(false);
+          }}
+        >
           Deutsch <FontAwesomeIcon icon={faGlobe} />
         </button>
         <button onClick={() => setMenu(false)}>
@@ -92,7 +98,7 @@ function Navbar() {
         style={{ visibility: menu() ? "hidden" : "visible" }}
       >
         <button onClick={() => navigate(-1)}>Back</button>
-        <A href="#start">Start</A>
+        <button onClick={() => navigate("/en/overview")}>Start</button>
         <button onClick={() => setMenu(true)}>Menu</button>
       </div>
     </>
diff --git a/src/routes/de/overview.tsx b/src/routes/de/overview.tsx
index 8b954d3..41316dd 100644
--- a/src/routes/de/overview.tsx
+++ b/src/routes/de/overview.tsx
@@ -10,7 +10,7 @@ function overview() {
       <Link rel="stylesheet" href="/styles/overview.css" />
       <Navbar />
 
-      <header id="start">
+      <header>
         <img src="/images/cover.jpg" />
       </header>
 
diff --git a/src/routes/en/overview.tsx b/src/routes/en/overview.tsx
index cfdf72e..a3372c6 100644
--- a/src/routes/en/overview.tsx
+++ b/src/routes/en/overview.tsx
@@ -9,7 +9,7 @@ function Overview() {
       <Title>Introduction EUCs</Title>
       <Link rel="stylesheet" href="/styles/overview.css" />
       <Navbar />
-      <header id="start">
+      <header>
         <img src="/images/cover.jpg" />
       </header>
       {/*