From 2dd7863e891cd8399923b68a8efbacf740d8df72 Mon Sep 17 00:00:00 2001
From: Darks <l.gatin@neuf.fr>
Date: Thu, 23 Jul 2020 20:24:26 +0200
Subject: [PATCH] Rebase master from preprod

---
 app/__init__.py                | 13 +++++++++++++
 app/templates/base/footer.html |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/app/__init__.py b/app/__init__.py
index 01ca7d3..bfee0a1 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -5,7 +5,11 @@ from flask_login import LoginManager
 from flask_mail import Mail
 from config import Config
 import time
+<<<<<<< HEAD
 import slugify
+=======
+
+>>>>>>> e15005a... Ajout des stats sur la durée de chargement
 
 app = Flask(__name__)
 app.config.from_object(Config)
@@ -18,10 +22,17 @@ db = SQLAlchemy(app)
 migrate = Migrate(app, db)
 mail = Mail(app)
 
+
+@app.before_request
+def request_time():
+    g.request_start_time = time.time()
+    g.request_time = lambda: "%.5fs" % (time.time() - g.request_start_time)
+
 login = LoginManager(app)
 login.login_view = 'login'
 login.login_message = "Veuillez vous authentifier avant de continuer."
 
+<<<<<<< HEAD
 from app.utils.converters import *
 app.url_map.converters['forum'] = ForumConverter
 app.url_map.converters['topicpage'] = TopicPageConverter
@@ -34,6 +45,8 @@ def request_time():
 
 from app.processors.menu import menu_processor
 from app.processors.utilities import utilities_processor
+=======
+>>>>>>> e15005a... Ajout des stats sur la durée de chargement
 
 from app import models  # IDK why this is here, but it works
 from app.models.comment import Comment
diff --git a/app/templates/base/footer.html b/app/templates/base/footer.html
index ed56b16..7c082dc 100644
--- a/app/templates/base/footer.html
+++ b/app/templates/base/footer.html
@@ -4,5 +4,8 @@
 	{% if current_user.is_authenticated and current_user.priv('footer-statistics') %}
 		<p>Page générée en {{ g.request_time() }}</p>
 	{% endif %}
+<<<<<<< HEAD
 	<p>Ceci est un environnement de test. Tout contenu peut être supprimé sans avertissement préalable.</p>
+=======
+>>>>>>> e15005a... Ajout des stats sur la durée de chargement
 </footer>