diff --git a/src/app/components/SpaceInviteAccept.svelte b/src/app/components/SpaceInviteAccept.svelte index 12a914a3..a64641c8 100644 --- a/src/app/components/SpaceInviteAccept.svelte +++ b/src/app/components/SpaceInviteAccept.svelte @@ -33,9 +33,10 @@ type Props = { invite: string back?: () => void + hideHeader?: boolean } - let {invite = "", back = () => history.back()}: Props = $props() + let {invite = "", back = () => history.back(), hideHeader}: Props = $props() const toggleScanner = () => { showScanner = !showScanner @@ -95,27 +96,29 @@ - - Join a Space - Enter a relay URL or invite link below to join an existing space. - - - {#snippet label()} -

Invite Link*

- {/snippet} - {#snippet input()} - - {/snippet} -
- {#if showScanner} - + {#if !hideHeader} + + Join a Space + Enter a relay URL or invite link below to join an existing space. + + + {#snippet label()} +

Invite Link*

+ {/snippet} + {#snippet input()} + + {/snippet} +
+ {#if showScanner} + + {/if} {/if} {#if inviteData}
diff --git a/src/app/routes.ts b/src/app/routes.ts index 1090fb98..81b4abdd 100644 --- a/src/app/routes.ts +++ b/src/app/routes.ts @@ -20,7 +20,7 @@ import { getRelaysFromList, } from "@welshman/util" import {makeChatId} from "@app/chats" -import {entityLink, PLATFORM_URL} from "@app/env" +import {entityLink, PLATFORM_URL, PLATFORM_RELAYS} from "@app/env" import {encodeRelay, hasNip29} from "@app/relays" import {DM_KINDS} from "@app/content" import {ROOM} from "@app/groups" @@ -101,6 +101,14 @@ export const goToSpace = (url: string, hash = "") => { return goto(makeSpacePath(url) + hash, {replaceState: true}) } +export const goToHome = () => { + if (PLATFORM_RELAYS.length > 0) { + goToSpace(PLATFORM_RELAYS[0], get(page).url.hash) + } else { + goto("/home" + get(page).url.hash) + } +} + // Content types, events export const makeMessagePath = (url: string, event: TrustedEvent) => { diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 087c9e21..ab2b078e 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,14 +1,5 @@ diff --git a/src/routes/join/+page.svelte b/src/routes/join/+page.svelte index 08f9d9b7..eb932b6c 100644 --- a/src/routes/join/+page.svelte +++ b/src/routes/join/+page.svelte @@ -1,18 +1,20 @@ - +{#if !$modal} + +{/if}