wip: modal refactor, not up

MesseBasseProduction · Oct 31, 2022 · ea4cfc7 · ea4cfc7
1 parent e7ac5e2
commit ea4cfc7
Show file tree

Hide file tree

Showing 46 changed files with 2,932 additions and 1,072 deletions.
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -4,11 +4,11 @@
 
 ### Création de spot
 
-- [ ] tags (liste finie ; chill, view, animated, nature, city, parc, seeside, sea; port (a elargir au besoin))
+- [x] tags (liste finie ; chill, view, animated, nature, city, parc, seeside, sea; port (a elargir au besoin))
 - [ ] photo (pas obligatoire)
 - [x] note
 - [x] description (faculattive)
-- [ ] type de posage ; bench, chair, on the floor, camping chair required, toilet nearby, trash nearby
+- [x] type de posage ; bench, chair, on the floor, camping chair required, toilet nearby, trash nearby
 - [ ] availability : often use, often free
 
 ### Affichage de spot
@@ -25,8 +25,8 @@
 
 ### Création de vendeur
 
-- [ ] tags (epicerie, maasin, etc)
-- [ ] dispose de frigo
+- [x] tags (epicerie, maasin, etc)
+- [x] dispose de frigo
 - [x] prix cher, moy ou pas
 
 ### Affichage du Vendeur
@@ -41,11 +41,11 @@
 - [ ] le plus proche de moi (fonction recherche dans modal, calc distance)
 - [x] cmd profil (voir interface) :
 - [x] clusters
-- [ ] modal qui display profil user, + stats
+- [x] modal qui display profil user, + stats
 - [ ] bières bues, spots ajoutés, vendeurs ajoutés, score
 - [ ] accès au classement par score des beercrackerz
 - [ ] mes contributions
-- [ ] update pp, mail etc classique user syst
+- [x] update pp, mail etc classique user syst
 
 ### Scoring
 
@@ -58,7 +58,7 @@
 - [x] fond de carte plus smooth, moins informatif
 - [x] ajouter pp user en haut droite pour accéder profil
 - [x] ajouter BeerCrackerz a coté pp coté gauche
-- [ ] logo beercrackerz
+- [x] logo beercrackerz
 
 
 En vrac :

diff --git a/back/app/templates/email/password-reset.html b/back/app/templates/email/password-reset.html
@@ -7,5 +7,5 @@
 Si la demande ne vient pas de vous, ignorez la simplement.
 
 
-L'équipe Beer Crackez
+L'équipe BeerCrackerz
 {% endautoescape %}
diff --git a/back/app/templates/modal/newshop.html b/back/app/templates/modal/newshop.html
@@ -5,8 +5,16 @@ <h1 id="nls-shop-title">{SHOP_TITLE}</h1>
   <p id="nls-shop-subtitle">{SHOP_SUBTITLE}</p>
   <label id="nls-shop-name" for="shop-name">{SHOP_NAME} :</label>
   <input id="shop-name" type="text">
+  <label id="nls-shop-type" for="shop-type">{SHOP_TYPE} :</label>
+  <div id="shop-type" class="type"></div>
   <label id="nls-shop-desc" for="shop-desc">{SHOP_DESC} :</label>
   <textarea id="shop-desc" name="shop-desc" rows="4" style="resize:none"></textarea>
+  <label id="nls-shop-modifiers">{SHOP_MODIFIERS} :</label>
+  <div id="shop-modifiers" class="modifiers">
+    <p id="shop-fresh"><img src="{% static 'img/logo/ice.svg' %}">{SHOP_FRESH}</p>
+    <p id="shop-card"><img src="{% static 'img/logo/card.svg' %}">{SHOP_CARD}</p>
+    <p id="shop-craft"><img src="{% static 'img/logo/craft.svg' %}">{SHOP_CRAFT}</p>
+  </div>
   <label id="nls-shop-rate" for="price-rating">{SHOP_RATE} :</label>
   <div id="shop-rating" class="rating" data-rate="0">
     <img src="{% static 'img/logo/star.svg' %}" alt="rating-star" data-id="0" class="active">

diff --git a/back/app/templates/modal/newspot.html b/back/app/templates/modal/newspot.html
@@ -5,8 +5,17 @@ <h1 id="nls-spot-title">{SPOT_TITLE}</h1>
   <p id="nls-spot-subtitle">{SPOT_SUBTITLE}</p>
   <label id="nls-spot-name" for="spot-name">{SPOT_NAME} :</label>
   <input id="spot-name" type="text">
+  <label id="nls-spot-type" for="spot-type">{SPOT_TYPE} :</label>
+  <div id="spot-type" class="type"></div>
   <label id="nls-spot-desc" for="spot-desc">{SPOT_DESC} :</label>
   <textarea id="spot-desc" name="spot-desc" rows="4" style="resize:none"></textarea>
+  <label id="nls-spot-modifiers">{SPOT_MODIFIERS} :</label>
+  <div id="spot-modifiers" class="modifiers">
+    <p id="spot-bench"><img src="{% static 'img/logo/bench.svg' %}">{SPOT_BENCH}</p>
+    <p id="spot-covered"><img src="{% static 'img/logo/umbrella.svg' %}">{SPOT_COVERED}</p>
+    <p id="spot-toilet"><img src="{% static 'img/logo/toilet.svg' %}">{SPOT_TOILET}</p>
+    <p id="spot-trash"><img src="{% static 'img/logo/delete.svg' %}">{SPOT_TRASH}</p>
+  </div>
   <label id="nls-spot-rate" for="star-rating">{SPOT_RATE} :</label>
   <div id="spot-rating" class="rating" data-rate="0">
     <img src="{% static 'img/logo/star.svg' %}" alt="rating-star" data-id="0" class="active">
@@ -15,8 +24,6 @@ <h1 id="nls-spot-title">{SPOT_TITLE}</h1>
     <img src="{% static 'img/logo/star.svg' %}" alt="rating-star" data-id="3">
     <img src="{% static 'img/logo/star.svg' %}" alt="rating-star" data-id="4">
   </div>
-  <label id="nls-spot-type" for="spot-type">{SPOT_TYPE} :</label>
-  <div id="spot-type" class="type"></div>
   <div class="button-wrapper">
     <button id="spot-cancel" class="cancel">{SPOT_CANCEL}</button>
     <button id="spot-submit" class="validate">{SPOT_SUBMIT}</button>