From 7f64b9d05fe020df6920a8424584902864740f79 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Tue, 24 Nov 2020 21:54:42 +0100
Subject: [PATCH 1/3] Don't show abstract on articles list

---
 articles/templates/articles/article_list.html | 18 +++++++++++-------
 articles/views/html.py                        |  2 --
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/articles/templates/articles/article_list.html b/articles/templates/articles/article_list.html
index 818bfd4..448c330 100644
--- a/articles/templates/articles/article_list.html
+++ b/articles/templates/articles/article_list.html
@@ -6,16 +6,20 @@
 {% block content %}
     <h1>{{ blog_title }}{% if title %} &middot; {{ title }}{% endif %}</h1>
     <p class="metadata">{{ blog_description }}</p>
+    <ul>
     {% for article in articles %}
-        <article class="article-list">
-            <h2><a href="{% url 'article-detail' slug=article.slug %}">{{ article.title }}</a></h2>
-            {% include "articles/metadata_snippet.html" %}
-            {{ article.get_abstract|safe }}
-            <p class="read-more"><a href="{% url 'article-detail' slug=article.slug %}">Read more...</a></p>
-        </article>
+        <li>
+            {% if article.published_at %}
+                <time datetime="{{ article.published_at|date:CUSTOM_ISO }}">{{ article.published_at|date }}</time>
+            {% else %}
+                <time datetime="{{ article.updated_at|date:CUSTOM_ISO }}">{{ article.updated_at|date }}</time>
+            {% endif %}
+            : <a href="{% url 'article-detail' slug=article.slug %}">{{ article.title }}</a>
+        </li>
     {% empty %}
-        <p>No article here. Come back later 🙂</p>
+        <li>No article here. Come back later 🙂</li>
     {% endfor %}
+    </ul>
     <nav class="pagination">
         <div class="older">
             {% if page_obj.has_next %}
diff --git a/articles/views/html.py b/articles/views/html.py
index 88ea7fe..cdbb867 100644
--- a/articles/views/html.py
+++ b/articles/views/html.py
@@ -9,8 +9,6 @@ from articles.models import Article, Page
 
 
 class BaseArticleListView(generic.ListView):
-    paginate_by = 15
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["blog_title"] = settings.BLOG["title"]

From 4f354c0014b621281af5465e9ad9cc2a2c3cb068 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Thu, 26 Nov 2020 11:26:47 +0100
Subject: [PATCH 2/3] Display an index page below the articles without abstract

---
 articles/context_processors.py                |  2 +-
 articles/static/style.css                     |  4 ++
 .../templates/articles/article_detail.html    |  4 +-
 articles/templates/articles/article_list.html | 43 +++++++++++--------
 articles/templates/articles/base.html         |  2 +-
 articles/views/html.py                        |  7 ++-
 6 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/articles/context_processors.py b/articles/context_processors.py
index 65b429d..022bde3 100644
--- a/articles/context_processors.py
+++ b/articles/context_processors.py
@@ -10,7 +10,7 @@ IGNORED_PATHS = [
 def pages(request):
     if request.path in IGNORED_PATHS:
         return {}
-    return {"pages": Page.objects.filter(status=Article.PUBLISHED)}
+    return {"pages": Page.objects.filter(status=Article.PUBLISHED).exclude(position=0)}
 
 
 def drafts_count(request):
diff --git a/articles/static/style.css b/articles/static/style.css
index e4c6e4f..e4bfa9b 100644
--- a/articles/static/style.css
+++ b/articles/static/style.css
@@ -48,6 +48,10 @@ a {
     border-bottom: .3ex solid var(--accent);
 }
 
+.index-page h2 {
+    margin-top: 2em;
+}
+
 .article-list h2 a {
     border-color: transparent;
 }
diff --git a/articles/templates/articles/article_detail.html b/articles/templates/articles/article_detail.html
index de72597..b517771 100644
--- a/articles/templates/articles/article_detail.html
+++ b/articles/templates/articles/article_detail.html
@@ -1,8 +1,6 @@
 {% extends 'articles/base.html' %}
 
-{% block title %}
-    {{ article.title }}
-{% endblock %}
+{% block title %}{{ article.title }} | {% endblock %}
 {% block content %}
     <article class="article-detail">
         <h1>{{ article.title }}{% if article.status != article.PUBLISHED %}
diff --git a/articles/templates/articles/article_list.html b/articles/templates/articles/article_list.html
index 448c330..ccde986 100644
--- a/articles/templates/articles/article_list.html
+++ b/articles/templates/articles/article_list.html
@@ -1,25 +1,26 @@
 {% extends 'articles/base.html' %}
 
-{% block title %}
-    {{ title_header }}
-{% endblock %}
+{% block title %}{% endblock %}
 {% block content %}
     <h1>{{ blog_title }}{% if title %} &middot; {{ title }}{% endif %}</h1>
-    <p class="metadata">{{ blog_description }}</p>
-    <ul>
-    {% for article in articles %}
-        <li>
-            {% if article.published_at %}
-                <time datetime="{{ article.published_at|date:CUSTOM_ISO }}">{{ article.published_at|date }}</time>
-            {% else %}
-                <time datetime="{{ article.updated_at|date:CUSTOM_ISO }}">{{ article.updated_at|date }}</time>
-            {% endif %}
-            : <a href="{% url 'article-detail' slug=article.slug %}">{{ article.title }}</a>
-        </li>
-    {% empty %}
-        <li>No article here. Come back later 🙂</li>
-    {% endfor %}
-    </ul>
+    <p class="metadata">{{ blog_description }} {% include "articles/admin_link_snippet.html" %}</p>
+    <section class="blog-posts">
+        <h2>Blog posts</h2>
+        <ul>
+        {% for article in articles %}
+            <li>
+                {% if article.published_at %}
+                    <time datetime="{{ article.published_at|date:CUSTOM_ISO }}">{{ article.published_at|date }}</time>
+                {% else %}
+                    <time datetime="{{ article.updated_at|date:CUSTOM_ISO }}">{{ article.updated_at|date }}</time>
+                {% endif %}
+                : <a href="{% url 'article-detail' slug=article.slug %}">{{ article.title }}</a>
+            </li>
+        {% empty %}
+            <li>No article here. Come back later 🙂</li>
+        {% endfor %}
+        </ul>
+    </section>
     <nav class="pagination">
         <div class="older">
             {% if page_obj.has_next %}
@@ -32,4 +33,10 @@
             {% endif %}
         </div>
     </nav>
+    <section class="index-page">
+        <h2>{{ index_page.title }}</h2>
+        <div>
+            {{ index_page.get_formatted_content|safe }}
+        </div>
+    </section>
 {% endblock %}
diff --git a/articles/templates/articles/base.html b/articles/templates/articles/base.html
index 586c52b..73d04e0 100644
--- a/articles/templates/articles/base.html
+++ b/articles/templates/articles/base.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{% block title %}Home{% endblock %} | Gab's Notes</title>
+    <title>{% block title %}Home | {% endblock %}Gab's Notes</title>
     <link rel="stylesheet" id="code-light" href="{% static 'code-light.css' %}" type="text/css">
     <link rel="stylesheet" id="code-dark" href="{% static 'code-dark.css' %}" type="text/css">
     <link rel="stylesheet" href="{% static 'style.css' %}" type="text/css">
diff --git a/articles/views/html.py b/articles/views/html.py
index cdbb867..12d4764 100644
--- a/articles/views/html.py
+++ b/articles/views/html.py
@@ -9,6 +9,8 @@ from articles.models import Article, Page
 
 
 class BaseArticleListView(generic.ListView):
+    paginate_by = 10
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["blog_title"] = settings.BLOG["title"]
@@ -23,7 +25,10 @@ class ArticlesListView(BaseArticleListView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["title_header"] = "Articles"
+        index_page = Page.objects.filter(
+            status=Article.PUBLISHED, position=0
+        ).first()  # type: Page
+        context["index_page"] = index_page
         return context
 
 

From 05b1eca6475f870f3c6892d80d5c907b047ccdd0 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Thu, 26 Nov 2020 11:31:33 +0100
Subject: [PATCH 3/3] Update tests

---
 articles/tests/conftest.py      | 1 +
 articles/tests/test_articles.py | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/articles/tests/conftest.py b/articles/tests/conftest.py
index 908e95a..c1448f6 100644
--- a/articles/tests/conftest.py
+++ b/articles/tests/conftest.py
@@ -33,4 +33,5 @@ def published_page(author: User) -> Page:
         published_at=timezone.now(),
         slug="some-page-slug",
         content="## some page markdown\n\n[a page link](https://page.com)",
+        position=2,
     )
diff --git a/articles/tests/test_articles.py b/articles/tests/test_articles.py
index 847821f..155a098 100644
--- a/articles/tests/test_articles.py
+++ b/articles/tests/test_articles.py
@@ -15,23 +15,26 @@ def test_can_access_list(
     content = res.content.decode("utf-8")
     for art in [published_article, published_page]:
         assert art.title in content
-    assert published_article.get_abstract() in content
+    assert published_article.get_abstract() not in content
     assert published_page.get_formatted_content() not in content
 
 
 @pytest.mark.django_db
-def test_abstract_shown_on_list(client: Client, author: User):
+def test_only_title_shown_on_list(client: Client, author: User):
+    title = "This is a very long title mouahahaha"
     abstract = "Some abstract"
     after = "Some content after abstract"
     baker.make(
         Article,
+        title=title,
         status=Article.PUBLISHED,
         author=author,
         content=f"{abstract}\n<!--more-->\n{after}",
     )  # type: Article
     res = client.get(reverse("articles-list"))
     content = res.content.decode("utf-8")
-    assert abstract in content
+    assert title in content
+    assert abstract not in content
     assert after not in content