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:
ksmithandClaude Sonnet 5 committed 2026-10-30 21:11:17 -06:00
1 parent 4c20558525
commit cfa64b5485
18 files changed
+860 -159

No files matched your search

+17 -1
View File
@@ -1,4 +1,6 @@
from .models import UserArticleState
from django.db.models import Count
from .models import Article, UserArticleState
def with_user_state(articles, user):
@@ -26,3 +28,17 @@ def with_user_state(articles, user):
article.is_starred = state.is_starred if state else False
article.is_saved_for_later = state.is_saved_for_later if state else False
return articles
def unread_counts_by_feed(user):
"""{feed_id: unread_count} for every feed the user subscribes to, in one
query — used by the sidebar, so it must stay cheap regardless of how
many feeds/articles exist."""
rows = (
Article.objects.filter(feed__subscriptions__user=user)
.exclude(user_states__user=user, user_states__is_read=True)
.exclude(user_states__user=user, user_states__is_hidden=True)
.values("feed_id")
.annotate(unread=Count("id"))
)
return {row["feed_id"]: row["unread"] for row in rows}
+41
View File
@@ -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(),
}
+4 -1
View File
@@ -35,7 +35,10 @@ def test_dashboard_lists_erroring_feeds(client, django_user_model):
assert response.status_code == 200
assert b"Broken Feed" in response.content
assert b"Connection timed out" in response.content
assert b"OK Feed" not in response.content
# "OK Feed" legitimately appears elsewhere on the page (the sidebar
# lists every subscription), so check the dashboard's own error table
# scope via context rather than raw page content.
assert list(response.context["erroring_feeds"]) == [broken_feed]
@pytest.mark.django_db
+6
View File
@@ -6,7 +6,13 @@ app_name = "reader"
urlpatterns = [
path("", views.stream, name="stream"),
path("mark-all-read/", views.mark_all_read, name="mark_all_read"),
path("articles/<int:article_id>/", views.article_detail, name="article_detail"),
path(
"articles/<int:article_id>/inline/",
views.article_inline,
name="article_inline",
),
path("articles/<int:article_id>/toggle-read/", views.toggle_read, name="toggle_read"),
path("articles/<int:article_id>/toggle-star/", views.toggle_star, name="toggle_star"),
path("articles/<int:article_id>/toggle-saved/", views.toggle_saved, name="toggle_saved"),
+125 -13
View File
@@ -1,11 +1,15 @@
from itertools import groupby
from django.contrib.auth.decorators import login_required
from django.http import Http404
from django.shortcuts import get_object_or_404, render
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
from django.utils import timezone
from django.views.decorators.http import require_POST
from apps.articles.models import Article, Tag, UserArticleState
from apps.articles.queries import with_user_state
from apps.feeds.models import Feed, Folder
FILTER_CHOICES = [
("unread", "Unread"),
@@ -32,6 +36,69 @@ def _get_or_create_state(user, article):
return state
def _apply_scope(request, queryset):
"""Narrows an already-base-scoped Article queryset by the optional
?tag=/?feed=/?folder= params the sidebar links use. feed_id alone is
enough to scope by feed (the base queryset already restricts to the
user's own subscriptions); folder_id must be combined with user in the
same .filter() call — Feed is shared across users, so a separate call
would match any user's subscription with that folder_id, not just this
user's, leaking other users' folder contents in.
"""
active_tag = None
tag_id = request.GET.get("tag")
if tag_id:
active_tag = Tag.objects.filter(user=request.user, pk=tag_id).first()
if active_tag:
queryset = queryset.filter(
article_tags__user=request.user, article_tags__tag=active_tag
)
active_feed = None
feed_id = request.GET.get("feed")
if feed_id:
active_feed = Feed.objects.filter(pk=feed_id, subscriptions__user=request.user).first()
if active_feed:
queryset = queryset.filter(feed_id=active_feed.pk)
active_folder = None
folder_id = request.GET.get("folder")
if folder_id:
active_folder = Folder.objects.filter(user=request.user, pk=folder_id).first()
if active_folder:
queryset = queryset.filter(
feed__subscriptions__user=request.user,
feed__subscriptions__folder_id=active_folder.pk,
)
return queryset, active_tag, active_feed, active_folder
def _date_label(day, today):
if day is None:
return "Undated"
diff = (today - day).days
if diff == 0:
return f"Received today — {day.strftime('%-d %B %Y')}"
if diff == 1:
return f"Received yesterday — {day.strftime('%-d %B %Y')}"
return f"Received {day.strftime('%-d %B %Y')}"
def _group_by_date(articles):
"""Articles are already ordered newest-first (Article.Meta.ordering),
so same-day articles are contiguous and groupby doesn't need a sort."""
today = timezone.localdate()
def day_of(article):
return timezone.localtime(article.published_at).date() if article.published_at else None
return [
{"label": _date_label(day, today), "articles": list(items)}
for day, items in groupby(articles, key=day_of)
]
@login_required
def stream(request):
active_filter = request.GET.get("filter", "unread")
@@ -48,14 +115,7 @@ def stream(request):
user_states__user=request.user, user_states__is_saved_for_later=True
)
active_tag = None
tag_id = request.GET.get("tag")
if tag_id:
active_tag = Tag.objects.filter(user=request.user, pk=tag_id).first()
if active_tag:
queryset = queryset.filter(
article_tags__user=request.user, article_tags__tag=active_tag
)
queryset, active_tag, active_feed, active_folder = _apply_scope(request, queryset)
try:
page = max(int(request.GET.get("page", 1)), 1)
@@ -67,10 +127,12 @@ def stream(request):
articles = with_user_state(queryset[start:end], request.user)
context = {
"articles": articles,
"date_groups": _group_by_date(articles),
"active_filter": active_filter,
"filters": FILTER_CHOICES,
"active_tag": active_tag,
"active_feed": active_feed,
"active_folder": active_folder,
"user_tags": Tag.objects.filter(user=request.user),
"page": page,
"has_next_page": end < total_count,
@@ -80,10 +142,45 @@ def stream(request):
@login_required
def article_detail(request, article_id):
article = get_object_or_404(_base_queryset(request.user), pk=article_id)
@require_POST
def mark_all_read(request):
"""Marks every unread article currently matching the stream's filter
scope (tag included, "unread"/"all" filter excluded since it's a no-op
choice here) as read — bulk, not one UserArticleState per article."""
queryset = _base_queryset(request.user)
queryset, _active_tag, _active_feed, _active_folder = _apply_scope(request, queryset)
state = _get_or_create_state(request.user, article)
unread_articles = queryset.exclude(user_states__user=request.user, user_states__is_read=True)
unread_ids = list(unread_articles.values_list("id", flat=True))
if unread_ids:
now = timezone.now()
existing_state_article_ids = set(
UserArticleState.objects.filter(
user=request.user, article_id__in=unread_ids
).values_list("article_id", flat=True)
)
UserArticleState.objects.filter(
user=request.user, article_id__in=existing_state_article_ids
).update(is_read=True, read_at=now)
new_article_ids = [aid for aid in unread_ids if aid not in existing_state_article_ids]
UserArticleState.objects.bulk_create(
[
UserArticleState(user=request.user, article_id=aid, is_read=True, read_at=now)
for aid in new_article_ids
]
)
stream_url = reverse("reader:stream")
query = request.GET.urlencode()
return redirect(f"{stream_url}?{query}" if query else stream_url)
def _load_article_and_mark_read(user, article_id):
article = get_object_or_404(_base_queryset(user), pk=article_id)
state = _get_or_create_state(user, article)
if not state.is_read:
state.is_read = True
state.read_at = timezone.now()
@@ -92,10 +189,25 @@ def article_detail(request, article_id):
article.is_read = state.is_read
article.is_starred = state.is_starred
article.is_saved_for_later = state.is_saved_for_later
return article
@login_required
def article_detail(request, article_id):
article = _load_article_and_mark_read(request.user, article_id)
return render(request, "reader/article_detail.html", {"article": article})
@login_required
def article_inline(request, article_id):
"""Fetched via htmx when a row in the stream is expanded in place —
mirrors article_detail's mark-read side effect, but renders just the
content fragment plus an out-of-band update of the row's own read/star
icons (see templates/reader/_article_inline.html)."""
article = _load_article_and_mark_read(request.user, article_id)
return render(request, "reader/_article_inline.html", {"article": article})
@login_required
@require_POST
def toggle_read(request, article_id):
+1 -1
View File
@@ -54,4 +54,4 @@ def test_search_results_carry_user_state(client, alice, feed):
response = client.get(reverse("search:search"), {"q": "Django"})
content = response.content.decode()
assert 'class="icon-btn active"' in content
assert 'class="icon-btn icon-btn-star active"' in content
+1
View File
@@ -63,6 +63,7 @@ TEMPLATES = [
"django.template.context_processors.request",
"django.contrib.auth.context_processors.auth",
"django.contrib.messages.context_processors.messages",
"apps.core.context_processors.sidebar",
],
},
},
+459 -89
View File
@@ -1,18 +1,74 @@
:root {
color-scheme: light dark;
color-scheme: dark;
font-family: system-ui, -apple-system, Segoe UI, Roboto, sans-serif;
--bg: #17181c;
--bg-sidebar: #1b1c21;
--bg-row-hover: #24262c;
--bg-row-selected: #1d3252;
--accent: #3b82f6;
--accent-dark: #1d4ed8;
--star: #f5b400;
--text: #e8e8ea;
--text-muted: #a3a3a8;
--text-dim: #74747a;
--border: #2a2b31;
}
@media (prefers-color-scheme: light) {
:root {
color-scheme: light;
--bg: #ffffff;
--bg-sidebar: #f4f5f7;
--bg-row-hover: #eef0f3;
--bg-row-selected: #e4edfd;
--accent: #1a56db;
--accent-dark: #163f99;
--star: #b7790f;
--text: #1a1b1e;
--text-muted: #5b5c63;
--text-dim: #85868c;
--border: #e2e3e7;
}
}
* {
box-sizing: border-box;
}
body {
margin: 0;
padding: 1rem;
max-width: 48rem;
margin-inline: auto;
background: var(--bg);
color: var(--text);
}
a {
color: var(--accent);
}
h1, h2, h3 {
color: var(--text);
margin: 0 0 0.5rem;
}
input, textarea, select, button {
background: var(--bg);
color: var(--text);
border: 1px solid var(--border);
border-radius: 0.375rem;
font-size: 1rem;
padding: 0.5rem;
font-family: inherit;
}
button {
cursor: pointer;
}
.messages {
list-style: none;
padding: 0;
padding: 1rem 1.25rem 0;
margin: 0;
}
.message {
@@ -32,99 +88,413 @@ form p {
gap: 0.25rem;
}
input, button {
font-size: 1rem;
padding: 0.5rem;
.inline-form {
display: inline;
}
.stream-header {
.empty-state {
opacity: 0.6;
padding: 2rem 0;
text-align: center;
}
.feed-favicon {
width: 14px;
height: 14px;
border-radius: 2px;
flex: 0 0 auto;
}
/* App shell: sidebar + main content, used on every authenticated page */
.app-shell {
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
gap: 0.5rem;
min-height: 100vh;
align-items: stretch;
}
.top-nav a {
margin-left: 1rem;
.sidebar {
width: 230px;
flex: 0 0 230px;
background: var(--bg-sidebar);
border-right: 1px solid var(--border);
display: flex;
flex-direction: column;
overflow-y: auto;
}
.sidebar-brand {
padding: 0.9rem 1rem;
font-weight: 600;
font-size: 1.1rem;
border-bottom: 1px solid var(--border);
}
.sidebar-brand a {
color: var(--text);
text-decoration: none;
}
.sidebar-manage-btn {
display: block;
margin: 0.75rem 1rem;
padding: 0.5rem 0.75rem;
background: var(--accent);
color: #fff;
text-align: center;
border-radius: 0.375rem;
text-decoration: none;
font-size: 0.85rem;
}
.sidebar-manage-btn:hover {
background: var(--accent-dark);
}
.sidebar-top-nav {
list-style: none;
margin: 0;
padding: 0 0.5rem;
}
.sidebar-top-nav li a {
display: block;
padding: 0.4rem 0.75rem;
color: var(--text-muted);
text-decoration: none;
border-radius: 0.375rem;
font-size: 0.9rem;
}
.sidebar-top-nav li a:hover {
background: var(--bg-row-hover);
color: var(--text);
}
.sidebar-top-nav li a.active {
background: var(--bg-row-selected);
color: var(--text);
font-weight: 600;
}
.sidebar-footer-nav {
margin-top: auto;
border-top: 1px solid var(--border);
padding-top: 0.5rem;
padding-bottom: 0.5rem;
}
.sidebar-section {
padding: 0 0.5rem;
}
.sidebar-section summary {
padding: 0.4rem 0.75rem;
cursor: pointer;
color: var(--text-dim);
font-size: 0.75rem;
text-transform: uppercase;
letter-spacing: 0.04em;
}
.sidebar-folder-link {
color: inherit;
text-decoration: none;
}
.sidebar-folder-link.active {
color: var(--accent);
}
.sidebar-item-list {
list-style: none;
margin: 0;
padding: 0 0.5rem 0.5rem;
}
.sidebar-item-list li {
display: flex;
align-items: center;
justify-content: space-between;
gap: 0.4rem;
}
.sidebar-feed-link {
flex: 1;
display: flex;
align-items: center;
gap: 0.4rem;
padding: 0.3rem 0.5rem;
color: var(--text-muted);
text-decoration: none;
border-radius: 0.375rem;
font-size: 0.85rem;
min-width: 0;
}
.sidebar-feed-link span {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.sidebar-feed-link:hover {
background: var(--bg-row-hover);
color: var(--text);
}
.sidebar-feed-link.active {
background: var(--bg-row-selected);
color: var(--text);
font-weight: 600;
}
.unread-count {
font-size: 0.75rem;
color: var(--text-dim);
padding-right: 0.5rem;
flex: 0 0 auto;
}
.app-main {
flex: 1;
min-width: 0;
display: flex;
flex-direction: column;
}
.app-topbar {
padding: 0.6rem 1rem;
border-bottom: 1px solid var(--border);
}
.topbar-search input[type="search"] {
width: 100%;
max-width: 420px;
border-radius: 999px;
padding: 0.45rem 0.9rem;
}
.app-content {
padding: 1rem 1.25rem 2rem;
flex: 1;
min-width: 0;
}
.auth-content {
max-width: 28rem;
margin: 3rem auto;
padding: 0 1rem;
}
/* Stream toolbar and article list */
.stream-toolbar {
display: flex;
align-items: center;
gap: 1rem;
flex-wrap: wrap;
margin-bottom: 0.75rem;
}
.stream-scope-title {
font-size: 1.15rem;
flex: 0 0 auto;
margin: 0;
}
.filter-tabs {
display: flex;
gap: 0.5rem;
margin: 1rem 0;
border-bottom: 1px solid #ddd;
gap: 0.25rem;
margin: 0;
}
.filter-tabs a {
padding: 0.5rem 0.75rem;
padding: 0.3rem 0.65rem;
border-radius: 999px;
text-decoration: none;
color: inherit;
border-bottom: 2px solid transparent;
font-size: 0.85rem;
color: var(--text-muted);
}
.filter-tabs a:hover {
background: var(--bg-row-hover);
}
.filter-tabs a.active {
border-bottom-color: currentColor;
background: var(--bg-row-selected);
color: var(--text);
font-weight: 600;
}
.stream-toolbar .inline-form {
margin-left: auto;
}
.stream-toolbar button[type="submit"] {
background: none;
font-size: 0.85rem;
padding: 0.4rem 0.75rem;
}
.article-list {
list-style: none;
padding: 0;
margin: 0;
}
.article-row {
display: flex;
justify-content: space-between;
align-items: center;
gap: 0.75rem;
padding: 0.75rem 0;
border-bottom: 1px solid #eee;
flex-wrap: wrap;
.date-header {
padding: 0.5rem 0.25rem;
margin-top: 0.75rem;
font-size: 0.78rem;
text-transform: uppercase;
letter-spacing: 0.04em;
color: var(--text-dim);
border-bottom: 1px solid var(--border);
}
.article-row.is-read .article-title {
opacity: 0.55;
.article-row {
border-bottom: 1px solid var(--border);
}
.article-row-main {
display: flex;
flex-direction: column;
gap: 0.15rem;
min-width: 0;
flex: 1;
align-items: center;
gap: 0.6rem;
padding: 0.4rem 0.25rem;
}
.article-row-main:hover {
background: var(--bg-row-hover);
}
.article-row.is-expanded .article-row-main {
background: var(--bg-row-selected);
box-shadow: inset 3px 0 0 var(--accent);
}
.article-feed-name {
font-size: 0.8rem;
color: var(--text-dim);
flex: 0 0 auto;
max-width: 140px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.article-title {
flex: 1;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-weight: 600;
color: var(--text);
text-decoration: none;
color: inherit;
}
.article-meta {
font-size: 0.85rem;
opacity: 0.65;
.article-row.is-read .article-title {
font-weight: 400;
color: var(--text-muted);
}
.article-time {
font-size: 0.8rem;
color: var(--text-dim);
flex: 0 0 auto;
}
.article-actions {
display: flex;
gap: 0.35rem;
flex-wrap: nowrap;
gap: 0.15rem;
flex: 0 0 auto;
}
.icon-btn {
background: none;
border: 1px solid #ccc;
border-radius: 0.375rem;
cursor: pointer;
padding: 0.35rem 0.6rem;
font-size: 0.9rem;
border: none;
padding: 0.25rem;
color: var(--text-dim);
display: inline-flex;
align-items: center;
justify-content: center;
border-radius: 0.25rem;
}
.icon-btn.active {
background: #fde68a;
border-color: #f59e0b;
.icon-btn:hover {
background: var(--bg-row-hover);
color: var(--text);
}
.icon-btn svg {
fill: none;
stroke: currentColor;
stroke-width: 1.6;
}
.icon-btn-read.is-unread {
color: var(--accent);
}
.icon-btn-read.is-unread svg {
fill: var(--accent);
}
.icon-btn-star.active {
color: var(--star);
}
.icon-btn-star.active svg {
fill: var(--star);
}
.icon-btn-saved.active {
color: var(--accent);
}
.icon-btn-saved.active svg {
fill: var(--accent);
}
.article-inline-body {
padding: 0.75rem 1rem 1.5rem 2.1rem;
border-bottom: 1px solid var(--border);
}
.article-content-header {
margin-bottom: 0.75rem;
}
.article-content-title {
font-size: 1.3rem;
margin: 0 0 0.3rem;
font-weight: 600;
}
.article-meta {
font-size: 0.85rem;
color: var(--text-muted);
}
.article-meta .feed-favicon {
vertical-align: -2px;
margin-right: 0.3rem;
}
.article-content {
line-height: 1.6;
margin-top: 1rem;
overflow-wrap: break-word;
word-break: break-word;
}
.article-content a {
overflow-wrap: anywhere;
}
.article-content img {
max-width: 100%;
}
.pagination {
@@ -133,11 +503,7 @@ input, button {
margin: 1rem 0;
}
.empty-state {
opacity: 0.6;
padding: 2rem 0;
text-align: center;
}
/* Tags */
.tag-tabs {
display: flex;
@@ -147,7 +513,7 @@ input, button {
}
.tag-pill {
--tag-color: #6b7280;
--tag-color: var(--accent);
display: inline-flex;
align-items: center;
gap: 0.3rem;
@@ -161,7 +527,7 @@ input, button {
.tag-pill.active {
background: var(--tag-color);
color: #111;
color: var(--bg);
}
.tag-remove {
@@ -203,12 +569,10 @@ input, button {
align-items: center;
gap: 0.75rem;
padding: 0.5rem 0;
border-bottom: 1px solid #eee;
border-bottom: 1px solid var(--border);
}
.inline-form {
display: inline;
}
/* Rules */
.rule-list {
list-style: none;
@@ -221,7 +585,7 @@ input, button {
align-items: center;
gap: 1rem;
padding: 0.75rem 0;
border-bottom: 1px solid #eee;
border-bottom: 1px solid var(--border);
flex-wrap: wrap;
}
@@ -239,12 +603,20 @@ input, button {
gap: 0.35rem;
}
/* Search */
.search-form {
display: flex;
gap: 0.5rem;
margin: 1rem 0;
}
.search-form input {
flex: 1;
}
/* Subscriptions */
.subscription-list {
list-style: none;
padding: 0;
@@ -256,34 +628,10 @@ input, button {
align-items: center;
gap: 1rem;
padding: 0.5rem 0;
border-bottom: 1px solid #eee;
border-bottom: 1px solid var(--border);
}
.search-form input {
flex: 1;
}
.article-content {
line-height: 1.6;
margin-top: 1rem;
overflow-wrap: break-word;
word-break: break-word;
}
.article-content a {
overflow-wrap: anywhere;
}
.article-content img {
max-width: 100%;
}
@media (max-width: 480px) {
.article-row {
flex-direction: column;
align-items: flex-start;
}
}
/* Dashboard */
.dashboard-stats {
list-style: none;
@@ -304,6 +652,28 @@ input, button {
.feed-error-table td {
text-align: left;
padding: 0.5rem;
border-bottom: 1px solid currentColor;
border-bottom: 1px solid var(--border);
font-size: 0.9rem;
}
@media (max-width: 760px) {
.app-shell {
flex-direction: column;
}
.sidebar {
width: 100%;
flex: 0 0 auto;
max-height: 40vh;
border-right: none;
border-bottom: 1px solid var(--border);
}
.article-feed-name {
display: none;
}
.stream-toolbar .inline-form {
margin-left: 0;
}
}
+29
View File
@@ -0,0 +1,29 @@
function toggleArticle(event, id) {
event.preventDefault();
var link = event.currentTarget;
var row = link.closest("li.article-row");
var body = document.getElementById("article-body-" + id);
var wasOpen = row.classList.contains("is-expanded");
document.querySelectorAll("li.article-row.is-expanded").forEach(function (openRow) {
openRow.classList.remove("is-expanded");
var openBody = openRow.querySelector(".article-inline-body");
if (openBody) {
openBody.hidden = true;
}
});
if (!wasOpen) {
row.classList.add("is-expanded");
body.hidden = false;
if (!body.dataset.loaded) {
body.dataset.loaded = "1";
htmx.ajax("GET", link.dataset.inlineUrl, { target: body, swap: "innerHTML" }).then(
function () {
row.classList.add("is-read");
}
);
}
}
return false;
}
+20 -1
View File
@@ -17,6 +17,17 @@
<meta name="apple-mobile-web-app-title" content="Evection">
</head>
<body hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'>
{% if user.is_authenticated %}
<div class="app-shell">
{% include "core/_sidebar.html" %}
<div class="app-main">
<header class="app-topbar">
<form method="get" action="{% url 'search:search' %}" class="topbar-search">
<input type="search" name="q" placeholder="Search words or #tags" aria-label="Search">
</form>
</header>
{% endif %}
{% if messages %}
<ul class="messages">
{% for message in messages %}
@@ -24,9 +35,17 @@
{% endfor %}
</ul>
{% endif %}
<main>
<main class="{% if user.is_authenticated %}app-content{% else %}auth-content{% endif %}">
{% block content %}{% endblock %}
</main>
{% if user.is_authenticated %}
</div>
</div>
{% endif %}
<script src="{% static 'js/stream.js' %}" defer></script>
<script src="{% static 'js/register-sw.js' %}" defer></script>
</body>
</html>
+88
View File
@@ -0,0 +1,88 @@
<nav class="sidebar" aria-label="Feeds and folders">
<div class="sidebar-brand">
<a href="{% url 'reader:stream' %}">Evection</a>
</div>
<a href="{% url 'feeds:subscription_list' %}" class="sidebar-manage-btn">Subscription management</a>
<ul class="sidebar-top-nav">
<li>
<a href="{% url 'reader:stream' %}?filter=all"
class="{% if not request.GET.tag and not request.GET.feed and not request.GET.folder and request.GET.filter == 'all' %}active{% endif %}">
All articles
</a>
</li>
<li>
<a href="{% url 'reader:stream' %}?filter=starred"
class="{% if request.GET.filter == 'starred' %}active{% endif %}">
Favourites{% if sidebar_starred_count %} ({{ sidebar_starred_count }}){% endif %}
</a>
</li>
<li>
<a href="{% url 'reader:stream' %}?filter=saved"
class="{% if request.GET.filter == 'saved' %}active{% endif %}">
Saved for later
</a>
</li>
</ul>
{% if sidebar_tags %}
<details class="sidebar-section" open>
<summary>Tags</summary>
<ul class="sidebar-item-list">
{% for tag in sidebar_tags %}
<li>
<a href="{% url 'reader:stream' %}?filter=all&tag={{ tag.pk }}"
class="{% if request.GET.tag == tag.pk|stringformat:'s' %}active{% endif %}">{{ tag.name }}</a>
</li>
{% endfor %}
</ul>
</details>
{% endif %}
{% for entry in sidebar_folders %}
<details class="sidebar-section" open>
<summary>
<a href="{% url 'reader:stream' %}?filter=all&folder={{ entry.folder.pk }}"
class="sidebar-folder-link{% if request.GET.folder == entry.folder.pk|stringformat:'s' %} active{% endif %}">{{ entry.folder.name }}</a>
</summary>
<ul class="sidebar-item-list">
{% for subscription in entry.subscriptions %}
<li>
<a href="{% url 'reader:stream' %}?filter=all&feed={{ subscription.feed_id }}"
class="sidebar-feed-link{% if request.GET.feed == subscription.feed_id|stringformat:'s' %} active{% endif %}">
{% if subscription.feed.favicon_url %}<img src="{{ subscription.feed.favicon_url }}" alt="" class="feed-favicon">{% endif %}
<span>{{ subscription.display_title }}</span>
</a>
{% if subscription.unread_count %}<span class="unread-count">{{ subscription.unread_count }}</span>{% endif %}
</li>
{% endfor %}
</ul>
</details>
{% endfor %}
{% if sidebar_unfoldered %}
<details class="sidebar-section" open>
<summary>Uncategorized</summary>
<ul class="sidebar-item-list">
{% for subscription in sidebar_unfoldered %}
<li>
<a href="{% url 'reader:stream' %}?filter=all&feed={{ subscription.feed_id }}"
class="sidebar-feed-link{% if request.GET.feed == subscription.feed_id|stringformat:'s' %} active{% endif %}">
{% if subscription.feed.favicon_url %}<img src="{{ subscription.feed.favicon_url }}" alt="" class="feed-favicon">{% endif %}
<span>{{ subscription.display_title }}</span>
</a>
{% if subscription.unread_count %}<span class="unread-count">{{ subscription.unread_count }}</span>{% endif %}
</li>
{% endfor %}
</ul>
</details>
{% endif %}
<ul class="sidebar-top-nav sidebar-footer-nav">
<li><a href="{% url 'articles:tag_list' %}">Manage tags</a></li>
<li><a href="{% url 'rules:rule_list' %}">Rules</a></li>
{% if request.user.is_staff %}<li><a href="{% url 'core:dashboard' %}">Dashboard</a></li>{% endif %}
<li><a href="{% url 'accounts:logout' %}">Log out</a></li>
</ul>
</nav>
+13 -7
View File
@@ -1,20 +1,26 @@
<div id="article-actions-{{ article.pk }}" class="article-actions">
<div id="article-actions-{{ article.pk }}" class="article-actions"{% if oob %} hx-swap-oob="true"{% endif %}>
<button
hx-post="{% url 'reader:toggle_read' article.pk %}"
hx-target="#article-actions-{{ article.pk }}"
hx-swap="outerHTML"
class="icon-btn{% if article.is_read %} active{% endif %}"
title="Toggle read">{% if article.is_read %}Read{% else %}Unread{% endif %}</button>
class="icon-btn icon-btn-read{% if not article.is_read %} is-unread{% endif %}"
title="{% if article.is_read %}Mark unread{% else %}Mark read{% endif %}">
<svg viewBox="0 0 16 16" width="15" height="15" aria-hidden="true"><circle cx="8" cy="8" r="5"></circle></svg>
</button>
<button
hx-post="{% url 'reader:toggle_star' article.pk %}"
hx-target="#article-actions-{{ article.pk }}"
hx-swap="outerHTML"
class="icon-btn{% if article.is_starred %} active{% endif %}"
title="Toggle star">&#9733;</button>
class="icon-btn icon-btn-star{% if article.is_starred %} active{% endif %}"
title="{% if article.is_starred %}Remove star{% else %}Star{% endif %}">
<svg viewBox="0 0 16 16" width="15" height="15" aria-hidden="true"><path d="M8 1.3l2.1 4.3 4.7.7-3.4 3.3.8 4.7L8 12.1l-4.2 2.2.8-4.7-3.4-3.3 4.7-.7z"></path></svg>
</button>
<button
hx-post="{% url 'reader:toggle_saved' article.pk %}"
hx-target="#article-actions-{{ article.pk }}"
hx-swap="outerHTML"
class="icon-btn{% if article.is_saved_for_later %} active{% endif %}"
title="Save for later">&#128278;</button>
class="icon-btn icon-btn-saved{% if article.is_saved_for_later %} active{% endif %}"
title="{% if article.is_saved_for_later %}Remove from saved{% else %}Save for later{% endif %}">
<svg viewBox="0 0 16 16" width="15" height="15" aria-hidden="true"><path d="M3.5 1.5h9v13l-4.5-3-4.5 3z"></path></svg>
</button>
</div>
+19
View File
@@ -0,0 +1,19 @@
<div class="article-content-header">
<h2 class="article-content-title">{{ article.title|default:"(untitled)" }}</h2>
<p class="article-meta">
{% if article.feed.favicon_url %}<img src="{{ article.feed.favicon_url }}" alt="" class="feed-favicon">{% endif %}
{{ article.feed.title }} &middot; {{ article.published_at|date:"M j, Y H:i" }}
{% if article.author %} &middot; {{ article.author }}{% endif %}
{% if article.link %} &middot; <a href="{{ article.link }}" target="_blank" rel="noopener noreferrer">Original &#8599;</a>{% endif %}
</p>
<div
id="article-tags-{{ article.pk }}"
hx-get="{% url 'articles:article_tags_partial' article.pk %}"
hx-trigger="load"
hx-swap="outerHTML"></div>
</div>
<div class="article-content">
{{ article.content_html|safe }}
</div>
+2
View File
@@ -0,0 +1,2 @@
{% include "reader/_article_content.html" %}
{% include "reader/_article_actions.html" with oob=True %}
+5 -2
View File
@@ -1,6 +1,9 @@
<ul class="article-list">
{% for article in articles %}
{% include "reader/_article_row.html" %}
{% for group in date_groups %}
<li class="date-header">{{ group.label }}</li>
{% for article in group.articles %}
{% include "reader/_article_row.html" %}
{% endfor %}
{% empty %}
<li class="empty-state">Nothing here.</li>
{% endfor %}
+10 -3
View File
@@ -1,7 +1,14 @@
<li id="article-{{ article.pk }}" class="article-row{% if article.is_read %} is-read{% endif %}">
<div class="article-row-main">
<a class="article-title" href="{% url 'reader:article_detail' article.pk %}">{{ article.title|default:"(untitled)" }}</a>
<span class="article-meta">{{ article.feed.title }} &middot; {{ article.published_at|date:"M j, Y" }}</span>
{% include "reader/_article_actions.html" %}
{% if article.feed.favicon_url %}
<img src="{{ article.feed.favicon_url }}" alt="" class="feed-favicon">
{% endif %}
<span class="article-feed-name">{{ article.feed.title|default:article.feed.feed_url }}</span>
<a href="{% url 'reader:article_detail' article.pk %}" class="article-title"
data-inline-url="{% url 'reader:article_inline' article.pk %}"
onclick="return toggleArticle(event, {{ article.pk }})">{{ article.title|default:"(untitled)" }}</a>
<span class="article-time">{{ article.published_at|date:"g:i A" }}</span>
</div>
{% include "reader/_article_actions.html" %}
<div id="article-body-{{ article.pk }}" class="article-inline-body" hidden></div>
</li>
+1 -18
View File
@@ -2,25 +2,8 @@
{% block title %}{{ article.title|default:"Article" }} — Evection{% endblock %}
{% block content %}
<p><a href="{% url 'reader:stream' %}">&larr; Back to stream</a></p>
<article>
<h1>{{ article.title|default:"(untitled)" }}</h1>
<p class="article-meta">
{{ article.feed.title }} &middot; {{ article.published_at|date:"M j, Y H:i" }}
{% if article.author %} &middot; {{ article.author }}{% endif %}
{% if article.link %} &middot; <a href="{{ article.link }}" target="_blank" rel="noopener noreferrer">Original</a>{% endif %}
</p>
{% include "reader/_article_actions.html" %}
<div
id="article-tags-{{ article.pk }}"
hx-get="{% url 'articles:article_tags_partial' article.pk %}"
hx-trigger="load"
hx-swap="outerHTML"></div>
<div class="article-content">
{{ article.content_html|safe }}
</div>
{% include "reader/_article_content.html" %}
</article>
{% endblock %}
+19 -23
View File
@@ -1,32 +1,28 @@
{% extends "base.html" %}
{% block title %}Stream — Evection{% endblock %}
{% block content %}
<header class="stream-header">
<h1>Evection</h1>
<nav class="top-nav">
<a href="{% url 'feeds:subscription_list' %}">Subscriptions</a>
<a href="{% url 'articles:tag_list' %}">Tags</a>
<a href="{% url 'rules:rule_list' %}">Rules</a>
<a href="{% url 'search:search' %}">Search</a>
{% if user.is_staff %}<a href="{% url 'core:dashboard' %}">Dashboard</a>{% endif %}
<a href="{% url 'accounts:logout' %}">Log out</a>
</nav>
</header>
<div class="stream-toolbar">
<h1 class="stream-scope-title">
{% if active_feed %}{{ active_feed.title|default:active_feed.feed_url }}
{% elif active_folder %}{{ active_folder.name }}
{% elif active_tag %}{{ active_tag.name }}
{% else %}All articles{% endif %}
</h1>
<nav class="filter-tabs">
{% for key, label in filters %}
<a href="?filter={{ key }}" class="{% if active_filter == key and not active_tag %}active{% endif %}">{{ label }}</a>
{% endfor %}
</nav>
{% if user_tags %}
<nav class="tag-tabs">
{% for tag in user_tags %}
<a href="?filter={{ active_filter }}&tag={{ tag.pk }}" class="tag-pill{% if active_tag.pk == tag.pk %} active{% endif %}"
{% if tag.color %}style="--tag-color: {{ tag.color }};"{% endif %}>{{ tag.name }}</a>
<nav class="filter-tabs">
{% for key, label in filters %}
<a href="?filter={{ key }}{% if active_tag %}&tag={{ active_tag.pk }}{% endif %}{% if active_feed %}&feed={{ active_feed.pk }}{% endif %}{% if active_folder %}&folder={{ active_folder.pk }}{% endif %}"
class="{% if active_filter == key %}active{% endif %}">{{ label }}</a>
{% endfor %}
</nav>
{% endif %}
<form method="post"
action="{% url 'reader:mark_all_read' %}?filter={{ active_filter }}{% if active_tag %}&tag={{ active_tag.pk }}{% endif %}{% if active_feed %}&feed={{ active_feed.pk }}{% endif %}{% if active_folder %}&folder={{ active_folder.pk }}{% endif %}"
class="inline-form">
{% csrf_token %}
<button type="submit">Mark all as read</button>
</form>
</div>
{% include "reader/_article_list.html" %}
{% endblock %}