From a20cb2964bd9cfe789d76be80b7c6750c9412793 Mon Sep 17 00:00:00 2001 From: Nicola Zangrandi Date: Fri, 28 Feb 2025 12:32:45 +0100 Subject: [PATCH] feat(qn): added linking between feeds links and notes --- feeds/service.go | 4 +-- frontend/src/lib/components/Navbar.svelte | 5 +-- frontend/src/lib/feeds.ts | 2 +- frontend/src/routes/+page.svelte | 11 +++++++ frontend/src/routes/feeds/[id]/+page.svelte | 4 ++- .../routes/feeds/entries/[id]/+page.svelte | 31 +++++++++++++++++-- frontend/src/routes/notes/new/+page.svelte | 12 +++++-- frontend/src/routes/notes/new/+page.ts | 5 ++- .../src/routes/readlist/[id]/+page.svelte | 23 ++++++++++++++ 9 files changed, 86 insertions(+), 11 deletions(-) diff --git a/feeds/service.go b/feeds/service.go index 8a2db61..1c91193 100644 --- a/feeds/service.go +++ b/feeds/service.go @@ -224,11 +224,11 @@ func (s *Service) MarkEntryAsRead(id string) error { // MarkAllEntriesAsRead marks all entries as read, optionally filtered by feed ID func (s *Service) MarkAllEntriesAsRead(feedID string) error { query := s.db.Model(&Entry{}).Where("read_at IS NULL") - + if feedID != "" { query = query.Where("feed_id = ?", feedID) } - + return query.Update("read_at", time.Now()).Error } diff --git a/frontend/src/lib/components/Navbar.svelte b/frontend/src/lib/components/Navbar.svelte index 8725d8e..86097e8 100644 --- a/frontend/src/lib/components/Navbar.svelte +++ b/frontend/src/lib/components/Navbar.svelte @@ -19,7 +19,7 @@ }); - @@ -136,11 +153,20 @@ {/if} +
+ +
{#if entry.summary && !entry.fullContent}
+ {@html entry.summary}
@@ -148,6 +174,7 @@
{:else if entry.fullContent}
+ {@html entry.fullContent}
{:else} diff --git a/frontend/src/routes/notes/new/+page.svelte b/frontend/src/routes/notes/new/+page.svelte index 5625c1a..82e21f9 100644 --- a/frontend/src/routes/notes/new/+page.svelte +++ b/frontend/src/routes/notes/new/+page.svelte @@ -3,10 +3,18 @@ import { notes } from '$lib'; import { goto } from '$app/navigation'; import Navigation from '$lib/components/Navigation.svelte'; - let { data } = $props(); + + interface PageData { + props: { + prefilledTitle: string; + prefilledContent?: string; + }; + } + + let { data } = $props<{ data: PageData }>(); let title = $state(data.props.prefilledTitle); - let content = $state(''); + let content = $state(data.props.prefilledContent || ''); async function handleSave() { if (!title || !content) return; diff --git a/frontend/src/routes/notes/new/+page.ts b/frontend/src/routes/notes/new/+page.ts index 2b0b889..2597b31 100644 --- a/frontend/src/routes/notes/new/+page.ts +++ b/frontend/src/routes/notes/new/+page.ts @@ -2,10 +2,13 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ url }) => { const title = url.searchParams.get('title') || ''; + const content = url.searchParams.get('content') || ''; + return { status: 'success', props: { - prefilledTitle: title + prefilledTitle: title, + prefilledContent: content } }; }; diff --git a/frontend/src/routes/readlist/[id]/+page.svelte b/frontend/src/routes/readlist/[id]/+page.svelte index 48249d0..f9b6d70 100644 --- a/frontend/src/routes/readlist/[id]/+page.svelte +++ b/frontend/src/routes/readlist/[id]/+page.svelte @@ -2,6 +2,7 @@ import { onMount } from 'svelte'; import { readlist } from '$lib/readlist'; import type { ReadLaterItem } from '$lib/types'; + import { goto } from '$app/navigation'; export let data: { id: string }; let id = data.id; @@ -32,6 +33,20 @@ error = e instanceof Error ? e.message : 'Failed to load item'; } }); + + function createNote() { + if (!item) return; + + const title = `Highlights from ${item.title}`; + const content = `[Original Link](/readlist/${item.id})\n\n${item.content || ''}`; + + const params = new URLSearchParams({ + title, + content + }); + + goto(`/notes/new?${params.toString()}`); + }
@@ -78,6 +93,14 @@
+
+ +