Merge branch 'today-in-history' into collapsable-posts

flaskr/__init__.py

@@ -1,6 +1,7 @@
 import os
 
 from flask import Flask, request, g
+import markdown
 
 
 def create_app(test_config=None):

flaskr/blog.py

@@ -6,6 +6,7 @@ from flask import render_template
 from flask import request
 from flask import url_for
 from werkzeug.exceptions import abort
+import markdown
 
 from .auth import login_required
 from .db import get_db
@@ -22,6 +23,11 @@ def index():
         " FROM post p JOIN user u ON p.author_id = u.id"
         " ORDER BY created DESC"
     ).fetchall()
+    # Convert the immutable cursor to a list of dictionaries
+    posts = [dict(post) for post in posts]
+    # Convert markdown to HTML for each post body
+    for post in posts:
+        post['body'] = markdown.markdown(post['body'])
     return render_template("blog/index.html", posts=posts)
 
 

flaskr/templates/blog/create.html

@@ -8,7 +8,7 @@
   <form method="post">
     <label for="title">Title</label>
     <input name="title" id="title" value="{{ request.form['title'] }}" required>
-    <label for="body">Body</label>
+    <label for="body">Body (Markdown supported)</label>
     <textarea name="body" id="body">{{ request.form['body'] }}</textarea>
     <input type="submit" value="Save">
   </form>

flaskr/templates/blog/index.html

@@ -21,6 +21,7 @@
         <button class="toggle-content" onclick="toggleContent(this)">Expand</button>
       </header>
       <p class="body" style="display: none;">{{ post['body'] }}</p>
+      <p class="body" style="display: none;">{{ post['body']|safe }}</p>
     </article>
     {% if not loop.last %}
       <hr>

flaskr/templates/blog/update.html

@@ -8,7 +8,7 @@
   <form method="post">
     <label for="title">Title</label>
     <input name="title" id="title" value="{{ request.form['title'] or post['title'] }}" required>
-    <label for="body">Body</label>
+    <label for="body">Body (Markdown supported)</label>
     <textarea name="body" id="body">{{ request.form['body'] or post['body'] }}</textarea>
     <input type="submit" value="Save">
   </form>