From 2da26637260e8b4ec46c5eb9d980b6fa3e9a2d3d Mon Sep 17 00:00:00 2001 From: Dark-Storm Date: Fri, 23 Feb 2018 22:58:30 +0100 Subject: [PATCH] =?UTF-8?q?Refactorisation=20des=20templates=20Merci=20de?= =?UTF-8?q?=20bien=20penser=20=C3=A0=20s=C3=A9parer=20les=20groupes=20?= =?UTF-8?q?=C3=A0=20l'avenir.=20Y'a=20encore=20du=20taf=20sur=20la=20d?= =?UTF-8?q?=C3=A9coupe=20du=20menu,=20je=20pense=20qu'on=20peut=20faire=20?= =?UTF-8?q?un=20sous-dossier=20`navbar`=20avec=20un=20fichier=20par=20grou?= =?UTF-8?q?pe=20de=20menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 + README.md | 7 +- app/routes.py | 55 +++-- app/static/css/navbar.css | 6 +- app/templates/base/base.html | 14 ++ app/templates/base/container.html | 10 + app/templates/base/footer.html | 8 + app/templates/base/head.html | 12 ++ app/templates/base/header.html | 15 ++ app/templates/base/navbar.html | 313 ++++++++++++++++++++++++++++ app/templates/base/scripts.html | 3 + app/templates/container.html | 26 --- app/templates/footer.html | 19 -- app/templates/head.html | 26 --- app/templates/index.html | 15 +- app/templates/login.html | 44 ++-- app/templates/navbar.html | 327 ------------------------------ app/templates/validation.html | 4 +- 18 files changed, 442 insertions(+), 466 deletions(-) create mode 100644 .gitignore create mode 100644 app/templates/base/base.html create mode 100644 app/templates/base/container.html create mode 100644 app/templates/base/footer.html create mode 100644 app/templates/base/head.html create mode 100644 app/templates/base/header.html create mode 100644 app/templates/base/navbar.html create mode 100644 app/templates/base/scripts.html delete mode 100644 app/templates/container.html delete mode 100644 app/templates/footer.html delete mode 100644 app/templates/head.html delete mode 100644 app/templates/navbar.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6245b64 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +app.db + +__pycache__/ +app/__pycache__/ diff --git a/README.md b/README.md index b2f9414..cee7f2c 100644 --- a/README.md +++ b/README.md @@ -1 +1,6 @@ -projet v5 +# Planète Casio v5 + +## Style de code + +* L'indentation se fait avec des tabulations +* Merci d'essayer de respecter les 80 colonnes max diff --git a/app/routes.py b/app/routes.py index c7e0fd2..fe7f6f6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,48 +8,45 @@ from app.models import User @app.route('/', methods=['GET', 'POST']) def index(): - - form = LoginForm() - if form.validate_on_submit(): - user = User.query.filter_by(username=form.username.data).first() - if user is None or not user.check_password(form.password.data): - flash('pseudo ou mot de passe invalide') - return redirect(url_for('index')) - login_user(user, remember=form.remember_me.data) - - - return render_template('index.html', form=form) + form = LoginForm() + if form.validate_on_submit(): + user = User.query.filter_by(username=form.username.data).first() + if user is None or not user.check_password(form.password.data): + flash('pseudo ou mot de passe invalide') + return redirect(url_for('index')) + login_user(user, remember=form.remember_me.data) + return render_template('index.html', form=form) @app.route('/logout/') def logout(): - logout_user() - return redirect(url_for('index')) + logout_user() + return redirect(url_for('index')) @app.route('/register', methods=['GET', 'POST']) def register(): - if current_user.is_authenticated: - return redirect(url_for('index')) - form = LoginForm() - form2 = RegistrationForm() - if form2.validate_on_submit(): - user = User(username=form2.username.data, email=form2.email.data) - user.set_password(form2.password.data) - db.session.add(user) - db.session.commit() - flash('Congratulations, you are now a registered user!') - return redirect(url_for('validation')) - return render_template('register.html', title='Register', form=form, form2 = form2) + if current_user.is_authenticated: + return redirect(url_for('index')) + form = LoginForm() + form2 = RegistrationForm() + if form2.validate_on_submit(): + user = User(username=form2.username.data, email=form2.email.data) + user.set_password(form2.password.data) + db.session.add(user) + db.session.commit() + flash('Congratulations, you are now a registered user!') + return redirect(url_for('validation')) + return render_template('register.html', title='Register', form=form, form2 = form2) @app.route('/register/validation/') def validation(): - if current_user.is_authenticated : - return redirect(url_for('index')) - form = LoginForm() - return render_template('validation.html', form = form) \ No newline at end of file + if current_user.is_authenticated : + return redirect(url_for('index')) + form = LoginForm() + return render_template('validation.html', form = form) diff --git a/app/static/css/navbar.css b/app/static/css/navbar.css index 5dec525..4e8009e 100644 --- a/app/static/css/navbar.css +++ b/app/static/css/navbar.css @@ -98,15 +98,15 @@ nav a:focus { #menu { position: fixed; z-index: 5; left: -240px; width: 300px; /* left-to-right animation */ - /*left: 60px; width: 0;*/ /* scroll animation */ + /*left: 60px; width: 0;*/ /* scroll animation */ height: 100%; overflow-x: hidden; overflow-y: auto; font-family: NotoSans; font-size: 14px; background: #22292c; box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - transition: 2s ease; + transition: .15s ease; } #menu.opened { - left: 60px; /* left-to-right animation */ + left: 60px; /* left-to-right animation */ /*width: 300px;*/ /* scroll animation */ } diff --git a/app/templates/base/base.html b/app/templates/base/base.html new file mode 100644 index 0000000..a5eb781 --- /dev/null +++ b/app/templates/base/base.html @@ -0,0 +1,14 @@ + + + {% include "base/head.html" %} + + {% include "base/navbar.html" %} + + {% block container %} + {% endblock container %} + + {% include "base/footer.html" %} + + {% include "base/scripts.html" %} + + diff --git a/app/templates/base/container.html b/app/templates/base/container.html new file mode 100644 index 0000000..cf4302e --- /dev/null +++ b/app/templates/base/container.html @@ -0,0 +1,10 @@ +{% extends "base/base.html" %} + +{% block container %} +
+ {% include "base/header.html" %} + + {% block content %} + {% endblock content %} +
+{% endblock container %} diff --git a/app/templates/base/footer.html b/app/templates/base/footer.html new file mode 100644 index 0000000..c4f1f15 --- /dev/null +++ b/app/templates/base/footer.html @@ -0,0 +1,8 @@ + diff --git a/app/templates/base/head.html b/app/templates/base/head.html new file mode 100644 index 0000000..9be58bc --- /dev/null +++ b/app/templates/base/head.html @@ -0,0 +1,12 @@ + + Planète Casio + + + + + + + + + + diff --git a/app/templates/base/header.html b/app/templates/base/header.html new file mode 100644 index 0000000..2d4558e --- /dev/null +++ b/app/templates/base/header.html @@ -0,0 +1,15 @@ +
+
+ + + + + + +
+ + +
diff --git a/app/templates/base/navbar.html b/app/templates/base/navbar.html new file mode 100644 index 0000000..c5716e8 --- /dev/null +++ b/app/templates/base/navbar.html @@ -0,0 +1,313 @@ + diff --git a/app/templates/base/scripts.html b/app/templates/base/scripts.html new file mode 100644 index 0000000..9be4f53 --- /dev/null +++ b/app/templates/base/scripts.html @@ -0,0 +1,3 @@ + + + diff --git a/app/templates/container.html b/app/templates/container.html deleted file mode 100644 index 27cebbb..0000000 --- a/app/templates/container.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "navbar.html" %} - - -{% block container %} - - -
-
-
- - - - - - -
- - -
-
- {% block footer %} - {% endblock footer %} -{% endblock container %} \ No newline at end of file diff --git a/app/templates/footer.html b/app/templates/footer.html deleted file mode 100644 index 8c37085..0000000 --- a/app/templates/footer.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "container.html" %} - - -{% block footer %} - -{% block content %} -{% endblock content %} - - - -{% endblock footer %} \ No newline at end of file diff --git a/app/templates/head.html b/app/templates/head.html deleted file mode 100644 index aa7d32a..0000000 --- a/app/templates/head.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - Planète Casio - - - - - - - - - - - - {% block body %} - - {% endblock body %} - - - - - - \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index da12c4f..4905fee 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1,16 +1,9 @@ -{% extends "footer.html" %} - - +{% extends "base/container.html" %} {% block content %} -
-
-

du contenu....

-
+
+

du contenu....

+
{% endblock %} - - - - diff --git a/app/templates/login.html b/app/templates/login.html index 8d5a0b6..64e5f6a 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -1,25 +1,25 @@ -{% extends "base.html" %} +{% extends "container.html" %} {% block content %} -

Sign In

-
- {{ form.hidden_tag() }} -

- {{ form.username.label }}
- {{ form.username(size=32) }}
- {% for error in form.username.errors %} - [{{ error }}] - {% endfor %} -

-

- {{ form.password.label }}
- {{ form.password(size=32) }}
- {% for error in form.password.errors %} - [{{ error }}] - {% endfor %} -

-

{{ form.remember_me() }} {{ form.remember_me.label }}

-

{{ form.submit() }}

-
-

New User? Click to Register!

+

Sign In

+
+ {{ form.hidden_tag() }} +

+ {{ form.username.label }}
+ {{ form.username(size=32) }}
+ {% for error in form.username.errors %} + [{{ error }}] + {% endfor %} +

+

+ {{ form.password.label }}
+ {{ form.password(size=32) }}
+ {% for error in form.password.errors %} + [{{ error }}] + {% endfor %} +

+

{{ form.remember_me() }} {{ form.remember_me.label }}

+

{{ form.submit() }}

+
+

New User? Click to Register!

{% endblock %} diff --git a/app/templates/navbar.html b/app/templates/navbar.html deleted file mode 100644 index c19c470..0000000 --- a/app/templates/navbar.html +++ /dev/null @@ -1,327 +0,0 @@ -{% extends "head.html" %} - - -{% block body%} - - - - - - -{% block container %} - -{% endblock container %} - -{% endblock body %} \ No newline at end of file diff --git a/app/templates/validation.html b/app/templates/validation.html index 9521226..cf2108b 100644 --- a/app/templates/validation.html +++ b/app/templates/validation.html @@ -1,4 +1,4 @@ -{% extends "footer.html" %} +{% extends "base/container.html" %} {% block content %}
@@ -8,4 +8,4 @@ Retour à la page d'acceuil
-{% endblock content %} \ No newline at end of file +{% endblock content %}