From f3d355b3dace71ae1a6d1b1405185662248d55a3 Mon Sep 17 00:00:00 2001 From: Dark-Storm Date: Sun, 16 Sep 2018 23:14:07 +0200 Subject: [PATCH] =?UTF-8?q?Cr=C3=A9ation=20du=20diagramme=20de=20classes.?= =?UTF-8?q?=20Modifications=20mineures=20des=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/routes.py | 3 + app/static/css/global.css | 17 +- app/static/css/navbar.css | 2 +- app/templates/base/alerts.html | 30 +-- app/templates/base/navbar.html | 243 ------------------------- app/templates/base/navbar/account.html | 10 +- app/templates/register.html | 85 +++++---- app/templates/validation.html | 3 +- assets/diagramme_1.dia | Bin 0 -> 3447 bytes 9 files changed, 90 insertions(+), 303 deletions(-) create mode 100644 assets/diagramme_1.dia diff --git a/app/routes.py b/app/routes.py index fe7f6f6..a327b31 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,6 +10,9 @@ from app.models import User def index(): form = LoginForm() + flash('pseudo ou mot de passe invalide', 'error') + flash('tout ça c\'est ok !', 'ok') + flash('mais ça non', 'error') 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): diff --git a/app/static/css/global.css b/app/static/css/global.css index 6fe5e6f..e03131d 100644 --- a/app/static/css/global.css +++ b/app/static/css/global.css @@ -167,13 +167,20 @@ input[type="button"].raised:active { } /* Input text */ +input[type="text"], +input[type="search"], +input[type="password"] { + background: #FFFFFF; color: #000000; +} + input[type="text"]:focus, input[type="search"]:focus, input[type="password"]:focus { - + box-shadow: :0 0 0 0.2rem rgba(0,123,255,0.25); } + section { margin: 10px 5%; } @@ -186,4 +193,10 @@ section h1 { section * { transition: .15s ease; -} \ No newline at end of file +} + + +/* Bootstrap-style rules */ +.flex { + display: flex; +} diff --git a/app/static/css/navbar.css b/app/static/css/navbar.css index d2dd033..1b36e6f 100644 --- a/app/static/css/navbar.css +++ b/app/static/css/navbar.css @@ -180,7 +180,7 @@ nav a:focus { margin-right: 10px; } -#menu form p { +#menu form div { padding: 0 5%; } #menu form input[type="text"] { diff --git a/app/templates/base/alerts.html b/app/templates/base/alerts.html index 1157c2e..276cab1 100644 --- a/app/templates/base/alerts.html +++ b/app/templates/base/alerts.html @@ -1,15 +1,15 @@ -{% with messages = get_flashed_messages() %} -{% if messages %} -{% for message in messages %} -
- - - - - {{ message }} - - -
-{% endfor %} -{% endif %} -{% endwith %} \ No newline at end of file +{% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for category, message in messages %} +
+ + + + + {{ message }} + + +
+ {% endfor %} + {% endif %} +{% endwith %} diff --git a/app/templates/base/navbar.html b/app/templates/base/navbar.html index bd61bac..c526f14 100644 --- a/app/templates/base/navbar.html +++ b/app/templates/base/navbar.html @@ -69,7 +69,6 @@ diff --git a/app/templates/base/navbar/account.html b/app/templates/base/navbar/account.html index 4ca29aa..529a9bc 100644 --- a/app/templates/base/navbar/account.html +++ b/app/templates/base/navbar/account.html @@ -49,14 +49,14 @@

Invité

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

+

{{ form.username(size=32, placeholder="Identifiant") }} {{ form.password(size=32, placeholder="Mot de passe") }} -

-

{{ form.submit() }}

-

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

+
+
{{ form.submit() }}
+
{{ form.remember_me.label }} {{ form.remember_me() }}
Mot de passe oublié ? diff --git a/app/templates/register.html b/app/templates/register.html index 2eb4771..f2b5725 100644 --- a/app/templates/register.html +++ b/app/templates/register.html @@ -1,41 +1,56 @@ {% extends "base/container.html" %} {% block content %} -
+
+
+

Planète Casio

+

Pourquoi s'inscrire sur Planète Casio ? Parce que c'est cool et qu'ici on peut mettre plein de truc sympas. + Vous saviez que Planète Casio c'est : +

    +
  • Presque 10000 membres
    • +
  • (Bon ok, seulement une vingtaine de vraiments actifs)
    • +
  • Plein de programmes
    • +
  • Une multitude de tutos pour mieux comprendre comment fonctionne sa calto
    • +
  • Mais surtout, une communauté au top !
    • +
+ Et oui, ça fait beaucoup, mais bon, je commence à être à court de trucs à écrire ici, donc bon… +

+
+
+

Inscription :

-

Inscription :

- -
- {{ form2.hidden_tag() }} -

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

-

- {{ form2.email.label }}
- {{ form2.email(size=64) }}
- {% for error in form2.email.errors %} - [{{ error }}] - {% endfor %} -

-

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

-

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

-

{{ form2.submit() }}

-
+
+ {{ form2.hidden_tag() }} +
+ {{ form2.username.label }} + {{ form2.username() }} + {% for error in form2.username.errors %} + [{{ error }}] + {% endfor %} +
+
+ {{ form2.email.label }} + {{ form2.email() }} + {% for error in form2.email.errors %} + [{{ error }}] + {% endfor %} +
+
+ {{ form2.password.label }} + {{ form2.password() }} + {% for error in form2.password.errors %} + [{{ error }}] + {% endfor %} +
+
+ {{ form2.password2.label }} + {{ form2.password2() }} + {% for error in form2.password2.errors %} + [{{ error }}] + {% endfor %} +
+
{{ form2.submit() }}
+
+
{% endblock %} diff --git a/app/templates/validation.html b/app/templates/validation.html index cf2108b..0b5ffa0 100644 --- a/app/templates/validation.html +++ b/app/templates/validation.html @@ -2,10 +2,9 @@ {% block content %}
-

ici il y aura la page qui demande de checker les mails pour valider


- Retour à la page d'acceuil + Retour à la page d'accueil
{% endblock content %} diff --git a/assets/diagramme_1.dia b/assets/diagramme_1.dia new file mode 100644 index 0000000000000000000000000000000000000000..048f9a8fef0d2043a833cf0d6b0ef2a9026dd152 GIT binary patch literal 3447 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 literal 0 HcmV?d00001