From e8aa6e77c015492699a5a07d7bdf162c53a8d862 Mon Sep 17 00:00:00 2001 From: xangelo Date: Thu, 12 Jun 2025 12:12:27 -0400 Subject: [PATCH] feat: admin panel to manage feeds --- src/public/admin.html | 169 +++++++++++++++++++++++++++++++++++++++++ src/public/index.html | 68 +++++++++-------- src/public/reader.html | 1 + src/public/style.css | 71 ++++++++++++++--- src/server.ts | 91 ++++++++++++++++------ src/views.ts | 152 ++++++++++++++++++++++++++++++++++-- 6 files changed, 479 insertions(+), 73 deletions(-) create mode 100644 src/public/admin.html diff --git a/src/public/admin.html b/src/public/admin.html new file mode 100644 index 0000000..607e013 --- /dev/null +++ b/src/public/admin.html @@ -0,0 +1,169 @@ + + + + + River Admin + + + + + + + + + + + +

Admin Authentication

Enter your admin key to access the admin panel

+ +

+ + + + + + + + + + \ No newline at end of file diff --git a/src/public/index.html b/src/public/index.html index 93b2d5f..aa5e110 100644 --- a/src/public/index.html +++ b/src/public/index.html @@ -1,46 +1,50 @@ - - River - - - - - - - - -

River of News

- An auto-updating list of news -

- - + + + River + + + + + + + + + +

River of News

+ An auto-updating list of news +

+ + - + + + \ No newline at end of file diff --git a/src/public/reader.html b/src/public/reader.html index e02043d..b5a59e7 100644 --- a/src/public/reader.html +++ b/src/public/reader.html @@ -13,6 +13,7 @@

diff --git a/src/public/style.css b/src/public/style.css index 88541c3..ac52da1 100644 --- a/src/public/style.css +++ b/src/public/style.css @@ -1,3 +1,18 @@ +.hidden { + display: none !important; +} + +.feed-favicon { + width: 16px; + height: 16px; + margin-right: 0.5rem; + vertical-align: middle; + display: inline-block; +} + +.full-width { + width: 100%; +} .item { .header { @@ -14,7 +29,7 @@ } .header::before { - content: ''; + content: ""; border: solid 0 #aaa; border-top-width: 1px; width: 100%; @@ -64,13 +79,51 @@ footer { } } +.notification { + padding: 1rem; + margin-bottom: 1rem; + border-radius: 0.5rem; + background-color: var(--clight); +} +.notification.success { + background-color: var(--cemphbg); +} +.notification.error { + background-color: var(--cmed); +} +.notification.info { + background-color: var(--clight); +} + +.visibility-controls { + display: flex; + flex-direction: column; + gap: 0.25rem; +} + +.visibility-controls label { + display: flex; + align-items: center; + gap: 0.5rem; + font-size: 0.9rem; + cursor: pointer; +} + +.visibility-controls input[type="checkbox"] { + margin: 0; + cursor: pointer; +} + @media (prefers-color-scheme: dark) { - :root { - /* foreground | background color */ - --cfg: #cecbc4; --cbg: #252220; - --cdark: #999; --clight: #333; - --cmed: #566; - --clink: #1ad; - --cemph: #0b9; --cemphbg: #0b91; - } + :root { + /* foreground | background color */ + --cfg: #cecbc4; + --cbg: #252220; + --cdark: #999; + --clight: #333; + --cmed: #566; + --clink: #1ad; + --cemph: #0b9; + --cemphbg: #0b91; + } } diff --git a/src/server.ts b/src/server.ts index 50a8844..2e8c19a 100644 --- a/src/server.ts +++ b/src/server.ts @@ -2,9 +2,10 @@ import 'dotenv/config'; import express from 'express'; import knex from 'knex'; import { join } from 'path'; +import bodyParser from 'body-parser'; import Parser from 'rss-parser'; import { FeedEntrySchema, FeedSchema, FeedSchemaWithUnread, FeedWithEntrySchema } from './types'; -import { renderFeedItem, renderFeedItemHeader, renderReaderAppFeedEntries, renderReaderAppFeedEntry, renderReaderAppFeedList } from './views'; +import { renderAdminNotifications, renderFeedItem, renderFeedItemHeader, renderReaderAppFeedEntries, renderReaderAppFeedEntry, renderReaderAppFeedList, renderSimpleAdminFeedsList } from './views'; import { createHash } from 'crypto'; const db = knex({ @@ -142,6 +143,7 @@ async function runMigrations() { } app.use(express.static(join(__dirname, 'public'))); +app.use(bodyParser.urlencoded({ extended: true })); app.use(express.json()); app.use((req, res, next) => { @@ -176,6 +178,7 @@ app.get('/river', async (req, res) => { .from('feed_entry') .join('feeds', 'feeds.id', '=', 'feed_entry.feed_id') .where('feed_entry.created_at', '>', createdAt) + .where('feeds.show_in_river', true) .limit(100) .orderBy('feed_entry.pub_date', 'desc'); @@ -208,11 +211,16 @@ ${group.map(renderFeedItem).join("\n")} }).join("\n")); }); -app.post('/feeds', async (req, res) => { - if (req.body.key !== process.env.ADMIN_KEY) { - res.sendStatus(400).end(); - return; +function isAdmin(req: express.Request, res: express.Response, next: express.NextFunction) { + if (req.header('x-secret') === process.env.ADMIN_KEY) { + next(); + } + else { + res.sendStatus(401).end(); } +} + +app.post('/feeds', isAdmin, async (req, res) => { const now = new Date(); const feed = { url: req.body.url, @@ -223,8 +231,12 @@ app.post('/feeds', async (req, res) => { }; const rows = await db('feeds').insert(feed).onConflict().ignore().returning('*'); - - res.json(rows); + if (rows.length > 0) { + res.send(renderAdminNotifications(`Feed ${feed.title} added successfully!`, 'success')); + } + else { + res.send(renderAdminNotifications(`Feed ${feed.title} already exists!`, 'error')); + } }); app.get('/feeds', async (req, res) => { @@ -277,32 +289,63 @@ group by fe.feed_id }); app.post('/feed_entry/:feed_entry_id', async (req, res) => { - const authSecret = req.header('x-secret'); + const item: FeedWithEntrySchema[] = await db('feed_entry').update({ + is_read: true + }).where({ + id: req.params.feed_entry_id + }).returning('*'); + res.sendStatus(204).end(); +}); - if (authSecret === process.env.ADMIN_KEY) { - const item: FeedWithEntrySchema[] = await db('feed_entry').update({ - is_read: true - }).where({ - id: req.params.feed_entry_id - }).returning('*'); +app.delete('/feeds/:feed_id', isAdmin, async (req, res) => { + await db('feeds').delete().where({ id: req.params.feed_id }); + await db('feed_entry').delete().where({ feed_id: req.params.feed_id }); - res.send(renderReaderAppFeedEntry(item.pop())); - } - else { - res.sendStatus(204).end(); + const feedList: FeedSchema[] = await db.select('*').from('feeds').orderBy('created_at'); + if (req.accepts('html')) { + res.send(renderSimpleAdminFeedsList(feedList)); + } else { + res.json(feedList); } }); -app.delete('/feeds/:feed_id', async (req, res) => { - if (req.query.key !== process.env.ADMIN_KEY) { - res.sendStatus(400).end(); +// Update feed visibility settings +app.patch('/feeds/:feed_id/visibility', isAdmin, async (req, res) => { + const feedId = req.params.feed_id; + + // Determine which field is being updated based on what's in the request body + let field: string; + let boolValue: boolean; + + if (req.body.show_in_river !== undefined) { + field = 'show_in_river'; + boolValue = req.body.show_in_river === 'on'; + } else if (req.body.show_in_reader !== undefined) { + field = 'show_in_reader'; + boolValue = req.body.show_in_reader === 'on'; + } else { + res.status(400).json({ error: 'No valid field provided' }); return; } - await db('feeds').delete().where({ id: req.params.feed_id }); - await db('feed_entry').delete().where({ feed_id: req.params.feed_id }); + try { + await db('feeds').update({ [field]: boolValue }).where({ id: feedId }); + res.send(renderAdminNotifications(`Feed ${feedId} visibility updated successfully!`, 'success')); + } catch (error) { + console.error('Error updating feed visibility:', error); + res.send(renderAdminNotifications(`Failed to update feed visibility: ${error}`, 'error')); + } +}); - res.json(await db.select('*').from('feeds').orderBy('created_at')); +// Admin endpoint for feeds list +app.get('/admin/feeds', isAdmin, async (req, res) => { + const feedList: FeedSchema[] = await db.select('*').from('feeds').orderBy('created_at'); + + if (req.accepts('html')) { + res.send(renderSimpleAdminFeedsList(feedList)); + } else { + res.json(feedList); + } }); // Start the application diff --git a/src/views.ts b/src/views.ts index 486fda1..892af3d 100644 --- a/src/views.ts +++ b/src/views.ts @@ -2,7 +2,7 @@ import { fuzzyTime } from "./time"; import { FeedSchema, FeedSchemaWithUnread, FeedWithEntrySchema } from "./types"; export function renderFeedItemHeader(entry: FeedWithEntrySchema): string { -return ` + return `

$Favicon for ${entry.feed_title}$ [ @@ -27,7 +27,7 @@ export function renderFeedItem(entry: FeedWithEntrySchema): string { export function renderReaderAppFeedListItem(feed: FeedSchemaWithUnread, autoload: boolean = false): string { - return ` + return ` ${feed.title} (${feed.total - feed.read}) `; @@ -40,9 +40,9 @@ export function renderReaderAppFeedList(list: FeedSchemaWithUnread[]): string { } export function renderReaderAppFeedEntry(entry: FeedWithEntrySchema): string { - const meta = JSON.parse(entry.meta); - const date = new Date(entry.pub_date * 1000); - return ` + const meta = JSON.parse(entry.meta); + const date = new Date(entry.pub_date * 1000); + return `

${entry.title} @@ -60,9 +60,9 @@ export function renderReaderAppFeedEntry(entry: FeedWithEntrySchema): string { export function renderPagination(baseLink: string, currentPage: number, totalItems: number, itemsPerPage: number = 100): string { let pageLinks: string[] = ['
']; - const pages = Math.ceil(totalItems/itemsPerPage); - for(let i = 1; i <= pages; ++i) { - if(i === (currentPage + 1)) { + const pages = Math.ceil(totalItems / itemsPerPage); + for (let i = 1; i <= pages; ++i) { + if (i === (currentPage + 1)) { pageLinks.push(i.toString()); } else { @@ -84,3 +84,139 @@ export function renderReaderAppFeedEntries(page: number, feed: FeedSchemaWithUnr ${renderPagination(`/feeds/${feed.id}`, page, feed.total)} `; } + +export function renderAdminFeedsList(list: FeedSchemaWithUnread[]): string { + if (list.length === 0) { + return '
No feeds found. Add your first feed above!
'; + } + + const tableRows = list.map(feed => { + const createdDate = new Date(feed.created_at); + const updatedDate = new Date(feed.updated_at); + const faviconImg = feed.favicon ? `` : ''; + + return ` + + + ${faviconImg} + ${feed.title} + + +
${feed.url}
+ + + ${feed.total - feed.read} unread / ${feed.total} total + + + ${fuzzyTime(createdDate.getTime())} + + + ${fuzzyTime(updatedDate.getTime())} + + + + + + `; + }).join(''); + + return ` + + + + + + + + + + + + + ${tableRows} + +
Feed Title URL Articles Created Last Updated Actions
+ `; +} + +export function renderAdminNotifications(message: string, type: 'success' | 'error' | 'info' = 'info'): string { + return `
${message}
`; +} + +export function renderSimpleAdminFeedsList(list: FeedSchema[]): string { + if (list.length === 0) { + return '
No feeds found. Add your first feed above!
'; + } + + const tableRows = list.map(feed => { + const createdDate = new Date(feed.created_at); + const updatedDate = new Date(feed.updated_at); + const faviconImg = feed.favicon ? `` : ''; + + return ` + + + ${faviconImg} ${feed.title}
+ ${feed.url} + + + ${fuzzyTime(createdDate.getTime())} + + +
+ + + River View + +
+ + + Reader View + +
+ + + + + + `; + }).join(''); + + return ` + + + + + + + + + + + ${tableRows} + +
Feed Created Visibility Actions
+ `; +} -- 2.25.1

Admin Authentication

River Admin Panel

Add New Feed

Manage Feeds

River of News

River of News