feat: Add instance info
This commit is contained in:
1 parent
3159583654
commit
4b23c98dbd
11 files changed
+189
-68
No files matched your search
+12
-6
@@ -1,4 +1,5 @@
|
|||||||
import { instance_url } from '$lib/lemmy.js'
|
import { instance_url } from '$lib/lemmy.js'
|
||||||
|
import { error } from '@sveltejs/kit'
|
||||||
|
|
||||||
export async function handle({ event, resolve }) {
|
export async function handle({ event, resolve }) {
|
||||||
// annoying hack to fix lemmy's CORS
|
// annoying hack to fix lemmy's CORS
|
||||||
@@ -12,13 +13,18 @@ export async function handle({ event, resolve }) {
|
|||||||
event.request.headers.delete('origin')
|
event.request.headers.delete('origin')
|
||||||
event.request.headers.delete('host')
|
event.request.headers.delete('host')
|
||||||
|
|
||||||
const data = await fetch(`https://${instance}/${url.toString()}`, {
|
try {
|
||||||
method: event.request.method,
|
const data = await fetch(`https://${instance}/${url.toString()}`, {
|
||||||
body: event.request.body,
|
method: event.request.method,
|
||||||
headers: event.request.headers,
|
body: event.request.body,
|
||||||
})
|
headers: event.request.headers,
|
||||||
|
})
|
||||||
|
|
||||||
return new Response(JSON.stringify(await data.json()))
|
return new Response(JSON.stringify(await data.json()))
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
throw error(500, `The proxy failed to fetch from ${instance}.`)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await resolve(event)
|
const response = await resolve(event)
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<div
|
||||||
|
class="sticky top-4 bg-white border border-slate-200
|
||||||
|
dark:border-zinc-800 dark:bg-zinc-900 break-words hidden lg:flex
|
||||||
|
flex-col gap-4 p-8 max-w-sm rounded-md h-max max-h-[calc(100vh-2rem)] overflow-auto"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
export let number: number
|
||||||
|
export let locale: string = 'en'
|
||||||
|
export let options: Intl.NumberFormatOptions = {
|
||||||
|
notation: 'compact',
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<span>{Intl.NumberFormat(locale, options).format(number)}</span>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/stores'
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="flex flex-col mx-auto gap-4 justify-center items-center">
|
||||||
|
<h1 class="font-black text-3xl">{$page.status}</h1>
|
||||||
|
<p>{JSON.stringify($page.error)}</p>
|
||||||
|
</div>
|
||||||
@@ -8,10 +8,13 @@ export function load({ url, cookies }) {
|
|||||||
const listingType: ListingType =
|
const listingType: ListingType =
|
||||||
(url.searchParams.get('type') as ListingType) || 'Local'
|
(url.searchParams.get('type') as ListingType) || 'Local'
|
||||||
|
|
||||||
return getClient(cookies.get('instance_url')).getPosts({
|
return {
|
||||||
limit: 40,
|
posts: getClient(cookies.get('instance_url')).getPosts({
|
||||||
page: page,
|
limit: 40,
|
||||||
sort: sort,
|
page: page,
|
||||||
type_: listingType,
|
sort: sort,
|
||||||
})
|
type_: listingType,
|
||||||
|
}),
|
||||||
|
site: getClient(cookies.get('instance_url')).getSite({}),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+96
-47
@@ -2,60 +2,109 @@
|
|||||||
import { goto } from '$app/navigation'
|
import { goto } from '$app/navigation'
|
||||||
import { page } from '$app/stores'
|
import { page } from '$app/stores'
|
||||||
import Button from '$lib/components/Button.svelte'
|
import Button from '$lib/components/Button.svelte'
|
||||||
|
import Card from '$lib/components/Card.svelte'
|
||||||
import Link from '$lib/components/Link.svelte'
|
import Link from '$lib/components/Link.svelte'
|
||||||
import MultiSelect from '$lib/components/MultiSelect.svelte'
|
import MultiSelect from '$lib/components/MultiSelect.svelte'
|
||||||
|
import {
|
||||||
|
Calendar,
|
||||||
|
ChatBubbleLeftEllipsis,
|
||||||
|
ChatBubbleOvalLeftEllipsis,
|
||||||
|
Icon,
|
||||||
|
Newspaper,
|
||||||
|
PencilSquare,
|
||||||
|
UserGroup,
|
||||||
|
} from 'svelte-hero-icons'
|
||||||
|
import Avatar from './post/[id]/Avatar.svelte'
|
||||||
import Post from './post/[id]/Post.svelte'
|
import Post from './post/[id]/Post.svelte'
|
||||||
|
import FormattedNumber from '$lib/components/FormattedNumber.svelte'
|
||||||
|
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||||
|
import RelativeDate from '$lib/components/RelativeDate.svelte'
|
||||||
|
|
||||||
export let data
|
export let data
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="flex flex-col gap-2">
|
<div class="flex flex-row gap-4">
|
||||||
<div class="flex flex-col sm:flex-row gap-4">
|
<div class="flex flex-col gap-4">
|
||||||
<MultiSelect
|
<div class="flex flex-col sm:flex-row gap-4">
|
||||||
options={['Subscribed', 'Local', 'All']}
|
<MultiSelect
|
||||||
selected={$page.url.searchParams.get('type') ?? 'Local'}
|
options={['Subscribed', 'Local', 'All']}
|
||||||
on:select={(e) => {
|
selected={$page.url.searchParams.get('type') ?? 'Local'}
|
||||||
const url = $page.url
|
on:select={(e) => {
|
||||||
url.searchParams.set('type', e.detail)
|
const url = $page.url
|
||||||
url.searchParams.delete('page')
|
url.searchParams.set('type', e.detail)
|
||||||
goto(url, {
|
url.searchParams.delete('page')
|
||||||
invalidateAll: true,
|
goto(url, {
|
||||||
})
|
invalidateAll: true,
|
||||||
}}
|
})
|
||||||
/>
|
}}
|
||||||
<MultiSelect
|
/>
|
||||||
options={['Active', 'TopWeek', 'TopAll', 'New']}
|
<MultiSelect
|
||||||
optionNames={['Active', 'Top (Week)', 'Top (All)', 'New']}
|
options={['Active', 'TopWeek', 'TopAll', 'New']}
|
||||||
selected={$page.url.searchParams.get('sort') ?? 'Active'}
|
optionNames={['Active', 'Top (Week)', 'Top (All)', 'New']}
|
||||||
on:select={(e) => {
|
selected={$page.url.searchParams.get('sort') ?? 'Active'}
|
||||||
const url = $page.url
|
on:select={(e) => {
|
||||||
url.searchParams.set('sort', e.detail)
|
const url = $page.url
|
||||||
url.searchParams.delete('page')
|
url.searchParams.set('sort', e.detail)
|
||||||
goto(url, {
|
url.searchParams.delete('page')
|
||||||
invalidateAll: true,
|
goto(url, {
|
||||||
})
|
invalidateAll: true,
|
||||||
}}
|
})
|
||||||
/>
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex flex-col gap-4 w-full">
|
||||||
|
{#each data.posts.posts as post}
|
||||||
|
<Post {post} />
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Link
|
||||||
|
href={(function () {
|
||||||
|
$page.url.searchParams.set(
|
||||||
|
'page',
|
||||||
|
((Number($page.url.searchParams.get('page')) || 1) + 1).toString()
|
||||||
|
)
|
||||||
|
|
||||||
|
return $page.url.toString()
|
||||||
|
})()}
|
||||||
|
>
|
||||||
|
Next
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="ml-auto hidden lg:block max-w-sm w-full">
|
||||||
<div class="flex flex-col gap-4 w-full">
|
<Card>
|
||||||
{#each data.posts as post}
|
<Avatar
|
||||||
<Post {post} />
|
width={64}
|
||||||
{/each}
|
url={data.site.site_view.site.icon ?? ''}
|
||||||
</div>
|
alt={data.site.site_view.site.name}
|
||||||
|
/>
|
||||||
<div>
|
<span class="flex flex-row items-center gap-1 text-sm">
|
||||||
<Link
|
<Icon src={Calendar} width={16} height={16} mini />
|
||||||
href={(function () {
|
<RelativeDate date={new Date(data.site.site_view.site.published)} />
|
||||||
$page.url.searchParams.set(
|
</span>
|
||||||
'page',
|
<div class="text-sm flex flex-row flex-wrap gap-3">
|
||||||
((Number($page.url.searchParams.get('page')) || 1) + 1).toString()
|
<span class="flex flex-row items-center gap-1">
|
||||||
)
|
<Icon src={UserGroup} width={16} height={16} mini />
|
||||||
|
<FormattedNumber number={data.site.site_view.counts.users} />
|
||||||
return $page.url.toString()
|
</span>
|
||||||
})()}
|
<span class="flex flex-row items-center gap-1">
|
||||||
>
|
<Icon src={PencilSquare} width={16} height={16} mini />
|
||||||
Next
|
<FormattedNumber number={data.site.site_view.counts.posts} />
|
||||||
</Link>
|
</span>
|
||||||
|
<span class="flex flex-row items-center gap-1">
|
||||||
|
<Icon src={ChatBubbleOvalLeftEllipsis} width={16} height={16} mini />
|
||||||
|
<FormattedNumber number={data.site.site_view.counts.comments} />
|
||||||
|
</span>
|
||||||
|
<span class="flex flex-row items-center gap-1">
|
||||||
|
<Icon src={Newspaper} width={16} height={16} mini />
|
||||||
|
<FormattedNumber number={data.site.site_view.counts.communities} />
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<h1 class="font-bold text-lg">{data.site.site_view.site.name}</h1>
|
||||||
|
<Markdown source={data.site.site_view.site.description ?? ''} />
|
||||||
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -10,6 +10,7 @@
|
|||||||
import Comments from './Comments.svelte'
|
import Comments from './Comments.svelte'
|
||||||
import SvelteMarkdown from 'svelte-markdown'
|
import SvelteMarkdown from 'svelte-markdown'
|
||||||
import CommunityLink from '$lib/components/CommunityLink.svelte'
|
import CommunityLink from '$lib/components/CommunityLink.svelte'
|
||||||
|
import { isImage } from '$lib/ui/image.js'
|
||||||
|
|
||||||
export let data: { post: GetPostResponse; comments: GetCommentsResponse }
|
export let data: { post: GetPostResponse; comments: GetCommentsResponse }
|
||||||
|
|
||||||
@@ -101,9 +102,9 @@
|
|||||||
{post.url}
|
{post.url}
|
||||||
</a>
|
</a>
|
||||||
{/if}
|
{/if}
|
||||||
{#if post.thumbnail_url}
|
{#if isImage(post.url)}
|
||||||
<img
|
<img
|
||||||
src={post.thumbnail_url}
|
src={post.url}
|
||||||
alt={post.name}
|
alt={post.name}
|
||||||
class="rounded-md max-w-screen max-h-[80vh] mx-auto"
|
class="rounded-md max-w-screen max-h-[80vh] mx-auto"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -13,7 +13,9 @@
|
|||||||
|
|
||||||
<li class="py-3">
|
<li class="py-3">
|
||||||
<details bind:open class="flex flex-col gap-1">
|
<details bind:open class="flex flex-col gap-1">
|
||||||
<summary class="flex flex-row cursor-pointer arrow gap-2 items-center">
|
<summary
|
||||||
|
class="flex flex-row cursor-pointer arrow gap-2 items-center group"
|
||||||
|
>
|
||||||
<Avatar
|
<Avatar
|
||||||
url={node.comment_view.creator.avatar ??
|
url={node.comment_view.creator.avatar ??
|
||||||
`https://api.dicebear.com/6.x/initials/svg?seed=${node.comment_view.creator.name}`}
|
`https://api.dicebear.com/6.x/initials/svg?seed=${node.comment_view.creator.name}`}
|
||||||
@@ -29,6 +31,25 @@
|
|||||||
<span class="text-sm opacity-60">
|
<span class="text-sm opacity-60">
|
||||||
<RelativeDate date={new Date(node.comment_view.comment.published)} />
|
<RelativeDate date={new Date(node.comment_view.comment.published)} />
|
||||||
</span>
|
</span>
|
||||||
|
<span
|
||||||
|
class="ml-auto translate-x-1 opacity-0
|
||||||
|
group-hover:translate-x-0 group-hover:opacity-100 text-xs transition-all
|
||||||
|
flex flex-row items-center gap-1 hover:dark:bg-white/10 p-1 rounded-md
|
||||||
|
hover:bg-black/10 px-2"
|
||||||
|
>
|
||||||
|
{#if open}
|
||||||
|
<div class="inline">
|
||||||
|
<Icon src={Minus} width={16} height={16} mini />
|
||||||
|
</div>
|
||||||
|
Collapse
|
||||||
|
{:else}
|
||||||
|
<Icon src={Plus} width={16} height={16} mini />
|
||||||
|
Expand
|
||||||
|
{#if node.children.length > 0}
|
||||||
|
<span class="text-xs opacity-50">+{node.children.length}</span>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
|
</span>
|
||||||
</summary>
|
</summary>
|
||||||
<div class="mt-1">
|
<div class="mt-1">
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -9,6 +9,8 @@
|
|||||||
ArrowDown,
|
ArrowDown,
|
||||||
ArrowUp,
|
ArrowUp,
|
||||||
ChatBubbleLeft,
|
ChatBubbleLeft,
|
||||||
|
ChatBubbleOvalLeft,
|
||||||
|
ChatBubbleOvalLeftEllipsis,
|
||||||
ChevronDown,
|
ChevronDown,
|
||||||
ChevronUp,
|
ChevronUp,
|
||||||
Icon,
|
Icon,
|
||||||
@@ -65,7 +67,8 @@
|
|||||||
<div class="flex flex-row gap-2 p-2">
|
<div class="flex flex-row gap-2 p-2">
|
||||||
<div
|
<div
|
||||||
class="flex flex-row items-center gap-1 rounded-md
|
class="flex flex-row items-center gap-1 rounded-md
|
||||||
bg-slate-100 dark:bg-zinc-800"
|
bg-slate-100 dark:bg-zinc-800 hover:bg-slate-200
|
||||||
|
dark:hover:bg-zinc-700 transition-colors cursor-pointer"
|
||||||
>
|
>
|
||||||
<button aria-label="Upvote" class="p-1 px-1.5">
|
<button aria-label="Upvote" class="p-1 px-1.5">
|
||||||
<Icon src={ChevronUp} mini width={20} height={20} />
|
<Icon src={ChevronUp} mini width={20} height={20} />
|
||||||
@@ -76,16 +79,17 @@
|
|||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
<button aria-label="Downvote" class="p-1 px-1.5">
|
<button aria-label="Downvote" class="p-1 px-1.5">
|
||||||
<Icon src={ChevronDown} mini width={20} height="20}" />
|
<Icon src={ChevronDown} mini width={20} height={20} />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<a
|
<a
|
||||||
class="flex flex-row items-center gap-2.5 p-1 px-2 rounded-md
|
class="flex flex-row items-center gap-1 p-1.5 px-3 rounded-md
|
||||||
bg-slate-100 dark:bg-zinc-800"
|
bg-slate-100 dark:bg-zinc-800 hover:bg-slate-200
|
||||||
|
dark:hover:bg-zinc-700 transition-colors"
|
||||||
href="/post/{postRes.post.id}"
|
href="/post/{postRes.post.id}"
|
||||||
>
|
>
|
||||||
<Icon src={ChatBubbleLeft} width={16} height={16} />
|
<Icon src={ChatBubbleOvalLeft} mini width={16} height={16} />
|
||||||
<span class="text-sm">
|
<span class="text-sm">
|
||||||
{Intl.NumberFormat('en', { notation: 'compact' }).format(
|
{Intl.NumberFormat('en', { notation: 'compact' }).format(
|
||||||
postRes.counts.comments
|
postRes.counts.comments
|
||||||
|
|||||||
@@ -25,3 +25,7 @@ pre {
|
|||||||
@apply bg-slate-100 p-2 rounded-md m-2 max-w-full whitespace-pre-wrap
|
@apply bg-slate-100 p-2 rounded-md m-2 max-w-full whitespace-pre-wrap
|
||||||
border-slate-200 border dark:bg-zinc-900 dark:border-zinc-800 text-sm;
|
border-slate-200 border dark:bg-zinc-900 dark:border-zinc-800 text-sm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ol {
|
||||||
|
@apply list-decimal;
|
||||||
|
}
|
||||||
+10
-1
@@ -2,7 +2,16 @@
|
|||||||
export default {
|
export default {
|
||||||
content: ['src/**/*.{js,ts,svelte,html}'],
|
content: ['src/**/*.{js,ts,svelte,html}'],
|
||||||
theme: {
|
theme: {
|
||||||
extend: {},
|
extend: {
|
||||||
|
animation: {
|
||||||
|
'pop-in': 'pop-in 0.25s ease-out forwards'
|
||||||
|
},
|
||||||
|
keyframes: {
|
||||||
|
'pop-in': {
|
||||||
|
'0%, 100%': { transform: 'translateX(8px)', opacity: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
plugins: [],
|
plugins: [],
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user