feat: add 'cozy' post style

This commit is contained in:
Xyphyn committed 2023-09-23 14:54:58 -07:00
1 parent 771f32766b
commit 1b4bd8081f
8 files changed
+64 -32

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "photon-lemmy", "name": "photon-lemmy",
"version": "1.9.4", "version": "1.10.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
+2 -1
View File
@@ -9,7 +9,8 @@
<Icon src={ViewColumns} size="14" mini /> <Icon src={ViewColumns} size="14" mini />
View View
</span> </span>
<option value="list">List</option>
<option value="card">Cards</option> <option value="card">Cards</option>
<option value="cozy">Cozy</option>
<option value="list">List</option>
<option value="compact">Compact</option> <option value="compact">Compact</option>
</Select> </Select>
@@ -11,9 +11,9 @@
</script> </script>
<Material <Material
class="flex flex-col flex-1 gap-1 {view == 'list' || view == 'compact' class="flex flex-col flex-1 gap-1 {view != 'card'
? '!bg-transparent !border-0 rounded-none' ? '!bg-transparent !border-0 rounded-none'
: 'p-5'} {view == 'list' ? 'py-5' : view == 'compact' ? 'py-4' : ''}" : 'p-5'} {view == 'list' ? 'py-5' : view == 'compact' ? 'py-4' : 'py-5'}"
color="distinct" color="distinct"
padding="none" padding="none"
> >
+13 -8
View File
@@ -15,7 +15,7 @@
export let post: PostView export let post: PostView
export let actions: boolean = true export let actions: boolean = true
export let hideCommunity = false export let hideCommunity = false
export let view: 'card' | 'list' | 'compact' = $userSettings.view export let view = $userSettings.view
let loaded = false let loaded = false
</script> </script>
@@ -24,13 +24,15 @@
color="distinct" color="distinct"
padding="none" padding="none"
class="relative max-w-full min-w-0 w-full group class="relative max-w-full min-w-0 w-full group
{view == 'list' || view == 'compact' {view != 'card' ? '!bg-transparent !border-0' : 'p-5'} {view == 'compact'
? '!bg-transparent !border-0' ? 'py-4'
: 'p-5'} {view == 'list' ? 'py-5' : view == 'compact' ? 'py-4' : ''}" : view == 'list'
? 'py-5'
: 'py-5'}"
> >
<!-- 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 -->
{#if view == 'list'} {#if view == 'list' || view == 'cozy'}
<div <div
class="absolute -inset-x-2 md:-inset-x-4 inset-y-2 scale-95 opacity-0 bg-slate-50 dark:bg-zinc-900 class="absolute -inset-x-2 md:-inset-x-4 inset-y-2 scale-95 opacity-0 bg-slate-50 dark:bg-zinc-900
-z-10 rounded-xl group-hover:opacity-100 group-hover:scale-100 transition-all" -z-10 rounded-xl group-hover:opacity-100 group-hover:scale-100 transition-all"
@@ -67,7 +69,7 @@
</a> </a>
</div> </div>
{#if isImage(post.post.url)} {#if isImage(post.post.url)}
{#if view == 'card'} {#if view == 'card' || view == 'cozy'}
<!--disabled preloads here since most people will hover over every image while scrolling--> <!--disabled preloads here since most people will hover over every image while scrolling-->
<svelte:component <svelte:component
this={$userSettings.expandImages ? ExpandableImage : Empty} this={$userSettings.expandImages ? ExpandableImage : Empty}
@@ -77,12 +79,15 @@
<svelte:element <svelte:element
this={$userSettings.expandImages ? 'div' : 'a'} this={$userSettings.expandImages ? 'div' : 'a'}
href={postLink(post.post)} href={postLink(post.post)}
class="self-stretch overflow-hidden z-10 relative bg-slate-200 dark:bg-zinc-800 rounded-md max-w-full" class="self-stretch overflow-hidden z-10 relative {loaded
? ''
: 'bg-slate-200 dark:bg-zinc-800'} rounded-md max-w-full"
data-sveltekit-preload-data="off" data-sveltekit-preload-data="off"
aria-label={post.post.name} aria-label={post.post.name}
> >
<picture <picture
class="flex justify-center rounded-md overflow-hidden max-h-[min(min-content, 50vh,500px)] w-full max-w-full" class="flex justify-center rounded-xl
overflow-hidden w-[50vh] h-auto max-w-full"
> >
<source <source
srcset={bestImageURL(post.post, false, 512)} srcset={bestImageURL(post.post, false, 512)}
@@ -14,8 +14,7 @@
class="flex flex-col {$userSettings.view == 'card' class="flex flex-col {$userSettings.view == 'card'
? 'gap-3 md:gap-4' ? 'gap-3 md:gap-4'
: ''} divide-slate-200 dark:divide-zinc-800 z-[5]" : ''} divide-slate-200 dark:divide-zinc-800 z-[5]"
class:divide-y={$userSettings.view == 'compact' || class:divide-y={$userSettings.view != 'card'}
$userSettings.view == 'list'}
> >
{#if posts.length == 0} {#if posts.length == 0}
<div class="h-full grid place-items-center"> <div class="h-full grid place-items-center">
+2 -1
View File
@@ -1,5 +1,6 @@
<span <span
class="text-sm font-bold text-slate-600 dark:text-zinc-400 {$$props.class} " {...$$restProps}
class="text-sm font-bold text-slate-600 dark:text-zinc-400 {$$props.class}"
> >
<slot /> <slot />
</span> </span>
+4 -2
View File
@@ -5,6 +5,8 @@ import { env } from '$env/dynamic/public'
console.log('Using the following default settings from the environment:') console.log('Using the following default settings from the environment:')
console.log(env) console.log(env)
export type View = 'card' | 'cozy' | 'list' | 'compact'
export const SSR_ENABLED = env.PUBLIC_SSR_ENABLED?.toLowerCase() == 'true' export const SSR_ENABLED = env.PUBLIC_SSR_ENABLED?.toLowerCase() == 'true'
// Returns a proper boolean or null. Used to set boolean values from env var strings while allowing nullish coalescing to set default values. // Returns a proper boolean or null. Used to set boolean values from env var strings while allowing nullish coalescing to set default values.
@@ -29,7 +31,7 @@ interface Settings {
// deprecated // deprecated
showCompactPosts: boolean showCompactPosts: boolean
view: 'card' | 'list' | 'compact' view: View
defaultSort: { defaultSort: {
sort: SortType sort: SortType
@@ -97,7 +99,7 @@ export const defaultSettings: Settings = {
modlogCardView: toBool(env.PUBLIC_MODLOG_CARD_VIEW) ?? undefined, modlogCardView: toBool(env.PUBLIC_MODLOG_CARD_VIEW) ?? undefined,
debugInfo: false, debugInfo: false,
expandImages: true, expandImages: true,
view: 'list', view: 'cozy',
font: 'system', font: 'system',
leftAlign: false, leftAlign: false,
hidePhoton: toBool(env.PUBLIC_REMOVE_CREDIT) ?? false, hidePhoton: toBool(env.PUBLIC_REMOVE_CREDIT) ?? false,
+39 -15
View File
@@ -42,14 +42,29 @@
</Button> </Button>
</h1> </h1>
<div class="flex flex-col max-w-4xl mx-auto"> <div
<SectionTitle class="mt-4">UI</SectionTitle> class="flex flex-row md:divide-x divide-slate-200 dark:divide-zinc-800"
style="scroll-behavior: smooth;"
>
<nav class="hidden md:flex flex-col gap-2 w-64 pr-4 pt-4 sticky top-16 h-max">
<SectionTitle>Navigation</SectionTitle>
<Button href="#ui" alignment="left" color="tertiary">UI</Button>
<Button href="#posts" alignment="left" color="tertiary">Posts</Button>
<Button href="#instances" alignment="left" color="tertiary">
Instances
</Button>
<Button href="#other" alignment="left" color="tertiary">Other</Button>
</nav>
<div class="flex flex-col md:flex-1 md:pl-4 min-w-0">
<SectionTitle id="ui" class="mt-4">UI</SectionTitle>
<Setting> <Setting>
<span slot="title">Post style</span> <span slot="title">Post style</span>
<ViewSelect /> <ViewSelect />
<p slot="description"> <p slot="description">
{#if $userSettings.view == 'list'} {#if $userSettings.view == 'list'}
Show posts in a list, with post bodies and compact images. Show posts in a list, with post bodies and compact images.
{:else if $userSettings.view == 'cozy'}
Card view, but without a background.
{:else if $userSettings.view == 'compact'} {:else if $userSettings.view == 'compact'}
Show posts in a list, without post bodies and with tighter spacing. Show posts in a list, without post bodies and with tighter spacing.
{:else if $userSettings.view == 'card'} {:else if $userSettings.view == 'card'}
@@ -83,7 +98,10 @@
</Select> </Select>
</div> </div>
<div class="max-w-full"> <div class="max-w-full">
<Sort bind:selected={$userSettings.defaultSort.sort} navigate={false} /> <Sort
bind:selected={$userSettings.defaultSort.sort}
navigate={false}
/>
</div> </div>
<div class="max-w-full"> <div class="max-w-full">
<Select bind:value={$userSettings.defaultSort.comments}> <Select bind:value={$userSettings.defaultSort.comments}>
@@ -110,10 +128,12 @@
</Checkbox> </Checkbox>
</Setting> </Setting>
<SectionTitle class="mt-4">Posts</SectionTitle> <SectionTitle class="mt-4" id="posts">Posts</SectionTitle>
<Setting> <Setting>
<span slot="title">Fade read posts</span> <span slot="title">Fade read posts</span>
<span slot="description">Fade the title of posts you've already read.</span> <span slot="description">
Fade the title of posts you've already read.
</span>
<Checkbox bind:checked={$userSettings.markReadPosts}> <Checkbox bind:checked={$userSettings.markReadPosts}>
{$userSettings.markReadPosts ? 'Enabled' : 'Disabled'} {$userSettings.markReadPosts ? 'Enabled' : 'Disabled'}
</Checkbox> </Checkbox>
@@ -173,14 +193,15 @@
{#if LINKED_INSTANCE_URL} {#if LINKED_INSTANCE_URL}
<Setting> <Setting>
<span slot="title"> <span slot="title">
Remove original project's credit because you don't like the creator as a Remove original project's credit because you don't like the creator as
person a person
</span> </span>
<span slot="description"> <span slot="description">
Disable the "Powered by Photon" in the top left corner, thus decreasing Disable the "Powered by Photon" in the top left corner, thus
visibility of the original project and limiting discovery. The creator decreasing visibility of the original project and limiting discovery.
of Photon intentionally made it unobtrusive, but if you want to remove The creator of Photon intentionally made it unobtrusive, but if you
it because a 120x16 div bothers you so much, you have that option. want to remove it because a 120x16 div bothers you so much, you have
that option.
</span> </span>
<Checkbox bind:checked={$userSettings.hidePhoton}> <Checkbox bind:checked={$userSettings.hidePhoton}>
{$userSettings.hidePhoton ? 'Enabled' : 'Disabled'} {$userSettings.hidePhoton ? 'Enabled' : 'Disabled'}
@@ -188,7 +209,7 @@
</Setting> </Setting>
{/if} {/if}
<SectionTitle class="mt-4">Instances</SectionTitle> <SectionTitle class="mt-4" id="instances">Instances</SectionTitle>
<Setting> <Setting>
<span slot="title">Show instances</span> <span slot="title">Show instances</span>
<span slot="description">Show items' instances.</span> <span slot="description">Show items' instances.</span>
@@ -199,7 +220,9 @@
<span class="opacity-50">@example.com</span> <span class="opacity-50">@example.com</span>
</span> </span>
<div class="flex flex-row flex-wrap items-center gap-4"> <div class="flex flex-row flex-wrap items-center gap-4">
<Checkbox bind:checked={$userSettings.showInstances.user}>Users</Checkbox> <Checkbox bind:checked={$userSettings.showInstances.user}>
Users
</Checkbox>
<Checkbox bind:checked={$userSettings.showInstances.comments}> <Checkbox bind:checked={$userSettings.showInstances.comments}>
Comments Comments
</Checkbox> </Checkbox>
@@ -209,7 +232,7 @@
</div> </div>
</Setting> </Setting>
<SectionTitle class="mt-4">Moderation</SectionTitle> <SectionTitle class="mt-4" id="moderation">Moderation</SectionTitle>
<Setting> <Setting>
<span slot="title">Removal reply preset</span> <span slot="title">Removal reply preset</span>
<span slot="description"> <span slot="description">
@@ -248,7 +271,7 @@
/> />
</Setting> </Setting>
<SectionTitle class="mt-4">Other</SectionTitle> <SectionTitle class="mt-4" id="other">Other</SectionTitle>
<Setting> <Setting>
<span slot="title">Font</span> <span slot="title">Font</span>
<span slot="description">What font Photon should use.</span> <span slot="description">What font Photon should use.</span>
@@ -268,4 +291,5 @@
{$userSettings.debugInfo ? 'Enabled' : 'Disabled'} {$userSettings.debugInfo ? 'Enabled' : 'Disabled'}
</Checkbox> </Checkbox>
</Setting> </Setting>
</div>
</div> </div>