misc: Tweak design
This commit is contained in:
1 parent
42a429326a
commit
4c3b5fae6a
10 files changed
+65
-24
No files matched your search
@@ -57,14 +57,21 @@
|
|||||||
buttonColor[color],
|
buttonColor[color],
|
||||||
buttonSize[size],
|
buttonSize[size],
|
||||||
buttonRoundness[rounded],
|
buttonRoundness[rounded],
|
||||||
loading ? (color == 'primary' ? '!bg-transparent !text-inherit' : '') : '',
|
|
||||||
'text-sm transition-all disabled:opacity-70 disabled:pointer-events-none',
|
'text-sm transition-all disabled:opacity-70 disabled:pointer-events-none',
|
||||||
$$props.class
|
$$props.class
|
||||||
)
|
)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if href}
|
{#if href}
|
||||||
<a {href} {...$$restProps} class={buttonClass}>
|
<a
|
||||||
|
{href}
|
||||||
|
{...$$restProps}
|
||||||
|
class="{buttonClass} {loading
|
||||||
|
? color == 'primary'
|
||||||
|
? '!bg-transparent !text-inherit'
|
||||||
|
: ''
|
||||||
|
: ''}"
|
||||||
|
>
|
||||||
<div class="flex flex-row items-center justify-center gap-1.5">
|
<div class="flex flex-row items-center justify-center gap-1.5">
|
||||||
{#if loading}
|
{#if loading}
|
||||||
<Spinner />
|
<Spinner />
|
||||||
@@ -79,7 +86,11 @@
|
|||||||
disabled={loading}
|
disabled={loading}
|
||||||
{...$$restProps}
|
{...$$restProps}
|
||||||
on:click={(e) => dispatch('click', e)}
|
on:click={(e) => dispatch('click', e)}
|
||||||
class={buttonClass}
|
class="{buttonClass} {loading
|
||||||
|
? color == 'primary'
|
||||||
|
? '!bg-transparent !text-inherit'
|
||||||
|
: ''
|
||||||
|
: ''}"
|
||||||
type={submit ? 'submit' : 'button'}
|
type={submit ? 'submit' : 'button'}
|
||||||
>
|
>
|
||||||
<div class="flex flex-row items-center justify-center gap-1.5">
|
<div class="flex flex-row items-center justify-center gap-1.5">
|
||||||
|
|||||||
@@ -66,6 +66,7 @@
|
|||||||
color="elevated"
|
color="elevated"
|
||||||
size="sm"
|
size="sm"
|
||||||
href="/post/{getInstance()}/{post.post.id}"
|
href="/post/{getInstance()}/{post.post.id}"
|
||||||
|
class="px-3"
|
||||||
>
|
>
|
||||||
<Icon slot="icon" src={ChatBubbleOvalLeft} mini width={16} height={16} />
|
<Icon slot="icon" src={ChatBubbleOvalLeft} mini width={16} height={16} />
|
||||||
<FormattedNumber number={post.counts.comments} />
|
<FormattedNumber number={post.counts.comments} />
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<!-- svelte-ignore a11y-missing-attribute -->
|
<!-- svelte-ignore a11y-missing-attribute -->
|
||||||
<img
|
<img
|
||||||
src={thumbnail_url}
|
src={thumbnail_url}
|
||||||
class="rounded-md max-h-[16rem] w-full aspect-[16/9] object-cover bg-slate-200 dark:bg-zinc-800"
|
class="rounded-md w-[500px] aspect-video object-cover bg-slate-200 dark:bg-zinc-800"
|
||||||
width={600}
|
width={600}
|
||||||
height={400}
|
height={400}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -21,19 +21,25 @@
|
|||||||
Plus,
|
Plus,
|
||||||
UserCircle,
|
UserCircle,
|
||||||
} from 'svelte-hero-icons'
|
} from 'svelte-hero-icons'
|
||||||
|
import { get } from 'svelte/store'
|
||||||
|
|
||||||
|
let scrollY = 0
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<svelte:window bind:scrollY />
|
||||||
|
|
||||||
<nav
|
<nav
|
||||||
class="flex flex-row gap-2 items-center sticky top-0 bg-slate-50/80
|
class="flex flex-row gap-2 items-center sticky top-0 bg-slate-100
|
||||||
lg:bg-white/80 lg:rounded-b-md
|
dark:bg-black {scrollY > 0
|
||||||
dark:bg-zinc-950/80 lg:dark:bg-zinc-900/80 backdrop-blur-3xl max-w-5xl
|
? 'bg-slate-100/80 dark:bg-black/80'
|
||||||
w-full mx-auto px-4 py-2 z-50 lg:border-x lg:border-b transition-all
|
: ''} backdrop-blur-3xl
|
||||||
border-slate-200 dark:border-zinc-800 box-border"
|
w-full mx-auto px-4 py-2 z-50 border-b transition-all
|
||||||
|
border-slate-200 dark:border-zinc-900 box-border"
|
||||||
>
|
>
|
||||||
<div class="flex flex-row gap-2 items-center mr-auto">
|
<div class="flex flex-row gap-2 items-center mr-auto">
|
||||||
<a href="/" class="flex flex-row items-center gap-2">
|
<a href="/" class="flex flex-row items-center gap-2">
|
||||||
<Logo width={40} />
|
<Logo width={40} />
|
||||||
<span class="opacity-30 text-lg">/</span>
|
<span class="opacity-30 text-xl">/</span>
|
||||||
<span class="text-sm font-bold">
|
<span class="text-sm font-bold">
|
||||||
{$instance}
|
{$instance}
|
||||||
</span>
|
</span>
|
||||||
@@ -69,6 +75,11 @@
|
|||||||
slot="button"
|
slot="button"
|
||||||
on:click={toggleOpen}
|
on:click={toggleOpen}
|
||||||
>
|
>
|
||||||
|
{#if $user === undefined}
|
||||||
|
<div class="w-full h-full grid place-items-center">
|
||||||
|
<Spinner width={20} />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
{#if $user}
|
{#if $user}
|
||||||
<img
|
<img
|
||||||
src={$user.person.avatar ??
|
src={$user.person.avatar ??
|
||||||
@@ -86,11 +97,7 @@
|
|||||||
<li class="text-xs opacity-80 text-left mx-4 my-1 py-1">
|
<li class="text-xs opacity-80 text-left mx-4 my-1 py-1">
|
||||||
{$user ? $user.person.name : 'Profile'}
|
{$user ? $user.person.name : 'Profile'}
|
||||||
</li>
|
</li>
|
||||||
{#if !$user || !$authData}
|
{#if $user && $authData}
|
||||||
<MenuButton link href="/login">
|
|
||||||
<Icon src={ArrowLeftOnRectangle} mini width={16} /> Log in
|
|
||||||
</MenuButton>
|
|
||||||
{:else}
|
|
||||||
<MenuButton link href="/u/{$user.person.name}@{$authData.instance}">
|
<MenuButton link href="/u/{$user.person.name}@{$authData.instance}">
|
||||||
<Icon src={UserCircle} mini width={16} /> Profile
|
<Icon src={UserCircle} mini width={16} /> Profile
|
||||||
</MenuButton>
|
</MenuButton>
|
||||||
@@ -118,6 +125,12 @@
|
|||||||
<Icon src={ArrowRightOnRectangle} mini width={16} />Log out
|
<Icon src={ArrowRightOnRectangle} mini width={16} />Log out
|
||||||
</MenuButton>
|
</MenuButton>
|
||||||
{/if}
|
{/if}
|
||||||
|
{#if !$user || !$authData}
|
||||||
|
<MenuButton link href="/login">
|
||||||
|
<Icon src={ArrowLeftOnRectangle} mini width={16} />
|
||||||
|
Log in
|
||||||
|
</MenuButton>
|
||||||
|
{/if}
|
||||||
<hr class="dark:opacity-10 w-[90%] my-2 mx-auto" />
|
<hr class="dark:opacity-10 w-[90%] my-2 mx-auto" />
|
||||||
<li class="text-xs px-4 py-1 my-1 opacity-80">App</li>
|
<li class="text-xs px-4 py-1 my-1 opacity-80">App</li>
|
||||||
<MenuButton link href="/settings">
|
<MenuButton link href="/settings">
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<aside
|
<aside
|
||||||
class="sticky top-20 border bg-white border-slate-200
|
class="sticky top-20 border bg-white border-slate-200
|
||||||
dark:border-zinc-800 dark:bg-zinc-900 break-words flex
|
dark:border-zinc-800 dark:bg-zinc-900 break-words flex
|
||||||
flex-col gap-4 p-6 w-[20rem] rounded-md h-max max-h-[calc(100vh-6rem)]
|
flex-col gap-4 p-6 w-[22rem] rounded-md h-max max-h-[calc(100vh-6rem)]
|
||||||
overflow-auto"
|
overflow-auto text-sm"
|
||||||
>
|
>
|
||||||
<slot />
|
<slot />
|
||||||
</aside>
|
</aside>
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
? ExclamationCircle
|
? ExclamationCircle
|
||||||
: ExclamationCircle}
|
: ExclamationCircle}
|
||||||
/>
|
/>
|
||||||
<div class="flex flex-col p-4 pl-0 mr-auto">
|
<div class="flex flex-col p-4 pl-0 break-words max-w-full">
|
||||||
{#if toast.title}
|
{#if toast.title}
|
||||||
<h1 class="text-base font-bold">{toast.title}</h1>
|
<h1 class="text-base font-bold">{toast.title}</h1>
|
||||||
{/if}
|
{/if}
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
on:click={() => {
|
on:click={() => {
|
||||||
toasts.update((toasts) => toasts.filter((t) => t.id != toast.id))
|
toasts.update((toasts) => toasts.filter((t) => t.id != toast.id))
|
||||||
}}
|
}}
|
||||||
class="rounded-lg transition-colors hover:bg-slate-200 hover:dark:bg-zinc-800 p-2 m-2"
|
class="rounded-lg ml-auto w-max transition-colors hover:bg-slate-200 hover:dark:bg-zinc-800 p-2 m-2"
|
||||||
>
|
>
|
||||||
<Icon src={XMark} size="16" mini />
|
<Icon src={XMark} size="16" mini />
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { writable } from 'svelte/store'
|
import { writable } from 'svelte/store'
|
||||||
|
|
||||||
export enum ToastType {
|
export enum ToastType {
|
||||||
'error' = 'bg-red-500 text-black border border-red-600',
|
'error' = 'bg-red-500 text-white border border-red-600',
|
||||||
'warning' = 'bg-yellow-400 text-black border border-yellow-500',
|
'warning' = 'bg-yellow-400 text-black border border-yellow-500',
|
||||||
'success' = 'bg-green-400 text-black border border-green-500',
|
'success' = 'bg-green-400 text-black border border-green-500',
|
||||||
'info' = 'dark:bg-zinc-900 bg-white border border-slate-200 dark:border-zinc-800 shadow-lg',
|
'info' = 'dark:bg-zinc-900 bg-white border border-slate-200 dark:border-zinc-800 shadow-lg',
|
||||||
|
|||||||
+12
-4
@@ -47,7 +47,9 @@ export interface UserData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const authData = writable<AuthData | undefined>()
|
export const authData = writable<AuthData | undefined>()
|
||||||
export const user = writable<(PersonView & UserData) | undefined>()
|
export const user = writable<(PersonView & UserData) | undefined | null>(
|
||||||
|
undefined
|
||||||
|
)
|
||||||
|
|
||||||
setInterval(async () => {
|
setInterval(async () => {
|
||||||
// check for unread messages
|
// check for unread messages
|
||||||
@@ -77,13 +79,18 @@ authData.subscribe(async (data) => {
|
|||||||
instance.set(
|
instance.set(
|
||||||
data?.instance ?? get(userSettings).instance ?? DEFAULT_INSTANCE_URL
|
data?.instance ?? get(userSettings).instance ?? DEFAULT_INSTANCE_URL
|
||||||
)
|
)
|
||||||
if (!data?.token) return
|
if (!data?.token) {
|
||||||
|
user.set(null)
|
||||||
|
return
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
const site = await getClient().getSite({
|
const site = await getClient().getSite({
|
||||||
auth: data.token,
|
auth: data.token,
|
||||||
})
|
})
|
||||||
if (!site?.my_user) throw Error('Missing user')
|
if (!site?.my_user) {
|
||||||
|
user.set(null)
|
||||||
|
throw Error('Missing user')
|
||||||
|
}
|
||||||
user.set({ ...site.my_user.local_user_view, unreads: 0 })
|
user.set({ ...site.my_user.local_user_view, unreads: 0 })
|
||||||
if (typeof localStorage != 'undefined') {
|
if (typeof localStorage != 'undefined') {
|
||||||
localStorage.setItem('user', JSON.stringify(data))
|
localStorage.setItem('user', JSON.stringify(data))
|
||||||
@@ -95,6 +102,7 @@ authData.subscribe(async (data) => {
|
|||||||
})
|
})
|
||||||
console.error(error)
|
console.error(error)
|
||||||
authData.set(undefined)
|
authData.set(undefined)
|
||||||
|
user.set(null)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
DEFAULT_INSTANCE_URL,
|
DEFAULT_INSTANCE_URL,
|
||||||
authData,
|
authData,
|
||||||
getClient,
|
getClient,
|
||||||
|
user,
|
||||||
validateInstance,
|
validateInstance,
|
||||||
} from '$lib/lemmy.js'
|
} from '$lib/lemmy.js'
|
||||||
import { Color } from '$lib/ui/colors.js'
|
import { Color } from '$lib/ui/colors.js'
|
||||||
@@ -38,6 +39,7 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
if (response?.jwt) {
|
if (response?.jwt) {
|
||||||
|
user.set(undefined)
|
||||||
authData.set({
|
authData.set({
|
||||||
instance: data.instance,
|
instance: data.instance,
|
||||||
token: response.jwt,
|
token: response.jwt,
|
||||||
@@ -54,6 +56,7 @@
|
|||||||
content: error as any,
|
content: error as any,
|
||||||
type: ToastType.error,
|
type: ToastType.error,
|
||||||
})
|
})
|
||||||
|
user.set(null)
|
||||||
}
|
}
|
||||||
data.loading = false
|
data.loading = false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html,
|
||||||
|
body {
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
}
|
||||||
|
|
||||||
.wait * {
|
.wait * {
|
||||||
cursor: wait !important;
|
cursor: wait !important;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user