From c3520a8ea787ed152a99b6a49d69f7bec7affdd0 Mon Sep 17 00:00:00 2001
From: ed <ed@brz9.dev>
Date: Fri, 20 May 2022 23:23:00 +0200
Subject: [PATCH] menu update

---
 proj/map/asset/css/font.css        |  16 +-
 proj/map/asset/css/style.css       |  34 +++-
 proj/map/asset/js/.main.js.swp     | Bin 32768 -> 32768 bytes
 proj/map/asset/js/db.js            | 243 +++++++++++++++++++++++++++--
 proj/map/asset/js/main.js          |  36 +++--
 proj/map/asset/markers/markers.svg |  41 ++++-
 6 files changed, 336 insertions(+), 34 deletions(-)

diff --git a/proj/map/asset/css/font.css b/proj/map/asset/css/font.css
index 4482ee6..56b4c92 100644
--- a/proj/map/asset/css/font.css
+++ b/proj/map/asset/css/font.css
@@ -22,6 +22,20 @@
   font-weight: 400;
 }
 
+@font-face {
+  font-family: Inter;
+  src: url("../fonts/inter/Inter-LightItalic.woff");
+  font-style: italic;
+  font-weight: 200;
+}
+
+@font-face {
+  font-family: Inter;
+  src: url("../fonts/inter/Inter-Italic.woff");
+  font-style: italic;
+  font-weight: 400;
+}
+
 @font-face {
   font-family: Inter;
   src: url("../fonts/inter/Inter-SemiBold.woff");
@@ -30,4 +44,4 @@
 
 html {
   font-family: Inter;
-}
\ No newline at end of file
+}
diff --git a/proj/map/asset/css/style.css b/proj/map/asset/css/style.css
index da2581b..e9538fa 100644
--- a/proj/map/asset/css/style.css
+++ b/proj/map/asset/css/style.css
@@ -265,7 +265,7 @@ div.timetable p {
 }
 
 section.restomenu {
-  margin-top: 50px;
+  /*! margin-top: 50px; */
   padding: 10px;
   height: 100%;
   overflow-y: scroll;
@@ -273,11 +273,37 @@ section.restomenu {
   scrollbar-width: none;  /* Firefox */
 }
 
-section.restomenu div.dish h3 {
-  margin-bottom: 10px;
-  margin-top: 10px;
+section.restomenu section.top {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  text-align: center;
 }
 
+section.restomenu section.top p.drinks {
+  font-style: italic;
+  font-size: 1rem;
+}
+
+section.restomenu section.top p{
+  margin-bottom: 0px;
+  margin-top: 5px;
+}
+
+section.restomenu div.dish h3 {
+  margin-bottom: 0px;
+  margin-top: 30px;
+}
+
+section.restomenu div.dish p {
+  margin-top: 3px;
+  font-style: italic;
+}
+
+section.restomenu div.dish p {
+  line-height: 1rem;
+}
+
+
 ::-webkit-scrollbar {
     display: none;
 }
\ No newline at end of file
diff --git a/proj/map/asset/js/.main.js.swp b/proj/map/asset/js/.main.js.swp
index a46d65f8050f6c14b0c4229fedd19161a69eb86f..80b3d06e1244ab325f6b135ab365267d51a87043 100644
GIT binary patch
delta 1561
zcma*nTWAzl9LMpqF(z5#YNFAKns~CoB$8y)h!qW+Xh{*G#E^^Einy2A?AYzhW@ZyD
zHrcI$(L#}SytGIJQG(!umk}*ed=V5RSXx_erRa<3TWKpvAKKFI?5<WZLIys|**$0f
z=RY&QnN%t#mC7j#zPqutO|I}Q6&yuE{P27z*bxc4#<%1OCH&=u$_pQi&UCG@ii;Mx
zVs=B(opw)az7PWindMCEn4LT@Q;0Uq!o3+noJ0tV@zf*4ecZz-3}F?<rwefor*RBl
zVL$p1M;M#13{{wgzYB$UhDW%CZ_ryPlA?t{BPuWjkEaQ74VQ5qXEBV=u@UX?qXyG3
z<`&{EF5**cM;j`!5G9z3e>v?Z_zB<P1dbNa*${)zFi>Fo0yX(oL)UC;byx0dR&8)w
zzp0Dt)XwUh?&_e@AJD>zRLoGU&s3IpYlX}niY6PSw_4fFOjy-=WY|!(kIYw>M2z&3
zsBV}tsH>)_YvvMrEOyjoU0FZZzNi(ttls{2_)@YU`*&~io;}j}!;AGkHDQ(N<)v(w
z+2G9;ipGkHw^xW5%+D)}8)``LHcK{0L{-zL2Y33?zjX$*9>v*YzM7DR^Ci7UMDH^~
zQ6-U3vOUbFhY6=M4RlUC$we3#@Ylzi(^t-KDxrj`YqGyijWl^DXv8Z+v4CkZr^l_U
z`dZJ!Tp>pCGD(hE#qpZtB@&xL6kAb=84wsHwU;o0VI0OG?1O=i5kNN@AmPRz<l`6o
zi0iO%9DAW+JJw_QbdtP~K@P@A@l%ZAJPzX^K0yF$P>XUDV~iC4itG3mXK)A!Y(od$
zM<qP?lQciWV?4yqxam&P9fK420)q(QLu^Giy3mewSc_KFq7;Ae1bmO%xPhzq8qSl^
zi4M%c1KuFR=s^UV(T;o%AJ@1c=P;6I-{`%Zo0oYgEV-+s$X~Ao`klL-9az7cjrKpg
z+<Eg_qH3S1zwr#USY?BAd3(J#cqCbG#sgX=Do#nV8j9(r5+;Jgh@#HncNS$66qZd*
zRaGxT6D71VxH4K7Bgb`W!uz6@|E-lt^~=i1Ntaf%Nt8}!U!;4UT+<a!*Ae6Y(yyIq
Od6VQ+?c0M(UH<`Clx|J{

delta 1217
zcmajeZAep59LMo9F_)$}v4>TV$DvVLv#b|2bRk6{R=x<NprSq5U9Nj|*I6oagPtg&
zs8bRZ<*SJ3g*J>Zib9G411T~n0;A}Gf*xM<1VP_xi;7+}_?(?{&;Q=T{qMJAG9#JH
znCYM2P`g?#c2^2M4k0#;?DacV1#O?#XNpkpaNn%H<wN<lrK-SDWDBGgIPTZy)np5?
zKIdmS8=DIg`|^d@hEhD4D8w-wg~D!hU>h`SKpj@VgL%lo_dFq9;U2D`A3ZRz64T(o
z*IXeUV*n>`Bv&NF0VaFVjz(0X98TErVge7wMI6LBcrXVU_`>VF$5TAQ4fNtTIuJzw
z8)3bA4T_PAm)RU}ou1smsqB>7S8i8YWT7V*Zu1IJRnhDfQdXJGK3xVPKGUprX+|vS
z@^*I0RxND04gXfR8PjDvUR7aLd4+n{Riv(OA2%iFYd5VucewTMZKqnAuosTqZq-N`
z=L~C9d$i)&zn5cIrHqDJV^Lj3(#t=KUH>muom#m{Xr+a}?z4_cKUBpv31=#<)n}~n
zhuVC4FeF1}AQCe}uDN2Yk|Cr^k9380a6K5-x5!{LtT&l|6f{Py0?mk;(r<)K)6mV7
zZ0fd+PxnNq0%LmWb|l}Xt{N-zW@HI5X#W|)fGTJ%PYe>G0rcSldT<E)(S;VQK{aL}
zA72R6JB(r&mvIJr(1|9j#S#=@5;F0cpZqTRa2DNG2)mdBPzx{ID8x4cHi`$hi3>Q4
zcIeoIWhjFK<M5qeea1&T$1twoJWe8s9oUW*H0LCQh%nKx1&yeM2b1xZaK6DaJVZZE
z!+?%Td>T&&u?ss9Lj)ywOs|Jv^}GoUSd?Dx<GVhOp$;oB)t<W5aw${www`mO15j0=
z`}jLZsXmx4Oin9OiC779PinL+JIfi+!ZFkMCl&!^i%+pNDrfwdDof<1M!L#uKLAjO
B0Vx0g

diff --git a/proj/map/asset/js/db.js b/proj/map/asset/js/db.js
index 50ab07f..b1b02ba 100644
--- a/proj/map/asset/js/db.js
+++ b/proj/map/asset/js/db.js
@@ -9,6 +9,11 @@ let ingredients = {
     en: "mozzarella",
     it: "mozzarella",
   },
+  mozzarellaBufala: {
+    fr: "mozzarella de bufflonne",
+    en: "buffalo's mozzarella",
+    it: "mozzarella di bufala",
+  },
   saucissecalabraisepiquante : {
     fr: "saucisse calabraise piquante",
     en: "spicy sausage",
@@ -23,7 +28,137 @@ let ingredients = {
     fr: "champignons",
     en: "mushrooms",
     it: "funghi",
-  }
+  },
+  provoletta : {
+    fr : "provoletta",
+    en : "provoletta",
+    it : "provoletta",
+  },
+  salsiccia :{
+    fr : "chaire à saucisse",
+    en : "sausage",
+    it : "salsiccia",
+  },
+  chimichurri : {
+    fr : "chimichurri",
+    en : "chimichurri",
+    it : "chimichurri",
+  },
+  gorgonzola : {
+    fr : "gorgonzola",
+    en : "gorgonzola",
+    it : "gorgonzola",
+  },
+  parma : {
+    fr : "parma",
+    en : "jambon de Parme",
+    it : "Parma ham",
+  },
+  noix : {
+    fr : "noix",
+    en : "nuts",
+    it : "noci",
+  },
+  caprino : {
+    fr : "fromage de chèvre",
+    en : "goat cheese",
+    it : "caprino",
+  },
+  honey : {
+    fr : "miel",
+    en : "honey",
+    it : "miele",
+  },
+  bresaola : {
+    fr : "bresaola",
+    en : "bresaola",
+    it : "bresaola",
+  },
+  roquette : {
+    fr : "roquette",
+    en : "aragula salad",
+    it : "rucola",
+  },
+  crudaioladipomodoro : {
+    fr : "tomates fraîches concassées",
+    en : "fresh tomatoes",
+    it : "crudaiola di pomodoro",
+  },
+  burrata : {
+    fr : "burrata",
+    en : "burrata",
+    it : "burrata",
+  },
+  basilic : {
+    fr : "basilic",
+    en : "basil",
+    it : "basilico",
+  },
+  thon : {
+    fr : "thon",
+    en : "tuna",
+    it : "tono",
+  },
+  cipollaTropea : {
+    fr : "oignons rouges de Tropea",
+    en : "red onions from Tropea",
+    it : "cipolla rossa di Tropea",
+  },
+  aubergines : {
+    fr : "aubergines",
+    en : "eggplants",
+    it : "melanzane",
+  },
+  anchois : {
+    fr : "anchois",
+    en : "anchovies",
+    it : "acciughe",
+  },
+  capres : {
+    fr : "câpres",
+    en : "capers",
+    it : "capperi",
+  },
+  huileextravierge : {
+    fr : "huile extra vierge",
+    en : "extra olive oil",
+    it : "olio extra vergine",
+  },
+  name : {
+    fr : "",
+    en : "",
+    it : "",
+  },
+  name : {
+    fr : "",
+    en : "",
+    it : "",
+  },
+  name : {
+    fr : "",
+    en : "",
+    it : "",
+  },
+  name : {
+    fr : "",
+    en : "",
+    it : "",
+  },
+  name : {
+    fr : "",
+    en : "",
+    it : "",
+  },
+  name : {
+    fr : "",
+    en : "",
+    it : "",
+  },
+  name : {
+    fr : "",
+    en : "",
+    it : "",
+  },
 }
 
 let SanTelmo = {
@@ -43,18 +178,65 @@ let SanTelmo = {
     tabs : {
       menu : {
         tabtype : "menu",
-        priceRange : "18-32€",
+        priceRange : "17-25€",
         dishes : {
-          divola : {
-            name : "Pizza Divola",
+          diavolo : {
+            name : "Pizza Diavolo",
             ing : [
               ingredients.tomate,
               ingredients.mozzarella,
               ingredients.saucissecalabraisepiquante
             ]
           },
-          reg : {
-            name : "Pizza Regina nanana",
+          d10s : {
+            name : "Pizza D10S",
+            ing : [
+              ingredients.tomate,
+              ingredients.mozzarella,
+              ingredients.provoletta,
+              ingredients.salsiccia,
+              ingredients.chimichurri
+            ]
+          },
+          navigli : {
+            name : "Pizza Navigli",
+            ing : [
+              ingredients.tomate,
+              ingredients.mozzarella,
+              ingredients.gorgonzola,
+              ingredients.parma
+            ]
+          },
+          brachet : {
+            name : "Pizza Brachet (bianca - blanche - white)",
+            ing : [
+              ingredients.mozzarella,
+              ingredients.caprino,
+              ingredients.noix,
+              ingredients.honey
+            ]
+          },
+          superibricchi : {
+            name : "Pizza Sù Per I Bricchi",
+            ing : [
+              ingredients.tomate,
+              ingredients.mozzarella,
+              ingredients.caprino,
+              ingredients.bresaola,
+              ingredients.roquette
+            ]
+          },
+          superibricchi : {
+            name : "Pizza Sù Per I Bricchi",
+            ing : [
+              ingredients.tomate,
+              ingredients.mozzarella,
+              ingredients.thon,
+              ingredients.cipollaTropea
+            ]
+          },
+          reine : {
+            name : "Pizza Cotto e Funghi / Reine",
             ing : [
               ingredients.tomate,
               ingredients.mozzarella,
@@ -62,24 +244,53 @@ let SanTelmo = {
               ingredients.champignons
             ]
           },
-          regina : {
-            name : "Pizza Regina",
+          margherita : {
+            name : "Pizza Margherita",
             ing : [
               ingredients.tomate,
-              ingredients.mozzarella,
-              ingredients.jambonblanc,
-              ingredients.champignons
+              ingredients.mozzarella
             ]
           },
-          regina2 : {
-            name : "Pizza Regina due",
+          buffemel : {
+            name : "Pizza Bufala e Melanzane",
+            ing : [
+              ingredients.tomate,
+              ingredients.mozzarellaBufala,
+              ingredients.aubergines
+            ]
+          },
+          romana : {
+            name : "Pizza Romana",
             ing : [
               ingredients.tomate,
               ingredients.mozzarella,
-              ingredients.jambonblanc,
-              ingredients.champignons
+              ingredients.anchois,
+              ingredients.capres,
+              ingredients.huileextravierge
             ]
-          }
+          },
+          /*
+          pizza : {
+            name : "Pizza",
+            ing : [
+              ingredients. ,
+              ingredients. ,
+              ingredients. ,
+              ingredients. ,
+              ingredients. ,
+            ]
+          },
+          pizza : {
+            name : "Pizza",
+            ing : [
+              ingredients. ,
+              ingredients. ,
+              ingredients. ,
+              ingredients. ,
+              ingredients. ,
+            ]
+          },
+          */
         }
       },
       time : {
diff --git a/proj/map/asset/js/main.js b/proj/map/asset/js/main.js
index 0b66c68..02af7ff 100644
--- a/proj/map/asset/js/main.js
+++ b/proj/map/asset/js/main.js
@@ -1,14 +1,21 @@
 Vue.component('Menu',{
   template: `
   <section class="restomenu">
+    <section v-if="this.obj.priceRange" class="top">
+      <p class="b9h-lang-fr range">{{ fourchette.fr }}</p>
+      <p class="b9h-lang-en range">{{ fourchette.en }}</p>
+      <p class="b9h-lang-it range">{{ fourchette.it }}</p>
+      <p class="price"> {{ this.obj.priceRange }}</p>
+      <p class="b9h-lang-fr drinks">{{ horsboissons.fr }}</p>
+      <p class="b9h-lang-en drinks">{{ horsboissons.en }}</p>
+      <p class="b9h-lang-it drinks">{{ horsboissons.it }}</p>
+    </section>
+
     <div class="dish" v-for="d in this.obj.dishes">
       <h3>{{ d.name }}</h3>
       <p class="b9h-lang-fr" > {{ l2s(ings2ls(d.ing,"fr"), "fr") }}</p>
       <p class="b9h-lang-en" > {{ l2s(ings2ls(d.ing,"en"), "en") }}</p>
       <p class="b9h-lang-it" > {{ l2s(ings2ls(d.ing,"it"), "it") }}</p>
-
-
-      </span>
     </div>
   </section>
   `,
@@ -29,9 +36,9 @@ Vue.component('Menu',{
         it : "Fascia di prezzo per persona:",
       },
       horsboissons : {
-        fr : "hors boissons",
-        en : "excluding drinks",
-        it : "bevande escluse",
+        fr : "(hors boissons)",
+        en : "(excluding drinks)",
+        it : "(bevande escluse)",
       }
     }
   },
@@ -70,7 +77,16 @@ Vue.component('Time', {
       <span class="b9h-lang-fr">{{ days[i].fr }}</span>
       <span class="b9h-lang-en">{{ days[i].en }}</span>
       <span class="b9h-lang-it">{{ days[i].it }}</span>
-      <span class="hour">{{ d }}</span>
+      <span v-if="d != ''" class="hour">{{ d }}</span>
+      <span v-if="d ==''" class="hour b9h-lang-fr">
+        {{ closed.fr }}
+      </span>
+      <span v-if="d ==''" class="hour b9h-lang-en">
+        {{ closed.en }}
+      </span>
+      <span v-if="d ==''" class="hour b9h-lang-it">
+        {{ closed.it }}
+      </span>
     </p>
   </div>
   `,
@@ -81,9 +97,9 @@ Vue.component('Time', {
     return {
       message : "hello from time",
       closed : {
-        fr : "fermé",
-        fr : "closed",
-        it : "chiuso",
+        fr : "Fermé",
+        en : "Closed",
+        it : "Chiuso",
       },
       days : {
         mon : {
diff --git a/proj/map/asset/markers/markers.svg b/proj/map/asset/markers/markers.svg
index d83870a..dd1b4e2 100644
--- a/proj/map/asset/markers/markers.svg
+++ b/proj/map/asset/markers/markers.svg
@@ -23,9 +23,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.20296809"
-     inkscape:cx="2214.5142"
-     inkscape:cy="-7879.0027"
+     inkscape:zoom="0.30106958"
+     inkscape:cx="5547.9727"
+     inkscape:cy="-8955.9688"
      inkscape:document-units="mm"
      inkscape:current-layer="g5160"
      inkscape:document-rotation="0"
@@ -375,6 +375,41 @@
          d="m 3370.0581,-2099.8304 h 228.3351 l -38.0558,247.3632 -57.0838,-10e-5 v 76.1117 l 57.0838,19.028 0,19.0279 H 3408.114 l 0,-19.0279 57.0837,-19.028 v -76.1117 l -57.0837,10e-5 z"
          id="path7887"
          sodipodi:nodetypes="ccccccccccccc" />
+      <path
+         style="fill:none;stroke:#1c2729;stroke-width:23.78491036;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 3921.8681,-2366.2213 -152.2234,152.2235"
+         id="path7889"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#1c2729;stroke-width:23.78491036;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 4112.1474,-2366.2213 152.2234,152.2234"
+         id="path7891" />
+      <path
+         style="fill:none;stroke:#1c2729;stroke-width:23.78491036;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 3845.7564,-2328.1655 h 342.5027"
+         id="path7893" />
+      <path
+         style="fill:none;stroke:#1c2729;stroke-width:23.78491036;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 3769.6447,-2252.0537 h 494.7261"
+         id="path7895" />
+      <path
+         style="fill:none;stroke:#1c2729;stroke-width:23.78491036;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 3883.8123,-2366.2213 h 266.391 v -266.391"
+         id="path7899" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.475698px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 4473.678,-2213.9979 h 38.0558 l 152.2234,-190.2793 h -38.0558 z"
+         id="path7901" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.475698px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 4759.0968,-2442.3331 228.3352,-228.3352 38.0559,2e-4 v 76.1117 l -228.3351,228.3351 -38.0559,0 z"
+         id="path7903"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.439423px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 5405.607,-2442.7225 -195.3392,-227.7509 -32.5565,2e-4 v 75.9168 l 195.339,227.7508 h 32.5566 z"
+         id="path7905"
+         sodipodi:nodetypes="ccccccc" />
     </g>
   </g>
 </svg>