more refactoring, setting up individual route blueprints

suchwow/app.py

@@ -1,14 +1,14 @@
-from functools import wraps
 import uuid
-import os
 import json
 import requests
-from flask import Flask, request, redirect, url_for, abort
+from flask import Flask, request, redirect, url_for
-from flask import jsonify, render_template, flash, session
+from flask import render_template, flash, session
 from flask import send_from_directory, make_response
+from flask import jsonify
 from flask_session import Session
-from werkzeug.utils import secure_filename
 from suchwow.models import Post, Profile, Comment, Notification, db
+from suchwow.routes import auth, comment, post, profile
+from suchwow.utils.decorators import login_required
 
 
 app = Flask(__name__)
@@ -21,31 +21,7 @@ OPENID_CLIENT_ID = app.config["OIDC_CLIENT_ID"]
 OPENID_CLIENT_SECRET = app.config["OIDC_CLIENT_SECRET"]
 OPENID_REDIRECT_URI = "http://localhost:5000/auth"
 
-
+app.register_blueprint(post.bp)
-def allowed_file(filename):
-    return "." in filename and \
-           filename.rsplit(".", 1)[1].lower() in app.config["ALLOWED_EXTENSIONS"]
-
-def debug_login():
-    session["auth"] = {
-        "state": "active",
-        "session_state": "debug",
-        "code": "abcdefg",
-        "preferred_username": "debuguser",
-        "debug": True
-    }
-    return
-
-def login_required(f):
-    @wraps(f)
-    def decorated_function(*args, **kwargs):
-        if app.debug:
-            debug_login()
-            return f(*args, **kwargs)
-        if "auth" not in session or not session["auth"]:
-            return redirect(url_for("login"))
-        return f(*args, **kwargs)
-    return decorated_function
 
 
 @app.route("/")
@@ -58,53 +34,10 @@ def index():
     posts = Post.select().order_by(Post.timestamp).paginate(int(page), 10)
     return render_template("index.html", posts=posts, page=page)
 
-@app.route("/post/<id>")
-def read_post(id):
-    if Post.filter(id=id):
-        post = Post.get(Post.id == id)
-        return render_template("post.html", post=post)
-    else:
-        return "no meme there brah"
-
 @app.route("/uploads/<path:filename>")
 def uploaded_file(filename):
     return send_from_directory(app.config["UPLOAD_FOLDER"], filename)
 
-@app.route("/post/create", methods=["GET", "POST"])
-@login_required
-def create_post():
-    if request.method == "POST":
-        post_title = request.form.get("title")
-        # check if the post request has the file part
-        if "file" not in request.files:
-            flash("You didn't upload a caliente meme, bro! You're fuckin up!")
-            return redirect(request.url)
-        file = request.files["file"]
-        # if user does not select file, browser also
-        # submit an empty part without filename
-        if file.filename == "":
-            flash("You didn't upload a caliente meme, bro! You're fuckin up!")
-            return redirect(request.url)
-        if post_title is "":
-            flash("You didn't give your meme a spicy title, bro! You're fuckin up!")
-            return redirect(request.url)
-        if file and allowed_file(file.filename):
-            filename = secure_filename(file.filename)
-            save_path = os.path.join(app.config["UPLOAD_FOLDER"], filename)
-            file.save(save_path)
-            # gen wallet
-            post = Post(
-                title=post_title,
-                subtitle=request.form.get("subtitle", ""),
-                submitter=session["auth"]["preferred_username"],
-                image_name=filename,
-                account_index=0,
-                address_index=0
-            )
-            post.save()
-            return redirect(url_for("read_post", id=post.id))
-    return render_template("create_post.html")
-
 @app.route("/login")
 def login():
     state = uuid.uuid4().hex

suchwow/routes/post.py

@@ -0,0 +1,51 @@
+from os import path
+from flask import render_template, Blueprint, request, session
+from werkzeug.utils import secure_filename
+from suchwow.models import Post
+from suchwow.utils.decorators import login_required
+
+
+bp = Blueprint("post", "post")
+
+@bp.route("/post/<id>")
+def read(id):
+    if Post.filter(id=id):
+        post = Post.get(Post.id == id)
+        return render_template("post/read.html", post=post)
+    else:
+        return "no meme there brah"
+
+@bp.route("/post/create", methods=["GET", "POST"])
+@login_required
+def create():
+    if request.method == "POST":
+        post_title = request.form.get("title")
+        # check if the post request has the file part
+        if "file" not in request.files:
+            flash("You didn't upload a caliente meme, bro! You're fuckin up!")
+            return redirect(request.url)
+        file = request.files["file"]
+        # if user does not select file, browser also
+        # submit an empty part without filename
+        if file.filename == "":
+            flash("You didn't upload a caliente meme, bro! You're fuckin up!")
+            return redirect(request.url)
+        if post_title is "":
+            flash("You didn't give your meme a spicy title, bro! You're fuckin up!")
+            return redirect(request.url)
+        if file and allowed_file(file.filename):
+            filename = secure_filename(file.filename)
+            save_path = path.join(app.config["UPLOAD_FOLDER"], filename)
+            file.save(save_path)
+            # gen wallet
+            post = Post(
+                title=post_title,
+                subtitle=request.form.get("subtitle", ""),
+                submitter=session["auth"]["preferred_username"],
+                image_name=filename,
+                account_index=0,
+                address_index=0
+            )
+            post.save()
+            return redirect(url_for("post.read", id=post.id))
+    return render_template("post/create.html")

suchwow/templates/index.html

@@ -2,7 +2,7 @@
 
  {% block content %}
 
- <a href="{{ url_for('create_post') }}">Submit A Meme</a><br>
+ <a href="{{ url_for('post.create') }}">Submit A Meme</a><br>
  <a href="{{ url_for('debug') }}">Debug</a>
 
  {% block header %}
@@ -11,7 +11,7 @@
 
 <ul>
  {% for post in posts %}
-   <li><a href="{{ url_for('read_post', id=post.id) }}">{{ post.title }}</a></li>
+   <li><a href="{{ url_for('post.read', id=post.id) }}">{{ post.title }}</a></li>
  {% endfor %}
 </ul>
 

suchwow/utils/decorators.py

@@ -0,0 +1,15 @@
+from flask import current_app, session, redirect, url_for
+from functools import wraps
+from suchwow.utils.helpers import debug_login
+
+
+def login_required(f):
+    @wraps(f)
+    def decorated_function(*args, **kwargs):
+        if current_app.debug:
+            debug_login()
+            return f(*args, **kwargs)
+        if "auth" not in session or not session["auth"]:
+            return redirect(url_for("login"))
+        return f(*args, **kwargs)
+    return decorated_function

suchwow/utils/helpers.py

@@ -0,0 +1,16 @@
+from flask import current_app, session
+
+
+def allowed_file(filename):
+    return "." in filename and \
+           filename.rsplit(".", 1)[1].lower() in current_app.config["ALLOWED_EXTENSIONS"]
+
+def debug_login():
+    session["auth"] = {
+        "state": "active",
+        "session_state": "debug",
+        "code": "abcdefg",
+        "preferred_username": "debuguser",
+        "debug": True
+    }
+    return