diff --git a/.gitignore b/.gitignore index 99329539..0981428d 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ GoogleService-Info.plist # OS generated .DS_Store Thumbs.db +package-lock.json diff --git a/src/app/components/ChatMenu.svelte b/src/app/components/ChatMenu.svelte index 61aa76b1..17d8d301 100644 --- a/src/app/components/ChatMenu.svelte +++ b/src/app/components/ChatMenu.svelte @@ -1,6 +1,5 @@ + +
+ +
diff --git a/src/lib/components/SecondaryNavHeader.svelte b/src/lib/components/SecondaryNavHeader.svelte index ce9bb7c5..d15f77ff 100644 --- a/src/lib/components/SecondaryNavHeader.svelte +++ b/src/lib/components/SecondaryNavHeader.svelte @@ -6,6 +6,6 @@ const {children}: Props = $props() -
+
{@render children?.()}
diff --git a/src/lib/components/SecondaryNavSection.svelte b/src/lib/components/SecondaryNavSection.svelte index e141c763..0c1b7017 100644 --- a/src/lib/components/SecondaryNavSection.svelte +++ b/src/lib/components/SecondaryNavSection.svelte @@ -7,6 +7,6 @@ const {...props}: Props = $props() -
+
{@render props.children?.()}
diff --git a/src/routes/chat/+layout.svelte b/src/routes/chat/+layout.svelte index 06244c98..45c5ef8b 100644 --- a/src/routes/chat/+layout.svelte +++ b/src/routes/chat/+layout.svelte @@ -5,15 +5,19 @@ import {sleep} from "@welshman/lib" import {shouldUnwrap} from "@welshman/app" import MenuDots from "@assets/icons/menu-dots.svg?dataurl" + import ChatSquarePlus from "@assets/icons/chat-square-plus.svg?dataurl" + import AddCircle from "@assets/icons/add-circle.svg?dataurl" import Magnifier from "@assets/icons/magnifier.svg?dataurl" import Icon from "@lib/components/Icon.svelte" import Page from "@lib/components/Page.svelte" import Button from "@lib/components/Button.svelte" import Spinner from "@lib/components/Spinner.svelte" + import FAB from "@lib/components/FAB.svelte" import SecondaryNav from "@lib/components/SecondaryNav.svelte" import SecondaryNavHeader from "@lib/components/SecondaryNavHeader.svelte" import SecondaryNavSection from "@lib/components/SecondaryNavSection.svelte" import ChatMenu from "@app/components/ChatMenu.svelte" + import ChatStart from "@app/components/ChatStart.svelte" import ChatItem from "@app/components/ChatItem.svelte" import {chatSearch} from "@app/core/state" import {pushModal} from "@app/util/modal" @@ -26,6 +30,8 @@ const openMenu = () => pushModal(ChatMenu) + const startChat = () => pushModal(ChatStart) + let term = $state("") const chats = $derived($chatSearch.searchOptions(term)) @@ -37,7 +43,7 @@ }) - + Chats @@ -45,11 +51,15 @@ + + -
{#each chats as { id, pubkeys, messages } (id)} @@ -66,3 +76,9 @@ {@render children?.()} {/key} + +{#if !$page.params.chat} + + + +{/if}