design: make signup page look slightly less awful (#717)

* design: make signup page look slightly less awful (allow commonlist in virtualizer)

* misc: make buttons and menus unselectable

* feat: add recommended instances

* fix: broken piefed notifications count
This commit is contained in:
xylight authored and GitHub committed 2026-02-17 05:03:13 +00:00
1 parent ee7c097f80
commit ec7fd81304
14 files changed
+169 -113

No files matched your search

+2
View File
@@ -101,6 +101,8 @@ If you're hosting Photon for a Lemmy instance, you'll almost definitely want to
- `PUBLIC_THEME` `JSON`: If you'd like, you can export a theme from Photon and paste it here, which will become the default theme for users. - `PUBLIC_THEME` `JSON`: If you'd like, you can export a theme from Photon and paste it here, which will become the default theme for users.
- `RECOMMENDED_INSTANCES` `string`: (Only suitable for unlocked Photon instances) a comma separated list of instance domains that will be displayed as "recommended" on the sign-up page.
##### Default Photon options ##### Default Photon options
Photon has extensive user configuration options, and you can set the defaults for them with the environment variables found at `src/lib/settings.ts`, by looking at the `defaultSettings` object. Photon has extensive user configuration options, and you can set the defaults for them with the environment variables found at `src/lib/settings.ts`, by looking at the `defaultSettings` object.
+5 -2
View File
@@ -1,3 +1,4 @@
import { PiefedClient } from '$lib/api/piefed/adapter'
import type { Profile } from './profile.svelte' import type { Profile } from './profile.svelte'
interface Notifications { interface Notifications {
@@ -56,7 +57,8 @@ export class InboxService {
.then((res) => res.mentions + res.private_messages + res.replies) .then((res) => res.mentions + res.private_messages + res.replies)
.catch(() => 0) .catch(() => 0)
const reportsPromise = this.#profile.isMod() const reportsPromise =
!(this.#profile.client instanceof PiefedClient) && this.#profile.isMod()
? this.#profile.client ? this.#profile.client
.getReportCount({}) .getReportCount({})
.then( .then(
@@ -68,7 +70,8 @@ export class InboxService {
.catch(() => 0) .catch(() => 0)
: Promise.resolve(0) : Promise.resolve(0)
const applicationsPromise = this.#profile.isAdmin const applicationsPromise =
!(this.#profile.client instanceof PiefedClient) && this.#profile.isAdmin
? this.#profile.client ? this.#profile.client
.getUnreadRegistrationApplicationCount() .getUnreadRegistrationApplicationCount()
.then((res) => res.registration_applications) .then((res) => res.registration_applications)
+5 -3
View File
@@ -194,9 +194,10 @@
"setup": "Setup", "setup": "Setup",
"signup": { "signup": {
"title": "Sign Up", "title": "Sign Up",
"description": "Choose a server that interests you, or type the URL manually.", "description": "Choose the server your account's information will be hosted on.",
"info": "The server you choose is where your account will live. However, every server is connected, and you can still access almost all linked content.", "info": "You can access all content across the Fediverse regardless of your account's server, it is generally okay to pick any of the following.",
"chooseInstance": "Choose a server", "chooseInstance": "Choose a server",
"recommended": "Recommended",
"application": { "application": {
"label": "Application", "label": "Application",
"info": "To join this server, you must fill out this application, and wait to be accepted. You will receive an email if your application is accepted.", "info": "To join this server, you must fill out this application, and wait to be accepted. You will receive an email if your application is accepted.",
@@ -696,7 +697,8 @@
"remove": "Remove", "remove": "Remove",
"download": "Download", "download": "Download",
"attach": "Attach file", "attach": "Attach file",
"info": "Info" "info": "Info",
"continue": "Continue"
}, },
"message": { "message": {
"success": "Success", "success": "Success",
+5 -2
View File
@@ -19,6 +19,7 @@
debounceResize?: number debounceResize?: number
useWindow?: boolean useWindow?: boolean
height?: number height?: number
itemContainer?: string
} }
let { let {
@@ -31,6 +32,7 @@
debounceResize = 100, debounceResize = 100,
useWindow = true, useWindow = true,
height = 0, height = 0,
itemContainer = 'div',
...rest ...rest
}: Props = $props() }: Props = $props()
@@ -235,13 +237,14 @@
0}px; border: 0 !important;" 0}px; border: 0 !important;"
></div> ></div>
{#each visibleItems as item (item.index)} {#each visibleItems as item (item.index)}
<div <svelte:element
this={itemContainer}
data-index={item.index} data-index={item.index}
class="post-container fix-divide group/virtual" class="post-container fix-divide group/virtual"
use:resizeObserver use:resizeObserver
> >
{@render itemSnippet(item.index)} {@render itemSnippet(item.index)}
</div> </svelte:element>
{/each} {/each}
</div> </div>
{#if settings.debugInfo} {#if settings.debugInfo}
+1 -1
View File
@@ -22,7 +22,7 @@
nameDetail?: import('svelte').Snippet nameDetail?: import('svelte').Snippet
actions?: import('svelte').Snippet actions?: import('svelte').Snippet
children?: import('svelte').Snippet children?: import('svelte').Snippet
compact?: 'always' | 'lg' compact?: 'always' | 'lg' | 'never'
avatarCircle?: boolean avatarCircle?: boolean
} }
+39 -37
View File
@@ -53,13 +53,13 @@
@reference '../../../app.css'; @reference '../../../app.css';
ul { ul {
:global { :global {
:where(& > :not(:last-child)) { li:not(:last-child) {
margin-block-start: calc(calc(var(--spacing) * 1)); margin-block-start: calc(calc(var(--spacing) * 1));
margin-block-end: calc(calc(var(--spacing) * 1)); margin-block-end: calc(calc(var(--spacing) * 1));
} }
} }
} }
ul > :global(li) { ul :global(li:not(ul li li)) {
transition: background-color 0.1s; transition: background-color 0.1s;
background-color: var(--color-white); background-color: var(--color-white);
container-type: inline-size; container-type: inline-size;
@@ -68,11 +68,11 @@
border-radius: var(--radius-lg) var(--radius-lg); border-radius: var(--radius-lg) var(--radius-lg);
&:first-child { &:first-of-type {
border-top-left-radius: var(--radius-2xl); border-top-left-radius: var(--radius-2xl);
border-top-right-radius: var(--radius-2xl); border-top-right-radius: var(--radius-2xl);
} }
&:last-child { &:last-of-type {
border-bottom-left-radius: var(--radius-2xl); border-bottom-left-radius: var(--radius-2xl);
border-bottom-right-radius: var(--radius-2xl); border-bottom-right-radius: var(--radius-2xl);
} }
@@ -80,40 +80,8 @@
&:hover { &:hover {
background-color: var(--color-slate-25); background-color: var(--color-slate-25);
} }
}
ul > :global(li:not(.xs) > *) { @variant dark {
padding-block: calc(var(--spacing) * 3);
padding-inline: calc(var(--spacing) * 3.5);
@media screen and (min-width: 40rem) {
padding-block: calc(var(--spacing) * 3);
padding-inline: calc(var(--spacing) * 4);
}
}
ul > :global(li.xs > *) {
padding-block: calc(var(--spacing) * 0.5);
padding-block: calc(var(--spacing) * 1);
}
ul > :global(li.selected) {
background-color: color-mix(
in oklab,
var(--color-white),
var(--color-slate-50)
);
}
:global(.dark) ul > :global(li.selected) {
background-color: color-mix(
in oklab,
var(--color-zinc-900) 90%,
var(--color-zinc-800)
);
}
:global(.dark) ul > :global(li) {
border: 1px solid var(--color-zinc-900); border: 1px solid var(--color-zinc-900);
background-color: color-mix( background-color: color-mix(
in oklab, in oklab,
@@ -134,6 +102,40 @@
} }
} }
:global {
&:not(.xs) > * {
padding-block: calc(var(--spacing) * 3);
padding-inline: calc(var(--spacing) * 3.5);
@media screen and (min-width: 40rem) {
padding-block: calc(var(--spacing) * 3);
padding-inline: calc(var(--spacing) * 4);
}
}
&.xs > * {
padding-block: calc(var(--spacing) * 0.5);
padding-block: calc(var(--spacing) * 1);
}
&.selected {
background-color: color-mix(
in oklab,
var(--color-white),
var(--color-slate-50)
);
@variant dark {
background-color: color-mix(
in oklab,
var(--color-zinc-900) 90%,
var(--color-zinc-800)
);
}
}
}
}
@keyframes pop-in { @keyframes pop-in {
from { from {
transform: translateY(16px); transform: translateY(16px);
+2
View File
@@ -178,6 +178,8 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
font-size: var(--text-sm); font-size: var(--text-sm);
user-select: none;
-webkit-user-select: none;
transition: 75ms cubic-bezier(0.075, 0.82, 0.165, 1); transition: 75ms cubic-bezier(0.075, 0.82, 0.165, 1);
@@ -32,7 +32,7 @@
'dark:hover:text-primary-100 transition-colors z-0 group relative cursor-pointer', 'dark:hover:text-primary-100 transition-colors z-0 group relative cursor-pointer',
]} ]}
> >
<div class="flex flex-row gap-1 items-center w-full"> <div class="flex flex-row gap-1 items-center w-full select-none">
{@render title?.(open)} {@render title?.(open)}
</div> </div>
{#if icon} {#if icon}
+14 -7
View File
@@ -1,5 +1,6 @@
<script module lang="ts"> <script module lang="ts">
import { Label } from 'mono-svelte' import { Label } from 'mono-svelte'
import { Icon, type IconSource } from 'svelte-hero-icons/dist'
import type { HTMLInputAttributes } from 'svelte/elements' import type { HTMLInputAttributes } from 'svelte/elements'
import { generateID } from './helper' import { generateID } from './helper'
@@ -28,6 +29,7 @@
shadow?: Shadow shadow?: Shadow
element?: HTMLInputElement | undefined element?: HTMLInputElement | undefined
class?: string class?: string
icon?: IconSource
customLabel?: import('svelte').Snippet customLabel?: import('svelte').Snippet
prefix?: import('svelte').Snippet prefix?: import('svelte').Snippet
suffix?: import('svelte').Snippet suffix?: import('svelte').Snippet
@@ -41,14 +43,15 @@
const borderClass = `border border-slate-200 border-b-slate-300 dark:border-zinc-800` const borderClass = `border border-slate-200 border-b-slate-300 dark:border-zinc-800`
let { let {
label = undefined, label,
value = $bindable(), value = $bindable(),
placeholder = '', placeholder = '',
disabled = false, disabled = false,
required = false, required = false,
size = 'md', size = 'md',
id = generateID(), id = generateID(),
inlineAffixes = false, icon,
inlineAffixes = !!icon,
shadow = 'sm', shadow = 'sm',
element = $bindable(), element = $bindable(),
class: clazz = '', class: clazz = '',
@@ -84,15 +87,19 @@
clazz, clazz,
]} ]}
> >
{#if prefix} {#if prefix || icon}
<div <div
class={[ class={[
'rounded-xl rounded-r-none text-slate-600 dark:text-zinc-400', 'rounded-xl rounded-r-none text-slate-600 dark:text-zinc-400',
inlineAffixes && 'bg-white dark:bg-zinc-900 pr-0 w-8', inlineAffixes &&
sizeClass[size], 'bg-white dark:bg-zinc-900 pr-0 px-3 h-full flex items-center',
]} ]}
> >
{#if prefix}
{@render prefix?.()} {@render prefix?.()}
{:else if icon}
<Icon src={icon} size="20" mini />
{/if}
</div> </div>
{/if} {/if}
<input <input
@@ -110,8 +117,8 @@
focus:outline-hidden rounded-xl text-sm w-full disabled:bg-slate-100 focus:outline-hidden rounded-xl text-sm w-full disabled:bg-slate-100
disabled:cursor-not-allowed dark:disabled:bg-zinc-800 invalid:border-red-500! disabled:cursor-not-allowed dark:disabled:bg-zinc-800 invalid:border-red-500!
peer invalid:text-red-500 z-10`, peer invalid:text-red-500 z-10`,
prefix && 'rounded-l-none', (prefix || icon) && 'rounded-l-none',
prefix && inlineAffixes && 'border-l-0', (prefix || icon) && inlineAffixes && 'border-l-0',
suffix && 'rounded-r-none', suffix && 'rounded-r-none',
suffix && inlineAffixes && 'border-r-0', suffix && inlineAffixes && 'border-r-0',
clazz, clazz,
+8 -2
View File
@@ -220,8 +220,8 @@
.material-info { .material-info {
background: linear-gradient( background: linear-gradient(
to bottom, to bottom,
--alpha(var(--color-slate-300) / 10%), --alpha(var(--color-slate-200) / 10%),
--alpha(var(--color-slate-500) / 15%) --alpha(var(--color-slate-300) / 15%)
); );
color: var(--color-slate-900); color: var(--color-slate-900);
@@ -229,6 +229,12 @@
@variant dark { @variant dark {
color: var(--color-slate-300); color: var(--color-slate-300);
background: linear-gradient(
to bottom,
--alpha(var(--color-slate-300) / 10%),
--alpha(var(--color-slate-500) / 15%)
);
} }
} }
} }
+1 -1
View File
@@ -46,7 +46,7 @@
> >
{#snippet popover()} {#snippet popover()}
<div <div
class="w-full max-w-sm max-h-128 overflow-auto list-none shadow-lg rounded-xl" class="w-full max-w-sm max-h-128 overflow-auto list-none shadow-lg rounded-xl select-none"
> >
<div <div
class="flex flex-col p-1 list-none bg-white/80 dark:bg-zinc-900/90 rounded-xl class="flex flex-col p-1 list-none bg-white/80 dark:bg-zinc-900/90 rounded-xl
+49 -24
View File
@@ -10,20 +10,22 @@
langs?: string[] langs?: string[]
tags?: string[] tags?: string[]
score: number score: number
recommended?: boolean
} }
</script> </script>
<script lang="ts"> <script lang="ts">
import { goto } from '$app/navigation' import { goto } from '$app/navigation'
import { env } from '$env/dynamic/public'
import { validateInstance } from '$lib/api/client.svelte' import { validateInstance } from '$lib/api/client.svelte'
import { t } from '$lib/app/i18n' import { t } from '$lib/app/i18n'
import { DEFAULT_INSTANCE_URL } from '$lib/app/instance.svelte' import { DEFAULT_INSTANCE_URL } from '$lib/app/instance.svelte'
import VirtualList from '$lib/app/render/VirtualList.svelte' import VirtualList from '$lib/app/render/VirtualList.svelte'
import Avatar from '$lib/ui/generic/Avatar.svelte' import Avatar from '$lib/ui/generic/Avatar.svelte'
import { Header } from '$lib/ui/layout' import { CommonList, Header } from '$lib/ui/layout'
import { Button, TextInput, toast } from 'mono-svelte' import { Button, Note, TextInput, toast } from 'mono-svelte'
import { onMount } from 'svelte' import { onMount } from 'svelte'
import { ArrowLeft, Icon } from 'svelte-hero-icons/dist' import { ArrowLeft, CheckCircle, Icon } from 'svelte-hero-icons/dist'
import { preventDefault } from 'svelte/legacy' import { preventDefault } from 'svelte/legacy'
let selectedInstance: string = $state('') let selectedInstance: string = $state('')
@@ -34,15 +36,22 @@
onMount(async () => { onMount(async () => {
try { try {
const recommended = env.PUBLIC_RECOMMENDED_INSTANCES?.split(',')
const res: Instance[] = ( const res: Instance[] = (
await fetch(`https://data.lemmyverse.net/data/instance.full.json`).then( (await fetch(`https://servers.infra.phtn.app?limit=50`).then((r) =>
(r) => r.json(), r.json(),
) )) as Instance[]
) )
.filter((i: Instance) => i.fed) .filter((i: Instance) => i.fed)
.sort((a: Instance, b: Instance) => b.score - a.score) .sort((a: Instance, b: Instance) => b.score - a.score)
.slice(0, 100) .slice(0, 100)
recommended?.forEach((rec) => {
const found = res.find((i) => i.baseurl == rec)
if (found) res.unshift({ ...found, recommended: true })
})
instances = res instances = res
let placeholderIndex = 0 let placeholderIndex = 0
@@ -72,44 +81,60 @@
</Button> </Button>
<Header>{$t('form.signup.title')}</Header> <Header>{$t('form.signup.title')}</Header>
<p>{$t('form.signup.description')}</p> <p>{$t('form.signup.description')}</p>
<p> <Note>{$t('form.signup.info')}</Note>
{$t('form.signup.info')}
</p>
{#if instances} {#if instances}
<CommonList>
<VirtualList <VirtualList
items={instances} items={instances}
useWindow={false} useWindow={false}
height={400} height={384}
estimatedHeight={50} estimatedHeight={50}
class="overflow-auto border rounded-2xl border-slate-200 dark:border-zinc-900 bg-white dark:bg-zinc-950 class="overflow-auto overflow-x-hidden w-full min-w-0 min-h-96"
divide-y divide-slate-200 dark:divide-zinc-900" itemContainer="li"
> >
{#snippet item(i)} {#snippet item(i)}
{@const instance = instances![i]}
<button <button
onclick={() => (selectedInstance = instances![i].baseurl ?? '')} onclick={() => (selectedInstance = instance.baseurl ?? '')}
class="flex flex-row gap-2 text-left py-2 first:pt-0 last:pb-0 items-center class={[
h-16 max-h-16 min-h-16 overflow-hidden w-full cursor-pointer hover:bg-slate-50 hover:dark:bg-zinc-925 duration-100 'flex flex-row items-center text-left gap-2 w-full cursor-pointer rounded-[inherit]',
p-4" instance.recommended && 'material-success',
]}
> >
<Avatar <Avatar
width={32} width={32}
url={instances![i].icon} url={instance.icon}
alt={instances![i].name} alt={instance.name}
class="shrink-0" class="shrink-0"
/> />
<div class="flex flex-col max-h-full w-full"> <div class="flex flex-col max-h-full w-full">
<span class="font-medium text-base whitespace-nowrap text-ellipsis"> <div
{instances![i].name} class="font-medium text-base whitespace-nowrap text-ellipsis flex"
</span>
<span
class="whitespace-nowrap text-ellipsis overflow-hidden w-full"
> >
{instances![i].desc} <span>
{instance.name}
</span> </span>
<span class="text-slate-500 dark:text-zinc-500 ml-auto">
{instance.baseurl}
</span>
</div>
<p
class="overflow-hidden overflow-ellipsis w-full text-sm text-slate-600 dark:text-zinc-400"
>
{instance.desc}
</p>
{#if instance.recommended}
<p class="text-xs inline-flex items-center gap-1">
<Icon src={CheckCircle} size="14" micro class="inline" />
{$t('form.signup.recommended')}
</p>
{/if}
</div> </div>
</button> </button>
{/snippet} {/snippet}
</VirtualList> </VirtualList>
</CommonList>
{/if} {/if}
<form <form
class="flex flex-col gap-4" class="flex flex-col gap-4"
+37 -30
View File
@@ -8,9 +8,7 @@
import { errorMessage } from '$lib/app/error' import { errorMessage } from '$lib/app/error'
import { t } from '$lib/app/i18n' import { t } from '$lib/app/i18n'
import Markdown from '$lib/app/markdown/Markdown.svelte' import Markdown from '$lib/app/markdown/Markdown.svelte'
import MarkdownEditor from '$lib/app/markdown/MarkdownEditor.svelte' import EntityHeader from '$lib/ui/generic/EntityHeader.svelte'
import InstanceCard from '$lib/feature/instance/InstanceCard.svelte'
import Avatar from '$lib/ui/generic/Avatar.svelte'
import ErrorContainer, { import ErrorContainer, {
clearErrorScope, clearErrorScope,
pushError, pushError,
@@ -23,14 +21,18 @@
Material, Material,
Spinner, Spinner,
Switch, Switch,
TextArea,
TextInput, TextInput,
toast, toast,
} from 'mono-svelte' } from 'mono-svelte'
import { import {
ArrowLeft, ArrowLeft,
ArrowPath, ArrowPath,
AtSymbol,
Envelope,
ExclamationTriangle, ExclamationTriangle,
Icon, Icon,
Key,
Plus, Plus,
QuestionMarkCircle, QuestionMarkCircle,
XCircle, XCircle,
@@ -151,7 +153,7 @@
<title>{$t('account.signup')}</title> <title>{$t('account.signup')}</title>
</svelte:head> </svelte:head>
<div class="flex flex-col md:flex-row flex-1/3 gap-8 h-full max-w-5xl mx-auto"> <div class="flex flex-col md:flex-row flex-1/2 gap-8 h-full max-w-6xl mx-auto">
{#if stage == 'signup'} {#if stage == 'signup'}
<form <form
class="flex flex-col gap-4 h-full w-full flex-2/3" class="flex flex-col gap-4 h-full w-full flex-2/3"
@@ -160,23 +162,22 @@
submit() submit()
}} }}
> >
<Button href="/accounts" class=" mb-4 w-max" rounding="pill"> <Button href="/accounts" class=" mb-4 w-max">
<Icon src={ArrowLeft} size="16" micro /> <Icon src={ArrowLeft} size="16" micro />
{$t('common.back')} {$t('common.back')}
</Button> </Button>
<Header> <Header>
{$t('form.signup.title')} {$t('form.signup.title')}
{#snippet extended()} {#snippet extended()}
<span class="flex gap-4 items-center text-xl text-center mx-auto"> <div class="md:hidden">
{#if data.site_view.site.icon} <EntityHeader
<Avatar name={data.site_view.site.name}
circle={false} avatar={data.site_view.site.icon}
width={48} banner={data.site_view.site.banner || null}
url={data.site_view.site.icon} compact="always"
avatarCircle={false}
/> />
{/if} </div>
{data.site_view.site.name}
</span>
{/snippet} {/snippet}
</Header> </Header>
<ErrorContainer scope={page.url.pathname} /> <ErrorContainer scope={page.url.pathname} />
@@ -188,35 +189,44 @@
label={$t('form.email')} label={$t('form.email')}
required={data.site_view.local_site.require_email_verification} required={data.site_view.local_site.require_email_verification}
type="email" type="email"
icon={Envelope}
size="md"
/> />
<TextInput <TextInput
bind:value={username} bind:value={username}
label={$t('form.username')} label={$t('form.username')}
required required
icon={AtSymbol}
/> />
</div> </div>
<div class="flex flex-col md:flex-row gap-2 *:flex-1"> <div class="flex flex-col md:flex-row *:flex-1 gap-2">
<TextInput <TextInput
bind:value={password} bind:value={password}
label={$t('form.password')} label={$t('form.password')}
required required
type="password" type="password"
icon={Key}
/> />
<TextInput <TextInput
bind:value={passwordVerify} bind:value={passwordVerify}
label={$t('form.confirmPassword')} label={$t('form.confirmPassword')}
required required
type="password" type="password"
icon={Key}
/> />
</div> </div>
{#if data.site_view.local_site.registration_mode == 'RequireApplication'} {#if data.site_view.local_site.registration_mode == 'RequireApplication'}
<Material rounding="2xl" color="warning" icon={ExclamationTriangle}> <Material rounding="2xl" color="warning" icon={ExclamationTriangle}>
{$t('form.signup.application.info')} {$t('form.signup.application.info')}
</Material> </Material>
<Material rounding="2xl" color="info">
{#if data.site_view.local_site.application_question} {#if data.site_view.local_site.application_question}
<Markdown source={data.site_view.local_site.application_question} /> <Markdown
source={data.site_view.local_site.application_question}
/>
{/if} {/if}
<MarkdownEditor </Material>
<TextArea
label={$t('form.signup.application.label')} label={$t('form.signup.application.label')}
required required
bind:value={application} bind:value={application}
@@ -318,18 +328,15 @@
</Button> </Button>
</div> </div>
{/if} {/if}
<Material <div class="flex-1/2 flex flex-col gap-2 max-md:hidden">
color="uniform" <div class=" w-full sticky top-0">
class="flex-1/3 overflow-auto max-h-full max-md:hidden" <EntityHeader
rounding="2xl" name={data.site_view.site.name}
padding="none" avatar={data.site_view.site.icon}
> banner={data.site_view.site.banner || null}
<InstanceCard avatarCircle={false}
admins={data.admins} bio={data.site_view.site.sidebar}
site={data.site_view}
taglines={data.taglines}
version={data.version}
class="w-full p-4"
/> />
</Material> </div>
</div>
</div> </div>
-3
View File
@@ -10,9 +10,6 @@
} }
let { theme = $bindable() }: Props = $props() let { theme = $bindable() }: Props = $props()
let selected = $derived(theme.id == themeData.data.currentTheme)
let editingName = $state(false)
</script> </script>
<button class="h-full" onclick={() => (themeData.data.currentTheme = theme.id)}> <button class="h-full" onclick={() => (themeData.data.currentTheme = theme.id)}>