Fixes the header on the landing page and all of the menu links.

KenEucker · Jan 22, 2024 · 60f848c · 60f848c
1 parent 175082c
commit 60f848c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 46 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -10,14 +10,12 @@
     <meta property="og:image" :content="logo" />
   </Head>
   <div :class="isWhiteBackground">
-    <template v-if="isNotLanding">
-      <div :class="`spacer-top ${isWhiteBackground}`"></div>
-      <bike-tag-menu variant="top" />
-    </template>
+    <div :class="`spacer-top ${isWhiteBackground}`"></div>
+    <bike-tag-menu variant="top" />
     <confetti-explosion v-if="showConfetti" />
     <service-worker />
     <router-view />
-    <!-- <template v-if="isNotLanding">
+    <!-- <template v-if="!isNotLanding">
       <bike-tag-menu variant="bottom" />
       <div class="spacer-bottom"></div>
     </template> -->

diff --git a/src/components/BikeTagFooter.vue b/src/components/BikeTagFooter.vue
@@ -134,8 +134,9 @@ const goRoundPage = () => {
   router.push('/round')
 }
 const goWorldwide = () => {
-  window.location = 'http://biketag.org/'
+  // window.location = 'http://biketag.org/'
   // router.push('/worldwide')
+  router.push({ name: 'Landing' })
 }
 const closePopover = () => {
   hintPopover.value.hide({ type: 'click' })

diff --git a/src/components/BikeTagMenu.vue b/src/components/BikeTagMenu.vue
@@ -217,7 +217,7 @@ function onScroll() {
 async function resetBikeTagApp() {
   if (await isOnline()) {
     store.resetBikeTagCache()
-    router.push({ path: '/' })
+    router.push({ name: 'Home' })
   } else {
     router.push('/')
   }
@@ -241,7 +241,8 @@ function closeCollapsible() {
   // navList.value.classList.remove('show')
 }
 function goWorldwide() {
-  window.location = 'http://biketag.org/'
+  // window.location = 'http://biketag.org/'
+  router.push({ name: 'Landing' })
   // router.push('/worldwide')
 }
 function goApprovePage() {
@@ -278,7 +279,7 @@ function goHowPage() {
 }
 function goHomePage() {
   closeCollapsible()
-  router.push('/')
+  router.push({ name: 'Home' })
 }
 function goRoundPage() {
   router.push('/round')

diff --git a/src/views/Landing.vue b/src/views/Landing.vue
@@ -1,42 +1,5 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <header class="biketag-header">
-    <nav class="navbar">
-      <div class="navbar-brand" @click="toSection('mg-top')">
-        <img src="@/assets/images/biketag-logo.svg" class="logo" alt="BikeTag  Logo" />
-      </div>
-
-      <!-- Hamburger Menu -->
-      <button
-        ref="buttonCollapse"
-        class="navbar-toggler"
-        data-bs-toggle="collapse"
-        data-bs-target="#navbar-supported-content"
-        aria-controls="navbar-supported-content"
-        aria-expanded="false"
-        aria-label="Toggle navigation"
-      >
-        <img class="hamburger-image" src="/images/Hamburger.svg" alt="Menu" />
-      </button>
-
-      <div
-        id="navbar-supported-content"
-        ref="navList"
-        class="collapse navbar-collapse"
-        @click="closeMenu"
-      >
-        <ul class="m-auto navbar-nav mb-lg-0">
-          <li class="nav-item" @click="toSection('What is BikeTag?')">What is BikeTag?</li>
-          <li class="nav-item" @click="toSection('BikeTag Ambassador program')">
-            {{ $t('BikeTag Ambassadors') }}
-          </li>
-          <li class="nav-item" @click="toSection('Open-Source')">
-            {{ $t('Open-Source Project') }}
-          </li>
-        </ul>
-      </div>
-    </nav>
-  </header>
   <div id="mg-top"></div>
   <main>
     <bike-tag-blurb
@@ -161,6 +124,19 @@
     </div>
     <p><i>© 2023 The BikeTag Project. All Rights Reserved. </i></p>
   </footer>
+  <!-- <header class="biketag-header">
+    <div>
+      <ul class="m-auto navbar-nav mb-lg-0">
+        <li class="nav-item" @click="toSection('What is BikeTag?')">What is BikeTag?</li>
+        <li class="nav-item" @click="toSection('BikeTag Ambassador program')">
+          {{ $t('BikeTag Ambassadors') }}
+        </li>
+        <li class="nav-item" @click="toSection('Open-Source')">
+          {{ $t('Open-Source Project') }}
+        </li>
+      </ul>
+    </div>
+  </header> -->
 </template>
 
 <script setup name="LandingView">