Attempt to better use blueprints

Move templates and static assets to corresponding blueprint package, fixup a few references (url_for calls). Leave openid at root (instead of moving to sphinxweb.auth) because pallets/flask#348 (can't mount blueprint static files to /static) & it is referred to from the root CSS. Maybe look into e.g. flask-assets to see if it can handle these cases correctly and/or CSS concatenation so auth CSS can be in auth blueprint? Though can also just load multiple CSS (can blueprint override base to add CSS? Maybe use blueprint-local base?)
shimizukawa · Apr 9, 2013 · 48df1e6 · 48df1e6
1 parent 73f441a
commit 48df1e6
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 5 deletions.
diff --git a/sphinxweb/__init__.py b/sphinxweb/__init__.py
@@ -83,6 +83,6 @@ def after_request(response):
     db_session.remove()
     return response
 
-from sphinxweb.views import docs, auth
+from . import docs, auth
 app.register_blueprint(docs.docs)
 app.register_blueprint(auth.auth)
diff --git a/sphinxweb/views/auth.py → sphinxweb/auth/__init__.py b/sphinxweb/views/auth.py → sphinxweb/auth/__init__.py
@@ -19,7 +19,11 @@
 from sphinxweb import support
 from sphinxweb.models import User, db_session
 
-auth = Blueprint('auth', __name__)
+auth = Blueprint(
+    'auth', __name__,
+    template_folder='templates',
+    static_folder='static',
+    static_url_path='/auth/static')
 
 # setup flask-openid
 oid = OpenID()

diff --git a/sphinxweb/static/oid/google.png → sphinxweb/auth/static/oid/google.png b/sphinxweb/static/oid/google.png → sphinxweb/auth/static/oid/google.png
diff --git a/sphinxweb/static/oid/launchpad.png → sphinxweb/auth/static/oid/launchpad.png b/sphinxweb/static/oid/launchpad.png → sphinxweb/auth/static/oid/launchpad.png
diff --git a/sphinxweb/static/oid/myopenid.png → sphinxweb/auth/static/oid/myopenid.png b/sphinxweb/static/oid/myopenid.png → sphinxweb/auth/static/oid/myopenid.png
diff --git a/sphinxweb/static/oid/yahoo.png → sphinxweb/auth/static/oid/yahoo.png b/sphinxweb/static/oid/yahoo.png → sphinxweb/auth/static/oid/yahoo.png
diff --git a/sphinxweb/templates/create_profile.html → sphinxweb/auth/templates/create_profile.html b/sphinxweb/templates/create_profile.html → sphinxweb/auth/templates/create_profile.html
@@ -19,7 +19,7 @@ <h1>Create Profile</h1>
     </p>
   </form>
   <p>
-    If you don't want to proceed, you can <a href="{{ url_for('auth.logout')
+    If you don't want to proceed, you can <a href="{{ url_for('.logout')
     }}">sign out</a> again.
   </p>
 {% endblock %}
diff --git a/sphinxweb/templates/edit_profile.html → sphinxweb/auth/templates/edit_profile.html b/sphinxweb/templates/edit_profile.html → sphinxweb/auth/templates/edit_profile.html
diff --git a/sphinxweb/templates/login.html → sphinxweb/auth/templates/login.html b/sphinxweb/templates/login.html → sphinxweb/auth/templates/login.html
@@ -25,7 +25,7 @@ <h1>Sign in with your OpenID</h1>
   <p>
   {%- for name, icon, url in oid_providers %}
   <a href="{{ url }}" class="oid">
-    <img src="{{ url_for('static', filename='oid/' + icon) }}" alt="{{ name }}" />
+    <img src="{{ url_for('.static', filename='oid/' + icon) }}" alt="{{ name }}" />
   </a>
   {%- endfor %}
   </p>

diff --git a/sphinxweb/views/docs.py → sphinxweb/docs/__init__.py b/sphinxweb/views/docs.py → sphinxweb/docs/__init__.py
@@ -15,7 +15,7 @@
 
 from sphinxweb import support
 
-docs = Blueprint('docs', __name__)
+docs = Blueprint('docs', __name__, template_folder='templates')
 
 @docs.route('/')
 def index():

diff --git a/sphinxweb/templates/doc.html → sphinxweb/docs/templates/doc.html b/sphinxweb/templates/doc.html → sphinxweb/docs/templates/doc.html
diff --git a/sphinxweb/views/__init__.py b/sphinxweb/views/__init__.py