From dc923e6d651462711b752a852bacfc367d52b462 Mon Sep 17 00:00:00 2001
From: Christian Carlsson <hello@crlssn.com>
Date: Tue, 19 Nov 2024 12:45:38 +0000
Subject: [PATCH] feat: bottom mobile navigation (#38)

---
 Makefile                                     |  4 ++
 apps/web/src/clients/interceptors.ts         |  2 +
 apps/web/src/components/Dashboard.vue        | 48 ++++++++++++--------
 apps/web/src/components/NavigationMobile.vue | 37 +++++++++++++++
 4 files changed, 72 insertions(+), 19 deletions(-)
 create mode 100644 apps/web/src/components/NavigationMobile.vue

diff --git a/Makefile b/Makefile
index 241924d3..c4541a07 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+start_db:
+	docker start getstronger
+
 run_db:
 	docker rm getstronger -f
 	docker run --name getstronger -d -p 5433:5432 -e POSTGRES_DB=root -e POSTGRES_USER=root -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16.4
@@ -33,6 +36,7 @@ run_web:
 
 lint:
 	golangci-lint run
+	cd apps/web && npm run format
 
 sort_packages:
 	npx sort-package-json
diff --git a/apps/web/src/clients/interceptors.ts b/apps/web/src/clients/interceptors.ts
index ae7a51c3..c4724f07 100644
--- a/apps/web/src/clients/interceptors.ts
+++ b/apps/web/src/clients/interceptors.ts
@@ -9,11 +9,13 @@ export const logger: Interceptor = (next) => async (req) => {
 }
 
 export const auth: Interceptor = (next) => async (req) => {
+  console.log('auth interceptor')
   const authStore = useAuthStore()
   try {
     req.header.set('Authorization', `Bearer ${authStore.accessToken}`)
     return next(req)
   } catch (error) {
+    console.error('error in auth interceptor', error)
     if (!(error instanceof ConnectError)) {
       throw error
     }
diff --git a/apps/web/src/components/Dashboard.vue b/apps/web/src/components/Dashboard.vue
index c9e7720c..5132ee87 100644
--- a/apps/web/src/components/Dashboard.vue
+++ b/apps/web/src/components/Dashboard.vue
@@ -15,18 +15,19 @@ import {
   Bars3Icon,
   BellIcon,
   BookOpenIcon,
+  FolderIcon,
   HomeIcon,
   XMarkIcon,
-  FolderIcon,
 } from '@heroicons/vue/24/outline'
-import { ChevronDownIcon, MagnifyingGlassIcon } from '@heroicons/vue/20/solid'
-import { RouterView, useLink, useRoute } from 'vue-router'
+import { ChevronDownIcon } from '@heroicons/vue/20/solid'
+import { RouterView, useRoute } from 'vue-router'
 
 const navigation = [
   { name: 'Home', href: '/home', icon: HomeIcon },
   { name: 'Routines', href: '/routines', icon: ArrowPathRoundedSquareIcon },
   { name: 'Exercises', href: '/exercises', icon: BookOpenIcon },
   { name: 'Workouts', href: '/workouts', icon: FolderIcon },
+  { name: 'Notifications', href: '/notifications', icon: BellIcon },
 ]
 
 const userNavigation = [
@@ -39,10 +40,12 @@ const sidebarOpen = ref(false)
 const route = useRoute()
 
 const isActive = (basePath: string) => computed(() => route.path.startsWith(basePath))
+
+import NavigationMobile from '@/components/NavigationMobile.vue'
 </script>
 
 <template>
-  <div>
+  <div class="mb-16">
     <TransitionRoot as="template" :show="sidebarOpen">
       <Dialog class="relative z-50 lg:hidden" @close="sidebarOpen = false">
         <TransitionChild
@@ -182,20 +185,25 @@ const isActive = (basePath: string) => computed(() => route.path.startsWith(base
       <div
         class="sticky top-0 z-40 flex h-16 shrink-0 items-center gap-x-4 border-b border-gray-200 bg-white px-4 shadow-sm sm:gap-x-6 sm:px-6 lg:px-8"
       >
-        <button
-          type="button"
-          class="-m-2.5 p-2.5 text-gray-700 lg:hidden"
-          @click="sidebarOpen = true"
-        >
-          <span class="sr-only">Open sidebar</span>
-          <Bars3Icon class="h-6 w-6" aria-hidden="true" />
-        </button>
+        <img
+          class="h-auto w-8 lg:hidden"
+          src="https://tailwindui.com/plus/img/logos/mark.svg"
+          alt="Your Company"
+        />
+        <!--        <button-->
+        <!--          type="button"-->
+        <!--          class="-m-2.5 p-2.5 text-gray-700 lg:hidden"-->
+        <!--          @click="sidebarOpen = true"-->
+        <!--        >-->
+        <!--          <span class="sr-only">Open sidebar</span>-->
+        <!--          <Bars3Icon class="h-6 w-6" aria-hidden="true"/>-->
+        <!--        </button>-->
 
         <!-- Separator -->
-        <div class="h-6 w-px bg-gray-900/10 lg:hidden" aria-hidden="true" />
+        <!--        <div class="h-6 w-px bg-gray-900/10 lg:hidden" aria-hidden="true"/>-->
 
         <div class="flex flex-1 gap-x-4 self-stretch lg:gap-x-6">
-          <div class="relative flex flex-1 items-center">
+          <div class="relative flex flex-1 items-center justify-center">
             <p class="uppercase text-sm font-semibold text-gray-900 lg:hidden">
               {{ route.meta.title }}
             </p>
@@ -209,13 +217,13 @@ const isActive = (basePath: string) => computed(() => route.path.startsWith(base
           <!--                   placeholder="Search..." type="search" name="search"/>-->
           <!--          </form>-->
           <div class="flex items-center gap-x-4 lg:gap-x-6">
-            <button type="button" class="-m-2.5 p-2.5 text-gray-400 hover:text-gray-500">
-              <span class="sr-only">View notifications</span>
-              <BellIcon class="h-6 w-6" aria-hidden="true" />
-            </button>
+            <!--            <button type="button" class="-m-2.5 p-2.5 text-gray-400 hover:text-gray-500">-->
+            <!--              <span class="sr-only">View notifications</span>-->
+            <!--              <BellIcon class="h-6 w-6" aria-hidden="true"/>-->
+            <!--            </button>-->
 
             <!-- Separator -->
-            <div class="hidden lg:block lg:h-6 lg:w-px lg:bg-gray-900/10" aria-hidden="true" />
+            <!--            <div class="hidden lg:block lg:h-6 lg:w-px lg:bg-gray-900/10" aria-hidden="true"/>-->
 
             <!-- Profile dropdown -->
             <Menu as="div" class="relative">
@@ -274,4 +282,6 @@ const isActive = (basePath: string) => computed(() => route.path.startsWith(base
       </main>
     </div>
   </div>
+
+  <NavigationMobile :items="navigation" />
 </template>
diff --git a/apps/web/src/components/NavigationMobile.vue b/apps/web/src/components/NavigationMobile.vue
new file mode 100644
index 00000000..504c1f5c
--- /dev/null
+++ b/apps/web/src/components/NavigationMobile.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { type FunctionalComponent } from 'vue'
+import { useRoute } from 'vue-router'
+
+const props = defineProps<{
+  items: Array<{
+    name: string
+    href: string
+    icon: FunctionalComponent
+  }>
+}>()
+
+const route = useRoute()
+
+const isActive = (basePath: string) => {
+  return route.path.startsWith(basePath)
+}
+
+const iconClass = (isActive: boolean) => {
+  return isActive ? 'text-indigo-500' : 'text-gray-500'
+}
+</script>
+
+<template>
+  <nav>
+    <RouterLink v-for="item in props.items" :key="item.href" :to="item.href">
+      <component :is="item.icon" class="h-6 w-6" :class="iconClass(isActive(item.href))" />
+    </RouterLink>
+  </nav>
+</template>
+
+<style scoped>
+nav {
+  @apply fixed w-full bottom-0 z-50 h-16 bg-white border-t-2 border-gray-200 lg:hidden;
+  @apply flex justify-evenly items-center;
+}
+</style>