fix: favorites bar
This commit is contained in:
1 parent
7903c74e16
commit
3a079b01f1
8 files changed
+60
-46
No files matched your search
@@ -1,52 +1,64 @@
|
||||
<script lang="ts">
|
||||
import { profile } from '$lib/auth'
|
||||
import Avatar from '$lib/components/ui/Avatar.svelte'
|
||||
import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte'
|
||||
import { communityLink } from '$lib/lemmy/generic'
|
||||
import { addResumable } from '$lib/lemmy/item'
|
||||
import { addFavorite } from '$lib/lemmy/item'
|
||||
import { hasFavorite } from '$lib/lemmy/user'
|
||||
import type { Community } from 'lemmy-js-client'
|
||||
import { Button } from 'mono-svelte'
|
||||
import { Icon, Star } from 'svelte-hero-icons'
|
||||
import { Icon, Star, Trash } from 'svelte-hero-icons'
|
||||
import { flip } from 'svelte/animate'
|
||||
import { expoOut } from 'svelte/easing'
|
||||
import { slide } from 'svelte/transition'
|
||||
|
||||
export let items: Community[]
|
||||
export let isFavorites = false
|
||||
</script>
|
||||
|
||||
{#each items.sort( (a, b) => a.title.localeCompare(b.title) ) as follow (follow.id)}
|
||||
<div
|
||||
class="inline-flex w-full items-center px-3"
|
||||
class="inline-flex w-full items-center pl-3 hover:bg-slate-100 hover:dark:bg-zinc-800
|
||||
transition-colors rounded-lg"
|
||||
animate:flip={{ duration: 500, easing: expoOut }}
|
||||
>
|
||||
<div class="flex-none grid group">
|
||||
<Button
|
||||
rounding="pill"
|
||||
size="custom"
|
||||
class="hidden group-hover:inline-flex opacity-0 group-hover:opacity-100 transition-all z-20
|
||||
{#if $profile && !hasFavorite($profile, follow.id)}
|
||||
<Button
|
||||
rounding="pill"
|
||||
size="custom"
|
||||
class="hidden group-hover:inline-flex opacity-0 group-hover:opacity-100 transition-all z-20
|
||||
items-center justify-center box-border w-7 h-7"
|
||||
style="grid-column: 1; grid-row: 1;"
|
||||
on:click={() =>
|
||||
addResumable({
|
||||
id: follow.id,
|
||||
name: follow.title,
|
||||
type: 'community',
|
||||
url: communityLink(follow),
|
||||
avatar: follow.icon,
|
||||
})}
|
||||
>
|
||||
<Icon src={Star} size="16" mini />
|
||||
</Button>
|
||||
style="grid-column: 1; grid-row: 1;"
|
||||
on:click={() => addFavorite(follow)}
|
||||
>
|
||||
<Icon src={Star} size="16" mini />
|
||||
</Button>
|
||||
{:else if isFavorites && $profile && hasFavorite($profile, follow.id)}
|
||||
<Button
|
||||
rounding="pill"
|
||||
size="custom"
|
||||
class="hidden group-hover:inline-flex opacity-0 group-hover:opacity-100 transition-all z-20
|
||||
items-center justify-center box-border w-7 h-7"
|
||||
style="grid-column: 1; grid-row: 1;"
|
||||
on:click={() => addFavorite(follow, false)}
|
||||
>
|
||||
<Icon src={Trash} size="16" mini />
|
||||
</Button>
|
||||
{/if}
|
||||
<Avatar
|
||||
url={follow.icon}
|
||||
alt={follow.name}
|
||||
title={follow.title}
|
||||
width={28}
|
||||
class="group-hover:hidden"
|
||||
class={!isFavorites && $profile && hasFavorite($profile, follow.id)
|
||||
? ''
|
||||
: 'group-hover:hidden'}
|
||||
/>
|
||||
</div>
|
||||
<SidebarButton
|
||||
class="font-normal w-full h-max !px-1"
|
||||
color="tertiary"
|
||||
class="font-normal w-full h-max"
|
||||
color="none"
|
||||
alignment="left"
|
||||
href="/c/{follow.name}@{new URL(follow.actor_id).hostname}"
|
||||
>
|
||||
|
||||
@@ -28,6 +28,8 @@
|
||||
import Application from '../../../../routes/admin/applications/Application.svelte'
|
||||
import { t } from '$lib/translations'
|
||||
import ItemList from '$lib/components/lemmy/generic/ItemList.svelte'
|
||||
|
||||
$: if ($profile) console.log('profile changed')
|
||||
</script>
|
||||
|
||||
<nav
|
||||
@@ -112,15 +114,7 @@
|
||||
</span>
|
||||
</EndPlaceholder>
|
||||
</span>
|
||||
<ItemList
|
||||
items={$profile.favorites.map((i) => ({
|
||||
avatar: i.avatar ?? '',
|
||||
id: i.id,
|
||||
name: i.name,
|
||||
url: i.url.toString(),
|
||||
instance: 'doesnt exist',
|
||||
}))}
|
||||
/>
|
||||
<CommunityList isFavorites items={$profile.favorites} />
|
||||
</Expandable>
|
||||
<hr class="border-slate-200 dark:border-zinc-900 my-1" />
|
||||
{/if}
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
</script>
|
||||
|
||||
<Button
|
||||
color="tertiary"
|
||||
{...$$restProps}
|
||||
{href}
|
||||
color="tertiary"
|
||||
alignment="left"
|
||||
on:click
|
||||
class="hover:bg-slate-100 font-normal {selected
|
||||
class="font-normal {selected
|
||||
? 'text-primary-900 dark:!text-primary-100'
|
||||
: 'text-slate-600 dark:text-zinc-400'} {$userSettings.expandSidebar
|
||||
? ''
|
||||
|
||||
Reference in new issue
Block a user