impr: remove individual if conditions for badges in posts
This commit is contained in:
4 files changed
+99
-93
No files matched your search
@@ -1,4 +1,14 @@
|
|||||||
<script lang="ts" module>
|
<script lang="ts" module>
|
||||||
|
type BadgeType =
|
||||||
|
| 'nsfw'
|
||||||
|
| 'saved'
|
||||||
|
| 'featured'
|
||||||
|
| 'deleted'
|
||||||
|
| 'removed'
|
||||||
|
| 'locked'
|
||||||
|
| 'moderator'
|
||||||
|
| 'admin'
|
||||||
|
|
||||||
export interface Tag {
|
export interface Tag {
|
||||||
content: string
|
content: string
|
||||||
color?: string
|
color?: string
|
||||||
@@ -56,11 +66,11 @@
|
|||||||
import { settings, type View } from '$lib/settings.svelte'
|
import { settings, type View } from '$lib/settings.svelte'
|
||||||
import type { Community, Person, SubscribedType } from 'lemmy-js-client'
|
import type { Community, Person, SubscribedType } from 'lemmy-js-client'
|
||||||
import { Badge, Popover } from 'mono-svelte'
|
import { Badge, Popover } from 'mono-svelte'
|
||||||
|
import Material from 'mono-svelte/materials/Material.svelte'
|
||||||
import {
|
import {
|
||||||
Bookmark,
|
Bookmark,
|
||||||
ExclamationTriangle,
|
ExclamationTriangle,
|
||||||
Icon,
|
Icon,
|
||||||
LockClosed,
|
|
||||||
Megaphone,
|
Megaphone,
|
||||||
PaperAirplane,
|
PaperAirplane,
|
||||||
Pencil,
|
Pencil,
|
||||||
@@ -70,7 +80,64 @@
|
|||||||
} from 'svelte-hero-icons'
|
} from 'svelte-hero-icons'
|
||||||
import CommunityHeader from '../community/CommunityHeader.svelte'
|
import CommunityHeader from '../community/CommunityHeader.svelte'
|
||||||
import ShieldIcon from '../moderation/ShieldIcon.svelte'
|
import ShieldIcon from '../moderation/ShieldIcon.svelte'
|
||||||
import Material from 'mono-svelte/materials/Material.svelte'
|
|
||||||
|
const badgeToData: Map<
|
||||||
|
BadgeType,
|
||||||
|
{
|
||||||
|
icon: IconSource
|
||||||
|
color: 'red-subtle' | 'yellow-subtle' | 'green-subtle'
|
||||||
|
label: string
|
||||||
|
}
|
||||||
|
> = new Map([
|
||||||
|
[
|
||||||
|
'nsfw',
|
||||||
|
{
|
||||||
|
icon: ExclamationTriangle,
|
||||||
|
color: 'red-subtle',
|
||||||
|
label: t.get('post.badges.nsfw'),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'saved',
|
||||||
|
{
|
||||||
|
icon: Bookmark,
|
||||||
|
color: 'yellow-subtle',
|
||||||
|
label: t.get('post.badges.saved'),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'featured',
|
||||||
|
{
|
||||||
|
icon: Megaphone,
|
||||||
|
color: 'green-subtle',
|
||||||
|
label: t.get('post.badges.featured'),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'removed',
|
||||||
|
{
|
||||||
|
icon: Trash,
|
||||||
|
color: 'green-subtle',
|
||||||
|
label: t.get('post.badges.removed'),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'deleted',
|
||||||
|
{
|
||||||
|
icon: Trash,
|
||||||
|
color: 'red-subtle',
|
||||||
|
label: t.get('post.badges.deleted'),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'locked',
|
||||||
|
{
|
||||||
|
icon: Lock,
|
||||||
|
color: 'yellow-subtle',
|
||||||
|
label: t.get('post.badges.locked'),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
])
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
community?: Community
|
community?: Community
|
||||||
@@ -83,17 +150,7 @@
|
|||||||
read?: boolean
|
read?: boolean
|
||||||
edited?: string
|
edited?: string
|
||||||
view?: View
|
view?: View
|
||||||
// Badges
|
badges?: Record<BadgeType, boolean>
|
||||||
badges?: {
|
|
||||||
nsfw: boolean
|
|
||||||
saved: boolean
|
|
||||||
featured: boolean
|
|
||||||
deleted: boolean
|
|
||||||
removed: boolean
|
|
||||||
locked: boolean
|
|
||||||
moderator: boolean
|
|
||||||
admin: boolean
|
|
||||||
}
|
|
||||||
tags?: Tag[]
|
tags?: Tag[]
|
||||||
style?: string
|
style?: string
|
||||||
titleClass?: string
|
titleClass?: string
|
||||||
@@ -196,10 +253,7 @@
|
|||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
<div
|
<div
|
||||||
class="flex flex-row gap-1.5 items-center
|
class="flex flex-row gap-1.5 items-center no-list-margin"
|
||||||
no-list-margin {view == 'compact' && showCommunity
|
|
||||||
? 'min-[480px]:mx-2'
|
|
||||||
: ''}"
|
|
||||||
style="grid-area: stats;"
|
style="grid-area: stats;"
|
||||||
>
|
>
|
||||||
{#if user}
|
{#if user}
|
||||||
@@ -209,7 +263,7 @@
|
|||||||
src={PaperAirplane}
|
src={PaperAirplane}
|
||||||
size="12"
|
size="12"
|
||||||
micro
|
micro
|
||||||
class="rotate-180 text-slate-400 dark:text-zinc-600 max-[480px]:hidden"
|
class="rotate-180 text-slate-400 dark:text-zinc-600 max-[480px]:hidden ml-2"
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
<UserLink
|
<UserLink
|
||||||
@@ -269,66 +323,20 @@
|
|||||||
</a>
|
</a>
|
||||||
{/each}
|
{/each}
|
||||||
{/if}
|
{/if}
|
||||||
{#if badges.nsfw}
|
{#each Object.keys(badges)
|
||||||
<Badge label={$t('post.badges.nsfw')} color="red-subtle" allowIconOnly>
|
// filter by ones that are true
|
||||||
|
.filter(i => badges[i as BadgeType] == true)
|
||||||
|
// get from predetermined map
|
||||||
|
.map(i => badgeToData.get(i as BadgeType))
|
||||||
|
// remove null
|
||||||
|
.filter(i => i != undefined) as badge}
|
||||||
|
<Badge label={badge.label} color={badge.color} allowIconOnly>
|
||||||
{#snippet icon()}
|
{#snippet icon()}
|
||||||
<Icon src={ExclamationTriangle} size="14" micro />
|
<Icon src={badge.icon} micro size="14" />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
{$t('post.badges.nsfw')}
|
{badge.label}
|
||||||
</Badge>
|
</Badge>
|
||||||
{/if}
|
{/each}
|
||||||
{#if badges.saved}
|
|
||||||
<Badge
|
|
||||||
label={$t('post.badges.saved')}
|
|
||||||
color="yellow-subtle"
|
|
||||||
allowIconOnly
|
|
||||||
>
|
|
||||||
{#snippet icon()}
|
|
||||||
<Icon src={Bookmark} micro size="14" />
|
|
||||||
{/snippet}
|
|
||||||
{$t('post.badges.saved')}
|
|
||||||
</Badge>
|
|
||||||
{/if}
|
|
||||||
{#if badges.locked}
|
|
||||||
<Badge
|
|
||||||
label={$t('post.badges.locked')}
|
|
||||||
color="yellow-subtle"
|
|
||||||
allowIconOnly
|
|
||||||
>
|
|
||||||
{#snippet icon()}
|
|
||||||
<Icon src={LockClosed} micro size="14" />
|
|
||||||
{/snippet}
|
|
||||||
<span class="max-md:hidden">{$t('post.badges.locked')}</span>
|
|
||||||
</Badge>
|
|
||||||
{/if}
|
|
||||||
{#if badges.removed}
|
|
||||||
<Badge label={$t('post.badges.removed')} color="red-subtle" allowIconOnly>
|
|
||||||
{#snippet icon()}
|
|
||||||
<Icon src={Trash} micro size="14" />
|
|
||||||
{/snippet}
|
|
||||||
<span class="max-md:hidden">{$t('post.badges.removed')}</span>
|
|
||||||
</Badge>
|
|
||||||
{/if}
|
|
||||||
{#if badges.deleted}
|
|
||||||
<Badge label={$t('post.badges.deleted')} color="red-subtle" allowIconOnly>
|
|
||||||
{#snippet icon()}
|
|
||||||
<Icon src={Trash} micro size="14" />
|
|
||||||
{/snippet}
|
|
||||||
<span class="max-md:hidden">{$t('post.badges.deleted')}</span>
|
|
||||||
</Badge>
|
|
||||||
{/if}
|
|
||||||
{#if badges.featured}
|
|
||||||
<Badge
|
|
||||||
label={$t('post.badges.featured')}
|
|
||||||
color="green-subtle"
|
|
||||||
allowIconOnly
|
|
||||||
>
|
|
||||||
{#snippet icon()}
|
|
||||||
<Icon src={Megaphone} micro size="14" />
|
|
||||||
{/snippet}
|
|
||||||
<span class="max-md:hidden">{$t('post.badges.featured')}</span>
|
|
||||||
</Badge>
|
|
||||||
{/if}
|
|
||||||
{@render extraBadges?.()}
|
{@render extraBadges?.()}
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|||||||
@@ -50,7 +50,6 @@
|
|||||||
let hasMore = $state(true)
|
let hasMore = $state(true)
|
||||||
|
|
||||||
async function loadMore() {
|
async function loadMore() {
|
||||||
console.log(hasMore, loading)
|
|
||||||
if (!hasMore || loading) return
|
if (!hasMore || loading) return
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -183,7 +182,7 @@
|
|||||||
{#snippet item(row)}
|
{#snippet item(row)}
|
||||||
<li
|
<li
|
||||||
data-index={row}
|
data-index={row}
|
||||||
style={row < 7 ? `--anim-delay: ${row * 50}ms` : ''}
|
style={row < 9 ? `--anim-delay: ${row * 50}ms` : ''}
|
||||||
class={[
|
class={[
|
||||||
'relative post-container px-3 sm:px-6',
|
'relative post-container px-3 sm:px-6',
|
||||||
row < 9 && 'pop-in opacity-0',
|
row < 9 && 'pop-in opacity-0',
|
||||||
@@ -270,6 +269,6 @@
|
|||||||
|
|
||||||
.pop-in {
|
.pop-in {
|
||||||
animation: popIn 0.5s cubic-bezier(0.165, 0.84, 0.44, 1) forwards
|
animation: popIn 0.5s cubic-bezier(0.165, 0.84, 0.44, 1) forwards
|
||||||
var(--anim-delay);
|
var(--anim-delay, 0ms);
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -1,11 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
const badgeColor = {
|
const badgeColor = {
|
||||||
red: 'bg-red-500 text-white ring-transparent',
|
|
||||||
green: 'bg-green-500 text-white dark:text-black ring-transparent',
|
|
||||||
yellow: 'bg-yellow-500 text-black ring-transparent',
|
|
||||||
gray: 'bg-gray-600 text-white ring-transparent',
|
|
||||||
blue: 'bg-blue-500 text-white ring-transparent',
|
|
||||||
purple: 'bg-purple-500 text-white ring-transparent',
|
|
||||||
'red-subtle': `bg-red-100 dark:bg-red-500/20 text-red-600 dark:text-red-400
|
'red-subtle': `bg-red-100 dark:bg-red-500/20 text-red-600 dark:text-red-400
|
||||||
ring-red-400 dark:ring-red-500/30`,
|
ring-red-400 dark:ring-red-500/30`,
|
||||||
'green-subtle': `bg-green-100 dark:bg-green-500/20 text-green-700 dark:text-green-400
|
'green-subtle': `bg-green-100 dark:bg-green-500/20 text-green-700 dark:text-green-400
|
||||||
@@ -54,13 +48,13 @@
|
|||||||
|
|
||||||
<span
|
<span
|
||||||
{...rest}
|
{...rest}
|
||||||
class="{allowIconOnly
|
class={[
|
||||||
? 'max-md:px-1.5 max-md:py-1.5'
|
badgeRoundness[rounding],
|
||||||
: ''} px-2.5 py-1 {badgeRoundness[
|
badgeColor[color],
|
||||||
rounding
|
'px-2.5 py-1 text-xs font-medium flex items-center gap-1 ring-1 ring-inset',
|
||||||
]} text-xs font-medium flex items-center gap-1 ring-1 ring-inset {badgeColor[
|
allowIconOnly && 'max-md:px-1.5 max-md:py-1.5',
|
||||||
color
|
clazz,
|
||||||
]} {clazz}"
|
]}
|
||||||
title={label}
|
title={label}
|
||||||
>
|
>
|
||||||
{@render icon?.()}
|
{@render icon?.()}
|
||||||
|
|||||||
@@ -67,6 +67,13 @@
|
|||||||
floatingRef(node)
|
floatingRef(node)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// let previousFocus = $state<Element>()
|
||||||
|
// function focusTrap(element: HTMLElement) {
|
||||||
|
// previousFocus = document.activeElement ?? previousFocus
|
||||||
|
|
||||||
|
// svelteFocusTrap(element)
|
||||||
|
// }
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:body
|
<svelte:body
|
||||||
@@ -88,8 +95,6 @@
|
|||||||
onkeydown={async e => {
|
onkeydown={async e => {
|
||||||
if (open && e.key == 'Escape') {
|
if (open && e.key == 'Escape') {
|
||||||
open = false
|
open = false
|
||||||
// @ts-expect-error svelte hell
|
|
||||||
el?.firstChild.focus()
|
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in new issue
Block a user