Merge branch 'dev' into preprod

This commit is contained in:
Darks 2020-07-30 14:51:00 +02:00
commit 6083534ae5
Signed by: Darks
GPG Key ID: F61F10FA138E797C
8 changed files with 44 additions and 31 deletions

View File

@ -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

5
app/models/__init__.py Normal file
View File

@ -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

View File

@ -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

8
app/processors/stats.py Normal file
View File

@ -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)

View File

@ -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,
)

6
app/routes/__init__.py Normal file
View File

@ -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

View File

@ -4,7 +4,11 @@
<img class="profile-avatar" src="{{ url_for('avatar', filename=user.avatar) }}" alt="Avatar de {{ user.name }}">
<div>
<div class="profile-name"><a href="{{ url_for('user', username=user.name) }}">{{ user.name }}</a></div>
<div class="profile-title">{{ user.title.name if user.title else "Membre" }}</div>
{% if user.title %}
<div class="profile-title" style="{{ user.title.css }}">{{ user.title.name }}</div>
{% else %}
<div class="profile-title">Membre</div>
{% endif %}
<div class="profile-points">Niveau {{ user.level[0] }} <span>({{ user.xp }})</span></div>
<div class="profile-points-small">N{{ user.level[0] }} <span>({{ user.xp }})</span></div>
<div class="profile-xp"><div style='width: {{ user.level[1] }}%;'></div></div>

5
app/utils/__init__.py Normal file
View File

@ -0,0 +1,5 @@
# Register utils here
from app.utils import pluralize
from app.utils import date
from app.utils import is_title