Compare commits
2 Commits
48d0ae63bf
...
a0e705beec
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a0e705beec | ||
|
|
761ca83da5 |
@@ -335,6 +335,14 @@ create "notifications" '{
|
|||||||
{"name":"created", "type":"date"}
|
{"name":"created", "type":"date"}
|
||||||
]}'
|
]}'
|
||||||
|
|
||||||
|
create "push_subscriptions" '{
|
||||||
|
"name":"push_subscriptions","type":"base","fields":[
|
||||||
|
{"name":"user_id", "type":"text","required":true},
|
||||||
|
{"name":"endpoint", "type":"text","required":true},
|
||||||
|
{"name":"p256dh", "type":"text","required":true},
|
||||||
|
{"name":"auth", "type":"text","required":true}
|
||||||
|
]}'
|
||||||
|
|
||||||
create "ai_jobs" '{
|
create "ai_jobs" '{
|
||||||
"name":"ai_jobs","type":"base","fields":[
|
"name":"ai_jobs","type":"base","fields":[
|
||||||
{"name":"kind", "type":"text", "required":true},
|
{"name":"kind", "type":"text", "required":true},
|
||||||
@@ -393,6 +401,7 @@ add_field "user_settings" "font_size" "number"
|
|||||||
add_field "user_settings" "announce_chapter" "bool"
|
add_field "user_settings" "announce_chapter" "bool"
|
||||||
add_field "user_settings" "audio_mode" "text"
|
add_field "user_settings" "audio_mode" "text"
|
||||||
add_field "books" "archived" "bool"
|
add_field "books" "archived" "bool"
|
||||||
|
add_field "app_users" "notify_new_chapters" "bool"
|
||||||
|
|
||||||
# ── 6. Indexes ────────────────────────────────────────────────────────────────
|
# ── 6. Indexes ────────────────────────────────────────────────────────────────
|
||||||
add_index "chapters_idx" "idx_chapters_idx_slug_number" \
|
add_index "chapters_idx" "idx_chapters_idx_slug_number" \
|
||||||
|
|||||||
@@ -96,6 +96,7 @@ export interface User {
|
|||||||
polar_customer_id?: string;
|
polar_customer_id?: string;
|
||||||
polar_subscription_id?: string;
|
polar_subscription_id?: string;
|
||||||
notify_new_chapters?: boolean;
|
notify_new_chapters?: boolean;
|
||||||
|
notify_new_chapters_push?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ─── Auth token cache ─────────────────────────────────────────────────────────
|
// ─── Auth token cache ─────────────────────────────────────────────────────────
|
||||||
@@ -1582,7 +1583,10 @@ export async function updateUserAvatarUrl(userId: string, avatarUrl: string): Pr
|
|||||||
*/
|
*/
|
||||||
export async function updateUserNotificationPrefs(
|
export async function updateUserNotificationPrefs(
|
||||||
userId: string,
|
userId: string,
|
||||||
prefs: { notify_new_chapters?: boolean }
|
prefs: {
|
||||||
|
notify_new_chapters?: boolean;
|
||||||
|
notify_new_chapters_push?: boolean;
|
||||||
|
}
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const token = await getToken();
|
const token = await getToken();
|
||||||
const res = await fetch(`${PB_URL}/api/collections/app_users/records/${userId}`, {
|
const res = await fetch(`${PB_URL}/api/collections/app_users/records/${userId}`, {
|
||||||
|
|||||||
@@ -64,6 +64,7 @@
|
|||||||
} catch (e) { console.error('clear notifications:', e); }
|
} catch (e) { console.error('clear notifications:', e); }
|
||||||
}
|
}
|
||||||
$effect(() => { if (data.user) loadNotifications(); });
|
$effect(() => { if (data.user) loadNotifications(); });
|
||||||
|
$effect(() => { if (notificationsOpen && data.user) loadNotifications(); });
|
||||||
const unreadCount = $derived(notifications.filter(n => !n.read).length);
|
const unreadCount = $derived(notifications.filter(n => !n.read).length);
|
||||||
|
|
||||||
// Close search on navigation
|
// Close search on navigation
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { log } from '$lib/server/logger';
|
|||||||
* PATCH /api/profile
|
* PATCH /api/profile
|
||||||
*
|
*
|
||||||
* Update mutable profile preferences (currently: notification preferences).
|
* Update mutable profile preferences (currently: notification preferences).
|
||||||
* Body: { notify_new_chapters?: boolean }
|
* Body: { notify_new_chapters?: boolean, notify_new_chapters_push?: boolean }
|
||||||
*/
|
*/
|
||||||
export const PATCH: RequestHandler = async ({ locals, request }) => {
|
export const PATCH: RequestHandler = async ({ locals, request }) => {
|
||||||
if (!locals.user) error(401, 'Not authenticated');
|
if (!locals.user) error(401, 'Not authenticated');
|
||||||
@@ -19,10 +19,13 @@ export const PATCH: RequestHandler = async ({ locals, request }) => {
|
|||||||
error(400, 'Invalid JSON');
|
error(400, 'Invalid JSON');
|
||||||
}
|
}
|
||||||
|
|
||||||
const prefs: { notify_new_chapters?: boolean } = {};
|
const prefs: { notify_new_chapters?: boolean; notify_new_chapters_push?: boolean } = {};
|
||||||
if (typeof body.notify_new_chapters === 'boolean') {
|
if (typeof body.notify_new_chapters === 'boolean') {
|
||||||
prefs.notify_new_chapters = body.notify_new_chapters;
|
prefs.notify_new_chapters = body.notify_new_chapters;
|
||||||
}
|
}
|
||||||
|
if (typeof body.notify_new_chapters_push === 'boolean') {
|
||||||
|
prefs.notify_new_chapters_push = body.notify_new_chapters_push;
|
||||||
|
}
|
||||||
|
|
||||||
if (Object.keys(prefs).length === 0) {
|
if (Object.keys(prefs).length === 0) {
|
||||||
error(400, 'No valid preferences provided');
|
error(400, 'No valid preferences provided');
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ export const load: PageServerLoad = async ({ locals }) => {
|
|||||||
email,
|
email,
|
||||||
polarCustomerId,
|
polarCustomerId,
|
||||||
notifyNewChapters: freshUser?.notify_new_chapters ?? true,
|
notifyNewChapters: freshUser?.notify_new_chapters ?? true,
|
||||||
|
notifyNewChaptersPush: freshUser?.notify_new_chapters_push ?? true,
|
||||||
stats: stats ?? {
|
stats: stats ?? {
|
||||||
totalChaptersRead: 0, booksReading: 0, booksCompleted: 0,
|
totalChaptersRead: 0, booksReading: 0, booksCompleted: 0,
|
||||||
booksPlanToRead: 0, booksDropped: 0, topGenres: [],
|
booksPlanToRead: 0, booksDropped: 0, topGenres: [],
|
||||||
|
|||||||
@@ -236,8 +236,10 @@
|
|||||||
let pushError = $state('');
|
let pushError = $state('');
|
||||||
|
|
||||||
// ── In-app notifications ──────────────────────────────────────────────────────
|
// ── In-app notifications ──────────────────────────────────────────────────────
|
||||||
let notifyNewChapters = $state(data.notifyNewChapters ?? true);
|
let notifyNewChapters = $state(data.notifyNewChapters ?? true);
|
||||||
let notifyNewChaptersSaving = $state(false);
|
let notifyNewChaptersPush = $state(data.notifyNewChaptersPush ?? true);
|
||||||
|
let notifyNewChaptersSaving = $state(false);
|
||||||
|
let notifyNewChaptersPushSaving = $state(false);
|
||||||
|
|
||||||
async function toggleNotifyNewChapters() {
|
async function toggleNotifyNewChapters() {
|
||||||
notifyNewChaptersSaving = true;
|
notifyNewChaptersSaving = true;
|
||||||
@@ -248,14 +250,27 @@
|
|||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify({ notify_new_chapters: next })
|
body: JSON.stringify({ notify_new_chapters: next })
|
||||||
});
|
});
|
||||||
if (res.ok) {
|
if (res.ok) notifyNewChapters = next;
|
||||||
notifyNewChapters = next;
|
|
||||||
}
|
|
||||||
} catch { /* ignore */ } finally {
|
} catch { /* ignore */ } finally {
|
||||||
notifyNewChaptersSaving = false;
|
notifyNewChaptersSaving = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function toggleNotifyNewChaptersPush() {
|
||||||
|
notifyNewChaptersPushSaving = true;
|
||||||
|
const next = !notifyNewChaptersPush;
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/profile', {
|
||||||
|
method: 'PATCH',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ notify_new_chapters_push: next })
|
||||||
|
});
|
||||||
|
if (res.ok) notifyNewChaptersPush = next;
|
||||||
|
} catch { /* ignore */ } finally {
|
||||||
|
notifyNewChaptersPushSaving = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (!browser) return;
|
if (!browser) return;
|
||||||
if (!('serviceWorker' in navigator) || !('PushManager' in window)) {
|
if (!('serviceWorker' in navigator) || !('PushManager' in window)) {
|
||||||
@@ -802,8 +817,16 @@
|
|||||||
</svg>
|
</svg>
|
||||||
</span>
|
</span>
|
||||||
<span class="flex-1 text-sm font-medium text-(--color-text)">Notifications</span>
|
<span class="flex-1 text-sm font-medium text-(--color-text)">Notifications</span>
|
||||||
<span class="text-xs mr-2 hidden sm:inline {notifyNewChapters ? 'text-(--color-brand)' : 'text-(--color-muted)'}">
|
<span class="text-xs mr-2 hidden sm:inline text-(--color-muted)">
|
||||||
{notifyNewChapters ? 'On' : 'Off'}
|
{#if notifyNewChapters && pushState === 'subscribed'}
|
||||||
|
<span class="text-(--color-brand)">In-app · Push</span>
|
||||||
|
{:else if notifyNewChapters}
|
||||||
|
<span class="text-(--color-brand)">In-app</span>
|
||||||
|
{:else if pushState === 'subscribed'}
|
||||||
|
<span class="text-(--color-brand)">Push</span>
|
||||||
|
{:else}
|
||||||
|
Off
|
||||||
|
{/if}
|
||||||
</span>
|
</span>
|
||||||
<svg class={cn(chevronClass, expanded === 'notifications' ? 'rotate-90' : '')} fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg class={cn(chevronClass, expanded === 'notifications' ? 'rotate-90' : '')} fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
|
||||||
@@ -814,50 +837,24 @@
|
|||||||
<div class="px-5 py-5 space-y-5 bg-(--color-surface-3)/30">
|
<div class="px-5 py-5 space-y-5 bg-(--color-surface-3)/30">
|
||||||
<span class="text-xs font-semibold text-(--color-muted) uppercase tracking-wider">Notifications</span>
|
<span class="text-xs font-semibold text-(--color-muted) uppercase tracking-wider">Notifications</span>
|
||||||
|
|
||||||
<!-- In-app -->
|
<!-- Browser push master toggle -->
|
||||||
<div class="flex items-start justify-between gap-4">
|
|
||||||
<div class="min-w-0">
|
|
||||||
<p class="text-sm font-medium text-(--color-text)">In-app notifications</p>
|
|
||||||
<p class="text-sm text-(--color-muted) mt-0.5">
|
|
||||||
{#if notifyNewChapters}
|
|
||||||
Notified when new chapters arrive in your library.
|
|
||||||
{:else}
|
|
||||||
In-app new-chapter notifications are disabled.
|
|
||||||
{/if}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onclick={toggleNotifyNewChapters}
|
|
||||||
disabled={notifyNewChaptersSaving}
|
|
||||||
class={cn(
|
|
||||||
'shrink-0 relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none disabled:opacity-50',
|
|
||||||
notifyNewChapters ? 'bg-(--color-brand)' : 'bg-(--color-surface-3)'
|
|
||||||
)}
|
|
||||||
role="switch"
|
|
||||||
aria-checked={notifyNewChapters}
|
|
||||||
title={notifyNewChapters ? 'Turn off in-app notifications' : 'Turn on in-app notifications'}
|
|
||||||
>
|
|
||||||
<span class={cn('inline-block h-4 w-4 transform rounded-full bg-white shadow transition-transform', notifyNewChapters ? 'translate-x-6' : 'translate-x-1')}></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Push -->
|
|
||||||
{#if pushState !== 'unsupported'}
|
{#if pushState !== 'unsupported'}
|
||||||
<div class="flex items-start justify-between gap-4">
|
<div class="flex items-start justify-between gap-4">
|
||||||
<div class="min-w-0">
|
<div class="min-w-0">
|
||||||
<p class="text-sm font-medium text-(--color-text)">Push notifications</p>
|
<p class="text-sm font-medium text-(--color-text)">Browser push</p>
|
||||||
<p class="text-sm text-(--color-muted) mt-0.5">
|
<p class="text-xs text-(--color-muted) mt-0.5">
|
||||||
{#if pushState === 'subscribed'}
|
{#if pushState === 'subscribed'}
|
||||||
Push enabled for new chapters in your library.
|
This browser is subscribed to push notifications.
|
||||||
{:else if pushState === 'denied'}
|
{:else if pushState === 'denied'}
|
||||||
Blocked by your browser. Change in browser settings.
|
Blocked by your browser — change in browser settings.
|
||||||
|
{:else if pushState === 'loading'}
|
||||||
|
Updating…
|
||||||
{:else}
|
{:else}
|
||||||
Get notified when new chapters arrive.
|
Subscribe to receive push notifications in this browser.
|
||||||
{/if}
|
{/if}
|
||||||
</p>
|
</p>
|
||||||
{#if pushError}
|
{#if pushError}
|
||||||
<p class="text-sm text-(--color-danger) mt-1.5">{pushError}</p>
|
<p class="text-xs text-(--color-danger) mt-1">{pushError}</p>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<div class="shrink-0">
|
<div class="shrink-0">
|
||||||
@@ -890,6 +887,63 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
<!-- Per-category table -->
|
||||||
|
<div class="rounded-lg border border-(--color-border) overflow-hidden">
|
||||||
|
<!-- Header -->
|
||||||
|
<div class="grid grid-cols-[1fr_auto_auto] items-center gap-4 px-4 py-2 bg-(--color-surface-3)/60 border-b border-(--color-border)">
|
||||||
|
<span class="text-xs font-semibold text-(--color-muted) uppercase tracking-wider">Category</span>
|
||||||
|
<span class="text-xs font-semibold text-(--color-muted) uppercase tracking-wider w-12 text-center">In-app</span>
|
||||||
|
<span class="text-xs font-semibold text-(--color-muted) uppercase tracking-wider w-12 text-center">Push</span>
|
||||||
|
</div>
|
||||||
|
<!-- New chapters row -->
|
||||||
|
<div class="grid grid-cols-[1fr_auto_auto] items-center gap-4 px-4 py-3">
|
||||||
|
<div>
|
||||||
|
<p class="text-sm font-medium text-(--color-text)">New chapters</p>
|
||||||
|
<p class="text-xs text-(--color-muted) mt-0.5">When a book in your library gets new chapters</p>
|
||||||
|
</div>
|
||||||
|
<!-- In-app toggle -->
|
||||||
|
<div class="w-12 flex justify-center">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="switch"
|
||||||
|
aria-checked={notifyNewChapters}
|
||||||
|
aria-label="In-app notifications for new chapters"
|
||||||
|
onclick={toggleNotifyNewChapters}
|
||||||
|
disabled={notifyNewChaptersSaving}
|
||||||
|
class={cn(
|
||||||
|
'shrink-0 relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-(--color-brand) focus:ring-offset-2 focus:ring-offset-(--color-surface) disabled:opacity-50',
|
||||||
|
notifyNewChapters ? 'bg-(--color-brand)' : 'bg-(--color-surface-3) border border-(--color-border)'
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<span class={cn('inline-block h-4 w-4 transform rounded-full bg-white shadow transition-transform', notifyNewChapters ? 'translate-x-6' : 'translate-x-1')}></span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<!-- Push toggle -->
|
||||||
|
<div class="w-12 flex justify-center">
|
||||||
|
{#if pushState === 'unsupported'}
|
||||||
|
<span class="text-xs text-(--color-muted)" title="Push not supported in this browser">—</span>
|
||||||
|
{:else if pushState === 'denied'}
|
||||||
|
<span class="text-xs text-(--color-muted)" title="Push blocked by browser">—</span>
|
||||||
|
{:else}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="switch"
|
||||||
|
aria-checked={notifyNewChaptersPush && pushState === 'subscribed'}
|
||||||
|
aria-label="Push notifications for new chapters"
|
||||||
|
onclick={toggleNotifyNewChaptersPush}
|
||||||
|
disabled={notifyNewChaptersPushSaving || pushState !== 'subscribed'}
|
||||||
|
class={cn(
|
||||||
|
'shrink-0 relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-(--color-brand) focus:ring-offset-2 focus:ring-offset-(--color-surface) disabled:opacity-40',
|
||||||
|
notifyNewChaptersPush && pushState === 'subscribed' ? 'bg-(--color-brand)' : 'bg-(--color-surface-3) border border-(--color-border)'
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<span class={cn('inline-block h-4 w-4 transform rounded-full bg-white shadow transition-transform', notifyNewChaptersPush && pushState === 'subscribed' ? 'translate-x-6' : 'translate-x-1')}></span>
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user