From e35f6887e335f481bcda7f1ae1c802135c25412a Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Fri, 13 Oct 2023 14:07:31 -0700 Subject: [PATCH] feat: explicit guest button --- package.json | 2 +- .../components/ui/sidebar/ProfileButton.svelte | 10 +++++++--- src/lib/components/ui/sidebar/Sidebar.svelte | 18 ++++++++++++++---- src/lib/lemmy/ProfileAvatar.svelte | 5 ++++- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 04a998b2..e03d9ff1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "1.19.3", + "version": "1.20.0", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/components/ui/sidebar/ProfileButton.svelte b/src/lib/components/ui/sidebar/ProfileButton.svelte index 53ffece1..99eeb98b 100644 --- a/src/lib/components/ui/sidebar/ProfileButton.svelte +++ b/src/lib/components/ui/sidebar/ProfileButton.svelte @@ -10,6 +10,7 @@ export let index: number let switching: boolean = false + export let guest: boolean = false @@ -47,8 +49,10 @@ slot="label" > {prof.username ?? prof.user?.local_user_view.person.name} - - {prof.instance} - + {#if !guest} + + {prof.instance} + + {/if} diff --git a/src/lib/components/ui/sidebar/Sidebar.svelte b/src/lib/components/ui/sidebar/Sidebar.svelte index 330dca05..d00fb5bc 100644 --- a/src/lib/components/ui/sidebar/Sidebar.svelte +++ b/src/lib/components/ui/sidebar/Sidebar.svelte @@ -18,6 +18,7 @@ import { flip } from 'svelte/animate' import { expoOut } from 'svelte/easing' import { Button } from 'mono-svelte' + import { DEFAULT_INSTANCE_URL } from '$lib/instance.js' export let route = '' @@ -53,22 +54,31 @@ Communities {#if $profileData.profiles.length >= 1} -
- {#each $profileData.profiles as prof, index (prof.id)} +
+ {#each [...$profileData.profiles] as prof, index (prof.id)}
{/each} + Accounts {/if} -
+
{#if $profile?.user} {#if $profile?.user.moderates.length > 0} i.community)} /> -
+
{/if} i.community)} /> diff --git a/src/lib/lemmy/ProfileAvatar.svelte b/src/lib/lemmy/ProfileAvatar.svelte index ae55ab2c..107335a5 100644 --- a/src/lib/lemmy/ProfileAvatar.svelte +++ b/src/lib/lemmy/ProfileAvatar.svelte @@ -6,6 +6,7 @@ export let selected: boolean = false export let index: number = 0 export let size: number = 20 + export let guest: boolean = false {#if profile} @@ -26,7 +27,9 @@ size={`${size}`} title={profile.username} class="text-blue-500 flex-shrink-0" - style={profile.color + style={guest + ? `color: gray` + : profile.color ? `color: ${profile.color}` : `filter: hue-rotate(${index * 50}deg)`} />