Merge branch 'master' into production

markdownblog/Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3.10-slim
 
 ENV PYTHONBUFFERED 1
-RUN apt update && apt upgrade
+RUN apt update && apt upgrade -y
 RUN mkdir "/markdownblog"
 WORKDIR "/markdownblog"
 ADD ./requirements.txt /markdownblog/

markdownblog/blog/migrations/0003_blogpost_views.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.5 on 2022-09-11 22:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0002_alter_blogpost_title_alter_tag_name_alter_topic_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='blogpost',
+            name='views',
+            field=models.IntegerField(default=0),
+        ),
+    ]

markdownblog/blog/models.py

@@ -30,3 +30,4 @@ class Blogpost(models.Model):
     tags = models.ManyToManyField(Tag)
     topic = models.ForeignKey(Topic, blank=True, null=True, on_delete=models.CASCADE)
     mdfile = models.CharField(max_length=255)
+    views = models.IntegerField(default=0)

markdownblog/blog/views.py

@@ -32,6 +32,8 @@ def render_md_file(path) -> Template:
 
 def viewblog(request, title) -> HttpResponse:
     post = Blogpost.objects.get(title=title)
+    post.views += 1
+    post.save()
     filepath = os.path.join(os.environ.get("MD_FILE_PATH"), title + ".md")
 
     rendered_html = render_md_file(filepath)

markdownblog/markdownblog/templates/blog/order.html

@@ -19,6 +19,7 @@
                         <li class="topic_list_element" draggable="true" ondragstart="drag(event)"
                             id="list_elem_post_{{ post.id }}">
                             <a href="{% url 'readpost' title=post.title %}">{{ post }}</a>
+                            <p>Views: {{ post.views }}</p>
                             <a href="/admin/blog/blogpost/{{ post.id }}/delete">
                                 <button class="btn waves-effect waves-light btn-danger">
                                     <span class="material-icons">delete</span>