Make feed.html sexier

discord_rss_bot/main.py

@@ -93,8 +93,8 @@ async def create_feed(feed_url: str = Form(), webhook_dropdown: str = Form()) ->
 
     # Check if set_hook_by_name() was successful.
     if isinstance(
-        set_hook_by_name(name=webhook_dropdown, feed_url=feed_url),
+            set_hook_by_name(name=webhook_dropdown, feed_url=feed_url),
-        ResourceNotFoundError,
+            ResourceNotFoundError,
     ):
         return set_hook_by_name(name=webhook_dropdown, feed_url=feed_url)
 
@@ -154,7 +154,14 @@ async def get_feed(feed_url: str, request: Request) -> _TemplateResponse:
     logger.info(f"Got feed: {feed_url}")
 
     feed: Feed = reader.get_feed(feed_url)
-    return templates.TemplateResponse("feed.html", {"request": request, "feed": feed})
+    # Get entries from the feed.
+    entries: Iterable[EntryCounts] = reader.get_entries(feed=feed_url)
+
+    # Get the entries in the feed.
+    feed_counts: FeedCounts = reader.get_feed_counts(feed=feed_url)
+
+    return templates.TemplateResponse("feed.html", {"request": request, "feed": feed, "entries": entries,
+                                                    "feed_counts": feed_counts})
 
 
 @app.get("/", response_class=HTMLResponse)

discord_rss_bot/templates/feed.html

@@ -1,26 +1,41 @@
 {% extends "base.html" %}
 {% block title %}Feed{% endblock %}
 {% block content %}
-    URL: {{ feed.url }} <br>
+    <a href="{{ feed.link }}"><h2>{{ feed.title }}</h2></a>
-    Title: {{ feed.title }} <br>
+    {% if feed.url %} Subtitle: {{ feed.subtitle }} <br> {% endif %}
-    Updated: {{ feed.updated }} <br>
+    {% if feed.url %} {{ feed.url }} <br> {% endif %}
-    Link: {{ feed.link }} <br>
+    {% if feed.updated %} Updated: {{ feed.updated.strftime('%Y-%m-%d, %T') }} <br> {% endif %}
-    Author: {{ feed.author }} <br>
+    {% if feed.version %} Version: {{ feed.version }} <br>{% endif %}
-    Subtitle: {{ feed.subtitle }} <br>
+    {% if feed.user_title %} User title: {{ feed.user_title }} <br>{% endif %}
-    Version: {{ feed.version }} <br>
+    {% if feed.added %} Added on: {{ feed.added.strftime('%Y-%m-%d, %T') }} <br> {% endif %}
-    User title: {{ feed.user_title }} <br>
+    {% if feed.last_update %} Last update: {{ feed.last_update }} <br> {% endif %}
-    Added on: {{ feed.added }} <br>
+    {% if feed.last_exception %} Last exception: {{ feed.last_exception }} <br> {% endif %}
-    Last update: {{ feed.last_update }} <br>
+    {% if not feed.updates_enabled %} <span style="color: red"> Updates disabled! </span>    <br>{% endif %}
-    Last exception: {{ feed.last_exception }} <br>
-    Updates enabled: {{ feed.updates_enabled }} <br>
 
-    <form action="/check" method="post">
+    {% for entry in entries %}
+        {% if entry.read %}
+            <span style="color: #868686">
+        {% else %}
+            <span>
+        {% endif %}
+    <hr>
+    <a href="{{ entry.link }}"><h2>{{ entry.title }}</h2></a>
+    By {{ entry.author }} <br>
+    <br>
+    {% if entry.published %} Published: {{ entry.published.strftime('%Y-%m-%d, %T') }} <br> {% endif %}
+    {% if entry.updated %} Updated: {{ entry.updated.strftime('%Y-%m-%d, %T') }} <br> {% endif %}
+    Summary: {{ entry.summary }} <br>
+    {% if entry.read_modified %} Read modified: {{ entry.read_modified.strftime('%Y-%m-%d, %T') }} <br> {% endif %}
+    </span>
+    {% endfor %}
+
+<form action="/check" method="post">
         <button type="submit" name="feed_url" value="{{ feed.url }}">
             Send new entries to Discord.
         </button>
     </form>
 
-    <form action="/remove" method="post">
+<form action="/remove" method="post">
         <button type="submit" name="feed_url" value="{{ feed.url }}">
             Remove feed.
         </button>