From 5410b26125a68382708c3db38255cc136062b26a Mon Sep 17 00:00:00 2001 From: Basile Clement Date: Sat, 7 Apr 2018 11:14:54 +0200 Subject: [PATCH 1/2] Add Pipfile with dependencies --- Pipfile | 9 ++++++++ Pipfile.lock | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 Pipfile create mode 100644 Pipfile.lock diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..0719cf7 --- /dev/null +++ b/Pipfile @@ -0,0 +1,9 @@ +[[source]] +url = "https://pypi.python.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +flask = "*" + +[dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..f9ad71a --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,60 @@ +{ + "_meta": { + "hash": { + "sha256": "903ea670e1e389320ed1f7cac23eb9b152bf693ab77c2e9e1ac1c68d43d3d473" + }, + "pipfile-spec": 6, + "requires": {}, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.python.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "click": { + "hashes": [ + "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d", + "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b" + ], + "version": "==6.7" + }, + "flask": { + "hashes": [ + "sha256:0749df235e3ff61ac108f69ac178c9770caeaccad2509cb762ce1f65570a8856", + "sha256:49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1" + ], + "index": "pypi", + "version": "==0.12.2" + }, + "itsdangerous": { + "hashes": [ + "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519" + ], + "version": "==0.24" + }, + "jinja2": { + "hashes": [ + "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd", + "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4" + ], + "version": "==2.10" + }, + "markupsafe": { + "hashes": [ + "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665" + ], + "version": "==1.0" + }, + "werkzeug": { + "hashes": [ + "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c", + "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b" + ], + "version": "==0.14.1" + } + }, + "develop": {} +} From e3d1dff9adf9dc603bce4861cd2772b6b340470b Mon Sep 17 00:00:00 2001 From: Basile Clement Date: Sat, 7 Apr 2018 13:53:55 +0200 Subject: [PATCH 2/2] Add some basic styling to the sonnette The style is inline in the HTML because it avoids another HTTP request before displaying the page, and that makes it more performant. This is an important feature when it rains, and people don't want to wait outside for too long. --- static/hasrung.svg | 1 + static/toomuch.svg | 3 ++ templates/base.html | 77 ++++++++++++++++++++++++++++++++++++++++- templates/homepage.html | 31 ++++++++--------- 4 files changed, 95 insertions(+), 17 deletions(-) create mode 100644 static/hasrung.svg create mode 100644 static/toomuch.svg diff --git a/static/hasrung.svg b/static/hasrung.svg new file mode 100644 index 0000000..efa1e7e --- /dev/null +++ b/static/hasrung.svg @@ -0,0 +1 @@ + diff --git a/static/toomuch.svg b/static/toomuch.svg new file mode 100644 index 0000000..a365073 --- /dev/null +++ b/static/toomuch.svg @@ -0,0 +1,3 @@ + + + diff --git a/templates/base.html b/templates/base.html index c6169fb..6a5f741 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,10 +3,85 @@ + Sonnette de l'Arcoloc - + {% block content %} diff --git a/templates/homepage.html b/templates/homepage.html index ed17464..634887d 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -2,23 +2,22 @@ {% block content %} -

Sonnette de l'Arcoloc

- -{% if has_rung %} -
-

Dring :)

-
-{% endif %} - -{% if too_much_dring %} -
-

Non mais on est pas sourd·e·s, hein. Nonmaisoh.

-
-{% endif %} -
- - + +
+{% if has_rung %} +

+ Dring :) +

+{% endif %} +{% if too_much_dring %} +

+ Non mais on est pas sourd·e·s, hein. Nonmaisoh. +

+{% endif %} +
{% endblock content %}