From 3216aeac11a86d71695549f5651a4f7695c39a0b Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Sun, 24 Mar 2019 15:45:58 +0100 Subject: [PATCH] Renamed + remote --- {kaba => copanier}/__init__.py | 5 +- {kaba => copanier}/base.py | 0 {kaba => copanier}/config.py | 2 +- {kaba => copanier}/emails.py | 0 {kaba => copanier}/models.py | 4 + {kaba => copanier}/reports.py | 0 {kaba => copanier}/session.py | 0 {kaba => copanier}/static/app.css | 0 .../fonts/WorkSans/WorkSansBoldLatin.woff2 | Bin .../fonts/WorkSans/WorkSansBoldLatinExt.woff2 | Bin .../fonts/WorkSans/WorkSansLightLatin.woff2 | Bin .../WorkSans/WorkSansLightLatinExt.woff2 | Bin .../fonts/WorkSans/WorkSansRegularLatin.woff2 | Bin .../WorkSans/WorkSansRegularLatinExt.woff2 | Bin .../WorkSans/WorkSansSemiBoldLatin.woff2 | Bin .../WorkSans/WorkSansSemiBoldLatinExt.woff2 | Bin .../static/fonts/icomoon/icomoon.eot | Bin .../static/fonts/icomoon/icomoon.svg | 0 .../static/fonts/icomoon/icomoon.ttf | Bin .../static/fonts/icomoon/icomoon.woff | Bin {kaba => copanier}/static/icomoon.css | 0 .../static/img/default_product.svg | 0 {kaba => copanier}/templates/base.html | 2 +- {kaba => copanier}/templates/delivery.html | 0 .../templates/edit_delivery.html | 0 {kaba => copanier}/templates/home.html | 0 .../templates/includes/delivery_head.html | 0 .../templates/includes/modal.html | 0 .../templates/includes/modal_add_command.html | 0 .../includes/modal_import_command.html | 0 .../templates/includes/modal_product.html | 0 {kaba => copanier}/templates/place_order.html | 0 {kaba => copanier}/templates/sesame.html | 0 .../templates/signing_sheet.html | 0 {kaba => copanier}/utils.py | 0 remote/__main__.py | 199 ++++++++++++++++++ remote/certbot.ini | 4 + remote/config.yml | 4 + remote/copanier.service | 17 ++ remote/gunicorn.conf | 4 + remote/letsencrypt.conf | 5 + remote/nginx-http.conf | 14 ++ remote/nginx-https.conf | 40 ++++ remote/nginx-snippet.conf | 6 + remote/ssl-renew | 5 + remote/ssl.conf | 15 ++ requirements-dev.txt | 4 + requirements.txt | 7 + setup.cfg | 4 +- tests/conftest.py | 14 +- tests/test_config.py | 18 +- tests/test_models.py | 2 +- tests/test_views.py | 2 +- 53 files changed, 353 insertions(+), 24 deletions(-) rename {kaba => copanier}/__init__.py (98%) rename {kaba => copanier}/base.py (100%) rename {kaba => copanier}/config.py (92%) rename {kaba => copanier}/emails.py (100%) rename {kaba => copanier}/models.py (97%) rename {kaba => copanier}/reports.py (100%) rename {kaba => copanier}/session.py (100%) rename {kaba => copanier}/static/app.css (100%) rename {kaba => copanier}/static/fonts/WorkSans/WorkSansBoldLatin.woff2 (100%) rename {kaba => copanier}/static/fonts/WorkSans/WorkSansBoldLatinExt.woff2 (100%) rename {kaba => copanier}/static/fonts/WorkSans/WorkSansLightLatin.woff2 (100%) rename {kaba => copanier}/static/fonts/WorkSans/WorkSansLightLatinExt.woff2 (100%) rename {kaba => copanier}/static/fonts/WorkSans/WorkSansRegularLatin.woff2 (100%) rename {kaba => copanier}/static/fonts/WorkSans/WorkSansRegularLatinExt.woff2 (100%) rename {kaba => copanier}/static/fonts/WorkSans/WorkSansSemiBoldLatin.woff2 (100%) rename {kaba => copanier}/static/fonts/WorkSans/WorkSansSemiBoldLatinExt.woff2 (100%) rename {kaba => copanier}/static/fonts/icomoon/icomoon.eot (100%) rename {kaba => copanier}/static/fonts/icomoon/icomoon.svg (100%) rename {kaba => copanier}/static/fonts/icomoon/icomoon.ttf (100%) rename {kaba => copanier}/static/fonts/icomoon/icomoon.woff (100%) rename {kaba => copanier}/static/icomoon.css (100%) rename {kaba => copanier}/static/img/default_product.svg (100%) rename {kaba => copanier}/templates/base.html (92%) rename {kaba => copanier}/templates/delivery.html (100%) rename {kaba => copanier}/templates/edit_delivery.html (100%) rename {kaba => copanier}/templates/home.html (100%) rename {kaba => copanier}/templates/includes/delivery_head.html (100%) rename {kaba => copanier}/templates/includes/modal.html (100%) rename {kaba => copanier}/templates/includes/modal_add_command.html (100%) rename {kaba => copanier}/templates/includes/modal_import_command.html (100%) rename {kaba => copanier}/templates/includes/modal_product.html (100%) rename {kaba => copanier}/templates/place_order.html (100%) rename {kaba => copanier}/templates/sesame.html (100%) rename {kaba => copanier}/templates/signing_sheet.html (100%) rename {kaba => copanier}/utils.py (100%) create mode 100644 remote/__main__.py create mode 100644 remote/certbot.ini create mode 100644 remote/config.yml create mode 100644 remote/copanier.service create mode 100644 remote/gunicorn.conf create mode 100644 remote/letsencrypt.conf create mode 100644 remote/nginx-http.conf create mode 100644 remote/nginx-https.conf create mode 100644 remote/nginx-snippet.conf create mode 100644 remote/ssl-renew create mode 100644 remote/ssl.conf create mode 100644 requirements-dev.txt create mode 100644 requirements.txt diff --git a/kaba/__init__.py b/copanier/__init__.py similarity index 98% rename from kaba/__init__.py rename to copanier/__init__.py index 33d36ef..ae10225 100644 --- a/kaba/__init__.py +++ b/copanier/__init__.py @@ -52,7 +52,7 @@ class Roll(Roll): env = Environment( - loader=PackageLoader("kaba", "templates"), autoescape=select_autoescape(["kaba"]) + loader=PackageLoader("copanier", "templates"), autoescape=select_autoescape(["copanier"]) ) @@ -116,6 +116,7 @@ async def attach_request(request, response): @app.listen("startup") async def on_startup(): configure() + Delivery.init_fs() @app.route("/sésame", methods=["GET"]) @@ -340,7 +341,7 @@ def cli_wrapper(): def serve(reload=False): """Run a web server (for development only).""" if reload: - hupper.start_reloader("kaba.serve") + hupper.start_reloader("copanier.serve") traceback(app) static(app, root=Path(__file__).parent / "static") simple_server(app, port=2244) diff --git a/kaba/base.py b/copanier/base.py similarity index 100% rename from kaba/base.py rename to copanier/base.py diff --git a/kaba/config.py b/copanier/config.py similarity index 92% rename from kaba/config.py rename to copanier/config.py index beca4ba..96278ee 100644 --- a/kaba/config.py +++ b/copanier/config.py @@ -16,7 +16,7 @@ FROM_EMAIL = "contact@epinamap.org" def init(): for key, value in globals().items(): if key.isupper(): - env_key = "KABA_" + key + env_key = "COPANIER_" + key typ = type(value) if env_key in os.environ: globals()[key] = typ(os.environ[env_key]) diff --git a/kaba/emails.py b/copanier/emails.py similarity index 100% rename from kaba/emails.py rename to copanier/emails.py diff --git a/kaba/models.py b/copanier/models.py similarity index 97% rename from kaba/models.py rename to copanier/models.py index 1d71078..79b010d 100644 --- a/kaba/models.py +++ b/copanier/models.py @@ -139,6 +139,10 @@ class Delivery(Base): def is_open(self): return datetime.now().date() <= self.order_before.date() + @classmethod + def init_fs(cls): + cls.get_root().mkdir(parents=True, exist_ok=True) + @classmethod def get_root(cls): return Path(config.DATA_ROOT) / cls.__root__ diff --git a/kaba/reports.py b/copanier/reports.py similarity index 100% rename from kaba/reports.py rename to copanier/reports.py diff --git a/kaba/session.py b/copanier/session.py similarity index 100% rename from kaba/session.py rename to copanier/session.py diff --git a/kaba/static/app.css b/copanier/static/app.css similarity index 100% rename from kaba/static/app.css rename to copanier/static/app.css diff --git a/kaba/static/fonts/WorkSans/WorkSansBoldLatin.woff2 b/copanier/static/fonts/WorkSans/WorkSansBoldLatin.woff2 similarity index 100% rename from kaba/static/fonts/WorkSans/WorkSansBoldLatin.woff2 rename to copanier/static/fonts/WorkSans/WorkSansBoldLatin.woff2 diff --git a/kaba/static/fonts/WorkSans/WorkSansBoldLatinExt.woff2 b/copanier/static/fonts/WorkSans/WorkSansBoldLatinExt.woff2 similarity index 100% rename from kaba/static/fonts/WorkSans/WorkSansBoldLatinExt.woff2 rename to copanier/static/fonts/WorkSans/WorkSansBoldLatinExt.woff2 diff --git a/kaba/static/fonts/WorkSans/WorkSansLightLatin.woff2 b/copanier/static/fonts/WorkSans/WorkSansLightLatin.woff2 similarity index 100% rename from kaba/static/fonts/WorkSans/WorkSansLightLatin.woff2 rename to copanier/static/fonts/WorkSans/WorkSansLightLatin.woff2 diff --git a/kaba/static/fonts/WorkSans/WorkSansLightLatinExt.woff2 b/copanier/static/fonts/WorkSans/WorkSansLightLatinExt.woff2 similarity index 100% rename from kaba/static/fonts/WorkSans/WorkSansLightLatinExt.woff2 rename to copanier/static/fonts/WorkSans/WorkSansLightLatinExt.woff2 diff --git a/kaba/static/fonts/WorkSans/WorkSansRegularLatin.woff2 b/copanier/static/fonts/WorkSans/WorkSansRegularLatin.woff2 similarity index 100% rename from kaba/static/fonts/WorkSans/WorkSansRegularLatin.woff2 rename to copanier/static/fonts/WorkSans/WorkSansRegularLatin.woff2 diff --git a/kaba/static/fonts/WorkSans/WorkSansRegularLatinExt.woff2 b/copanier/static/fonts/WorkSans/WorkSansRegularLatinExt.woff2 similarity index 100% rename from kaba/static/fonts/WorkSans/WorkSansRegularLatinExt.woff2 rename to copanier/static/fonts/WorkSans/WorkSansRegularLatinExt.woff2 diff --git a/kaba/static/fonts/WorkSans/WorkSansSemiBoldLatin.woff2 b/copanier/static/fonts/WorkSans/WorkSansSemiBoldLatin.woff2 similarity index 100% rename from kaba/static/fonts/WorkSans/WorkSansSemiBoldLatin.woff2 rename to copanier/static/fonts/WorkSans/WorkSansSemiBoldLatin.woff2 diff --git a/kaba/static/fonts/WorkSans/WorkSansSemiBoldLatinExt.woff2 b/copanier/static/fonts/WorkSans/WorkSansSemiBoldLatinExt.woff2 similarity index 100% rename from kaba/static/fonts/WorkSans/WorkSansSemiBoldLatinExt.woff2 rename to copanier/static/fonts/WorkSans/WorkSansSemiBoldLatinExt.woff2 diff --git a/kaba/static/fonts/icomoon/icomoon.eot b/copanier/static/fonts/icomoon/icomoon.eot similarity index 100% rename from kaba/static/fonts/icomoon/icomoon.eot rename to copanier/static/fonts/icomoon/icomoon.eot diff --git a/kaba/static/fonts/icomoon/icomoon.svg b/copanier/static/fonts/icomoon/icomoon.svg similarity index 100% rename from kaba/static/fonts/icomoon/icomoon.svg rename to copanier/static/fonts/icomoon/icomoon.svg diff --git a/kaba/static/fonts/icomoon/icomoon.ttf b/copanier/static/fonts/icomoon/icomoon.ttf similarity index 100% rename from kaba/static/fonts/icomoon/icomoon.ttf rename to copanier/static/fonts/icomoon/icomoon.ttf diff --git a/kaba/static/fonts/icomoon/icomoon.woff b/copanier/static/fonts/icomoon/icomoon.woff similarity index 100% rename from kaba/static/fonts/icomoon/icomoon.woff rename to copanier/static/fonts/icomoon/icomoon.woff diff --git a/kaba/static/icomoon.css b/copanier/static/icomoon.css similarity index 100% rename from kaba/static/icomoon.css rename to copanier/static/icomoon.css diff --git a/kaba/static/img/default_product.svg b/copanier/static/img/default_product.svg similarity index 100% rename from kaba/static/img/default_product.svg rename to copanier/static/img/default_product.svg diff --git a/kaba/templates/base.html b/copanier/templates/base.html similarity index 92% rename from kaba/templates/base.html rename to copanier/templates/base.html index e70ab94..5823ccc 100644 --- a/kaba/templates/base.html +++ b/copanier/templates/base.html @@ -17,7 +17,7 @@
{{ message[0] }}
{% endif %}