From 1acda0eb21d3832e2005603a73b1d2503fd684aa Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 16 Apr 2024 10:45:13 -0700 Subject: wip --- .../(app)/[username]/(profile)/+layout.svelte | 4 +- src/routes/(app)/[username]/(profile)/+page.svelte | 163 +----------- src/routes/(app)/[username]/home/+layout.server.js | 26 ++ src/routes/(app)/[username]/home/+layout.svelte | 276 +++++++++++++++++++++ src/routes/(app)/[username]/home/+page.server.js | 11 + src/routes/(app)/[username]/home/+page.svelte | 201 +++++++++++++++ .../[username]/home/event/[id]/+page.server.js | 12 + .../(app)/[username]/home/event/[id]/+page.svelte | 7 + .../(app)/[username]/home/followers/+page.svelte | 52 ++++ .../(app)/[username]/home/follows/+page.svelte | 51 ++++ 10 files changed, 639 insertions(+), 164 deletions(-) create mode 100644 src/routes/(app)/[username]/home/+layout.server.js create mode 100644 src/routes/(app)/[username]/home/+layout.svelte create mode 100644 src/routes/(app)/[username]/home/+page.server.js create mode 100644 src/routes/(app)/[username]/home/+page.svelte create mode 100644 src/routes/(app)/[username]/home/event/[id]/+page.server.js create mode 100644 src/routes/(app)/[username]/home/event/[id]/+page.svelte create mode 100644 src/routes/(app)/[username]/home/followers/+page.svelte create mode 100644 src/routes/(app)/[username]/home/follows/+page.svelte (limited to 'src/routes') diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index 0520f1b8..3d4f191b 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -149,7 +149,7 @@ {/if} - {#if !subject.anon && subject.username !== user?.username && !subject.hidepay} + {#if !subject.anon && subject.username !== user?.username} {/if} - {#if user?.username !== subject.username} - {/if} {#if user?.admin && user.username !== subject.username}
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte index 5878d252..c74f8e6d 100644 --- a/src/routes/(app)/[username]/(profile)/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/+page.svelte @@ -1,22 +1,9 @@ - - -{#if deleting} - -{/if} -
- {#if user?.id === subject.id} -
- -
- - {#if !user.balance} -
-

- {$t("user.welcome")} -

-
- {/if} - -
- - - - - - - - - {#if $installPrompt} - - {/if} -
- {/if} -
0} - use:dndzone={{ items, flipDurationMs, dropTargetStyle, dragDisabled }} - on:consider={handleConsider} - on:finalize={handleFinalize} > {#each items as i (i.id)} - - - - - - -
- {/if}
diff --git a/src/routes/(app)/[username]/home/+layout.server.js b/src/routes/(app)/[username]/home/+layout.server.js new file mode 100644 index 00000000..a508de92 --- /dev/null +++ b/src/routes/(app)/[username]/home/+layout.server.js @@ -0,0 +1,26 @@ +import { get } from "$lib/utils"; + +export async function load({ parent }) { + let { subject, user } = await parent(); + + subject.follows = []; + subject.followers = []; + + try { + subject.follows = await get(`/${subject.pubkey}/follows`); + } catch (e) { + console.log("problem fetching follows", e); + } + + try { + subject.followers = await get(`/${subject.pubkey}/followers`); + } catch (e) { + console.log("problem fetching followers", e); + } + + if (user) { + user.follows = await get(`/${user.pubkey}/follows?tagsonly=true`); + } + + return { subject, user }; +} diff --git a/src/routes/(app)/[username]/home/+layout.svelte b/src/routes/(app)/[username]/home/+layout.svelte new file mode 100644 index 00000000..0520f1b8 --- /dev/null +++ b/src/routes/(app)/[username]/home/+layout.svelte @@ -0,0 +1,276 @@ + + +
+ + +{#if currency} +
+
+
+
1
+ Bitcoin +
+
= {f(rates[currency], currency)}
+
+
+
+
⚡️{s((1 * sats) / rates[currency])} =
+
{f(1, currency)}
+
+
+
+{/if} diff --git a/src/routes/(app)/[username]/home/+page.server.js b/src/routes/(app)/[username]/home/+page.server.js new file mode 100644 index 00000000..59eb44d5 --- /dev/null +++ b/src/routes/(app)/[username]/home/+page.server.js @@ -0,0 +1,11 @@ +import { auth, get } from "$lib/utils"; + +export async function load({ cookies, depends, parent }) { + depends("app:items"); + + let { subject } = await parent(); + let items = await get(`/${subject.id}/items`, auth(cookies)); + items.map((i) => (i.quantity = 0)); + + return { items }; +} diff --git a/src/routes/(app)/[username]/home/+page.svelte b/src/routes/(app)/[username]/home/+page.svelte new file mode 100644 index 00000000..4e6365ff --- /dev/null +++ b/src/routes/(app)/[username]/home/+page.svelte @@ -0,0 +1,201 @@ + + + + +{#if deleting} + +{/if} + +
+ {#if user?.id === subject.id} +
+ +
+ + {#if !user.balance} +
+

+ {$t("user.welcome")} +

+
+ {/if} + +
+ + + + + + + + + {#if $installPrompt} + + {/if} +
+ {/if} + + {#if total > 0} + + {/if} +
+ + diff --git a/src/routes/(app)/[username]/home/event/[id]/+page.server.js b/src/routes/(app)/[username]/home/event/[id]/+page.server.js new file mode 100644 index 00000000..24f2b611 --- /dev/null +++ b/src/routes/(app)/[username]/home/event/[id]/+page.server.js @@ -0,0 +1,12 @@ +import { get } from "$lib/utils"; +import { error } from "@sveltejs/kit"; + +export async function load({ params: { id } }) { + try { + let event = await get(`/event/${id}`); + if (!event) error(500, "Event not found"); + return { event }; + } catch (e) { + error(500, e.message); + } +} diff --git a/src/routes/(app)/[username]/home/event/[id]/+page.svelte b/src/routes/(app)/[username]/home/event/[id]/+page.svelte new file mode 100644 index 00000000..74ce1067 --- /dev/null +++ b/src/routes/(app)/[username]/home/event/[id]/+page.svelte @@ -0,0 +1,7 @@ + + + diff --git a/src/routes/(app)/[username]/home/followers/+page.svelte b/src/routes/(app)/[username]/home/followers/+page.svelte new file mode 100644 index 00000000..e087ad42 --- /dev/null +++ b/src/routes/(app)/[username]/home/followers/+page.svelte @@ -0,0 +1,52 @@ + + + + +
+

+ {$t("user.followers")} +

+ + {#if browser} + {#if followers.length} + + +
+
+
+ +
+ +
+ +
+
+ {data.display_name || ""} + @{data.username} +
+
+
+
+
+ {:else} +
No followers
+ {/if} + {/if} +
diff --git a/src/routes/(app)/[username]/home/follows/+page.svelte b/src/routes/(app)/[username]/home/follows/+page.svelte new file mode 100644 index 00000000..e4363796 --- /dev/null +++ b/src/routes/(app)/[username]/home/follows/+page.svelte @@ -0,0 +1,51 @@ + + + + +
+

+ {$t("user.following")} +

+ + {#if browser} + {#if follows.length} + + +
+
+
+ +
+ +
+ +
+
+ {data.display_name || ""} + @{data.username} +
+
+
+
+
+ {:else} +
No follows
+ {/if} + {/if} +
-- cgit v1.2.3