add: color selection on dashboard
This commit is contained in:
@@ -77,6 +77,7 @@ export const user = pgTable("user", {
|
|||||||
password: text(),
|
password: text(),
|
||||||
username: text(),
|
username: text(),
|
||||||
dashboardTheme: text("dashboard_theme").default('none'),
|
dashboardTheme: text("dashboard_theme").default('none'),
|
||||||
|
dashboardColor: text("dashboard_color"),
|
||||||
}, (table) => [
|
}, (table) => [
|
||||||
unique("user_email_unique").on(table.email),
|
unique("user_email_unique").on(table.email),
|
||||||
unique("user_username_unique").on(table.username),
|
unique("user_username_unique").on(table.username),
|
||||||
|
|||||||
@@ -7,9 +7,13 @@
|
|||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
|
|
||||||
let {
|
let {
|
||||||
isAuthenticated = false
|
isAuthenticated = false,
|
||||||
|
fallbackColor = null,
|
||||||
|
fallbackTheme = null
|
||||||
}: {
|
}: {
|
||||||
isAuthenticated?: boolean;
|
isAuthenticated?: boolean;
|
||||||
|
fallbackColor?: string | null;
|
||||||
|
fallbackTheme?: string | null;
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
const t = $derived(languageStore.t);
|
const t = $derived(languageStore.t);
|
||||||
@@ -114,6 +118,8 @@
|
|||||||
emptyActionLabel={t.dashboard.createLocalWishlist || "Create local wishlist"}
|
emptyActionLabel={t.dashboard.createLocalWishlist || "Create local wishlist"}
|
||||||
emptyActionHref="/"
|
emptyActionHref="/"
|
||||||
showCreateButton={true}
|
showCreateButton={true}
|
||||||
|
fallbackColor={fallbackColor}
|
||||||
|
fallbackTheme={fallbackTheme}
|
||||||
>
|
>
|
||||||
{#snippet actions(wishlist, unlocked)}
|
{#snippet actions(wishlist, unlocked)}
|
||||||
<div class="flex gap-2 flex-wrap">
|
<div class="flex gap-2 flex-wrap">
|
||||||
|
|||||||
@@ -11,6 +11,8 @@
|
|||||||
itemCount,
|
itemCount,
|
||||||
color = null,
|
color = null,
|
||||||
theme = null,
|
theme = null,
|
||||||
|
fallbackColor = null,
|
||||||
|
fallbackTheme = null,
|
||||||
children
|
children
|
||||||
}: {
|
}: {
|
||||||
title: string;
|
title: string;
|
||||||
@@ -18,14 +20,18 @@
|
|||||||
itemCount: number;
|
itemCount: number;
|
||||||
color?: string | null;
|
color?: string | null;
|
||||||
theme?: string | null;
|
theme?: string | null;
|
||||||
|
fallbackColor?: string | null;
|
||||||
|
fallbackTheme?: string | null;
|
||||||
children?: Snippet;
|
children?: Snippet;
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
const cardStyle = $derived(getCardStyle(color));
|
const finalColor = $derived(color || fallbackColor);
|
||||||
|
const finalTheme = $derived(theme || fallbackTheme);
|
||||||
|
const cardStyle = $derived(getCardStyle(color, fallbackColor));
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<Card style={cardStyle} class="h-full flex flex-col relative overflow-hidden">
|
<Card style={cardStyle} class="h-full flex flex-col relative overflow-hidden">
|
||||||
<ThemeCard themeName={theme} color={color} />
|
<ThemeCard themeName={finalTheme} color={finalColor} />
|
||||||
<CardHeader class="flex-shrink-0 relative z-10">
|
<CardHeader class="flex-shrink-0 relative z-10">
|
||||||
<div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-1 sm:gap-2">
|
<div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-1 sm:gap-2">
|
||||||
<CardTitle class="text-lg flex items-center gap-2 flex-1 min-w-0">
|
<CardTitle class="text-lg flex items-center gap-2 flex-1 min-w-0">
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
import EmptyState from '$lib/components/layout/EmptyState.svelte';
|
import EmptyState from '$lib/components/layout/EmptyState.svelte';
|
||||||
import type { Snippet } from 'svelte';
|
import type { Snippet } from 'svelte';
|
||||||
import { flip } from 'svelte/animate';
|
import { flip } from 'svelte/animate';
|
||||||
|
import { getCardStyle } from '$lib/utils/colors';
|
||||||
|
import ThemeCard from '$lib/components/themes/ThemeCard.svelte';
|
||||||
|
|
||||||
let {
|
let {
|
||||||
title,
|
title,
|
||||||
@@ -13,6 +15,8 @@
|
|||||||
emptyDescription,
|
emptyDescription,
|
||||||
emptyActionLabel,
|
emptyActionLabel,
|
||||||
emptyActionHref,
|
emptyActionHref,
|
||||||
|
fallbackColor = null,
|
||||||
|
fallbackTheme = null,
|
||||||
headerAction,
|
headerAction,
|
||||||
searchBar,
|
searchBar,
|
||||||
children
|
children
|
||||||
@@ -24,11 +28,15 @@
|
|||||||
emptyDescription?: string;
|
emptyDescription?: string;
|
||||||
emptyActionLabel?: string;
|
emptyActionLabel?: string;
|
||||||
emptyActionHref?: string;
|
emptyActionHref?: string;
|
||||||
|
fallbackColor?: string | null;
|
||||||
|
fallbackTheme?: string | null;
|
||||||
headerAction?: Snippet;
|
headerAction?: Snippet;
|
||||||
searchBar?: Snippet;
|
searchBar?: Snippet;
|
||||||
children: Snippet<[any]>;
|
children: Snippet<[any]>;
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
|
const cardStyle = $derived(getCardStyle(fallbackColor, null));
|
||||||
|
|
||||||
let scrollContainer: HTMLElement | null = null;
|
let scrollContainer: HTMLElement | null = null;
|
||||||
|
|
||||||
function handleWheel(event: WheelEvent) {
|
function handleWheel(event: WheelEvent) {
|
||||||
@@ -44,8 +52,9 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<Card>
|
<Card style={cardStyle} class="relative overflow-hidden">
|
||||||
<CardHeader>
|
<ThemeCard themeName={fallbackTheme} color={fallbackColor} />
|
||||||
|
<CardHeader class="relative z-10">
|
||||||
<div class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
<div class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
||||||
<div class="flex-1 min-w-0">
|
<div class="flex-1 min-w-0">
|
||||||
<CardTitle>{title}</CardTitle>
|
<CardTitle>{title}</CardTitle>
|
||||||
@@ -63,7 +72,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent>
|
<CardContent class="relative z-10">
|
||||||
{#if items && items.length > 0}
|
{#if items && items.length > 0}
|
||||||
<div
|
<div
|
||||||
bind:this={scrollContainer}
|
bind:this={scrollContainer}
|
||||||
|
|||||||
@@ -21,6 +21,8 @@
|
|||||||
emptyActionHref,
|
emptyActionHref,
|
||||||
showCreateButton = false,
|
showCreateButton = false,
|
||||||
hideIfEmpty = false,
|
hideIfEmpty = false,
|
||||||
|
fallbackColor = null,
|
||||||
|
fallbackTheme = null,
|
||||||
actions
|
actions
|
||||||
}: {
|
}: {
|
||||||
title: string;
|
title: string;
|
||||||
@@ -32,6 +34,8 @@
|
|||||||
emptyActionHref?: string;
|
emptyActionHref?: string;
|
||||||
showCreateButton?: boolean;
|
showCreateButton?: boolean;
|
||||||
hideIfEmpty?: boolean;
|
hideIfEmpty?: boolean;
|
||||||
|
fallbackColor?: string | null;
|
||||||
|
fallbackTheme?: string | null;
|
||||||
actions: Snippet<[WishlistItem, boolean]>; // item, unlocked
|
actions: Snippet<[WishlistItem, boolean]>; // item, unlocked
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
@@ -126,6 +130,8 @@
|
|||||||
{emptyDescription}
|
{emptyDescription}
|
||||||
{emptyActionLabel}
|
{emptyActionLabel}
|
||||||
{emptyActionHref}
|
{emptyActionHref}
|
||||||
|
{fallbackColor}
|
||||||
|
{fallbackTheme}
|
||||||
>
|
>
|
||||||
{#snippet headerAction()}
|
{#snippet headerAction()}
|
||||||
<div class="flex flex-col sm:flex-row gap-2">
|
<div class="flex flex-col sm:flex-row gap-2">
|
||||||
@@ -150,6 +156,8 @@
|
|||||||
itemCount={wishlist.items?.length || 0}
|
itemCount={wishlist.items?.length || 0}
|
||||||
color={wishlist.color}
|
color={wishlist.color}
|
||||||
theme={wishlist.theme}
|
theme={wishlist.theme}
|
||||||
|
fallbackColor={fallbackColor}
|
||||||
|
fallbackTheme={fallbackTheme}
|
||||||
>
|
>
|
||||||
{@render actions(item, unlocked)}
|
{@render actions(item, unlocked)}
|
||||||
</WishlistCard>
|
</WishlistCard>
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
import { ThemeToggle } from '$lib/components/ui/theme-toggle';
|
import { ThemeToggle } from '$lib/components/ui/theme-toggle';
|
||||||
import { LanguageToggle } from '$lib/components/ui/language-toggle';
|
import { LanguageToggle } from '$lib/components/ui/language-toggle';
|
||||||
import ThemePicker from '$lib/components/ui/theme-picker.svelte';
|
import ThemePicker from '$lib/components/ui/theme-picker.svelte';
|
||||||
|
import ColorPicker from '$lib/components/ui/ColorPicker.svelte';
|
||||||
import { signOut } from '@auth/sveltekit/client';
|
import { signOut } from '@auth/sveltekit/client';
|
||||||
import { languageStore } from '$lib/stores/language.svelte';
|
import { languageStore } from '$lib/stores/language.svelte';
|
||||||
import { enhance } from '$app/forms';
|
import { enhance } from '$app/forms';
|
||||||
@@ -11,25 +12,27 @@
|
|||||||
userName,
|
userName,
|
||||||
userEmail,
|
userEmail,
|
||||||
dashboardTheme = 'none',
|
dashboardTheme = 'none',
|
||||||
|
dashboardColor = null,
|
||||||
isAuthenticated = false,
|
isAuthenticated = false,
|
||||||
onThemeUpdate
|
onThemeUpdate,
|
||||||
|
onColorUpdate
|
||||||
}: {
|
}: {
|
||||||
userName?: string | null;
|
userName?: string | null;
|
||||||
userEmail?: string | null;
|
userEmail?: string | null;
|
||||||
dashboardTheme?: string;
|
dashboardTheme?: string;
|
||||||
|
dashboardColor?: string | null;
|
||||||
isAuthenticated?: boolean;
|
isAuthenticated?: boolean;
|
||||||
onThemeUpdate?: (theme: string | null) => void;
|
onThemeUpdate?: (theme: string | null) => void;
|
||||||
|
onColorUpdate?: (color: string | null) => void;
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
const t = $derived(languageStore.t);
|
const t = $derived(languageStore.t);
|
||||||
|
|
||||||
async function handleThemeChange(theme: string) {
|
async function handleThemeChange(theme: string) {
|
||||||
// Update theme immediately for instant visual feedback
|
|
||||||
if (onThemeUpdate) {
|
if (onThemeUpdate) {
|
||||||
onThemeUpdate(theme);
|
onThemeUpdate(theme);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only submit to database for authenticated users
|
|
||||||
if (isAuthenticated) {
|
if (isAuthenticated) {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append('theme', theme);
|
formData.append('theme', theme);
|
||||||
@@ -40,6 +43,30 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let localColor = $state(dashboardColor);
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
localColor = dashboardColor;
|
||||||
|
});
|
||||||
|
|
||||||
|
async function handleColorChange() {
|
||||||
|
if (onColorUpdate) {
|
||||||
|
onColorUpdate(localColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isAuthenticated) {
|
||||||
|
const formData = new FormData();
|
||||||
|
if (localColor) {
|
||||||
|
formData.append('color', localColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
await fetch('?/updateDashboardColor', {
|
||||||
|
method: 'POST',
|
||||||
|
body: formData
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
<div class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
||||||
@@ -52,6 +79,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-1 sm:gap-2 flex-shrink-0">
|
<div class="flex items-center gap-1 sm:gap-2 flex-shrink-0">
|
||||||
|
<ColorPicker bind:color={localColor} onchange={handleColorChange} />
|
||||||
<ThemePicker value={dashboardTheme} onValueChange={handleThemeChange} />
|
<ThemePicker value={dashboardTheme} onValueChange={handleThemeChange} />
|
||||||
<LanguageToggle />
|
<LanguageToggle />
|
||||||
<ThemeToggle />
|
<ThemeToggle />
|
||||||
|
|||||||
@@ -7,8 +7,8 @@
|
|||||||
themeName,
|
themeName,
|
||||||
color
|
color
|
||||||
}: {
|
}: {
|
||||||
themeName?: string;
|
themeName?: string | null;
|
||||||
color?: string;
|
color?: string | null;
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
const theme = $derived(getTheme(themeName));
|
const theme = $derived(getTheme(themeName));
|
||||||
|
|||||||
@@ -13,7 +13,8 @@ export const users = pgTable('user', {
|
|||||||
image: text('image'),
|
image: text('image'),
|
||||||
password: text('password'),
|
password: text('password'),
|
||||||
username: text('username').unique(),
|
username: text('username').unique(),
|
||||||
dashboardTheme: text('dashboard_theme').default('none')
|
dashboardTheme: text('dashboard_theme').default('none'),
|
||||||
|
dashboardColor: text('dashboard_color')
|
||||||
});
|
});
|
||||||
|
|
||||||
export const accounts = pgTable(
|
export const accounts = pgTable(
|
||||||
|
|||||||
@@ -174,6 +174,22 @@ export const actions: Actions = {
|
|||||||
.set({ dashboardTheme: theme })
|
.set({ dashboardTheme: theme })
|
||||||
.where(eq(users.id, session.user.id));
|
.where(eq(users.id, session.user.id));
|
||||||
|
|
||||||
|
return { success: true };
|
||||||
|
},
|
||||||
|
|
||||||
|
updateDashboardColor: async ({ request, locals }) => {
|
||||||
|
const session = await locals.auth();
|
||||||
|
if (!session?.user?.id) {
|
||||||
|
throw redirect(303, '/signin');
|
||||||
|
}
|
||||||
|
|
||||||
|
const formData = await request.formData();
|
||||||
|
const color = formData.get('color') as string | null;
|
||||||
|
|
||||||
|
await db.update(users)
|
||||||
|
.set({ dashboardColor: color })
|
||||||
|
.where(eq(users.id, session.user.id));
|
||||||
|
|
||||||
return { success: true };
|
return { success: true };
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -24,7 +24,21 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// For anonymous users, get color from localStorage
|
||||||
|
function getInitialColor() {
|
||||||
|
if (data.isAuthenticated) {
|
||||||
|
return data.user?.dashboardColor || null;
|
||||||
|
} else {
|
||||||
|
// Anonymous user - get from localStorage
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
return localStorage.getItem('dashboardColor') || null;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let currentTheme = $state(getInitialTheme());
|
let currentTheme = $state(getInitialTheme());
|
||||||
|
let currentColor = $state(getInitialColor());
|
||||||
|
|
||||||
// Save to localStorage when theme changes for anonymous users
|
// Save to localStorage when theme changes for anonymous users
|
||||||
function handleThemeUpdate(theme: string | null) {
|
function handleThemeUpdate(theme: string | null) {
|
||||||
@@ -35,6 +49,19 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Save to localStorage when color changes for anonymous users
|
||||||
|
function handleColorUpdate(color: string | null) {
|
||||||
|
currentColor = color;
|
||||||
|
|
||||||
|
if (!data.isAuthenticated && typeof window !== 'undefined') {
|
||||||
|
if (color) {
|
||||||
|
localStorage.setItem('dashboardColor', color);
|
||||||
|
} else {
|
||||||
|
localStorage.removeItem('dashboardColor');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const t = $derived(languageStore.t);
|
const t = $derived(languageStore.t);
|
||||||
|
|
||||||
// Only owned wishlists for "My Wishlists"
|
// Only owned wishlists for "My Wishlists"
|
||||||
@@ -58,17 +85,23 @@
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<PageContainer theme={currentTheme} themeColor={null}>
|
<PageContainer theme={currentTheme} themeColor={currentColor}>
|
||||||
<DashboardHeader
|
<DashboardHeader
|
||||||
userName={data.user?.name}
|
userName={data.user?.name}
|
||||||
userEmail={data.user?.email}
|
userEmail={data.user?.email}
|
||||||
dashboardTheme={currentTheme}
|
dashboardTheme={currentTheme}
|
||||||
|
dashboardColor={currentColor}
|
||||||
isAuthenticated={data.isAuthenticated}
|
isAuthenticated={data.isAuthenticated}
|
||||||
onThemeUpdate={handleThemeUpdate}
|
onThemeUpdate={handleThemeUpdate}
|
||||||
|
onColorUpdate={handleColorUpdate}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- Local Wishlists Section (for anonymous and authenticated users) -->
|
<!-- Local Wishlists Section (for anonymous and authenticated users) -->
|
||||||
<LocalWishlistsSection isAuthenticated={data.isAuthenticated} />
|
<LocalWishlistsSection
|
||||||
|
isAuthenticated={data.isAuthenticated}
|
||||||
|
fallbackColor={currentColor}
|
||||||
|
fallbackTheme={currentTheme}
|
||||||
|
/>
|
||||||
|
|
||||||
{#if data.isAuthenticated}
|
{#if data.isAuthenticated}
|
||||||
<!-- My Wishlists Section -->
|
<!-- My Wishlists Section -->
|
||||||
@@ -80,6 +113,8 @@
|
|||||||
emptyActionLabel={t.dashboard.emptyWishlistsAction}
|
emptyActionLabel={t.dashboard.emptyWishlistsAction}
|
||||||
emptyActionHref="/"
|
emptyActionHref="/"
|
||||||
showCreateButton={true}
|
showCreateButton={true}
|
||||||
|
fallbackColor={currentColor}
|
||||||
|
fallbackTheme={currentTheme}
|
||||||
>
|
>
|
||||||
{#snippet actions(wishlist, unlocked)}
|
{#snippet actions(wishlist, unlocked)}
|
||||||
<div class="flex gap-2 flex-wrap">
|
<div class="flex gap-2 flex-wrap">
|
||||||
@@ -135,6 +170,8 @@
|
|||||||
emptyMessage={t.dashboard.emptyClaimedWishlists}
|
emptyMessage={t.dashboard.emptyClaimedWishlists}
|
||||||
emptyDescription={t.dashboard.emptyClaimedWishlistsDescription}
|
emptyDescription={t.dashboard.emptyClaimedWishlistsDescription}
|
||||||
hideIfEmpty={true}
|
hideIfEmpty={true}
|
||||||
|
fallbackColor={currentColor}
|
||||||
|
fallbackTheme={currentTheme}
|
||||||
>
|
>
|
||||||
{#snippet actions(wishlist, unlocked)}
|
{#snippet actions(wishlist, unlocked)}
|
||||||
<div class="flex gap-2 flex-wrap">
|
<div class="flex gap-2 flex-wrap">
|
||||||
@@ -189,6 +226,8 @@
|
|||||||
items={savedWishlists()}
|
items={savedWishlists()}
|
||||||
emptyMessage={t.dashboard.emptySavedWishlists}
|
emptyMessage={t.dashboard.emptySavedWishlists}
|
||||||
emptyDescription={t.dashboard.emptySavedWishlistsDescription}
|
emptyDescription={t.dashboard.emptySavedWishlistsDescription}
|
||||||
|
fallbackColor={currentColor}
|
||||||
|
fallbackTheme={currentTheme}
|
||||||
>
|
>
|
||||||
{#snippet actions(saved, unlocked)}
|
{#snippet actions(saved, unlocked)}
|
||||||
<div class="flex gap-2 flex-wrap">
|
<div class="flex gap-2 flex-wrap">
|
||||||
|
|||||||
Reference in New Issue
Block a user