Fix mobile navigation

This commit is contained in:
Jon Staab 2026-07-02 12:24:56 -07:00
parent ff5d7aeb87
commit 05954752e2
5 changed files with 24 additions and 18 deletions

View file

@ -10,6 +10,7 @@
import Divider from "@lib/components/Divider.svelte" import Divider from "@lib/components/Divider.svelte"
import MenuSettings from "@app/components/MenuSettings.svelte" import MenuSettings from "@app/components/MenuSettings.svelte"
import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte" import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
import PrimaryNavItemSpace from "@app/components/PrimaryNavItemSpace.svelte"
import PrimaryNavSpaces from "@app/components/PrimaryNavSpaces.svelte" import PrimaryNavSpaces from "@app/components/PrimaryNavSpaces.svelte"
import {userSpaceUrls} from "@app/groups" import {userSpaceUrls} from "@app/groups"
import {PLATFORM_RELAYS} from "@app/env" import {PLATFORM_RELAYS} from "@app/env"
@ -66,23 +67,23 @@
class="hide-on-keyboard border-top bottom-sai fixed left-0 right-0 z-nav h-14 border border-line bg-surface md:hidden"> class="hide-on-keyboard border-top bottom-sai fixed left-0 right-0 z-nav h-14 border border-line bg-surface md:hidden">
<div class="flex h-full justify-between px-2"> <div class="flex h-full justify-between px-2">
<div class="flex items-center gap-6"> <div class="flex items-center gap-6">
<PrimaryNavItem title="Search" href="/people"> {#if PLATFORM_RELAYS.length === 1}
<ImageIcon alt="Search" src={Magnifier} size={8} /> <PrimaryNavItemSpace url={PLATFORM_RELAYS[0]} />
</PrimaryNavItem> {:else}
<PrimaryNavItem <PrimaryNavItem href="/people">
title="Messages" <ImageIcon alt="Search" src={Magnifier} size={8} />
href="/chat" </PrimaryNavItem>
onclick={chatHandler} {/if}
notification={$notifications.has("/chat")}> <PrimaryNavItem href="/chat" onclick={chatHandler} notification={$notifications.has("/chat")}>
<ImageIcon alt="Messages" src={Letter} size={8} /> <ImageIcon alt="Messages" src={Letter} size={8} />
</PrimaryNavItem> </PrimaryNavItem>
{#if PLATFORM_RELAYS.length !== 1} {#if PLATFORM_RELAYS.length !== 1}
<PrimaryNavItem title="Spaces" href="/spaces" notification={anySpaceNotifications}> <PrimaryNavItem href="/spaces" notification={anySpaceNotifications}>
<ImageIcon alt="Spaces" src={Widget} size={8} /> <ImageIcon alt="Spaces" src={Widget} size={8} />
</PrimaryNavItem> </PrimaryNavItem>
{/if} {/if}
</div> </div>
<PrimaryNavItem title="Settings" onclick={showSettingsMenu}> <PrimaryNavItem onclick={showSettingsMenu}>
{#if $userProfile?.picture} {#if $userProfile?.picture}
<ImageIcon alt="Settings" src={$userProfile?.picture} size={10} class="rounded-full" /> <ImageIcon alt="Settings" src={$userProfile?.picture} size={10} class="rounded-full" />
{:else} {:else}

View file

@ -7,7 +7,6 @@
import Icon from "@lib/components/Icon.svelte" import Icon from "@lib/components/Icon.svelte"
import Button from "@lib/components/Button.svelte" import Button from "@lib/components/Button.svelte"
import PageBar from "@lib/components/PageBar.svelte" import PageBar from "@lib/components/PageBar.svelte"
import RelayIcon from "@app/components/RelayIcon.svelte"
import {decodeRelay} from "@app/relays" import {decodeRelay} from "@app/relays"
import {makeSpacePath} from "@app/routes" import {makeSpacePath} from "@app/routes"
@ -32,7 +31,6 @@
<div class="flex grow items-center justify-between gap-4"> <div class="flex grow items-center justify-between gap-4">
<div class="flex min-w-0 flex-col"> <div class="flex min-w-0 flex-col">
<div class="flex min-w-0 items-start gap-2"> <div class="flex min-w-0 items-start gap-2">
<RelayIcon {url} size={5} class="shrink-0 rounded-full md:hidden" />
<div class="hidden shrink-0 md:flex md:items-center place-self-center"> <div class="hidden shrink-0 md:flex md:items-center place-self-center">
{@render leading?.()} {@render leading?.()}
</div> </div>
@ -40,7 +38,7 @@
{@render title?.()} {@render title?.()}
</div> </div>
</div> </div>
<div class="text-xs text-primary pl-7 md:hidden"> <div class="text-xs text-primary md:hidden">
{displayRelayUrl(url)} {displayRelayUrl(url)}
</div> </div>
</div> </div>

View file

@ -313,8 +313,7 @@
<div class="h-5 shrink-0"></div> <div class="h-5 shrink-0"></div>
</div> </div>
</SecondaryNavSection> </SecondaryNavSection>
<div <div class="flex shrink-0 flex-col gap-2 p-2 pt-0 -mt-4 pb-1 md:pb-2 z-nav">
class="flex shrink-0 flex-col gap-2 p-2 pt-0 -mt-4 pb-[calc(var(--saib)+0.25rem)] md:pb-2 z-nav">
<VoiceWidget /> <VoiceWidget />
<Link href={makeSpacePath(url, "about")} class="button button-neutral button-sm h-10"> <Link href={makeSpacePath(url, "about")} class="button button-neutral button-sm h-10">
<SocketStatusIndicator {url} /> <SocketStatusIndicator {url} />

View file

@ -22,7 +22,7 @@
<svelte:window bind:innerWidth={width} /> <svelte:window bind:innerWidth={width} />
{#if width <= md} {#if width <= md}
<div class="primary-nav flex mb-14"> <div class="primary-nav">
<PrimaryNavSpaces /> <PrimaryNavSpaces />
</div> </div>
<SecondaryNav visible class="w-auto grow pb-16"> <SecondaryNav visible class="w-auto grow pb-16">

View file

@ -1,8 +1,10 @@
<script lang="ts"> <script lang="ts">
import {page} from "$app/stores" import {page} from "$app/stores"
import {goto} from "$app/navigation"
import {displayRelayUrl} from "@welshman/util" import {displayRelayUrl} from "@welshman/util"
import {deriveRelay} from "@welshman/app" import {deriveRelay} from "@welshman/app"
import Pen from "@assets/icons/pen.svg?dataurl" import Pen from "@assets/icons/pen.svg?dataurl"
import ArrowLeft from "@assets/icons/arrow-left.svg?dataurl"
import ShieldUser from "@assets/icons/shield-user.svg?dataurl" import ShieldUser from "@assets/icons/shield-user.svg?dataurl"
import BillList from "@assets/icons/bill-list.svg?dataurl" import BillList from "@assets/icons/bill-list.svg?dataurl"
import Icon from "@lib/components/Icon.svelte" import Icon from "@lib/components/Icon.svelte"
@ -17,6 +19,7 @@
import SpaceMembersSummary from "@app/components/SpaceMembersSummary.svelte" import SpaceMembersSummary from "@app/components/SpaceMembersSummary.svelte"
import SpaceFeaturedContent from "@app/components/SpaceFeaturedContent.svelte" import SpaceFeaturedContent from "@app/components/SpaceFeaturedContent.svelte"
import {deriveUserIsSpaceAdmin} from "@app/members" import {deriveUserIsSpaceAdmin} from "@app/members"
import {makeSpacePath} from "@app/routes"
import {decodeRelay} from "@app/relays" import {decodeRelay} from "@app/relays"
import {pushModal} from "@app/modal" import {pushModal} from "@app/modal"
@ -25,9 +28,14 @@
const userIsAdmin = deriveUserIsSpaceAdmin(url) const userIsAdmin = deriveUserIsSpaceAdmin(url)
const startEdit = () => pushModal(SpaceEdit, {url, initialValues: $relay || {url}}) const startEdit = () => pushModal(SpaceEdit, {url, initialValues: $relay || {url}})
const showMenu = () => goto(makeSpacePath(url))
</script> </script>
<PageContent class="flex flex-col gap-4 p-4"> <PageContent class="flex flex-col gap-4 p-4">
<Button onclick={showMenu} class="button button-neutral md:hidden place-self-start">
<Icon icon={ArrowLeft} size={7} /> Go Back
</Button>
<div class="card flex flex-col gap-4"> <div class="card flex flex-col gap-4">
<div class="relative flex gap-4"> <div class="relative flex gap-4">
<div class="relative"> <div class="relative">
@ -35,7 +43,7 @@
</div> </div>
<div class="flex min-w-0 flex-col"> <div class="flex min-w-0 flex-col">
<h1 class="ellipsize whitespace-nowrap"> <h1 class="ellipsize whitespace-nowrap">
<RelayName {url} class="text-2xl font-bold" /> <RelayName {url} class="text-xl sm:text-2xl font-bold" />
</h1> </h1>
<p class="ellipsize text-sm text-primary">{displayRelayUrl(url)}</p> <p class="ellipsize text-sm text-primary">{displayRelayUrl(url)}</p>
</div> </div>
@ -100,7 +108,7 @@
{#if $userIsAdmin} {#if $userIsAdmin}
<Button class="button button-primary" onclick={startEdit}> <Button class="button button-primary" onclick={startEdit}>
<Icon icon={Pen} /> <Icon icon={Pen} />
<span class="hidden sm:inline">Edit Space</span> Edit Space
</Button> </Button>
{/if} {/if}
</div> </div>