index page is now also rendered from MD file

markdownblog/blog/views.py

@@ -1,6 +1,4 @@
 import os
-import random
-import re
 
 import markdown2
 
@@ -8,18 +6,14 @@ from django.contrib.auth.decorators import login_required
 from django.db import IntegrityError
 from django.http import HttpResponse
 from django.shortcuts import render, redirect
-#from blog.factories import TopicFactory
+# from blog.factories import TopicFactory
 from blog.models import Topic, Tag, Blogpost
 from django.template import Template, Context
 from django.views.decorators.csrf import csrf_exempt
 
-from markdownblog import settings
 
-
-def viewblog(request, title) -> HttpResponse:
-    post = Blogpost.objects.get(title=title)
-    filepath = os.path.join(os.environ.get("MD_FILE_PATH"), title + ".md")
-    with open(filepath, 'r') as mdfile:
+def render_md_file(path) -> Template:
+    with open(path, 'r') as mdfile:
         md_file_content = mdfile.read()
         mdfile.close()
 
@@ -31,6 +25,16 @@ def viewblog(request, title) -> HttpResponse:
                              '{% autoescape off %}' +
                              html_form_md +
                              '{% endautoescape %}').render(Context({}))
+
+    return rendered_html
+
+
+def viewblog(request, title) -> HttpResponse:
+    post = Blogpost.objects.get(title=title)
+    filepath = os.path.join(os.environ.get("MD_FILE_PATH"), title + ".md")
+
+    rendered_html = render_md_file(filepath)
+
     context = {'post': post, 'html': rendered_html, 'roottopics': Topic.objects.all().filter(rootTopic=None),
                'allposts': Blogpost.objects.all()}
 
@@ -38,8 +42,13 @@ def viewblog(request, title) -> HttpResponse:
 
 
 def index(request) -> HttpResponse:
-    context = {'roottopics': Topic.objects.all().filter(rootTopic=None), 'allposts': Blogpost.objects.all(),
-               'debug': settings.DEBUG}
+    filepath = os.path.join(os.environ.get("MD_FILE_PATH"), 'indexpage/index.md')
+
+    rendered_html = render_md_file(filepath)
+
+    context = {'html': rendered_html, 'roottopics': Topic.objects.all().filter(rootTopic=None),
+               'allposts': Blogpost.objects.all()}
+
     return render(request, 'blog/index.html', context)