fix: ssr issues

This commit is contained in:
Xyphyn committed 2023-10-10 17:15:08 -07:00
1 parent e3c7aca8ee
commit 16154bbc23
9 files changed
+146 -146

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "photon-lemmy", "name": "photon-lemmy",
"version": "1.18.2", "version": "1.19.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
+4 -6
View File
@@ -31,6 +31,7 @@
: view == 'list' : view == 'list'
? 'py-5' ? 'py-5'
: 'py-5'}" : 'py-5'}"
id={post.post.id}
> >
<!-- svelte-ignore a11y-no-static-element-interactions --> <!-- svelte-ignore a11y-no-static-element-interactions -->
<!-- svelte-ignore a11y-click-events-have-key-events --> <!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -83,9 +84,7 @@
<svelte:element <svelte:element
this={$userSettings.expandImages ? 'div' : 'a'} this={$userSettings.expandImages ? 'div' : 'a'}
href={postLink(post.post)} href={postLink(post.post)}
class="container mx-auto z-10 transition-colors {loaded class="container mx-auto z-10 transition-colors rounded-xl max-h-[60vh] relative overflow-hidden"
? ''
: 'bg-slate-200 dark:bg-zinc-800'} rounded-xl max-h-[60vh] relative overflow-hidden"
data-sveltekit-preload-data="off" data-sveltekit-preload-data="off"
aria-label={post.post.name} aria-label={post.post.name}
> >
@@ -126,8 +125,7 @@
src={bestImageURL(post.post, false, 1024)} src={bestImageURL(post.post, false, 1024)}
loading="lazy" loading="lazy"
class="max-h-[inherit] max-w-full h-auto z-30 class="max-h-[inherit] max-w-full h-auto z-30
opacity-0 transition-opacity duration-300 object-contain mx-auto" transition-opacity duration-300 object-contain mx-auto"
class:opacity-100={loaded}
width={512} width={512}
height={300} height={300}
class:blur-3xl={post.post.nsfw && $userSettings.nsfwBlur} class:blur-3xl={post.post.nsfw && $userSettings.nsfwBlur}
@@ -168,7 +166,7 @@
dark:from-zinc-400 dark:via-zinc-400 bg-clip-text dark:from-zinc-400 dark:via-zinc-400 bg-clip-text
{view == 'list' ? `max-h-24` : 'max-h-48'}" {view == 'list' ? `max-h-24` : 'max-h-48'}"
> >
<Markdown inline source={post.post.body.slice(0, 500)} /> <Markdown inline source={post.post.body} />
</div> </div>
{/if} {/if}
</div> </div>
@@ -11,11 +11,10 @@
export let community: boolean = false export let community: boolean = false
</script> </script>
<div <ul
class="flex flex-col {$userSettings.view == 'card' class="flex flex-col list-none {$userSettings.view == 'card'
? 'gap-3 md:gap-4' ? 'gap-3 md:gap-4'
: ''} divide-slate-200 dark:divide-zinc-800" : 'divide-y'} divide-slate-200 dark:divide-zinc-800"
class:divide-y={$userSettings.view != 'card'}
> >
{#if posts.length == 0} {#if posts.length == 0}
<div class="h-full grid place-items-center"> <div class="h-full grid place-items-center">
@@ -31,9 +30,9 @@
</Placeholder> </Placeholder>
</div> </div>
{:else} {:else}
{#each posts as post, index (post.post.id)} {#each posts as post, index}
{#if !($userSettings.hidePosts.deleted && post.post.deleted) && !($userSettings.hidePosts.removed && post.post.removed)} {#if !($userSettings.hidePosts.deleted && post.post.deleted) && !($userSettings.hidePosts.removed && post.post.removed)}
<div <li
in:fly|global={{ in:fly|global={{
y: -8, y: -8,
duration: 500, duration: 500,
@@ -42,8 +41,8 @@
}} }}
> >
<Post hideCommunity={community} view={$userSettings.view} bind:post /> <Post hideCommunity={community} view={$userSettings.view} bind:post />
</div> </li>
{/if} {/if}
{/each} {/each}
{/if} {/if}
</div> </ul>
+52 -55
View File
@@ -39,63 +39,60 @@
</script> </script>
<slot {vote} {score}> <slot {vote} {score}>
<Popover openOnHover placement="bottom"> <!-- <Popover openOnHover placement="bottom"> -->
<div <div
class=" flex items-center text-sm gap-1 rounded-md border border-slate-200 class=" flex items-center text-sm gap-1 rounded-md border border-slate-200
dark:border-zinc-800 bg-white dark:bg-zinc-900 px-1 h-8 cursor-pointer" dark:border-zinc-800 bg-white dark:bg-zinc-900 px-1 h-8 cursor-pointer"
slot="target" >
<Button
aria-label="Upvote"
class={vote == 1
? voteColor(vote)
: 'hover:dark:text-blue-600 hover:text-blue-500'}
on:click={async () => castVote(vote == 1 ? 0 : 1)}
size="square-sm"
color="tertiary"
alignment="center"
> >
<Button <Icon src={ChevronUp} mini size="18" />
aria-label="Upvote" </Button>
class={vote == 1 <span
? voteColor(vote) class="font-medium transition-colors duration-200 grid {voteColor(vote)}"
: 'hover:dark:text-blue-600 hover:text-blue-500'} class:hidden={$profile?.user?.local_user_view.local_user.show_scores ==
on:click={async () => castVote(vote == 1 ? 0 : 1)} false}
size="square-sm" >
color="tertiary" {#key score}
alignment="center" <span
> in:fly={{ y: score > oldScore ? 4 : -4, duration: 200 }}
<Icon src={ChevronUp} mini size="18" /> out:fly={{ y: score > oldScore ? -4 : 4, duration: 200 }}
</Button> style="grid-column: 1; grid-row: 1;"
<span >
class="font-medium transition-colors duration-200 grid {voteColor( <FormattedNumber number={score} />
vote </span>
)}" {/key}
class:hidden={$profile?.user?.local_user_view.local_user.show_scores == </span>
false} <Button
> aria-label="Downvote"
{#key score} class="{vote == -1 ? voteColor(vote) : ''} {$site?.site_view.local_site
<span .enable_downvotes
in:fly={{ y: score > oldScore ? 4 : -4, duration: 200 }} ? 'hover:dark:text-red-600 hover:text-red-500'
out:fly={{ y: score > oldScore ? -4 : 4, duration: 200 }} : 'pointer-events-none opacity-50'}"
style="grid-column: 1; grid-row: 1;" on:click={async () => castVote(vote == -1 ? 0 : -1)}
> size="square-sm"
<FormattedNumber number={score} /> color="tertiary"
</span> >
{/key} <Icon src={ChevronDown} mini size="18" />
</span> </Button>
<Button </div>
aria-label="Downvote" <!-- <div class="flex items-center gap-2">
class="{vote == -1 ? voteColor(vote) : ''} {$site?.site_view.local_site <div class="flex items-center font-medium text-blue-500 gap-0.5">
.enable_downvotes <Icon src={ArrowUp} mini size="18" title="Upvotes" />
? 'hover:dark:text-red-600 hover:text-red-500' {upvotes}
: 'pointer-events-none opacity-50'}"
on:click={async () => castVote(vote == -1 ? 0 : -1)}
size="square-sm"
color="tertiary"
>
<Icon src={ChevronDown} mini size="18" />
</Button>
</div> </div>
<div class="flex items-center gap-2"> <div class="flex items-center font-medium text-red-500 gap-0.5">
<div class="flex items-center font-medium text-blue-500 gap-0.5"> <Icon src={ArrowDown} mini size="18" title="Downvotes" />
<Icon src={ArrowUp} mini size="18" title="Upvotes" /> {downvotes}
{upvotes}
</div>
<div class="flex items-center font-medium text-red-500 gap-0.5">
<Icon src={ArrowDown} mini size="18" title="Downvotes" />
{downvotes}
</div>
</div> </div>
</Popover> </div> -->
<!-- </Popover> -->
</slot> </slot>
+10 -4
View File
@@ -1,10 +1,12 @@
<script lang="ts"> <script lang="ts">
import { md, mdInline, photonify } from '$lib/components/markdown/markdown' import { md, mdInline, photonify } from '$lib/components/markdown/markdown'
import { userSettings } from '$lib/settings.js' import { onMount } from 'svelte'
export let source: string = '' export let source: string = ''
export let inline: boolean = false export let inline: boolean = false
let rendered = ''
function replaceURLs(node: HTMLElement, source: string) { function replaceURLs(node: HTMLElement, source: string) {
if (!div) return if (!div) return
const links = node.querySelectorAll('a') const links = node.querySelectorAll('a')
@@ -17,18 +19,22 @@
let div: HTMLElement let div: HTMLElement
const render = (source: string): string => { function render(source: string): string {
if (!source || source == '') return '' if (!source || source == '') return ''
try { try {
return inline ? mdInline.render(source) : md.render(source) const output = inline ? mdInline.render(source) : md.render(source)
return output
} catch (err) { } catch (err) {
console.error(err)
return '' return ''
} }
} }
$: rendered = render(source) $: rendered = render(source)
$: replaceURLs(div, rendered) $: replaceURLs(div, rendered)
onMount(() => {
rendered = `${rendered} `
})
</script> </script>
<div <div
+11 -1
View File
@@ -1,5 +1,6 @@
// maybe fix circular dependency, hopefully. // maybe fix circular dependency, hopefully.
import { browser } from '$app/environment'
import { env } from '$env/dynamic/public' import { env } from '$env/dynamic/public'
import { writable } from 'svelte/store' import { writable } from 'svelte/store'
@@ -7,5 +8,14 @@ export const LINKED_INSTANCE_URL =
(env.PUBLIC_LOCK_TO_INSTANCE ?? 'true').toLowerCase() == 'true' (env.PUBLIC_LOCK_TO_INSTANCE ?? 'true').toLowerCase() == 'true'
? env.PUBLIC_INSTANCE_URL ? env.PUBLIC_INSTANCE_URL
: undefined : undefined
export const DEFAULT_INSTANCE_URL = env.PUBLIC_INSTANCE_URL || 'lemmy.ml'
const getDefaultInstance = (): string => {
if (browser) {
return env.PUBLIC_INSTANCE_URL || 'lemmy.ml'
} else {
return env.PUBLIC_INTERNAL_INSTANCE || env.PUBLIC_INSTANCE_URL || 'lemmy.ml'
}
}
export const DEFAULT_INSTANCE_URL = getDefaultInstance()
export let instance = writable(DEFAULT_INSTANCE_URL) export let instance = writable(DEFAULT_INSTANCE_URL)
+1 -1
View File
@@ -113,7 +113,7 @@ export const defaultSettings: Settings = {
debugInfo: false, debugInfo: false,
expandImages: true, expandImages: true,
view: 'cozy', view: 'cozy',
font: 'system', font: 'inter',
leftAlign: false, leftAlign: false,
hidePhoton: toBool(env.PUBLIC_REMOVE_CREDIT) ?? false, hidePhoton: toBool(env.PUBLIC_REMOVE_CREDIT) ?? false,
newWidth: true, newWidth: true,
+6 -8
View File
@@ -23,19 +23,17 @@
minimum: 0.4, minimum: 0.4,
trickleSpeed: 200, trickleSpeed: 200,
showSpinner: false, showSpinner: false,
easing: 'ease-out',
speed: 300,
}) })
$: { $: {
if ($navigating) { if (browser) {
if (typeof document != 'undefined') { if ($navigating) {
nProgress.start() nProgress.start()
document?.documentElement?.classList?.toggle('wait', true)
} }
} if (!$navigating) {
if (!$navigating) { nProgress.done()
if (typeof document != 'undefined') {
nProgress.done(true)
document?.documentElement?.classList?.toggle('wait', false)
} }
} }
} }
+54 -62
View File
@@ -37,71 +37,63 @@
</div> </div>
</Modal> </Modal>
<div <div class="flex flex-col gap-4 max-w-full w-full min-w-0">
class="flex flex-row gap-4 w-full h-full xl:divide-x divide-slate-200 dark:divide-zinc-900" <header>
> <h1
<div class="flex flex-col gap-4 max-w-full w-full min-w-0"> class="text-3xl font-bold flex items-center w-full justify-between flex-wrap"
<header>
<h1
class="text-3xl font-bold flex items-center w-full justify-between flex-wrap"
>
Frontpage
<span class="xl:hidden">
<Button on:click={() => (sidebar = !sidebar)}>About</Button>
</span>
</h1>
</header>
<div
class="flex flex-row gap-4 max-w-full justify-between w-full flex-wrap"
> >
<Select Frontpage
bind:value={data.listingType} <span class="xl:hidden">
on:change={() => <Button on:click={() => (sidebar = !sidebar)}>About</Button>
searchParam($page.url, 'type', data.listingType, 'page', 'cursor')} </span>
> </h1>
<span slot="label" class="flex items-center gap-1"> </header>
<Icon src={GlobeAmericas} size="16" mini /> <div class="flex flex-row gap-4 max-w-full justify-between w-full flex-wrap">
Location <Select
</span> bind:value={data.listingType}
<option value="All">All</option> on:change={() =>
<option value="Local">Local</option> searchParam($page.url, 'type', data.listingType, 'page', 'cursor')}
<option value="Subscribed" disabled={!$profile?.jwt}>Subscribed</option> >
{#if feature('moderatorView', $site?.version)} <span slot="label" class="flex items-center gap-1">
<option <Icon src={GlobeAmericas} size="16" mini />
value="ModeratorView" Location
disabled={!$profile?.jwt || !amModOfAny($profile?.user)} </span>
> <option value="All">All</option>
Moderator <option value="Local">Local</option>
</option> <option value="Subscribed" disabled={!$profile?.jwt}>Subscribed</option>
{/if} {#if feature('moderatorView', $site?.version)}
</Select> <option
<div class="flex gap-4 flex-wrap"> value="ModeratorView"
<Sort selected={data.sort} /> disabled={!$profile?.jwt || !amModOfAny($profile?.user)}
<div class="max-[420px]:hidden"> >
<ViewSelect /> Moderator
</div> </option>
{/if}
</Select>
<div class="flex gap-4 flex-wrap">
<Sort selected={data.sort} />
<div class="max-[420px]:hidden">
<ViewSelect />
</div> </div>
</div> </div>
<section class="flex flex-col gap-3 sm:gap-4 h-full"> </div>
<PostFeed posts={data.posts.posts} /> <PostFeed posts={data.posts.posts} />
</section> <div class="mt-auto">
<div class="mt-auto"> <Pageination
<Pageination page={data.page}
page={data.page} cursor={{ next: data.cursor.next, back: data.cursor.back }}
cursor={{ next: data.cursor.next, back: data.cursor.back }} on:change={(p) => searchParam($page.url, 'page', p.detail.toString())}
on:change={(p) => searchParam($page.url, 'page', p.detail.toString())} on:cursor={(c) => {
on:cursor={(c) => { searchParam($page.url, 'cursor', c.detail)
searchParam($page.url, 'cursor', c.detail) }}
}} >
> <span class="flex flex-row items-center gap-1">
<span class="flex flex-row items-center gap-1"> <Icon src={ChartBar} size="16" mini />
<Icon src={ChartBar} size="16" mini /> <span class="font-medium text-black dark:text-white">
<span class="font-medium text-black dark:text-white"> {$site?.site_view.counts.users_active_day}
{$site?.site_view.counts.users_active_day}
</span>
<span class="font-normal">Active users</span>
</span> </span>
</Pageination> <span class="font-normal">Active users</span>
</div> </span>
</Pageination>
</div> </div>
</div> </div>