From a4efe29a7d01ee73a1c19f87076092e646273cf5 Mon Sep 17 00:00:00 2001 From: Darks Date: Thu, 30 Jul 2020 14:49:18 +0200 Subject: [PATCH 1/2] __init__.py: refactor registration of assets --- app/__init__.py | 38 ++++++++----------------------------- app/models/__init__.py | 5 +++++ app/processors/__init__.py | 5 +++++ app/processors/stats.py | 8 ++++++++ app/processors/utilities.py | 2 ++ app/routes/__init__.py | 6 ++++++ app/utils/__init__.py | 5 +++++ 7 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 app/models/__init__.py create mode 100644 app/processors/__init__.py create mode 100644 app/processors/stats.py create mode 100644 app/routes/__init__.py create mode 100644 app/utils/__init__.py diff --git a/app/__init__.py b/app/__init__.py index 01ca7d3..a231147 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,11 +1,9 @@ -from flask import Flask, g +from flask import Flask from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate from flask_login import LoginManager from flask_mail import Mail from config import Config -import time -import slugify app = Flask(__name__) app.config.from_object(Config) @@ -22,36 +20,16 @@ login = LoginManager(app) login.login_view = 'login' login.login_message = "Veuillez vous authentifier avant de continuer." +# Register converters (needed for routing) from app.utils.converters import * app.url_map.converters['forum'] = ForumConverter app.url_map.converters['topicpage'] = TopicPageConverter -@app.before_request -def request_time(): - g.request_start_time = time.time() - g.request_time = lambda: "%.5fs" % (time.time() - g.request_start_time) +# Register routes +from app import routes +# Register utils +from app import utils -from app.processors.menu import menu_processor -from app.processors.utilities import utilities_processor - -from app import models # IDK why this is here, but it works -from app.models.comment import Comment -from app.models.thread import Thread -from app.models.forum import Forum -from app.models.topic import Topic -from app.models.notification import Notification - -from app.routes import index, search, users, tools # To load routes at initialization -from app.routes.account import login, account, notification -from app.routes.admin import index, groups, account, trophies, forums -from app.routes.forum import index, topic - -from app.utils import pluralize # To use pluralize into the templates -from app.utils import date -from app.utils import is_title - -# Add slugify into the available functions in every template -app.jinja_env.globals.update( - slugify=slugify.slugify -) +# Register processors +from app import processors diff --git a/app/models/__init__.py b/app/models/__init__.py new file mode 100644 index 0000000..9849a04 --- /dev/null +++ b/app/models/__init__.py @@ -0,0 +1,5 @@ +from app.models.comment import Comment +from app.models.thread import Thread +from app.models.forum import Forum +from app.models.topic import Topic +from app.models.notification import Notification diff --git a/app/processors/__init__.py b/app/processors/__init__.py new file mode 100644 index 0000000..d29ee40 --- /dev/null +++ b/app/processors/__init__.py @@ -0,0 +1,5 @@ +# Register processors here + +from app.processors.menu import menu_processor +from app.processors.utilities import utilities_processor +from app.processors.stats import request_time diff --git a/app/processors/stats.py b/app/processors/stats.py new file mode 100644 index 0000000..0a2c893 --- /dev/null +++ b/app/processors/stats.py @@ -0,0 +1,8 @@ +from flask import g +from time import time +from app import app + +@app.before_request +def request_time(): + g.request_start_time = time() + g.request_time = lambda: "%.5fs" % (time() - g.request_start_time) diff --git a/app/processors/utilities.py b/app/processors/utilities.py index 1fa5e62..ad6dbde 100644 --- a/app/processors/utilities.py +++ b/app/processors/utilities.py @@ -1,6 +1,7 @@ from app import app from flask import url_for from config import V5Config +from slugify import slugify @app.context_processor def utilities_processor(): @@ -10,4 +11,5 @@ def utilities_processor(): # enumerate=enumerate, _url_for = lambda route, args, **other: url_for(route, **args, **other), V5Config = V5Config, + slugify=slugify, ) diff --git a/app/routes/__init__.py b/app/routes/__init__.py new file mode 100644 index 0000000..9bc4576 --- /dev/null +++ b/app/routes/__init__.py @@ -0,0 +1,6 @@ +# Register routes here + +from app.routes import index, search, users, tools +from app.routes.account import login, account, notification +from app.routes.admin import index, groups, account, trophies, forums +from app.routes.forum import index, topic diff --git a/app/utils/__init__.py b/app/utils/__init__.py new file mode 100644 index 0000000..03b88c2 --- /dev/null +++ b/app/utils/__init__.py @@ -0,0 +1,5 @@ +# Register utils here + +from app.utils import pluralize +from app.utils import date +from app.utils import is_title From a2767c43439487d3928d500d7584516bc14d04d5 Mon Sep 17 00:00:00 2001 From: Darks Date: Thu, 30 Jul 2020 14:50:08 +0200 Subject: [PATCH 2/2] widget_user: add title style if there is one --- app/templates/widgets/user.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/templates/widgets/user.html b/app/templates/widgets/user.html index e0df4d6..8866930 100644 --- a/app/templates/widgets/user.html +++ b/app/templates/widgets/user.html @@ -4,7 +4,11 @@ Avatar de {{ user.name }}
{{ user.name }}
-
{{ user.title.name if user.title else "Membre" }}
+ {% if user.title %} +
{{ user.title.name }}
+ {% else %} +
Membre
+ {% endif %}
Niveau {{ user.level[0] }} ({{ user.xp }})
N{{ user.level[0] }} ({{ user.xp }})