design: reorganize profile (#451)

* fix: re-add actions to community header

* impr: reorganize the profile menu

* misc: improve blocks page

* fix: use a better icon for expands

* misc: reorganize some settings
This commit is contained in:
Xylight authored and GitHub committed 2024-09-22 14:48:22 -07:00
1 parent 7c7df02e3d
commit 62e20fcb69
14 files changed
+373 -189

No files matched your search

@@ -18,6 +18,9 @@
import { Button } from 'mono-svelte'
import Entity from '$lib/components/ui/Entity.svelte'
import { t } from '$lib/translations.js'
import Switch from '$lib/components/input/Switch.svelte'
import UserAutocomplete from '$lib/components/lemmy/user/UserAutocomplete.svelte'
import { expoOut } from 'svelte/easing'
// sveltekit doesn't feel like making types work right now
export let data: PageData & {
@@ -86,22 +89,23 @@
<EditableList let:action on:action={(i) => unblockInstances(i.detail)}>
{#each data.my_user?.instance_blocks as block (block.instance.id)}
<div
class="flex flex-row gap-2 items-center py-4 justify-between"
class="flex flex-row gap-2 items-center py-4"
animate:flip={{ duration: 250 }}
out:slide|local={{ axis: 'y' }}
>
<Button
title="Unblock"
size="square-md"
rounding="pill"
on:click={() => action(block)}
>
<Icon src={XMark} mini size="16" slot="prefix" />
</Button>
<Entity
icon={block.site?.icon}
name={block.site?.name ?? block.instance.domain}
label={block.instance.domain}
/>
<Button
title="Unblock"
size="square-md"
on:click={() => action(block)}
>
<Icon src={XMark} mini size="16" slot="prefix" />
</Button>
</div>
{/each}
</EditableList>
@@ -113,18 +117,19 @@
<EditableList let:action on:action={(i) => unblockCommunity(i.detail)}>
{#each data.community_blocks as block (block.community.id)}
<div
class="flex flex-row gap-2 items-center py-2 justify-between"
class="flex flex-row gap-2 items-center py-2"
animate:flip={{ duration: 250 }}
out:slide|local={{ axis: 'y' }}
out:slide|global={{ axis: 'y', easing: expoOut, duration: 300 }}
>
<CommunityLink community={block.community} avatar />
<Button
title="Unblock"
size="square-md"
rounding="pill"
on:click={() => action(block)}
>
<Icon src={XMark} mini size="16" slot="prefix" />
</Button>
<CommunityLink community={block.community} avatar />
</div>
{/each}
</EditableList>
@@ -136,21 +141,30 @@
<EditableList let:action on:action={(i) => unblockUser(i.detail)}>
{#each data.person_blocks as block (block.target.id)}
<div
class="flex flex-row gap-2 items-center py-2 justify-between"
class="flex flex-row gap-2 items-center py-2"
animate:flip={{ duration: 250 }}
out:slide|local={{ axis: 'y' }}
out:slide|global={{ axis: 'y', easing: expoOut, duration: 300 }}
>
<UserLink user={block.target} avatar badges />
<Button
title="Unblock"
size="square-md"
rounding="pill"
on:click={() => action(block)}
>
<Icon src={XMark} mini size="16" slot="prefix" />
</Button>
<UserLink user={block.target} avatar badges />
</div>
{/each}
</EditableList>
</div>
{/if}
{:else}
<div class="h-full w-full grid place-items-center">
<Placeholder
icon={Check}
title={$t('routes.profile.blocks.empty.title')}
description={$t('routes.profile.blocks.empty.description')}
/>
</div>
{/if}
@@ -4,11 +4,12 @@
import { ImageInput, Material, removeToast, toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
import type { SaveUserSettings } from 'lemmy-js-client'
import { Button, Checkbox, Modal, TextInput } from 'mono-svelte'
import { Button, Switch, TextInput } from 'mono-svelte'
import { uploadImage } from '$lib/util.js'
import { t } from '$lib/translations.js'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
export let inline: boolean = false
export let data
let formData: Omit<SaveUserSettings, 'auth'> | undefined = {
@@ -56,8 +57,12 @@
</script>
<form class="flex flex-col gap-4 h-full" on:submit|preventDefault={save}>
<Header pageHeader>{$t('routes.profile.settings')}</Header>
{#if !inline}
<Header pageHeader>{$t('routes.profile.settings')}</Header>
{/if}
<slot />
{#if data.my_user?.local_user_view?.local_user && formData}
<TextInput label={$t('form.profile.email')} bind:value={formData.email} />
<TextInput
label={$t('form.profile.displayName')}
bind:value={formData.display_name}
@@ -69,29 +74,30 @@
label={$t('form.profile.bio')}
previewButton
/>
<ImageInput label={$t('form.profile.avatar')} bind:files={profileImage} />
<ImageInput label={$t('form.profile.banner')} bind:files={bannerImage} />
<TextInput label={$t('form.profile.email')} bind:value={formData.email} />
<div class="flex gap-2 items-center *:flex-1">
<ImageInput label={$t('form.profile.avatar')} bind:files={profileImage} />
<ImageInput label={$t('form.profile.banner')} bind:files={bannerImage} />
</div>
<TextInput
label={$t('form.profile.matrix')}
bind:value={formData.matrix_user_id}
placeholder="@user:example.com"
/>
<Checkbox bind:checked={formData.show_nsfw}>
<Switch bind:checked={formData.show_nsfw}>
{$t('form.profile.showNSFW')}
</Checkbox>
<Checkbox bind:checked={formData.show_scores}>
</Switch>
<Switch bind:checked={formData.show_scores}>
{$t('form.profile.scores')}
</Checkbox>
<Checkbox bind:checked={formData.bot_account}>
</Switch>
<Switch bind:checked={formData.bot_account}>
{$t('form.profile.bot')}
</Checkbox>
<Checkbox bind:checked={formData.show_bot_accounts}>
</Switch>
<Switch bind:checked={formData.show_bot_accounts}>
{$t('form.profile.showBots')}
</Checkbox>
<Checkbox bind:checked={formData.show_read_posts}>
</Switch>
<Switch bind:checked={formData.show_read_posts}>
{$t('form.profile.showRead')}
</Checkbox>
</Switch>
<Button
submit
+6 -2
View File
@@ -30,9 +30,13 @@
<Tabs
class="overflow-auto"
routes={[
{
href: '/profile',
name: $t('routes.profile.overview'),
},
{
href: '/profile/user',
name: $t('routes.profile.user'),
name: $t('routes.profile.submissions'),
},
{
@@ -42,7 +46,7 @@
{
href: '/profile/blocks',
name: $t('routes.profile.blocks'),
name: $t('routes.profile.blocks.title'),
},
{
+1
View File
@@ -17,5 +17,6 @@ export async function load({ params, url, fetch }) {
community_blocks: my_user?.community_blocks,
person_blocks: my_user?.person_blocks,
follows: my_user?.follows,
moderates: my_user?.moderates,
}
}
+91 -1
View File
@@ -1 +1,91 @@
how did you get here? something in my code must have broke
<script lang="ts">
import { profile } from '$lib/auth'
import ItemList from '$lib/components/lemmy/generic/ItemList.svelte'
import { isAdmin } from '$lib/components/lemmy/moderation/moderation.js'
import ShieldIcon from '$lib/components/lemmy/moderation/ShieldIcon.svelte'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import EntityHeader from '$lib/components/ui/EntityHeader.svelte'
import Expandable from '$lib/components/ui/Expandable.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { publishedToDate } from '$lib/components/util/date.js'
import { formatRelativeDate } from '$lib/components/util/RelativeDate.svelte'
import { communityLink } from '$lib/lemmy/generic.js'
import { userSettings } from '$lib/settings.js'
import { t } from '$lib/translations'
import { Spinner, Button, Menu, MenuButton } from 'mono-svelte'
import {
AtSymbol,
EllipsisHorizontal,
Envelope,
Icon,
ShieldExclamation,
} from 'svelte-hero-icons'
export let data
$: my_user = data.my_user!.local_user_view
</script>
<Header pageHeader>
{$t('routes.profile.overview')}
</Header>
<EntityHeader
avatar={my_user.person.avatar}
name={my_user.person.display_name || my_user.person.name}
banner={my_user.person.banner}
bio={my_user.person.bio}
stats={[
{
name: $t('content.posts'),
value: my_user.counts.post_count.toString(),
},
{
name: $t('content.comments'),
value: my_user.counts.comment_count.toString(),
},
{
name: $t('stats.joined'),
value: formatRelativeDate(publishedToDate(my_user.person.published), {
style: 'short',
}).toString(),
format: false,
},
]}
>
<span class="text-sm flex gap-0 items-center w-max" slot="nameDetail">
@
<UserLink
showInstance
user={my_user.person}
displayName={false}
class="font-normal"
/>
</span>
{#if (data.moderates ?? []).length > 0}
<Expandable
class="border rounded-xl bg-white/50 dark:bg-zinc-900/50 w-full p-3 px-4
dark:border-zinc-800 border-slate-300 border-opacity-50 text-slate-700 dark:text-zinc-300 transition-colors"
>
<span slot="title" class="flex items-center gap-1">
<ShieldIcon width={14} filled />
{$t('routes.profile.moderates')}
</span>
<ItemList
items={data.moderates?.map((m) => ({
id: m.community.id,
name: m.community.title,
url: communityLink(m.community),
avatar: m.community.icon,
instance: new URL(m.community.actor_id).hostname,
})) ?? []}
/>
</Expandable>
{/if}
</EntityHeader>
{#if $userSettings.debugInfo}
<pre>
{JSON.stringify(my_user, undefined, 4)}
</pre>
{/if}
-5
View File
@@ -1,5 +0,0 @@
import { redirect } from '@sveltejs/kit'
export const load = async () => {
redirect(302, '/profile/user');
}
+1
View File
@@ -5,6 +5,7 @@
{#if data.user && data.sort && data.type && data.page}
<UserPage
inline
data={{
items: data.user.submissions,
page: data.page,