Private
Public Access
Rebuild the reader UI to match FreshRSS's two-column layout
The previous UI was plain unstyled lists. Rebuilt around what FreshRSS actually looks like (per reference screenshots): a persistent left sidebar (folders/feeds with unread counts, favourites, tags) and a single main column with a date-grouped article list, where clicking a title expands the full article inline in place rather than navigating to a separate page. - apps/core/context_processors.py: feeds the sidebar's folder/feed tree, tags, and starred count to every authenticated page in one shared query set, so base.html can render it without each view wiring it up. - apps/reader/views.py: date-grouped stream (itertools.groupby over the already-ordered queryset), ?feed=/?folder= scoping alongside the existing ?tag=, a bulk mark-all-read endpoint (bulk_create/update, not one UserArticleState per article), and article_inline — the htmx endpoint behind the inline expand, sharing its mark-read logic with the full article_detail view via _load_article_and_mark_read. - templates/reader/_article_inline.html returns the article content plus an out-of-band swap of _article_actions.html, so the row's read/star icons update immediately when an article is expanded and marked read. - static/js/stream.js: the accordion toggle (one article open at a time), calling htmx.ajax() directly rather than hx-* attributes so a second click on an already-open row can collapse it without re-fetching. - static/css/base.css: full FreshRSS-like dark theme (with a light variant under prefers-color-scheme) replacing the previous unstyled pass — sidebar, topbar search, row/icon states, inline-expand styling. Verified end to end against a running dev server: folder/feed/tag scoping, mark-all-read, the inline-expand mark-read side effect and its icon update, and — against config.settings.prod specifically — that no inline <script> crept back in anywhere (would silently break under the CSP added in the previous commit) and the CSP header is still present on every page. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
4c20558525
commit
cfa64b5485
18 files changed
+860
-159
No files matched your search
@@ -0,0 +1,41 @@
|
||||
from apps.articles.models import Tag, UserArticleState
|
||||
from apps.articles.queries import unread_counts_by_feed
|
||||
from apps.feeds.models import Folder, Subscription
|
||||
|
||||
|
||||
def sidebar(request):
|
||||
"""Folder/feed tree, tags, and starred count for the persistent sidebar
|
||||
rendered by base.html on every authenticated page. Kept out of
|
||||
individual views so every page gets the same sidebar for free.
|
||||
"""
|
||||
user = getattr(request, "user", None)
|
||||
if user is None or not user.is_authenticated:
|
||||
return {}
|
||||
|
||||
unread_counts = unread_counts_by_feed(user)
|
||||
subscriptions = (
|
||||
Subscription.objects.filter(user=user)
|
||||
.select_related("feed", "folder")
|
||||
.order_by("order", "id")
|
||||
)
|
||||
|
||||
folders = list(Folder.objects.filter(user=user).order_by("order", "name"))
|
||||
by_folder = {folder.pk: [] for folder in folders}
|
||||
unfoldered = []
|
||||
for subscription in subscriptions:
|
||||
subscription.unread_count = unread_counts.get(subscription.feed_id, 0)
|
||||
if subscription.folder_id and subscription.folder_id in by_folder:
|
||||
by_folder[subscription.folder_id].append(subscription)
|
||||
else:
|
||||
unfoldered.append(subscription)
|
||||
|
||||
return {
|
||||
"sidebar_folders": [
|
||||
{"folder": folder, "subscriptions": by_folder[folder.pk]} for folder in folders
|
||||
],
|
||||
"sidebar_unfoldered": unfoldered,
|
||||
"sidebar_tags": Tag.objects.filter(user=user),
|
||||
"sidebar_starred_count": UserArticleState.objects.filter(
|
||||
user=user, is_starred=True
|
||||
).count(),
|
||||
}
|
||||
Reference in new issue
Block a user