From e5fbf7493cce75026e97e62f6a386dd6e6bcb5da Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Thu, 14 Sep 2023 16:44:00 -0700 Subject: [PATCH] feat: color overhaul --- package.json | 4 +- src/lib/auth.ts | 5 - src/lib/components/lemmy/Sort.svelte | 4 +- .../lemmy/community/CommunityItem.svelte | 22 ++- src/lib/components/lemmy/post/Post.svelte | 4 +- .../components/lemmy/post/PostActions.svelte | 2 +- src/lib/components/markdown/Markdown.svelte | 2 +- src/lib/components/ui/Navbar.svelte | 16 +- .../ui/sidebar/CommunityList.svelte | 2 +- .../ui/sidebar/ProfileButton.svelte | 2 +- src/lib/components/ui/sidebar/Sidebar.svelte | 4 +- .../ui/sidebar/SidebarButton.svelte | 4 +- src/lib/settings.ts | 5 +- src/lib/util.ts | 7 + src/routes/+layout.svelte | 11 +- src/routes/communities/+page.svelte | 180 ++++++------------ src/routes/communities/+page.ts | 4 + src/routes/settings/+page.svelte | 157 ++++++++------- src/routes/settings/Setting.svelte | 22 ++- src/style/app.css | 8 +- tailwind.config.js | 4 + yarn.lock | 8 +- 22 files changed, 234 insertions(+), 243 deletions(-) diff --git a/package.json b/package.json index 4887ec53..a8ba73f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "1.5.0", + "version": "1.6.0", "private": true, "scripts": { "dev": "vite dev", @@ -42,7 +42,7 @@ "@dicebear/initials": "^6.0.4", "lemmy-js-client": "^0.18.0-rc.2", "markdown-it": "^13.0.1", - "mono-svelte": "^0.2.20" + "mono-svelte": "^0.3.2" }, "type": "module" } diff --git a/src/lib/auth.ts b/src/lib/auth.ts index cab81aa3..dd55de9e 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -92,11 +92,6 @@ profile.subscribe(async (p) => { username: user?.user.local_user_view.person.name, avatar: user?.user.local_user_view.person.avatar, })) - - profile.update((pro) => { - console.log(pro) - return pro - }) }) export async function setUser(jwt: string, inst: string, username: string) { diff --git a/src/lib/components/lemmy/Sort.svelte b/src/lib/components/lemmy/Sort.svelte index edf38714..4cbef531 100644 --- a/src/lib/components/lemmy/Sort.svelte +++ b/src/lib/components/lemmy/Sort.svelte @@ -23,7 +23,7 @@ }} > - + Time @@ -47,7 +47,7 @@ }} > - + Sort diff --git a/src/lib/components/lemmy/community/CommunityItem.svelte b/src/lib/components/lemmy/community/CommunityItem.svelte index dc47bd1f..f520f4a4 100644 --- a/src/lib/components/lemmy/community/CommunityItem.svelte +++ b/src/lib/components/lemmy/community/CommunityItem.svelte @@ -4,12 +4,15 @@ import Subscribe from '../../../../routes/communities/Subscribe.svelte' import { ChatBubbleOvalLeftEllipsis, + Check, Icon, PencilSquare, + Plus, UserGroup, } from 'svelte-hero-icons' import FormattedNumber from '$lib/components/util/FormattedNumber.svelte' import { Button } from 'mono-svelte' + import { isSubscribed } from '$lib/util.js' export let community: CommunityView @@ -17,7 +20,7 @@
- {community.subscribed == 'Subscribed' ? 'Subscribed' : 'Subscribe'} + + {#if isSubscribed(community.subscribed)} + Subscribed + {:else} + Subscribe + {/if}
diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index 3702645e..5a802aa9 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -49,10 +49,10 @@ {#if view == 'list' || view == 'compact'}
{/if} -
+
{/if} -
+
{#if inline} {@html mdInline.render(source)} diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index fe4cbe6c..09a9c2b7 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -41,7 +41,7 @@