From f15a9bbbdeb1fe39482e4c69609b8e8031c5481f Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 31 May 2022 10:15:41 +0200 Subject: [PATCH] tag system workinglsls --- proj/map/asset/css/style.css | 32 +++++++++++++++++++++---- proj/map/asset/js/.main.js.swp | Bin 28672 -> 36864 bytes proj/map/asset/js/db.js | 24 +------------------ proj/map/asset/js/main.js | 42 +++++++++++++++++++++++++++++++-- proj/map/asset/js/resto.js | 32 ++++++++++++++++++++++++- proj/map/index.html | 2 +- 6 files changed, 100 insertions(+), 32 deletions(-) diff --git a/proj/map/asset/css/style.css b/proj/map/asset/css/style.css index 1a74e04..c46d0a1 100644 --- a/proj/map/asset/css/style.css +++ b/proj/map/asset/css/style.css @@ -10,6 +10,7 @@ header { body { height: 100vh; + height: --webkit-fill-available; overflow: hidden; } @@ -170,8 +171,8 @@ div.sep { width: 100vw; margin-left: -8px; overflow-x: hidden; - - content: "jsdflkj" + + content: "jsdflkj" } section.card { @@ -243,7 +244,7 @@ div.leaflet-popup-tip { .leaflet-container div.leaflet-popup-content-wrapper { border-radius: 0px; - color: var(--b9h-color-bg); + color: var(--b9h-color-bg); background-color: var(--b9h-color-fg); font-family: Inter; font-weight: 400; @@ -313,9 +314,30 @@ section.restomenu h2 { margin-top: 30px; text-decoration: underline; text-underline-offset: 10px; - text-decoration-thickness: 5px; + text-decoration-thickness: 5px; } ::-webkit-scrollbar { display: none; -} \ No newline at end of file +} + +section#resto nav span.resto-tag { + margin-top: 0px; + margin-bottom: 20px; + width: auto; + display: inline-block; + cursor: pointer; +} + +section#resto nav span.resto-tag h3 { + border: 3px; + border-style: solid; + border-width: 5px; + width: auto; + padding: 10px; + margin: 10px; +} + +section#resto nav span.resto-tag.active h3 { + border-color: var(--b9h-color-accent); +} diff --git a/proj/map/asset/js/.main.js.swp b/proj/map/asset/js/.main.js.swp index 9a908367b5559184d4478250087407ce31784034..8c47592d7eb2f4b87ed19a19bb28e2cae5387742 100644 GIT binary patch delta 4668 zcmb`~eQ*@z9l-IuOF}{tHzg-sQUYU||N%Wjj{ERt0I_ESv_-e%Lh`^=Kk+|xUy z_s)HzO_^GnWvQt^d)Sh1&lD-y9*pgz4~)IZ*ryr$Qmx05KPJog*J13Nqt94w9lc9V zw~V?gN0P?pa-M2SwJ{ZUM`~}7q^YoABrc7Tq_=Psd$1cnKm#23oZKgH2*1Uzu?ZWo z0*kQ_Qz0WCqQ-IfGqvwPC(hz{juerOaPT}}#_$DUdvvf)N8_wYXR-+z; zIL{-08+|x{9oT?1Xom}P;lMatHA~VLIEN$HiKmg*&CmDIiSJ>#Ir>Uv`iQx*v2{uD zBUuh9YI`UktD$x!>8w0-674Z1KOzsBAYSUwnPVxs;t5kq89tZd4=Zvf&D7Q@BWQzY zd%UROa~mm#PpDUO-PGb@q4*iPFr%9WBoVoiwxJ7%CF+uuc@vJHB z93~UJt3TnP3XPXZ%f#cjUTK3|{9j5H*?77Gx^BQY)texRl%%yw`d%C+j%3*r41|Mz zrOY2}v4!Lk*=k%HE_uXAfBobkC9DP;L#{Gk_zsWi>riB;>~+&Ev1|k?eH)^(>*Y3v z&tOSXrmD{?+f;YUoM3xEm8+fdG&>W-s5YfjQoH5ae*^!^vKleUEh$M97`q=)X`*G+ z9&S`!veW5gLed`%?v@3{XUmyPApUG*BcDcVA&Ulr4@ZA3P??6lpndKtVAy- zr@p)CA;qJXwJDE;V{J03x0g}XT(_syCfXr8tCRbMDq}t7lq=%BHJ~7SQGXG!{Nffo zt%|3OI=;~!@YuATs`1q+XX2w!O*EDvQPlrW5@o2tmKMK4AvV>nZCqTS<<7{`-mlJ# zuBa}{%ea*lc}jHmJ&SVn5F^V~+*1LIjN{#U!Lb)Y+HIV*dmO;!VH| z3l6Z*hfoZ$@Q=X-7Wfm0;&Ieq8Y+;7i!9F5`U_mZdpL;wh+-So zpj|BX_n`(hj7J(iXF>lvKE_GBhNtmEEJ6)tz=0{S;2$jNCm>z`dhsi~fYoThe9XdR zOoVs|sJg-ee+sYTMLY`)PeR4FumHDVFJ3i^vEy-vntjdM8`YDe>+6r0v?a>8NOIgX zUJH_f8JYB8)9MTBQ?{`pIqVs6FL`DTe6vX8_qbKLhQg|+kEKaORh z_~qHMYSic_sAyyACKoe%#W9y+b5;^Jlyat2yQ6MqbZqPU8TvXRt`D(QwN95i9O2gB za;KGv+@I>23-LK0wp*(c!TuiKqmR0)%3G($rzaDX@{CO{VZOuXb;fR!`7WhgOSvRM zX4x`PU?Or@tMv+sibNF~0tdeqZ>ZiQ;)eT^YWo9kXy@mS)?RnrsO?;sp4r(cb6M4P zxEyI^N`U<>5pT#^t)KUXBT3lne?M&e82*{3)!;u`({5&K@j z7W`}^ajlC31@lo3@wGDo7m0J{a0(}I7`@nl4z!>icVP~uA`71o2T$P;_F@lyflhoE zb*RF0IGp^9!zH@^Q;5g#E_UN(Y{PR{iFQ1Q66E8b8BtUEjC4!Ch$ZA3kjiEkrKOx6a6*)(53*RY_;q6+|Eq_+8?#gXiYVA^{y#*V z&ocCZ+eBnu#3~>LZv2z|G6VG^yo7Do02hiO267HAGgwdK_gI5w%tj?9!GsG8*h6>; z&tVl5h{0Snih*0g!C2%V9b$AJ!|$*ePhvSd5TEt)FcTAyhp!mW|G~fTA$CE`Gfa@MFPnk8ml6IN#BA7!%~%N^#3#Rkddz`%11Ls1&N8?+BaC^d!R?p`6aLB| zK8l0biZu{}T@3ImjMaD07vX0=HlY>MaFs!M7%yTgHeod$h93>6!er#)5|8c-PC~5s x+p!MIu^5eb0N;Ul%-==>YGMAm82vSA`MmW@f_S%19Prk*r*eCC1}96U{{omqw7&oV delta 1113 zcmWmCTSydP7{>8;cXnNM)m;x|SZu4NATp#s<~to~cuKZ6Gfc#WK>Q398Adzm;XwhmApr{^BBMBuUU*S~Jy;DJ z7Of&*;KwZtpbHJ~pb7`D0S>EpMPZo_7Ma2;+{QKZqY3pWLn-pH9Z~oYB=R1^=tUiB zPz^UKP!1R#$R_*+G~V?cUzp5OuaN(&}WkuB$CO<`ONb zXxixA$QMl9NUw=UZxSx1A#Xmi0e8mjj!H>tdi9Q@hDYCE$s}K$=0`P}2%;E*Eq91K& zLVXrT0n!iyD}EElJU(L_H_(MpF diff --git a/proj/map/asset/js/db.js b/proj/map/asset/js/db.js index 7bdfea6..1d7d750 100644 --- a/proj/map/asset/js/db.js +++ b/proj/map/asset/js/db.js @@ -34,29 +34,7 @@ var jdb = { sub : { SanTelmo, Salsamenteria, - italiens : { - id: "restoital", - isActive: false, - type : "list", - nameFR : "Italien", - nameEN : "Italian", - nameIT : "Italiano", - sub : { - SanTelmo, - Salsamenteria, - }, - }, - vege : { - id : "restovege", - isActive: false, - type : "list", - nameFR : "Végétarien", - nameEN : "Vegan", - nameIT : "Vegetariano", - sub : { - Novaa, - } - } + Novaa, } } } diff --git a/proj/map/asset/js/main.js b/proj/map/asset/js/main.js index c3f3df3..14bdb4e 100644 --- a/proj/map/asset/js/main.js +++ b/proj/map/asset/js/main.js @@ -192,7 +192,15 @@ Vue.component('Accordeon', {
@@ -201,6 +209,7 @@ Vue.component('Accordeon', {
`, props : { - list : Object + list : Object, + taglist : Object }, data () { return { + tl : this.taglist, isActive : false, displayCard : "block", cardTop : "110vh", @@ -317,6 +328,33 @@ Vue.component('Accordeon', { }, }, methods : { + toggleTag(t){ + t.isActive = !t.isActive + this.checkTagFunc() + }, + checkTagFunc() { + Object.keys(resto).forEach(r => { + + tagCount = 0 + + Object.keys(restoTagList).forEach(rtli => { + if (restoTagList[rtli].isActive) { + for (t in resto[r].tags) { + if (resto[r].tags[t] === restoTagList[rtli]) { + tagCount++ + } + } + } + }) + + if (tagCount >= 1) { + resto[r].isActive = true + } else { + resto[r].isActive = false + } + }) + + }, getMarkerId(i) { return this.cardid + this.getIndex(i).toString() }, diff --git a/proj/map/asset/js/resto.js b/proj/map/asset/js/resto.js index 0373c3d..9491c1b 100644 --- a/proj/map/asset/js/resto.js +++ b/proj/map/asset/js/resto.js @@ -1,10 +1,34 @@ - +let restoTagList = { + pizza : { + isActive: false, + fr: "Pizza", + en: "Pizza", + it: "Pizza", + }, + vege : { + isActive: false, + fr: "Végétarien", + en: "Vegie", + it: "Vigi", + }, + ital : { + isActive: false, + fr: "Italien", + en: "Italian", + it: "Italiano", + } +} let SanTelmo = { isActive: false, id: "santelmo", type : "item", + cat: "resto", name: "San Telmo", + tags : [ + restoTagList.pizza, + restoTagList.ital + ], xy: [-11.42,27.20], dirxy: [-12.98,35.95], dirzl: 4, @@ -60,6 +84,9 @@ let Novaa = { id: "novasocialfood", type : "item", name: "Noväa social food", + tags : [ + restoTagList.vege + ], xy: [-14.60,17.97], dirxy: [-18.48,35.68], dirzl: 3, @@ -103,6 +130,9 @@ let Salsamenteria = { dirxy: [-19.97,-7.73], dirzl: 3, minz: 3, + tags : [ + restoTagList.ital + ], type : "item", name: "Salsamenteria di Parma", img: "https://ed.brz9.dev/proj/map/asset/img/salsamentiera.jpg", diff --git a/proj/map/index.html b/proj/map/index.html index ea4fd25..33e1f80 100644 --- a/proj/map/index.html +++ b/proj/map/index.html @@ -30,7 +30,7 @@
- +