From 42f0ff2ff820f71a35ad5fc28d91796b69c719c5 Mon Sep 17 00:00:00 2001
From: ari melody <ari@arimelody.me>
Date: Tue, 2 Jul 2024 12:36:26 +0100
Subject: [PATCH] fixed navigation not reflecting current route

---
 src/lib/client/client.js     |  1 -
 src/lib/ui/Navigation.svelte | 40 ++++++++++++++++++++++++++----------
 src/routes/+layout.svelte    | 13 +++++++++---
 src/routes/+page.js          |  4 ++++
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/lib/client/client.js b/src/lib/client/client.js
index e540622..44e7b53 100644
--- a/src/lib/client/client.js
+++ b/src/lib/client/client.js
@@ -90,7 +90,6 @@ export class Client {
         }
         const user = await api.parseUser(data);
         console.log(`Logged in as @${user.username}@${user.host}`);
-        console.log(`You have ${data.source.follow_request_count} follow request${data.source.follow_request_count === 1 ? '' : 's'}!`);
         return user;
     }
 
diff --git a/src/lib/ui/Navigation.svelte b/src/lib/ui/Navigation.svelte
index 607a14d..ef16b70 100644
--- a/src/lib/ui/Navigation.svelte
+++ b/src/lib/ui/Navigation.svelte
@@ -7,6 +7,7 @@
     import { getTimeline } from '$lib/timeline.js';
     import { goto } from '$app/navigation';
     import { get } from 'svelte/store';
+    import { onMount } from 'svelte';
 
     import TimelineIcon from '../../img/icons/timeline.svg';
     import NotificationsIcon from '../../img/icons/notifications.svg';
@@ -20,21 +21,33 @@
     import SettingsIcon from '../../img/icons/settings.svg';
     import LogoutIcon from '../../img/icons/logout.svg';
 
+    export let path;
+
     const VERSION = APP_VERSION;
     
     let notification_count = 0;
     if (notification_count > 99) notification_count = "99+";
 
-    function goTimeline() {
-        if (location.pathname === "/") {
-            getTimeline(true);
-            window.scrollTo({
-                top: 0,
-                behavior: "smooth"
-            });
-            return;
+    function handle_btn(name) {
+        let route;
+        switch (name) {
+            case "timeline":
+                route = "/";
+                break;
+            case "notifcations":
+            case "explore":
+            case "lists":
+            case "favourites":
+            case "bookmarks":
+            case "hashtags":
+                return;
         }
-        goto("/");
+        if (!route) return;
+        window.scrollTo({
+            top: 0,
+            behavior: "smooth"
+        });
+        goto(route);
     }
 
     async function log_out() {
@@ -52,13 +65,18 @@
     </header>
 
     <div id="nav-items">
-        <Button label="Timeline" on:click={() => goTimeline()} active={!!$client.user}>
+        <Button label="Timeline"
+                on:click={handle_btn("timeline")}
+                active={path == "/"}>
             <svelte:fragment slot="icon">
                 <TimelineIcon/>
             </svelte:fragment>
             Timeline
         </Button>
-        <Button label="Notifications" disabled>
+        <Button label="Notifications"
+                on:click={handle_btn("notifications")}
+                active={path == "/notifications"}
+                disabled>
             <svelte:fragment slot="icon">
                 <NotificationsIcon/>
             </svelte:fragment>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index ab5ba36..955e424 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -5,12 +5,16 @@
     import { client, Client } from '$lib/client/client.js';
     import { get } from 'svelte/store';
 
+    export let data;
+    $: path = data.path || "/";
+
     let ready = new Promise(resolve => {
         if (get(client)) {
             return resolve();
         }
         let new_client = new Client();
         new_client.load();
+        client.set(new_client);
 
         return new_client.getClientUser().then(user => {
             if (!user) {
@@ -18,8 +22,11 @@
                 return resolve();
             }
             new_client.user = user;
-            client.set(new_client);
-            client.user
+            window.peekie = new_client;
+            client.update(client => {
+                client.user = user;
+                return client;
+            });
             return resolve();
         });
     });
@@ -28,7 +35,7 @@
 <div id="app">
 
     <header>
-        <Navigation />
+        <Navigation path={path} />
     </header>
 
     <main>
diff --git a/src/routes/+page.js b/src/routes/+page.js
index ceccaaf..50c77f5 100644
--- a/src/routes/+page.js
+++ b/src/routes/+page.js
@@ -1,2 +1,6 @@
 export const prerender = true;
 export const ssr = false;
+
+export async function load({ url }) {
+    return { path: url.pathname };
+}