From 49ffa74bb41ff2927038bd40d6df7e9a7fc82079 Mon Sep 17 00:00:00 2001 From: Me Date: Mon, 16 Jan 2023 18:48:13 +0100 Subject: [PATCH] small update to ProfileUsers, make it so buttons don't load if user doesn't --- .../pages/profile/ProfileDisplayOneUser.svelte | 8 ++++++++ .../src/pages/profile/ProfileUsers.svelte | 5 ++++- .../api_front/src/pieces/DisplayAUser.svelte | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte index f20dbade..fc2fd8fb 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte @@ -42,3 +42,11 @@ + diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index 7b945dc7..27de76b2 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -16,6 +16,7 @@ /**** Layout variables ****/ let tabItems: string[] = ['All Users', 'My Friends', 'Friend Requests', 'Blocked Users'] let activeTabItem: string = 'All Users'; + let loadedUser; onMount( async() => { @@ -295,8 +296,9 @@
{#if usernameBeingViewed !== undefined} - + + {#if loadedUser === true}
{#if friendshipStatusFull && friendshipStatusFull.id} {#if friendshipStatusFull.status === 'R'} @@ -329,6 +331,7 @@ {/if}
+ {/if} {:else}

Click on a user!

diff --git a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte index 0a0c6eb0..5a7b67b8 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte @@ -4,6 +4,7 @@ import GenerateUserDisplay from './GenerateUserDisplay.svelte'; export let aUsername; + export let loaded = false; let user; onMount( async() => { @@ -20,6 +21,13 @@ $: aUsername, updateUser(); + $: { + if (user === undefined) + loaded = false; + else + loaded = true; + } +
@@ -30,3 +38,13 @@
Failed to load user {aUsername}
{/if}
+ + + \ No newline at end of file