Subscription feeds per calendar, calendar color in ICS, About section in Settings
This commit is contained in:
1 parent
061ddb8b01
commit
f80f8e80b0
11 files changed
+156
-11
No files matched your search
@@ -3,14 +3,18 @@ export type Kind = 'no_school' | 'early_release' | 'event' | 'game' | 'practice'
|
||||
export interface Child { id: number; display_name: string; color: string }
|
||||
export interface Calendar {
|
||||
id: number; name: string; color: string; child_ids: number[]; source_ids: number[];
|
||||
alarm_minutes: number | null; last_exported_at: string | null;
|
||||
alarm_minutes: number | null; last_exported_at: string | null; feed_token: string;
|
||||
}
|
||||
export interface Source {
|
||||
id: number; name: string; layout_type: 'month_grid' | 'menu' | 'list'; double_read: boolean;
|
||||
ignore_labels: string[]; applies_filter: string | null; prompt_notes: string | null;
|
||||
default_calendar_id: number | null; child_ids: number[];
|
||||
}
|
||||
export interface Household { timezone: string; show_scan_stats: boolean; children: Child[]; calendars: Calendar[]; sources: Source[] }
|
||||
export interface Household {
|
||||
timezone: string; show_scan_stats: boolean; public_url: string;
|
||||
about: { version: string; commit: string; repo_url: string };
|
||||
children: Child[]; calendars: Calendar[]; sources: Source[];
|
||||
}
|
||||
|
||||
export interface CalEvent {
|
||||
id: number; uid: string; scan_id: number | null; source_id: number | null;
|
||||
|
||||
@@ -4,13 +4,15 @@
|
||||
import ChevronLeft from '@lucide/svelte/icons/chevron-left';
|
||||
import ChevronRight from '@lucide/svelte/icons/chevron-right';
|
||||
import CircleAlert from '@lucide/svelte/icons/circle-alert';
|
||||
import Copy from '@lucide/svelte/icons/copy';
|
||||
import Download from '@lucide/svelte/icons/download';
|
||||
import FileDown from '@lucide/svelte/icons/file-down';
|
||||
import LayoutGrid from '@lucide/svelte/icons/layout-grid';
|
||||
import List from '@lucide/svelte/icons/list';
|
||||
import MapPin from '@lucide/svelte/icons/map-pin';
|
||||
import Rss from '@lucide/svelte/icons/rss';
|
||||
import { api, KINDS, type CalEvent, type EventValues } from '../lib/api';
|
||||
import { app, toast } from '../lib/state.svelte';
|
||||
import { app, setHousehold, toast } from '../lib/state.svelte';
|
||||
import { iso, monthEnd, monthLabel, parse, shiftMonth, thisMonth, whenLabel } from '../lib/dates';
|
||||
import { KIND_ICONS } from '../lib/icons';
|
||||
import PageHeader from '../lib/ui/PageHeader.svelte';
|
||||
@@ -50,6 +52,27 @@
|
||||
return [...days.entries()].sort();
|
||||
});
|
||||
const today = iso(new Date());
|
||||
// The subscription feed: the one public URL, so it uses PUBLIC_URL. webcal:// opens the phone's subscribe screen.
|
||||
const feedUrl = $derived(calendar ? `${app.household!.public_url}/feed/${calendar.feed_token}.ics` : '');
|
||||
const webcalUrl = $derived(feedUrl.replace(/^https?:/, 'webcal:'));
|
||||
let confirmReset = $state(false);
|
||||
async function copyFeed() {
|
||||
try {
|
||||
await navigator.clipboard.writeText(feedUrl);
|
||||
toast('Link copied');
|
||||
} catch {
|
||||
toast("Couldn't copy. Press and hold Subscribe to copy the link instead.");
|
||||
}
|
||||
}
|
||||
async function resetFeed() {
|
||||
try {
|
||||
setHousehold(await api(`/calendars/${calendarId}/feed_token`, { method: 'POST' }));
|
||||
confirmReset = false;
|
||||
toast('New link made. Send it to everyone who subscribed.');
|
||||
} catch (e: any) {
|
||||
toast(e.message);
|
||||
}
|
||||
}
|
||||
const lastDownload = $derived(calendar?.last_exported_at ? new Date(calendar.last_exported_at.replace(' ', 'T') + 'Z') : null);
|
||||
|
||||
async function load() {
|
||||
@@ -104,11 +127,36 @@
|
||||
<Segmented label="View" bind:value={view} options={[{ value: 'list', label: 'List', icon: List }, { value: 'grid', label: 'Month', icon: LayoutGrid }]} />
|
||||
</div>
|
||||
|
||||
<section class="card export">
|
||||
<div class="export-head">
|
||||
<span class="export-icon"><Rss size={22} aria-hidden="true" /></span>
|
||||
<div>
|
||||
<h2>Subscribe, for the whole family</h2>
|
||||
<p class="hint">Each phone that subscribes keeps itself up to date, alerts included. Send the link to your family. On iPhone, tap Subscribe, then turn off “Remove Alerts”.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<a class="btn primary" href={webcalUrl}><Rss size={18} aria-hidden="true" />Subscribe</a>
|
||||
<button onclick={copyFeed}><Copy size={18} aria-hidden="true" />Copy link</button>
|
||||
</div>
|
||||
{#if confirmReset}
|
||||
<div class="alert warn" role="alert">
|
||||
<span>The old link stops working, so everyone has to subscribe again with the new one.</span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<button class="danger solid sm" onclick={resetFeed}>Make a new link</button>
|
||||
<button class="ghost sm" onclick={() => (confirmReset = false)}>Keep this link</button>
|
||||
</div>
|
||||
{:else}
|
||||
<button class="ghost sm reset" onclick={() => (confirmReset = true)}>Link shared by mistake? Make a new one…</button>
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
<section class="card export">
|
||||
<div class="export-head">
|
||||
<span class="export-icon"><FileDown size={22} aria-hidden="true" /></span>
|
||||
<div>
|
||||
<h2>Add to your phone's calendar</h2>
|
||||
<h2>Or download a file</h2>
|
||||
<p class="hint">On iPhone, open the file and tap “Add All”. Each download holds only what changed since the last one, so nothing is duplicated.</p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -190,6 +238,7 @@
|
||||
.export-head { display: flex; gap: var(--s3); align-items: flex-start; }
|
||||
.export-icon { display: grid; place-items: center; width: 44px; height: 44px; flex: none; border-radius: var(--r-md); background: var(--primary-soft); color: var(--primary-text); }
|
||||
.export h2 { font-size: var(--fs-md); margin-bottom: 2px; }
|
||||
.reset { align-self: flex-start; }
|
||||
|
||||
.month-bar { display: flex; align-items: center; gap: var(--s1); }
|
||||
.month-name { font-size: var(--fs-xl); min-width: 10ch; text-align: center; }
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import Check from '@lucide/svelte/icons/check';
|
||||
import ChevronRight from '@lucide/svelte/icons/chevron-right';
|
||||
import Globe from '@lucide/svelte/icons/globe';
|
||||
import Info from '@lucide/svelte/icons/info';
|
||||
import Monitor from '@lucide/svelte/icons/monitor';
|
||||
import Moon from '@lucide/svelte/icons/moon';
|
||||
import Palette from '@lucide/svelte/icons/palette';
|
||||
@@ -303,10 +304,30 @@
|
||||
</ul>
|
||||
{#if isEditing('source', null)}{@render sourceForm()}{:else}<button class="add" onclick={() => edit('source', null)}><Plus size={18} aria-hidden="true" />Add a source</button>{/if}
|
||||
</section>
|
||||
|
||||
<section class="card section-card">
|
||||
{@render heading(Info, 'About', '')}
|
||||
<dl class="about">
|
||||
<div><dt>Name</dt><dd>ParentCalendar</dd></div>
|
||||
<div><dt>Version</dt><dd class="tabular">{h.about.version}</dd></div>
|
||||
<div>
|
||||
<dt>Commit</dt>
|
||||
<dd class="tabular">
|
||||
{#if h.about.commit !== 'unknown'}
|
||||
<a href={`${h.about.repo_url}/commit/${h.about.commit}`} target="_blank" rel="noopener">{h.about.commit}</a>
|
||||
{:else}{h.about.commit}{/if}
|
||||
</dd>
|
||||
</div>
|
||||
</dl>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.section-card { display: flex; flex-direction: column; gap: var(--s4); }
|
||||
.about { display: flex; flex-direction: column; gap: var(--s2); margin: 0; }
|
||||
.about div { display: flex; justify-content: space-between; gap: var(--s3); min-height: 32px; align-items: center; }
|
||||
.about dt { color: var(--text-2); }
|
||||
.about dd { margin: 0; font-weight: 600; }
|
||||
.sec-head { display: flex; gap: var(--s3); align-items: flex-start; }
|
||||
.sec-icon { display: grid; place-items: center; width: 40px; height: 40px; flex: none; border-radius: var(--r-md); background: var(--primary-soft); color: var(--primary-text); }
|
||||
.sec-head h2 { font-size: var(--fs-md); }
|
||||
|
||||
Reference in new issue
Block a user