misc: improve pins

Xyphyn · Jul 2, 2024 · 005a8c0 · 005a8c0
1 parent c2858ac
commit 005a8c0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte
@@ -63,7 +63,7 @@
 
   $: contentPadding = calculatePadding(dockProps.noGap, dockProps.top, true)
   $: sidePadding = calculatePadding(dockProps.noGap, dockProps.top, false)
-  $: topPanel = $userSettings.dock.noGap && $userSettings.dock.top
+  $: topPanel = dockProps.noGap && dockProps.top
 </script>
 
 <svelte:window bind:innerWidth={screenWidth} />

diff --git a/src/lib/components/ui/navbar/link.ts b/src/lib/components/ui/navbar/link.ts
@@ -12,6 +12,7 @@ import {
   ShieldCheck,
   ServerStack,
   PencilSquare,
+  MapPin,
 } from 'svelte-hero-icons'
 import { get } from 'svelte/store'
 
@@ -21,10 +22,6 @@ export interface Link {
 }
 
 export const defaultLinks: Link[] = [
-  {
-    url: '/profile',
-    label: get(t)('profile.profile'),
-  },
   {
     url: '/',
     label: t.get('nav.home'),
@@ -69,16 +66,14 @@ export const defaultLinks: Link[] = [
 
 export const iconOfLink = (url: string): IconSource => {
   switch (url) {
-    case '/profile':
-      return UserCircle
     case '/':
       return Home
     case '/?type=All':
-      return ChartBar
+      return GlobeAmericas
     case '/?type=Subscribed':
       return Newspaper
     case '/?type=Local':
-      return GlobeAmericas
+      return MapPin
     case '/communities':
       return GlobeAlt
     case '/search':

diff --git a/src/lib/components/ui/sidebar/Sidebar.svelte b/src/lib/components/ui/sidebar/Sidebar.svelte
@@ -31,18 +31,6 @@
   import { iconOfLink } from '../navbar/link'
   import { goto } from '$app/navigation'
   import { page } from '$app/stores'
-
-  function pinsEvent(node: HTMLElement) {
-    node.oncontextmenu = (e) => {
-      e.preventDefault()
-      console.log('test')
-      // $userSettings.dock.pins = $userSettings.dock.pins.splice(
-      //   $userSettings.dock.pins.findIndex((p) => pin.url == p.url),
-      //   1
-      // )
-      return false
-    }
-  }
 </script>
 
 <nav
@@ -62,7 +50,7 @@
           on:contextmenu={(e) => {
             e.preventDefault()
             $userSettings.dock.pins = $userSettings.dock.pins.toSpliced(
-              $userSettings.dock.pins.findIndex((p) => pin.url == p.url),
+              $userSettings.dock.pins.findLastIndex((p) => pin.url == p.url),
               1
             )
             return false

diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
@@ -106,6 +106,9 @@
             <Button
               size="square-md"
               slot="target"
+              disabled={$userSettings.dock.pins
+                .map((p) => p.url)
+                .includes(pin.url)}
               on:click={() => {
                 $userSettings.dock.pins = [
                   ...($userSettings.dock.pins ?? []),
@@ -121,7 +124,9 @@
               class="px-4 py-2 flex flex-col"
             >
               <span class="font-medium text-lg">{pin.label}</span>
-              <code class="!bg-zinc-950 !rounded-md">{pin.url}</code>
+              <code class="bg-slate-50 dark:!bg-zinc-950 !rounded-md">
+                {pin.url}
+              </code>
             </Material>
           </Popover>
         {/each}