fix: Fix logout button
This commit is contained in:
1 parent
c0702d645c
commit
ab8630a76e
8 files changed
+23
-30
No files matched your search
@@ -9,18 +9,12 @@
|
|||||||
} from 'svelte-hero-icons'
|
} from 'svelte-hero-icons'
|
||||||
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||||
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
|
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
|
||||||
import { isImage, isVideo } from '$lib/ui/image.js'
|
import { isImage } from '$lib/ui/image.js'
|
||||||
import PostVote from '$lib/components/lemmy/PostVote.svelte'
|
import PostVote from '$lib/components/lemmy/PostVote.svelte'
|
||||||
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
|
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
|
||||||
import UserLink from '$lib/components/user/UserLink.svelte'
|
import UserLink from '$lib/components/user/UserLink.svelte'
|
||||||
import Card from '$lib/components/ui/Card.svelte'
|
import Card from '$lib/components/ui/Card.svelte'
|
||||||
import {
|
import { authData, getClient, getInstance, user } from '$lib/lemmy.js'
|
||||||
DEFAULT_INSTANCE_URL,
|
|
||||||
authData,
|
|
||||||
getClient,
|
|
||||||
getInstance,
|
|
||||||
user,
|
|
||||||
} from '$lib/lemmy.js'
|
|
||||||
import Menu from '$lib/components/ui/menu/Menu.svelte'
|
import Menu from '$lib/components/ui/menu/Menu.svelte'
|
||||||
import Button from '$lib/components/input/Button.svelte'
|
import Button from '$lib/components/input/Button.svelte'
|
||||||
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
|
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
|
||||||
@@ -32,20 +26,14 @@
|
|||||||
let postRes: PostView
|
let postRes: PostView
|
||||||
export { postRes as post }
|
export { postRes as post }
|
||||||
|
|
||||||
let deleting = false
|
|
||||||
|
|
||||||
async function deletePost() {
|
async function deletePost() {
|
||||||
if (!$authData) return
|
if (!$authData) return
|
||||||
|
|
||||||
deleting = true
|
|
||||||
|
|
||||||
await getClient().deletePost({
|
await getClient().deletePost({
|
||||||
auth: $authData.token,
|
auth: $authData.token,
|
||||||
deleted: true,
|
deleted: true,
|
||||||
post_id: postRes.post.id,
|
post_id: postRes.post.id,
|
||||||
})
|
})
|
||||||
|
|
||||||
deleting = false
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -58,7 +46,7 @@
|
|||||||
/>
|
/>
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<CommunityLink community={postRes.community} />
|
<CommunityLink community={postRes.community} />
|
||||||
<span class="opacity-60 flex flex-row gap-1">
|
<span class="text-slate-500 dark:text-zinc-400 flex flex-row gap-1">
|
||||||
<UserLink user={postRes.creator} />
|
<UserLink user={postRes.creator} />
|
||||||
<span>•</span>
|
<span>•</span>
|
||||||
<RelativeDate date={new Date(postRes.post.published)} />
|
<RelativeDate date={new Date(postRes.post.published)} />
|
||||||
@@ -100,7 +88,7 @@
|
|||||||
{#if postRes.post.body}
|
{#if postRes.post.body}
|
||||||
<p
|
<p
|
||||||
class="text-sm max-h-[74px] line-clamp-3 bg-slate-100 dark:bg-zinc-800
|
class="text-sm max-h-[74px] line-clamp-3 bg-slate-100 dark:bg-zinc-800
|
||||||
border border-slate200 dark:border-zinc-700 rounded-md p-2 mt-2"
|
border border-slate-200 dark:border-zinc-700 rounded-md p-2 mt-2"
|
||||||
>
|
>
|
||||||
{postRes.post.body}
|
{postRes.post.body}
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -83,7 +83,7 @@
|
|||||||
class="py-2 {$page.url.hash == `#${node.comment_view.comment.id}`
|
class="py-2 {$page.url.hash == `#${node.comment_view.comment.id}`
|
||||||
? 'bg-slate-200 dark:bg-zinc-800'
|
? 'bg-slate-200 dark:bg-zinc-800'
|
||||||
: ''} {node.depth == 0
|
: ''} {node.depth == 0
|
||||||
? 'border-b border-slate-200 dark:border-white/10'
|
? 'border-b border-slate-200 dark:border-zinc-800'
|
||||||
: ''}"
|
: ''}"
|
||||||
id="#{node.comment_view.comment.id.toString()}"
|
id="#{node.comment_view.comment.id.toString()}"
|
||||||
>
|
>
|
||||||
@@ -103,8 +103,8 @@
|
|||||||
<span
|
<span
|
||||||
class="ml-auto translate-x-1 opacity-0
|
class="ml-auto translate-x-1 opacity-0
|
||||||
group-hover:translate-x-0 group-hover:opacity-100 text-xs transition-all
|
group-hover:translate-x-0 group-hover:opacity-100 text-xs transition-all
|
||||||
flex flex-row items-center gap-1 dark:bg-white/5 p-1 rounded-md
|
flex flex-row items-center gap-1 dark:bg-zinc-900 p-1 rounded-md
|
||||||
bg-black/5 px-2"
|
bg-slate-200 hover:brightness-125 px-2"
|
||||||
>
|
>
|
||||||
{#if open}
|
{#if open}
|
||||||
<Icon src={Minus} width={16} height={16} mini />
|
<Icon src={Minus} width={16} height={16} mini />
|
||||||
|
|||||||
@@ -37,8 +37,7 @@
|
|||||||
|
|
||||||
const newComments = await getClient().getComments({
|
const newComments = await getClient().getComments({
|
||||||
auth: $authData?.token,
|
auth: $authData?.token,
|
||||||
max_depth: 3,
|
max_depth: 5,
|
||||||
limit: 10,
|
|
||||||
parent_id: parent.comment_view.comment.id,
|
parent_id: parent.comment_view.comment.id,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -11,5 +11,5 @@
|
|||||||
{alt}
|
{alt}
|
||||||
{width}
|
{width}
|
||||||
loading="lazy"
|
loading="lazy"
|
||||||
class="rounded-full aspect-square object-cover"
|
class="rounded-full aspect-square object-cover overflow-hidden"
|
||||||
/>
|
/>
|
||||||
@@ -116,9 +116,8 @@
|
|||||||
<MenuButton
|
<MenuButton
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
localStorage.removeItem('user')
|
localStorage.removeItem('user')
|
||||||
goto('/', {
|
user.set(undefined)
|
||||||
invalidateAll: true,
|
authData.set(undefined)
|
||||||
})
|
|
||||||
}}
|
}}
|
||||||
color={Color.dangerSecondary}
|
color={Color.dangerSecondary}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -20,10 +20,10 @@
|
|||||||
|
|
||||||
<svelte:body
|
<svelte:body
|
||||||
on:click={(event) => {
|
on:click={(event) => {
|
||||||
|
if (open) {
|
||||||
let path = event.composedPath()
|
let path = event.composedPath()
|
||||||
|
|
||||||
if (!path.includes(element)) {
|
if (!path.includes(element)) {
|
||||||
if (open) {
|
|
||||||
open = false
|
open = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-3
@@ -38,18 +38,20 @@ export interface UserData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const authData = writable<AuthData | undefined>()
|
export const authData = writable<AuthData | undefined>()
|
||||||
export const user = writable<GetPersonDetailsResponse & UserData>()
|
export const user = writable<
|
||||||
|
(GetPersonDetailsResponse & UserData) | undefined
|
||||||
|
>()
|
||||||
|
|
||||||
setInterval(async () => {
|
setInterval(async () => {
|
||||||
// check for unread messages
|
// check for unread messages
|
||||||
if (!get(authData)) return
|
if (!get(authData) || !get(user)) return
|
||||||
|
|
||||||
const response = await getClient().getUnreadCount({
|
const response = await getClient().getUnreadCount({
|
||||||
auth: get(authData)!.token,
|
auth: get(authData)!.token,
|
||||||
})
|
})
|
||||||
|
|
||||||
const u = get(user)
|
const u = get(user)
|
||||||
u.unreads = response.mentions + response.private_messages + response.replies
|
u!.unreads = response.mentions + response.private_messages + response.replies
|
||||||
|
|
||||||
user.set(u)
|
user.set(u)
|
||||||
}, 60 * 1000)
|
}, 60 * 1000)
|
||||||
|
|||||||
@@ -34,11 +34,16 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function markAllAsRead() {
|
async function markAllAsRead() {
|
||||||
|
if (!$user) {
|
||||||
|
goto('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
const response = await getClient().markAllAsRead({
|
const response = await getClient().markAllAsRead({
|
||||||
auth: $authData!.token,
|
auth: $authData!.token,
|
||||||
})
|
})
|
||||||
|
|
||||||
$user.unreads = 0
|
$user!.unreads = 0
|
||||||
|
|
||||||
goto($page.url, {
|
goto($page.url, {
|
||||||
invalidateAll: true,
|
invalidateAll: true,
|
||||||
|
|||||||
Reference in new issue
Block a user