From 4308e29dec323610175b5e09e9f6270a3916dcc7 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Fri, 18 Oct 2024 15:58:44 -0700 Subject: [PATCH] Move layout around a bit more --- .env | 1 + src/app/components/ContentQuote.svelte | 7 +- src/app/components/MenuSettings.svelte | 2 +- src/app/components/PrimaryNav.svelte | 84 ++++++---- src/app/components/RelayItem.svelte | 2 +- src/app/components/SpaceCreate.svelte | 2 +- src/assets/icons/Server.svg | 8 + src/lib/components/Icon.svelte | 2 + src/lib/components/PrimaryNavItem.svelte | 3 +- src/routes/settings/+layout.svelte | 2 +- src/routes/settings/profile/+page.svelte | 2 +- src/routes/spaces/[nrelay]/+layout.svelte | 191 +++++++++++----------- 12 files changed, 175 insertions(+), 131 deletions(-) create mode 100644 src/assets/icons/Server.svg diff --git a/.env b/.env index a399990..68957f0 100644 --- a/.env +++ b/.env @@ -1 +1,2 @@ VITE_DEFAULT_PUBKEYS=fe7f6bc6f7338b76bbf80db402ade65953e20b2f23e66e898204b63cc42539a3,391819e2f2f13b90cac7209419eb574ef7c0d1f4e81867fc24c47a3ce5e8a248,84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240,dace63b00c42e6e017d00dd190a9328386002ff597b841eb5ef91de4f1ce8491,82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2,58c741aa630c2da35a56a77c1d05381908bd10504fdd2d8b43f725efa6d23196,eeb11961b25442b16389fe6c7ebea9adf0ac36dd596816ea7119e521b8821b9e,b676ded7c768d66a757aa3967b1243d90bf57afb09d1044d3219d8d424e4aea0,61066504617ee79387021e18c89fb79d1ddbc3e7bff19cf2298f40466f8715e9 +VITE_PLATFORM_RELAY=wss://coracle-dev.nostr1.com diff --git a/src/app/components/ContentQuote.svelte b/src/app/components/ContentQuote.svelte index e6d7925..82e67ab 100644 --- a/src/app/components/ContentQuote.svelte +++ b/src/app/components/ContentQuote.svelte @@ -10,12 +10,13 @@ export let depth = 0 const {id, identifier, kind, pubkey, relays} = value - const idOrAddress = id || new Address(kind, pubkey, identifier).toString() + const addr = new Address(kind, pubkey, identifier) + const idOrAddress = id || addr.toString() const event = deriveEvent(idOrAddress, relays) - const nevent = nip19.neventEncode({id, relays}) + const entity = id ? nip19.neventEncode({id, relays}) : addr.toNaddr() - + {#if $event} diff --git a/src/app/components/MenuSettings.svelte b/src/app/components/MenuSettings.svelte index 75b7d87..5a6b69a 100644 --- a/src/app/components/MenuSettings.svelte +++ b/src/app/components/MenuSettings.svelte @@ -12,7 +12,7 @@
-
+
Relays
Control how Flotilla talks to the network
 diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte index 9b7df51..8898a94 100644 --- a/src/app/components/PrimaryNav.svelte +++ b/src/app/components/PrimaryNav.svelte @@ -21,37 +21,63 @@ const showSettingsMenu = () => pushModal(MenuSettings) - diff --git a/src/app/components/RelayItem.svelte b/src/app/components/RelayItem.svelte index 26d70ff..9b16b88 100644 --- a/src/app/components/RelayItem.svelte +++ b/src/app/components/RelayItem.svelte @@ -15,7 +15,7 @@
- +

{displayRelayUrl(url)}

diff --git a/src/app/components/SpaceCreate.svelte b/src/app/components/SpaceCreate.svelte index 4e63f09..a01dcfd 100644 --- a/src/app/components/SpaceCreate.svelte +++ b/src/app/components/SpaceCreate.svelte @@ -36,7 +36,7 @@

Relay

diff --git a/src/assets/icons/Server.svg b/src/assets/icons/Server.svg new file mode 100644 index 0000000..3e02848 --- /dev/null +++ b/src/assets/icons/Server.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/lib/components/Icon.svelte b/src/lib/components/Icon.svelte index e01cd77..92a95d7 100644 --- a/src/lib/components/Icon.svelte +++ b/src/lib/components/Icon.svelte @@ -61,6 +61,7 @@ import Plain from "@assets/icons/Plain.svg?dataurl" import RemoteControllerMinimalistic from "@assets/icons/Remote Controller Minimalistic.svg?dataurl" import Reply from "@assets/icons/Reply.svg?dataurl" + import Server from "@assets/icons/Server.svg?dataurl" import Settings from "@assets/icons/Settings.svg?dataurl" import TagHorizontal from "@assets/icons/Tag Horizontal.svg?dataurl" import ShareCircle from "@assets/icons/Share Circle.svg?dataurl" @@ -138,6 +139,7 @@ "share-circle": ShareCircle, "shop-minimalistic": ShopMinimalistic, "smile-circle": SmileCircle, + server: Server, settings: Settings, "tag-horizontal": TagHorizontal, "trash-bin-2": TrashBin2, diff --git a/src/lib/components/PrimaryNavItem.svelte b/src/lib/components/PrimaryNavItem.svelte index 18a3eff..0e09348 100644 --- a/src/lib/components/PrimaryNavItem.svelte +++ b/src/lib/components/PrimaryNavItem.svelte @@ -4,10 +4,11 @@ export let title = "" export let href = "" + export let noActive = false $: itemSegment = href.split("/")[1] $: currentSegment = $page.route?.id?.split("/")[1] - $: active = itemSegment === currentSegment + $: active = itemSegment === currentSegment && !noActive {#if href} diff --git a/src/routes/settings/+layout.svelte b/src/routes/settings/+layout.svelte index 4b61647..4d179a0 100644 --- a/src/routes/settings/+layout.svelte +++ b/src/routes/settings/+layout.svelte @@ -20,7 +20,7 @@

- Relays + Relays
diff --git a/src/routes/settings/profile/+page.svelte b/src/routes/settings/profile/+page.svelte index ae866f1..d561f6b 100644 --- a/src/routes/settings/profile/+page.svelte +++ b/src/routes/settings/profile/+page.svelte @@ -113,7 +113,7 @@

Nostr Address

diff --git a/src/routes/spaces/[nrelay]/+layout.svelte b/src/routes/spaces/[nrelay]/+layout.svelte index 275fdaf..da45950 100644 --- a/src/routes/spaces/[nrelay]/+layout.svelte +++ b/src/routes/spaces/[nrelay]/+layout.svelte @@ -5,6 +5,7 @@ import {fly, slide} from "@lib/transition" import Icon from "@lib/components/Icon.svelte" import Page from "@lib/components/Page.svelte" + import Delay from "@lib/components/Delay.svelte" import Button from "@lib/components/Button.svelte" import Popover from "@lib/components/Popover.svelte" import SecondaryNav from "@lib/components/SecondaryNav.svelte" @@ -71,102 +72,106 @@ {#key url} - - -

- - {displayRelayUrl(url)} - - - {#if showMenu} - -
    -
  • - -
    • -
  • - {#if getMembershipUrls($userMembership).includes(url)} - - {:else} - +
    • + {#if !import.meta.env.VITE_PLATFORM_RELAY} +
  • + {#if getMembershipUrls($userMembership).includes(url)} + + {:else} + + {/if} +
    • {/if} - -
- + + + {/if} +
+
+
+ + Chat + +
+
+ + Threads + +
+
+ + Calendar + +
+ {#if rooms.length > 0} +
+
+ Your Rooms +
{/if} -
-
-
- - Chat - -
-
- - Threads - -
-
- - Calendar - -
- {#if rooms.length > 0} -
-
- Your Rooms -
- {/if} - {#each rooms as room, i (room)} -
- - - {room} + {#each rooms as room, i (room)} +
+ + + {room} + +
+ {/each} + {#if otherRooms.length > 0} +
+
+ + {#if rooms.length > 0} + Other Rooms + {:else} + Rooms + {/if} + +
+ {/if} + {#each otherRooms as room, i (room)} +
+ + + {room} + +
+ {/each} +
+ + + Create room
- {/each} - {#if otherRooms.length > 0} -
-
- - {#if rooms.length > 0} - Other Rooms - {:else} - Rooms - {/if} - -
- {/if} - {#each otherRooms as room, i (room)} -
- - - {room} - -
- {/each} -
- - - Create room - -
- - - - {#key $page.params.room} - - {/key} - + + + + {#key $page.params.room} + + {/key} + + {/key}