migrate: change settings from a store to a state

This commit is contained in:
Xylight committed 2024-10-25 21:09:32 -07:00
1 parent ffcd9faa96
commit d597349887
128 files changed
+1010 -1144

No files matched your search

@@ -1,13 +1,13 @@
<script lang="ts">
import Post from '$lib/components/lemmy/post/Post.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import { userSettings } from '$lib/settings.js'
import { settings } from '$lib/settings.svelte.js'
import type { PostView } from 'lemmy-js-client'
import { Badge, Button } from 'mono-svelte'
import { ArchiveBox, Icon, Minus, Plus } from 'svelte-hero-icons'
import { expoOut } from 'svelte/easing'
import { fly, slide } from 'svelte/transition'
import { combineCrossposts } from './crosspost'
import { combineCrossposts } from './crosspost.svelte'
interface Props {
posts: PostView[]
@@ -32,7 +32,7 @@
</script>
<ul
class="flex flex-col list-none {$userSettings.view == 'card'
class="flex flex-col list-none {settings.view == 'card'
? 'gap-3 md:gap-4'
: 'divide-y'} divide-slate-200 dark:divide-zinc-800"
>
@@ -53,14 +53,14 @@
</div>
{:else}
{#each combinedPosts as post, index}
{#if !($userSettings.hidePosts.deleted && post.post.deleted) && !($userSettings.hidePosts.removed && post.post.removed)}
{#if !(settings.hidePosts.deleted && post.post.deleted) && !(settings.hidePosts.removed && post.post.removed)}
<li class="relative post-container">
<Post
hideCommunity={community}
view={(post.post.featured_community || post.post.featured_local) &&
$userSettings.posts.compactFeatured
settings.posts.compactFeatured
? 'compact'
: $userSettings.view}
: settings.view}
{post}
class="transition-all duration-250"
on:hide={() => {
@@ -102,14 +102,14 @@
>
<span
class="text-sm flex flex-row gap-2 items-center"
class:my-4={$userSettings.view == 'card'}
class:my-4={settings.view == 'card'}
>
Crossposts <hr class="w-full dark:border-zinc-800" />
{post.crossposts.length}
</span>
{#each post.crossposts as crosspost, index}
<div class="w-full transition-all mb-4">
<Post post={crosspost} view={$userSettings.view} />
<Post post={crosspost} view={settings.view} />
</div>
{/each}
</div>
@@ -3,7 +3,7 @@
import Post from '$lib/components/lemmy/post/Post.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import { userSettings } from '$lib/settings.js'
import { settings } from '$lib/settings.svelte.js'
import type {
GetPostsResponse,
ListingType,
@@ -29,7 +29,7 @@
type SvelteVirtualizer,
} from '@tanstack/svelte-virtual'
import { afterNavigate, beforeNavigate } from '$app/navigation'
import { combineCrossposts } from './crosspost'
import { combineCrossposts } from './crosspost.svelte'
import { client } from '$lib/lemmy'
import {
postFeeds,
@@ -199,7 +199,7 @@
<!-- <svelte:window on:keydown={handleKeydown} /> -->
<ul
class="flex flex-col list-none {$userSettings.view == 'card'
class="flex flex-col list-none {settings.view == 'card'
? 'gap-3 md:gap-4'
: 'divide-y'} divide-slate-200 dark:divide-zinc-800"
>
@@ -247,9 +247,9 @@
hideCommunity={community}
view={(posts[row.index]?.post.featured_community ||
posts[row.index]?.post.featured_local) &&
$userSettings.posts.compactFeatured
settings.posts.compactFeatured
? 'compact'
: $userSettings.view}
: settings.view}
{post}
class="transition-all duration-250"
on:hide={() => {
@@ -263,7 +263,7 @@
</div>
{/if}
{#if $userSettings.infiniteScroll && browser}
{#if settings.infiniteScroll && browser}
{#if error}
<div
class="flex flex-col justify-center items-center
@@ -1,4 +1,4 @@
import { userSettings } from '$lib/settings.svelte'
import { settings } from '$lib/settings.svelte'
import type { PostView } from 'lemmy-js-client'
import { get } from 'svelte/store'
@@ -29,8 +29,8 @@ export const combineCrossposts = (
posts?.forEach((post) => {
if (
!post ||
(get(userSettings).hidePosts.deleted && post.post.deleted) ||
(get(userSettings).hidePosts.removed && post.post.removed)
(settings.hidePosts.deleted && post.post.deleted) ||
(settings.hidePosts.removed && post.post.removed)
)
return
if (!post?.post?.url) {