menu refactor

4 files changed, 125 insertions, 135 deletions

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 130411dd..4ec890b4 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -1,31 +1,16 @@
 <script>
-  import OutClick from "svelte-outclick";
   import { banner, theme, newPayment } from "$lib/store";
   import { goto } from "$app/navigation";
   import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
+  import Menu from "$comp/Menu.svelte";
   import { loading, t } from "$lib/translations";
   import { page } from "$app/stores";
 
   export let user, subject;
 
+  let w;
   $: if (!subject) subject = user;
 
-  let menuButtons;
-  $: if (user)
-    menuButtons = [
-      { key: "nav.settings", icon: "ph:gear-bold", href: `/settings` },
-      { key: "nav.support", icon: "ph:lifebuoy-bold", href: `/support` },
-      { key: "nav.map", icon: "ph:map-trifold-bold", href: `/map` },
-      {
-        key: "nav.merch",
-        icon: "ph:storefront-bold",
-        href: `https://coinosmerch.com`,
-      },
-      { key: "nav.dark", icon: "ph:moon-stars-bold", href: `/dark` },
-      { key: "nav.signOut", icon: "ph:sign-out-bold", href: `/logout` },
-    ];
-
   let showMenu = false;
 
   $: bg =
@@ -37,132 +22,49 @@
           : `url(/api/public/${subject.banner}.webp)`
         : undefined;
 
-  $: $page && (showMenu = false);
+  const links = [
+    {
+      href: `/${user.username}`,
+      icon: "ph:house-bold",
+    },
+    {
+      href: `/${user.username}/receive`,
+      icon: "ph:hand-coins-bold",
+      flip: "horizontal",
+    },
+    {
+      href: `/payments`,
+      icon: "ph:clock-bold",
+    },
+    {
+      href: `/send`,
+      icon: "ph:paper-plane-right-bold",
+    },
+  ];
 
-  let dark = () => ($theme = $theme === "dark" ? "light" : "dark");
+  $: opacity = (href) =>
+    $page.url.pathname === href
+      ? "opacity-100"
+      : "opacity-90 hover:opacity-none";
 </script>
 
+<svelte:window bind:innerWidth={w} />
+
 {#if !$loading}
   <header
-    class="bg-gradient-to-r from-primary to-gradient h-[175px] w-full relative bg-cover mb-20"
+    class="bg-gradient-to-r bg-primary bg-accent h-[175px] w-full relative bg-cover mb-20"
     style:background-image={bg}
   >
     <nav class="flex justify-end items-center space-x-4 p-5">
       {#if user}
-        <a href={`/${user.username}`} data-sveltekit-preload-code="eager">
-          <button
-            class="flex justify-center items-center bg-base-100 p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl border border-black/10 {$page
-              .url.pathname === `/${user.username}`
-              ? 'opacity-100'
-              : 'opacity-70 hover:opacity-80'}"
-          >
-            <iconify-icon icon="ph:house-bold" width="24" />
-          </button>
-        </a>
-        <a href={`/${user.username}/receive`}>
-          <button
-            class="flex justify-center items-center bg-base-100 p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl border border-black/10 {$page.url.pathname.includes(
-              'invoice',
-            )
-              ? 'opacity-100'
-              : 'opacity-70 hover:opacity-80'}"
-          >
-            <iconify-icon
-              icon="ph:hand-coins-bold"
-              flip="horizontal"
-              width="24"
-            />
-          </button>
-        </a>
-        <a href={`/payments`} data-sveltekit-preload-code="eager">
-          <button
-            class="flex justify-center items-center bg-base-100 p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl border border-black/10 {$page
-              .url.pathname === `/payments`
-              ? 'opacity-100'
-              : 'opacity-70 hover:opacity-80'} relative"
-            ><iconify-icon icon="ph:clock-bold" width="24" />
-            {#if $newPayment}
-              <span class="absolute top-0 right-0">
-                <span class="flex h-3 w-3">
-                  <span
-                    class="animate-ping absolute inline-flex h-full w-full rounded-full bg-[#F7931A] opacity-75"
-                  />
-                  <span
-                    class="relative inline-flex rounded-full h-3 w-3 bg-[#F7931A]"
-                  />
-                </span>
-              </span>
-            {/if}
-          </button>
-        </a>
-        <a href={`/send`} data-sveltekit-preload-code="eager">
-          <button
-            class="flex justify-center items-center bg-base-100 p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl border border-black/10 {$page
-              .url.pathname === `/send`
-              ? 'opacity-100'
-              : 'opacity-70 hover:opacity-80'}"
-            ><iconify-icon icon="ph:paper-plane-right-bold" width="24" />
-          </button>
-        </a>
-        <div class="relative">
-          <OutClick on:outclick={() => (showMenu = false)}>
-            <button
-              class="flex justify-center items-center bg-base-100 p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl border border-black/10 {$page
-                .url.pathname === `/settings` ||
-              $page.url.pathname === `/support`
-                ? 'opacity-100'
-                : `opacity-70 hover:opacity-80 ${
-                    showMenu ? 'opacity-80' : ''
-                  }`}"
-              on:click={() => (showMenu = !showMenu)}
-              ><iconify-icon icon="ph:list-bold" width="24" />
+        {#each links as { href, icon, flip }}
+          <a {href} data-sveltekit-preload-code="eager">
+            <button class="btn-menu {opacity(href)}">
+              <iconify-icon {icon} width={w > 640 ? 32 : 24} {flip} />
             </button>
-
-            <div
-              class="{showMenu
-                ? 'block'
-                : 'hidden'} absolute top-14 right-0 bg-base-100 rounded-3xl p-8 shadow-xl z-50"
-            >
-              <ul class="space-y-5 w-48">
-                {#each menuButtons as { href, icon, key }}
-                  <li>
-                    {#if key.includes("dark")}
-                      <button
-                        class="flex justify-center items-center font-semibold hover:opacity-80 gap-2"
-                        on:click={dark}
-                      >
-                        <iconify-icon
-                          icon={$theme === "dark"
-                            ? "ph:sun-bold"
-                            : "ph:moon-stars-bold"}
-                          width="32"
-                        />
-                        {$t(`nav.${$theme === "dark" ? "light" : "dark"}`)}
-                      </button>
-                    {:else}
-                      <a
-                        {href}
-                        data-sveltekit-preload-code="eager"
-                        data-sveltekit-preload-data="false"
-                      >
-                        <button
-                          class="flex justify-center items-center font-semibold hover:opacity-80 gap-2"
-                        >
-                          <iconify-icon {icon} width="32" />
-                          {$t(key)}
-                        </button>
-                      </a>
-                    {/if}
-                  </li>
-                {/each}
-              </ul>
-              <hr class="my-4" />
-              <a href="/?stay=true"
-                ><iconify-icon icon="coinos:logo" width="130" /></a
-              >
-            </div>
-          </OutClick>
-        </div>
+          </a>
+        {/each}
+        <Menu bind:showMenu {w} {user} t={$t} {opacity} />
       {:else}
         <a href={`/login?redirect=${$page.url.pathname}`}>
           <button class="btn !rounded-full">{$t("nav.signIn")}</button>
@@ -180,6 +82,10 @@
 {/if}
 
 <style>
+  .btn-menu {
+    @apply flex justify-center items-center bg-base-100 p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl;
+  }
+
   header {
     z-index: 50;
     view-transition-name: header;
diff --git a/src/components/Menu.svelte b/src/components/Menu.svelte
new file mode 100644
index 00000000..c7f28e19
--- /dev/null
+++ b/src/components/Menu.svelte
@@ -0,0 +1,84 @@
+<script>
+  import { theme } from "$lib/store";
+  import OutClick from "svelte-outclick";
+  export let showMenu, t, user, w, opacity;
+
+  let dark = () => ($theme = $theme === "dark" ? "light" : "dark");
+
+  let menuButtons;
+  $: if (user)
+    menuButtons = [
+      { key: "nav.settings", icon: "ph:gear-bold", href: `/settings` },
+      { key: "nav.support", icon: "ph:lifebuoy-bold", href: `/support` },
+      { key: "nav.map", icon: "ph:map-trifold-bold", href: `/map` },
+      {
+        key: "nav.merch",
+        icon: "ph:storefront-bold",
+        href: `https://coinosmerch.com`,
+      },
+      { key: "nav.dark", icon: "ph:moon-stars-bold", href: `/dark` },
+      { key: "nav.signOut", icon: "ph:sign-out-bold", href: `/logout` },
+    ];
+</script>
+
+<div>
+  <OutClick on:outclick={() => (showMenu = false)}>
+    <button
+      class="btn-menu {opacity('/support')}"
+      on:click={() => {
+        console.log("YEAH");
+        showMenu = !showMenu;
+        console.log(showMenu);
+      }}
+      ><iconify-icon icon="ph:list-bold" width={w > 640 ? 32 : 24} />
+    </button>
+
+    <div
+      class="{showMenu
+        ? 'block'
+        : 'hidden'} absolute top-14 right-0 bg-base-100 rounded-3xl p-8 shadow-xl z-50"
+    >
+      <ul class="space-y-5 w-48">
+        {#each menuButtons as { href, icon, key }}
+          <li>
+            {#if key.includes("dark")}
+              <button
+                class="flex justify-center items-center font-semibold hover:opacity-80 gap-2"
+                on:click={dark}
+              >
+                <iconify-icon
+                  icon={$theme === "dark"
+                    ? "ph:sun-bold"
+                    : "ph:moon-stars-bold"}
+                  width="32"
+                />
+                {t(`nav.${$theme === "dark" ? "light" : "dark"}`)}
+              </button>
+            {:else}
+              <a
+                {href}
+                data-sveltekit-preload-code="eager"
+                data-sveltekit-preload-data="false"
+              >
+                <button
+                  class="flex justify-center items-center font-semibold hover:opacity-80 gap-2"
+                >
+                  <iconify-icon {icon} width="32" />
+                  {t(key)}
+                </button>
+              </a>
+            {/if}
+          </li>
+        {/each}
+      </ul>
+      <hr class="my-4" />
+      <a href="/?stay=true"><iconify-icon icon="coinos:logo" width="130" /></a>
+    </div>
+  </OutClick>
+</div>
+
+<style>
+  .btn-menu {
+    @apply flex justify-center items-center bg-base-100 p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl;
+  }
+</style>
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 4bbf582f..3bc8296f 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -47,7 +47,7 @@
       </button>
     </a>
 
-    {#if $installPrompt || true}
+    {#if $installPrompt}
       <button class="btn btn-accent" on:click={install}>
         <iconify-icon icon="ph:floppy-disk-bold" width="32" />
         {$t("user.install")}
diff --git a/src/routes/(app)/settings/[...tab]/+page.svelte b/src/routes/(app)/settings/[...tab]/+page.svelte
index caa46888..d2da3722 100644
--- a/src/routes/(app)/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/settings/[...tab]/+page.svelte
@@ -233,7 +233,7 @@
   </div>
 
   <div
-    class="z-10 fixed bottom-0 bg-base-100 shadow border-t w-full flex justify-center items-center py-3"
+    class="z-10 fixed bottom-0 bg-base-100 shadow border-t border-t-8 border-accent w-full flex justify-center items-center py-3"
   >
     <button
       bind:this={submit}