From e1c8fbdd91f44bdf0c33e14b410c580a3186c69a Mon Sep 17 00:00:00 2001
From: a-ill <a_ill@outlook.com>
Date: Mon, 3 Jul 2023 02:18:37 +0300
Subject: [PATCH] Update

---
 Server/app/svelte/src/join-us-component.svelte  | 17 +++++++++--------
 .../public/js/components/join-us-component.js   |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Server/app/svelte/src/join-us-component.svelte b/Server/app/svelte/src/join-us-component.svelte
index c67ada3..777011f 100644
--- a/Server/app/svelte/src/join-us-component.svelte
+++ b/Server/app/svelte/src/join-us-component.svelte
@@ -3,26 +3,27 @@
 <script>
     // Import statements
     import { onMount } from 'svelte'
+    import { writable } from 'svelte/store';
     import { addMarkersGroups } from '/js/groups.js'
     import { addMarkersCoops } from '/js/coops.js'
     import { addMarkersCommunities } from '/js/communities.js'
-    import { loadLocaleContent } from "/js/libraries/serverTools.js"
-    import { writable } from 'svelte/store';
+    import { loadLocaleContent, getLocale } from "/js/libraries/serverTools.js"
 
     // Import components
     import "/js/components/map-component.js" 
 
     // Main code
     let loaded
+    let locale = []
     let content = writable({})
 
-    loadLocaleContent(content,"join-us-component",loaded)
+    loadLocaleContent(content,"join-us-component",loaded,(lang) => getLocale(locale,lang))
 
-    function mapCallback(createMap) {
+    function mapCallback(createMap,content,locale) {
         let map = createMap([51.505, -0.09],3)
-        addMarkersGroups(map)
-        addMarkersCoops(map)
-        addMarkersCommunities(map)
+        addMarkersGroups(map,content,locale)
+        addMarkersCoops(map,content,locale)
+        addMarkersCommunities(map,content,locale)
     }
 
     onMount(() => { 
@@ -61,7 +62,7 @@
                     <p>{$content.nearYou}</p>
                 </div>
                 <p>{$content.noneNear} <a href="https://chat.whatsapp.com/BhnmUNljUxJ2AjeHUwyTKh" target="_blank" rel=noreferrer>{$content.WhatsAppGroup}</a> {$content.or} <a href="https://discord.gg/xAPZmyr8B6" target="_blank" rel=noreferrer>{$content.DiscordServer}</a>{$content.helpStart}</p>
-                <map-component id="map" callback={mapCallback}></map-component>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
             </div>
         </div>
     {/if}
diff --git a/Server/public/js/components/join-us-component.js b/Server/public/js/components/join-us-component.js
index 388d31e..48db008 100644
--- a/Server/public/js/components/join-us-component.js
+++ b/Server/public/js/components/join-us-component.js
@@ -1 +1 @@
-import{S as o,i as t,a as i,b as r,s as n,e,n as a,d as s,c as m,o as l,f as c,t as p,g as u,j as d,h as g,k as h,l as f,m as v}from"./index-ce8c147b.js";import{addMarkersGroups as b}from"../../../../../../../../../js/groups.js";import{addMarkersCoops as j}from"../../../../../../../../../js/coops.js";import{addMarkersCommunities as x}from"../../../../../../../../../js/communities.js";import{loadLocaleContent as y}from"../../../../../../../../../js/libraries/serverTools.js";import{w as P}from"./index-f2dbf8ff.js";import"../../../../../../../../../js/components/map-component.js";function w(o){let t,i,n,e,a,m,l,b,j,x,y,P,w,k,O,A,S,T,D,H,N,L,M,U,z,B,E,G,R,W,Y,_,C,J,K,Z,q,F,I,Q,V,X,$,oo,to,io,ro,no,eo,ao,so,mo,lo,co,po,uo,go,ho,fo,vo,bo,jo,xo,yo,Po,wo,ko,Oo,Ao,So,To,Do,Ho,No,Lo,Mo,Uo,zo,Bo=o[0].heading+"",Eo=o[0].condition1+"",Go=o[0].condition2+"",Ro=o[0].condition3+"",Wo=o[0].conditionsOutcome+"",Yo=o[0].subheading1+"",_o=o[0].valueProposition1+"",Co=o[0].valueProposition2+"",Jo=o[0].valueProposition3+"",Ko=o[0].valueProposition4+"",Zo=o[0].valueProposition5+"",qo=o[0].subheading2+"",Fo=o[0].findOur+"",Io=o[0].group+"",Qo=o[0].community+"",Vo=o[0].or+"",Xo=o[0].cooperative+"",$o=o[0].nearYou+"",ot=o[0].noneNear+"",tt=o[0].WhatsAppGroup+"",it=o[0].or+"",rt=o[0].DiscordServer+"",nt=o[0].helpStart+"";return{c(){t=c("div"),i=c("div"),n=c("h1"),e=p(Bo),a=u(),m=c("img"),b=u(),j=c("ol"),x=c("li"),y=p(Eo),P=u(),w=c("li"),k=p(Go),O=u(),A=c("li"),S=p(Ro),T=u(),D=c("p"),H=u(),N=c("h2"),L=p(Yo),M=u(),U=c("ol"),z=c("li"),B=p(_o),E=u(),G=c("li"),R=p(Co),W=u(),Y=c("li"),_=p(Jo),C=u(),J=c("li"),K=p(Ko),Z=u(),q=c("p"),F=p(Zo),I=u(),Q=c("h2"),V=p(qo),X=u(),$=c("div"),oo=c("p"),to=p(Fo),io=u(),ro=c("ol"),no=c("li"),eo=c("a"),ao=p(Io),so=p(","),mo=u(),lo=c("li"),co=c("a"),po=p(Qo),uo=u(),go=p(Vo),ho=u(),fo=c("li"),vo=c("a"),bo=p(Xo),jo=u(),xo=c("p"),yo=p($o),Po=u(),wo=c("p"),ko=p(ot),Oo=u(),Ao=c("a"),So=p(tt),To=u(),Do=p(it),Ho=u(),No=c("a"),Lo=p(rt),Mo=p(nt),Uo=u(),zo=c("map-component"),d(m.src,l="/img/common/join-group.svg")||g(m,"src","/img/common/join-group.svg"),g(m,"id","join-group"),g(m,"alt","join group"),g(j,"id","condition-list"),g(U,"id","value-proposition-list"),g(eo,"href","/groups"),g(co,"href","/communities"),g(vo,"href","/cooperatives"),g($,"id","call-to-action-list"),g(Ao,"href","https://chat.whatsapp.com/BhnmUNljUxJ2AjeHUwyTKh"),g(Ao,"target","_blank"),g(Ao,"rel","noreferrer"),g(No,"href","https://discord.gg/xAPZmyr8B6"),g(No,"target","_blank"),g(No,"rel","noreferrer"),h(zo,"id","map"),h(zo,"callback",o[3]),g(i,"id","text-container"),g(t,"id","container")},m(o,s){r(o,t,s),f(t,i),f(i,n),f(n,e),f(i,a),f(i,m),f(i,b),f(i,j),f(j,x),f(x,y),f(j,P),f(j,w),f(w,k),f(j,O),f(j,A),f(A,S),f(j,T),f(j,D),D.innerHTML=Wo,f(i,H),f(i,N),f(N,L),f(i,M),f(i,U),f(U,z),f(z,B),f(U,E),f(U,G),f(G,R),f(U,W),f(U,Y),f(Y,_),f(U,C),f(U,J),f(J,K),f(U,Z),f(U,q),f(q,F),f(i,I),f(i,Q),f(Q,V),f(i,X),f(i,$),f($,oo),f(oo,to),f($,io),f($,ro),f(ro,no),f(no,eo),f(eo,ao),f(no,so),f(ro,mo),f(ro,lo),f(lo,co),f(co,po),f(lo,uo),f(lo,go),f(ro,ho),f(ro,fo),f(fo,vo),f(vo,bo),f($,jo),f($,xo),f(xo,yo),f(i,Po),f(i,wo),f(wo,ko),f(wo,Oo),f(wo,Ao),f(Ao,So),f(wo,To),f(wo,Do),f(wo,Ho),f(wo,No),f(No,Lo),f(wo,Mo),f(i,Uo),f(i,zo)},p(o,t){1&t&&Bo!==(Bo=o[0].heading+"")&&v(e,Bo),1&t&&Eo!==(Eo=o[0].condition1+"")&&v(y,Eo),1&t&&Go!==(Go=o[0].condition2+"")&&v(k,Go),1&t&&Ro!==(Ro=o[0].condition3+"")&&v(S,Ro),1&t&&Wo!==(Wo=o[0].conditionsOutcome+"")&&(D.innerHTML=Wo),1&t&&Yo!==(Yo=o[0].subheading1+"")&&v(L,Yo),1&t&&_o!==(_o=o[0].valueProposition1+"")&&v(B,_o),1&t&&Co!==(Co=o[0].valueProposition2+"")&&v(R,Co),1&t&&Jo!==(Jo=o[0].valueProposition3+"")&&v(_,Jo),1&t&&Ko!==(Ko=o[0].valueProposition4+"")&&v(K,Ko),1&t&&Zo!==(Zo=o[0].valueProposition5+"")&&v(F,Zo),1&t&&qo!==(qo=o[0].subheading2+"")&&v(V,qo),1&t&&Fo!==(Fo=o[0].findOur+"")&&v(to,Fo),1&t&&Io!==(Io=o[0].group+"")&&v(ao,Io),1&t&&Qo!==(Qo=o[0].community+"")&&v(po,Qo),1&t&&Vo!==(Vo=o[0].or+"")&&v(go,Vo),1&t&&Xo!==(Xo=o[0].cooperative+"")&&v(bo,Xo),1&t&&$o!==($o=o[0].nearYou+"")&&v(yo,$o),1&t&&ot!==(ot=o[0].noneNear+"")&&v(ko,ot),1&t&&tt!==(tt=o[0].WhatsAppGroup+"")&&v(So,tt),1&t&&it!==(it=o[0].or+"")&&v(Do,it),1&t&&rt!==(rt=o[0].DiscordServer+"")&&v(Lo,rt),1&t&&nt!==(nt=o[0].helpStart+"")&&v(Mo,nt)},d(o){o&&s(t)}}}function k(o){let t,i=0!=Object.keys(o[0]).length,n=i&&w(o);return{c(){n&&n.c(),t=e(),this.c=a},m(o,i){n&&n.m(o,i),r(o,t,i)},p(o,[r]){1&r&&(i=0!=Object.keys(o[0]).length),i?n?n.p(o,r):(n=w(o),n.c(),n.m(t.parentNode,t)):n&&(n.d(1),n=null)},i:a,o:a,d(o){n&&n.d(o),o&&s(t)}}}function O(o,t,i){let r,n,e=P({});return m(o,e,(o=>i(0,r=o))),y(e,"join-us-component",n),l((()=>{})),[r,n,e,function(o){let t=o([51.505,-.09],3);b(t),j(t),x(t)}]}class A extends o{constructor(o){super(),this.shadowRoot.innerHTML="<style>@import '/css/common.css';h2{margin-bottom:1rem}#value-proposition-list{margin-bottom:2rem}#value-proposition-list>li{margin-bottom:1rem}ol li{position:relative;font-family:var(--serif,serif);margin-left:1.5rem;list-style-position:outside}#join-group{position:absolute;width:10.5rem;height:auto;left:calc(50% + 1.2rem);transform:translate(-50%);z-index:0;opacity:0.2}#map{--height:30rem;--width:100%;--margin-bottom:3rem}#call-to-action-list>ol>li{position:relative;font-family:var(--serif,serif);margin-left:3rem}#condition-list{margin-bottom:2rem;margin-top:7rem}#condition-list>li{margin-bottom:1rem}#text-container{max-width:calc(100vw - 4rem);margin:auto}h1{margin-bottom:1rem;font-size:2.2rem;text-align:center}#container{margin:auto;max-width:800px;margin-top:1rem;margin-bottom:4rem}#container>div>p{margin-bottom:1rem}#call-to-action-list>p{margin-bottom:1rem}#call-to-action-list>:nth-child(1){margin-bottom:0.5rem}#call-to-action-list>:nth-child(2){margin-bottom:0rem}#call-to-action-list>ol>li{margin-bottom:0.5rem}#text-container a{color:#DD1C1A\n    }#container p{text-align:justify}</style>",t(this,{target:this.shadowRoot,props:i(this.attributes),customElement:!0},O,k,n,{},null),o&&o.target&&r(o.target,this,o.anchor)}}customElements.define("join-us-component",A);export{A as default};
+import{S as o,i as t,a as i,b as r,s as n,e,n as a,d as s,c as m,o as l,f as c,t as p,g as u,j as d,h as g,k as h,l as f,m as v}from"./index-ce8c147b.js";import{w as b}from"./index-f2dbf8ff.js";import{addMarkersGroups as j}from"../../../../../../../../../js/groups.js";import{addMarkersCoops as x}from"../../../../../../../../../js/coops.js";import{addMarkersCommunities as y}from"../../../../../../../../../js/communities.js";import{loadLocaleContent as P,getLocale as w}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function k(o){let t,i,n,e,a,m,l,b,j,x,y,P,w,k,O,A,S,T,D,H,N,L,M,U,z,B,E,G,R,W,Y,_,C,J,K,Z,q,F,I,Q,V,X,$,oo,to,io,ro,no,eo,ao,so,mo,lo,co,po,uo,go,ho,fo,vo,bo,jo,xo,yo,Po,wo,ko,Oo,Ao,So,To,Do,Ho,No,Lo,Mo,Uo,zo,Bo,Eo=o[0].heading+"",Go=o[0].condition1+"",Ro=o[0].condition2+"",Wo=o[0].condition3+"",Yo=o[0].conditionsOutcome+"",_o=o[0].subheading1+"",Co=o[0].valueProposition1+"",Jo=o[0].valueProposition2+"",Ko=o[0].valueProposition3+"",Zo=o[0].valueProposition4+"",qo=o[0].valueProposition5+"",Fo=o[0].subheading2+"",Io=o[0].findOur+"",Qo=o[0].group+"",Vo=o[0].community+"",Xo=o[0].or+"",$o=o[0].cooperative+"",ot=o[0].nearYou+"",tt=o[0].noneNear+"",it=o[0].WhatsAppGroup+"",rt=o[0].or+"",nt=o[0].DiscordServer+"",et=o[0].helpStart+"";return{c(){t=c("div"),i=c("div"),n=c("h1"),e=p(Eo),a=u(),m=c("img"),b=u(),j=c("ol"),x=c("li"),y=p(Go),P=u(),w=c("li"),k=p(Ro),O=u(),A=c("li"),S=p(Wo),T=u(),D=c("p"),H=u(),N=c("h2"),L=p(_o),M=u(),U=c("ol"),z=c("li"),B=p(Co),E=u(),G=c("li"),R=p(Jo),W=u(),Y=c("li"),_=p(Ko),C=u(),J=c("li"),K=p(Zo),Z=u(),q=c("p"),F=p(qo),I=u(),Q=c("h2"),V=p(Fo),X=u(),$=c("div"),oo=c("p"),to=p(Io),io=u(),ro=c("ol"),no=c("li"),eo=c("a"),ao=p(Qo),so=p(","),mo=u(),lo=c("li"),co=c("a"),po=p(Vo),uo=u(),go=p(Xo),ho=u(),fo=c("li"),vo=c("a"),bo=p($o),jo=u(),xo=c("p"),yo=p(ot),Po=u(),wo=c("p"),ko=p(tt),Oo=u(),Ao=c("a"),So=p(it),To=u(),Do=p(rt),Ho=u(),No=c("a"),Lo=p(nt),Mo=p(et),Uo=u(),zo=c("map-component"),d(m.src,l="/img/common/join-group.svg")||g(m,"src","/img/common/join-group.svg"),g(m,"id","join-group"),g(m,"alt","join group"),g(j,"id","condition-list"),g(U,"id","value-proposition-list"),g(eo,"href","/groups"),g(co,"href","/communities"),g(vo,"href","/cooperatives"),g($,"id","call-to-action-list"),g(Ao,"href","https://chat.whatsapp.com/BhnmUNljUxJ2AjeHUwyTKh"),g(Ao,"target","_blank"),g(Ao,"rel","noreferrer"),g(No,"href","https://discord.gg/xAPZmyr8B6"),g(No,"target","_blank"),g(No,"rel","noreferrer"),h(zo,"id","map"),h(zo,"callback",Bo=o[5]),g(i,"id","text-container"),g(t,"id","container")},m(o,s){r(o,t,s),f(t,i),f(i,n),f(n,e),f(i,a),f(i,m),f(i,b),f(i,j),f(j,x),f(x,y),f(j,P),f(j,w),f(w,k),f(j,O),f(j,A),f(A,S),f(j,T),f(j,D),D.innerHTML=Yo,f(i,H),f(i,N),f(N,L),f(i,M),f(i,U),f(U,z),f(z,B),f(U,E),f(U,G),f(G,R),f(U,W),f(U,Y),f(Y,_),f(U,C),f(U,J),f(J,K),f(U,Z),f(U,q),f(q,F),f(i,I),f(i,Q),f(Q,V),f(i,X),f(i,$),f($,oo),f(oo,to),f($,io),f($,ro),f(ro,no),f(no,eo),f(eo,ao),f(no,so),f(ro,mo),f(ro,lo),f(lo,co),f(co,po),f(lo,uo),f(lo,go),f(ro,ho),f(ro,fo),f(fo,vo),f(vo,bo),f($,jo),f($,xo),f(xo,yo),f(i,Po),f(i,wo),f(wo,ko),f(wo,Oo),f(wo,Ao),f(Ao,So),f(wo,To),f(wo,Do),f(wo,Ho),f(wo,No),f(No,Lo),f(wo,Mo),f(i,Uo),f(i,zo)},p(o,t){1&t&&Eo!==(Eo=o[0].heading+"")&&v(e,Eo),1&t&&Go!==(Go=o[0].condition1+"")&&v(y,Go),1&t&&Ro!==(Ro=o[0].condition2+"")&&v(k,Ro),1&t&&Wo!==(Wo=o[0].condition3+"")&&v(S,Wo),1&t&&Yo!==(Yo=o[0].conditionsOutcome+"")&&(D.innerHTML=Yo),1&t&&_o!==(_o=o[0].subheading1+"")&&v(L,_o),1&t&&Co!==(Co=o[0].valueProposition1+"")&&v(B,Co),1&t&&Jo!==(Jo=o[0].valueProposition2+"")&&v(R,Jo),1&t&&Ko!==(Ko=o[0].valueProposition3+"")&&v(_,Ko),1&t&&Zo!==(Zo=o[0].valueProposition4+"")&&v(K,Zo),1&t&&qo!==(qo=o[0].valueProposition5+"")&&v(F,qo),1&t&&Fo!==(Fo=o[0].subheading2+"")&&v(V,Fo),1&t&&Io!==(Io=o[0].findOur+"")&&v(to,Io),1&t&&Qo!==(Qo=o[0].group+"")&&v(ao,Qo),1&t&&Vo!==(Vo=o[0].community+"")&&v(po,Vo),1&t&&Xo!==(Xo=o[0].or+"")&&v(go,Xo),1&t&&$o!==($o=o[0].cooperative+"")&&v(bo,$o),1&t&&ot!==(ot=o[0].nearYou+"")&&v(yo,ot),1&t&&tt!==(tt=o[0].noneNear+"")&&v(ko,tt),1&t&&it!==(it=o[0].WhatsAppGroup+"")&&v(So,it),1&t&&rt!==(rt=o[0].or+"")&&v(Do,rt),1&t&&nt!==(nt=o[0].DiscordServer+"")&&v(Lo,nt),1&t&&et!==(et=o[0].helpStart+"")&&v(Mo,et),1&t&&Bo!==(Bo=o[5])&&h(zo,"callback",Bo)},d(o){o&&s(t)}}}function O(o){let t,i=0!=Object.keys(o[0]).length,n=i&&k(o);return{c(){n&&n.c(),t=e(),this.c=a},m(o,i){n&&n.m(o,i),r(o,t,i)},p(o,[r]){1&r&&(i=0!=Object.keys(o[0]).length),i?n?n.p(o,r):(n=k(o),n.c(),n.m(t.parentNode,t)):n&&(n.d(1),n=null)},i:a,o:a,d(o){n&&n.d(o),o&&s(t)}}}function A(o,t,i){let r,n,e=[],a=b({});function s(o,t,i){let r=o([51.505,-.09],3);j(r,t,i),x(r,t,i),y(r,t,i)}m(o,a,(o=>i(0,r=o))),P(a,"join-us-component",n,(o=>w(e,o))),l((()=>{}));return[r,n,e,a,s,o=>s(o,r,e)]}class S extends o{constructor(o){super(),this.shadowRoot.innerHTML="<style>@import '/css/common.css';h2{margin-bottom:1rem}#value-proposition-list{margin-bottom:2rem}#value-proposition-list>li{margin-bottom:1rem}ol li{position:relative;font-family:var(--serif,serif);margin-left:1.5rem;list-style-position:outside}#join-group{position:absolute;width:10.5rem;height:auto;left:calc(50% + 1.2rem);transform:translate(-50%);z-index:0;opacity:0.2}#map{--height:30rem;--width:100%;--margin-bottom:3rem}#call-to-action-list>ol>li{position:relative;font-family:var(--serif,serif);margin-left:3rem}#condition-list{margin-bottom:2rem;margin-top:7rem}#condition-list>li{margin-bottom:1rem}#text-container{max-width:calc(100vw - 4rem);margin:auto}h1{margin-bottom:1rem;font-size:2.2rem;text-align:center}#container{margin:auto;max-width:800px;margin-top:1rem;margin-bottom:4rem}#container>div>p{margin-bottom:1rem}#call-to-action-list>p{margin-bottom:1rem}#call-to-action-list>:nth-child(1){margin-bottom:0.5rem}#call-to-action-list>:nth-child(2){margin-bottom:0rem}#call-to-action-list>ol>li{margin-bottom:0.5rem}#text-container a{color:#DD1C1A\n    }#container p{text-align:justify}</style>",t(this,{target:this.shadowRoot,props:i(this.attributes),customElement:!0},A,O,n,{},null),o&&o.target&&r(o.target,this,o.anchor)}}customElements.define("join-us-component",S);export{S as default};