From 5a2ce71f3c9bb83d6859f507ef294327b5cf4174 Mon Sep 17 00:00:00 2001
From: Paul Mathieu <paul@ponteilla.net>
Date: Wed, 28 Jun 2023 23:42:46 +0200
Subject: [PATCH] Small refactor into backend & frontend

---
 Dockerfile                               |  2 +-
 backend/data/tikettes.json               |  1 +
 makeplanche.py => backend/makeplanche.py |  0
 makesticker.py => backend/makesticker.py |  0
 mkjam.sh => backend/mkjam.sh             |  0
 planche.svg.in => backend/planche.svg.in |  0
 web.py => backend/web.py                 |  0
 frontend/config.js                       |  1 +
 {static => frontend}/index.html          |  0
 {static => frontend}/newtikette.html     |  0
 {static => frontend}/newtikette.js       |  7 +------
 {static => frontend}/zetikettes.js       | 24 ++++++++++++++++++------
 static/config.js                         |  2 --
 tikettes.json                            |  1 -
 14 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 backend/data/tikettes.json
 rename makeplanche.py => backend/makeplanche.py (100%)
 rename makesticker.py => backend/makesticker.py (100%)
 rename mkjam.sh => backend/mkjam.sh (100%)
 rename planche.svg.in => backend/planche.svg.in (100%)
 rename web.py => backend/web.py (100%)
 create mode 100644 frontend/config.js
 rename {static => frontend}/index.html (100%)
 rename {static => frontend}/newtikette.html (100%)
 rename {static => frontend}/newtikette.js (96%)
 rename {static => frontend}/zetikettes.js (88%)
 delete mode 100644 static/config.js
 delete mode 100644 tikettes.json

diff --git a/Dockerfile b/Dockerfile
index 53d3b7f..000313f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine
 
 RUN apk --no-cache add python3 inkscape bash imagemagick
 
-ADD . /root/zetikettes
+ADD backend /root/zetikettes
 
 RUN apk --no-cache add ttf-opensans && cp /root/zetikettes/fonts/*.ttf /usr/share/fonts/TTF/ && fc-cache -fv
 
diff --git a/backend/data/tikettes.json b/backend/data/tikettes.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/backend/data/tikettes.json
@@ -0,0 +1 @@
+[]
diff --git a/makeplanche.py b/backend/makeplanche.py
similarity index 100%
rename from makeplanche.py
rename to backend/makeplanche.py
diff --git a/makesticker.py b/backend/makesticker.py
similarity index 100%
rename from makesticker.py
rename to backend/makesticker.py
diff --git a/mkjam.sh b/backend/mkjam.sh
similarity index 100%
rename from mkjam.sh
rename to backend/mkjam.sh
diff --git a/planche.svg.in b/backend/planche.svg.in
similarity index 100%
rename from planche.svg.in
rename to backend/planche.svg.in
diff --git a/web.py b/backend/web.py
similarity index 100%
rename from web.py
rename to backend/web.py
diff --git a/frontend/config.js b/frontend/config.js
new file mode 100644
index 0000000..d520fc4
--- /dev/null
+++ b/frontend/config.js
@@ -0,0 +1 @@
+const backend_api = 'http://localhost:8001/'
\ No newline at end of file
diff --git a/static/index.html b/frontend/index.html
similarity index 100%
rename from static/index.html
rename to frontend/index.html
diff --git a/static/newtikette.html b/frontend/newtikette.html
similarity index 100%
rename from static/newtikette.html
rename to frontend/newtikette.html
diff --git a/static/newtikette.js b/frontend/newtikette.js
similarity index 96%
rename from static/newtikette.js
rename to frontend/newtikette.js
index c23f8ca..f0479d4 100644
--- a/static/newtikette.js
+++ b/frontend/newtikette.js
@@ -1,8 +1,3 @@
-const backend_api = {
-    'prod': '/zetikettes/srv/',
-    'dev': '/zetikettes.dev/srv/',
-}[config];
-
 const params = [
     ['dluo', 'DLUO', true],
     ['lot', 'Nº de lot', true],
@@ -65,7 +60,7 @@ $(document).ready(async () => {
                     <input type="checkbox" name="landscape"><span>landscape</span></label>`));
     const subst = $('<div class="section"><label class="active">Substitutions</label><p></p>');
     for (let param of params) {
-        subst.append($(`<div><label class="active"><input type="checkbox" name="${param}" ${param[2] ? 'checked': ''}>
+        subst.append($(`<div><label class="active"><input type="checkbox" name="${param[0]}" ${param[2] ? 'checked': ''}>
                         <span>\${${param[0]}}: ${param[1]}</span></label>`));
     }
     block.append(subst);
diff --git a/static/zetikettes.js b/frontend/zetikettes.js
similarity index 88%
rename from static/zetikettes.js
rename to frontend/zetikettes.js
index e1bd1e0..fdeac84 100644
--- a/static/zetikettes.js
+++ b/frontend/zetikettes.js
@@ -1,8 +1,3 @@
-const backend_api = {
-    'prod': '/zetikettes/srv/',
-    'dev': '/zetikettes.dev/srv/',
-}[config];
-
 const params = {
     'dluo': 'DLUO',
     'lot': 'Nº de lot',
@@ -62,6 +57,23 @@ function loadAll(zetikettes) {
     }
 
     $('.collapsible').collapsible();
+
+    konami();
+}
+
+function konami() {
+    var k = [38, 38, 40, 40, 37, 39, 37, 39, 66, 65],
+    n = 0;
+    $(document).keydown(function (e) {
+        if (e.keyCode === k[n++]) {
+            if (n === k.length) {
+                document.location.href = 'newtikette.html';
+            }
+        }
+        else {
+            n = 0;
+        }
+    });
 }
 
 $(document).ready(async () => {
@@ -76,4 +88,4 @@ $(document).ready(async () => {
         appbody.append(`<li>Could not reach backend server`);
         throw e;
     }
-});
\ No newline at end of file
+});
diff --git a/static/config.js b/static/config.js
deleted file mode 100644
index 6e5b375..0000000
--- a/static/config.js
+++ /dev/null
@@ -1,2 +0,0 @@
-config = 'prod'
-// config = 'dev'
diff --git a/tikettes.json b/tikettes.json
deleted file mode 100644
index 7ec6814..0000000
--- a/tikettes.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"title":"Aromate herbes de Provence","sticker":"Aromate - Herbes de Provence.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"40"},"landscape":false},{"title":"Aromate herbes de Provence avec romarin","sticker":"Aromate - Herbes de Provence avec romarin.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"40"},"landscape":false},{"title":"Aromate thym","sticker":"Aromate - Thym.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"40"},"landscape":false},{"title":"Chocolat lavande","sticker":"Chocolat - Lavande.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"100"},"landscape":false},{"title":"Confiture de Mirabelle - non bio","sticker":"Confiture - Mirabelle.svg","subs":{"dluo":"germinal 9999","fruit":"80","teneur":"50","lot":"0000-0","qty":"370"},"landscape":true},{"title":"Gelée Extra de groseille","sticker":"Gelée Extra - Groseille.svg","subs":{"dluo":"germinal 9999","fruit":"80","teneur":"50","lot":"0000-0","qty":"370"},"landscape":true},{"title":"Gelée Extra de groseille au basilic","sticker":"Gelée Extra - Groseille Basilic.svg","subs":{"dluo":"germinal 9999","fruit":"80","teneur":"50","lot":"0000-0","qty":"370"},"landscape":true},{"title":"Gelée Extra de cassis","sticker":"Gelée Extra - Cassis.svg","subs":{"dluo":"germinal 9999","fruit":"80","teneur":"50","lot":"0000-0","qty":"370"},"landscape":true},{"title":"Pesto ail des ours","sticker":"Pesto - Ail des Ours - 100% Olive.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"150"},"landscape":true},{"title":"Sel grillade et légumes","sticker":"Sel - Grillade.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"40"},"landscape":true},{"title":"Sel herbes de Provence","sticker":"Sel - Herbes de Provence.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"40"},"landscape":true},{"title":"Sel viande blanche et poisson","sticker":"Sel - Poisson et Viande Blanche.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"40"},"landscape":true},{"title":"Sel salade","sticker":"Sel - Salade.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"40"},"landscape":true},{"title":"Sel salade sans basilic","sticker":"Sel - Salade - Sans Basilic.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"40"},"landscape":true},{"title":"Sirop de sureau","sticker":"Sirop - Sureau.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"75"}},{"title":"Sirop de lavande","sticker":"Sirop - Lavande.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"75"}},{"title":"Sirop de cassis","sticker":"Sirop - Cassis.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"75"},"landscape":false},{"title":"Sirop de thym","sticker":"Sirop - Thym.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"75"},"landscape":false},{"title":"Sirop de mélisse","sticker":"Sirop - Melisse.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"75"},"landscape":false},{"title":"Sirop de menthe verte","sticker":"Sirop - Menthe Verte.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"75"},"landscape":false},{"title":"Tisane Hiver","sticker":"Tisane - Hiver.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"25"},"landscape":false},{"title":"Tisane Joie de Vivre","sticker":"Tisane - Joie de Vivre.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"25"},"landscape":false},{"title":"Tisane Réconfort de la Gorge (Origan, Thym, Agastache, Mauve)","sticker":"Tisane - Reconfort de la Gorge - Origan Thym Agastache Mauve.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"25"},"landscape":false},{"title":"Tisane Nuit Étoilée (Mélisse, Lavande, Aubépine)","sticker":"Tisane - Nuit Etoilee - Melisse Lavande Aubepine.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"25"},"landscape":false},{"title":"Tisane Détox (Menthe, Sarriette, Basilic, Souci)","sticker":"Tisane - Detox - Menthe Sarriette Basilic Souci.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"25"},"landscape":false},{"title":"Tisane digestion","sticker":"Tisane - Digestion.svg","subs":{"dluo":"germinal 9999","lot":"0000-0","qty":"25"},"landscape":false}]
\ No newline at end of file