From 0f74610ae17165e28ac77c95d898488a2d4e6f2d Mon Sep 17 00:00:00 2001 From: a-ill Date: Mon, 10 Jul 2023 17:16:02 +0300 Subject: [PATCH] Update --- Server/app/svelte/public/js/communities.js | 2 +- Server/app/svelte/public/js/groups.js | 5 +++++ .../public/locales/en/groups-component.json | 5 +++-- .../public/locales/ru/groups-component.json | 5 +++-- .../svelte/src/communities-component.svelte | 1 - .../svelte/src/cooperatives-component.svelte | 1 - Server/app/svelte/src/groups-component.svelte | 1 - Server/app/svelte/src/join-us-component.svelte | 18 +++++++++++++----- Server/public/js/communities.js | 2 +- .../js/components/communities-component.js | 2 +- .../js/components/cooperatives-component.js | 2 +- .../public/js/components/groups-component.js | 2 +- .../public/js/components/join-us-component.js | 2 +- Server/public/js/groups.js | 5 +++++ Server/public/locales/en/groups-component.json | 5 +++-- Server/public/locales/ru/groups-component.json | 5 +++-- 16 files changed, 41 insertions(+), 22 deletions(-) diff --git a/Server/app/svelte/public/js/communities.js b/Server/app/svelte/public/js/communities.js index f37f1a7..50256d4 100644 --- a/Server/app/svelte/public/js/communities.js +++ b/Server/app/svelte/public/js/communities.js @@ -1,7 +1,7 @@ export let communities = [ { - location: ["CanadaMontreal",[44.654781585774785, -63.61076905562609]], + location: ["CanadaMontreal",[45.55541047232767, -73.42859611607271]], status: "forming", members: 2, contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] diff --git a/Server/app/svelte/public/js/groups.js b/Server/app/svelte/public/js/groups.js index 90a0334..e78d9ec 100644 --- a/Server/app/svelte/public/js/groups.js +++ b/Server/app/svelte/public/js/groups.js @@ -1,4 +1,9 @@ export let groups = [ + { + location: ["CanadaHalifax",[44.65166135030067, -63.59289968306866]], + members: 2, + contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + }, { location: ["DenmarkCopenhagen",[55.6840661150132, 12.557133959514688]], members: 1, diff --git a/Server/app/svelte/public/locales/en/groups-component.json b/Server/app/svelte/public/locales/en/groups-component.json index 7c20d4e..1dd917c 100644 --- a/Server/app/svelte/public/locales/en/groups-component.json +++ b/Server/app/svelte/public/locales/en/groups-component.json @@ -7,11 +7,12 @@ "location": "Location", "members": "Members", "contact": "Contact", + "DiscordInviteLink": "Discord invite link", + "WhatsAppInviteLink": "WhatsApp invite link", "DenmarkCopenhagen": "Denmark, Copenhagen", "DenmarkKolding": "Denmark, Kolding", "EstoniaKohtlaJarve": "Estonia, Kohtla-Järve", "GreeceAthens": "Greece, Athens", "LatviaRiga": "Latvia, Riga", - "DiscordInviteLink": "Discord invite link", - "WhatsAppInviteLink": "WhatsApp invite link" + "CanadaHalifax": "Canada, Halifax" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/ru/groups-component.json b/Server/app/svelte/public/locales/ru/groups-component.json index fdedcbf..debc525 100644 --- a/Server/app/svelte/public/locales/ru/groups-component.json +++ b/Server/app/svelte/public/locales/ru/groups-component.json @@ -7,11 +7,12 @@ "location": "Локация", "members": "Участники", "contact": "Контакт", + "DiscordInviteLink": "Discord ссылка", + "WhatsAppInviteLink": "WhatsApp ссылка", "DenmarkCopenhagen": "Дания, Копенгаген", "DenmarkKolding": "Дания, Колдинг", "EstoniaKohtlaJarve": "Эстония, Кохтла-Ярве", "GreeceAthens": "Греция, Афины", "LatviaRiga": "Латвия, Рига", - "DiscordInviteLink": "Discord ссылка", - "WhatsAppInviteLink": "WhatsApp ссылка" + "CanadaHalifax": "Канада, Галифакс" } \ No newline at end of file diff --git a/Server/app/svelte/src/communities-component.svelte b/Server/app/svelte/src/communities-component.svelte index e2d129c..5cd233d 100644 --- a/Server/app/svelte/src/communities-component.svelte +++ b/Server/app/svelte/src/communities-component.svelte @@ -36,7 +36,6 @@

{$content.p1}

{$content.subheading1}

mapCallbackCommunities(createMap,$content,locale)}> -

{$content.subheading2}

{#each communities as community}

{$content.location}: {$content[community.location[0]]}

diff --git a/Server/app/svelte/src/cooperatives-component.svelte b/Server/app/svelte/src/cooperatives-component.svelte index 8bef72e..b903d8d 100644 --- a/Server/app/svelte/src/cooperatives-component.svelte +++ b/Server/app/svelte/src/cooperatives-component.svelte @@ -36,7 +36,6 @@

{$content.p2}

{$content.subheading1}

mapCallbackCoops(createMap,$content,locale)}> -

{$content.subheading2}

{#each coops as coop}
diff --git a/Server/app/svelte/src/groups-component.svelte b/Server/app/svelte/src/groups-component.svelte index 27c8105..c8a1560 100644 --- a/Server/app/svelte/src/groups-component.svelte +++ b/Server/app/svelte/src/groups-component.svelte @@ -37,7 +37,6 @@

{$content.p2}

{$content.subheading1}

mapCallbackGroups(createMap,$content,locale)}> -

{$content.subheading2}

{#each groups as group}

{$content.location}: {$content[group.location[0]]}

diff --git a/Server/app/svelte/src/join-us-component.svelte b/Server/app/svelte/src/join-us-component.svelte index 995ddf3..096327f 100644 --- a/Server/app/svelte/src/join-us-component.svelte +++ b/Server/app/svelte/src/join-us-component.svelte @@ -16,13 +16,21 @@ let loaded let content = writable({}) + let contentGroups = writable({}) + let contentCommunities = writable({}) + let contentCoops = writable({}) + + loadLocaleContent(contentGroups,"groups-component") + loadLocaleContent(contentCommunities,"communities-component") + loadLocaleContent(contentCoops,"cooperatives-component") + let locale = loadLocaleContent(content,"join-us-component",loaded) - function mapCallback(createMap,content,locale) { + function mapCallback(createMap,content) { let map = createMap([51.505, -0.09],3) - addMarkersGroups(map,content,locale) - addMarkersCoops(map,content,locale) - addMarkersCommunities(map,content,locale) + addMarkersGroups(map,$contentGroups) + addMarkersCommunities(map,$contentCommunities) + addMarkersCoops(map,$contentCoops) } onMount(() => { @@ -61,7 +69,7 @@

{$content.nearYou}

{$content.noneNear} {$content.WhatsAppGroup} {$content.or} {$content.DiscordServer}{$content.helpStart}

- mapCallback(createMap,$content,locale)}> + mapCallback(createMap,$content)}>
{/if} diff --git a/Server/public/js/communities.js b/Server/public/js/communities.js index f37f1a7..50256d4 100644 --- a/Server/public/js/communities.js +++ b/Server/public/js/communities.js @@ -1,7 +1,7 @@ export let communities = [ { - location: ["CanadaMontreal",[44.654781585774785, -63.61076905562609]], + location: ["CanadaMontreal",[45.55541047232767, -73.42859611607271]], status: "forming", members: 2, contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] diff --git a/Server/public/js/components/communities-component.js b/Server/public/js/components/communities-component.js index 316730b..511a0bc 100644 --- a/Server/public/js/components/communities-component.js +++ b/Server/public/js/components/communities-component.js @@ -1 +1 @@ -import{S as t,i as o,a as n,b as e,s as i,e as a,n as m,d as s,c as r,o as c,f as l,t as g,g as p,h as u,j as h,k as d,l as b,m as f,p as x}from"./index-4348483d.js";import{w as j}from"./index-71440b21.js";import{communities as v,addMarkersCommunities as w}from"../../../../../../../../../js/communities.js";import{loadLocaleContent as k}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function y(t,o,n){const e=t.slice();return e[6]=o[n],e}function z(t){let o,n,i,a,m,r,c,j,w,k,z,E,O,R,T,A,C,H,L,M,N=t[0].heading+"",S=t[0].p1+"",_=t[0].subheading1+"",q=t[0].subheading2+"",B=v,F=[];for(let o=0;on(0,e=t)));let m=k(a,"communities-component",i);function s(t,o){let n=t([51.505,-.09],3);w(n,o)}c((()=>{}));return[e,i,a,m,s,t=>s(t,e)]}class R extends t{constructor(t){super(),this.shadowRoot.innerHTML="",o(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},O,E,i,{},null),t&&t.target&&e(t.target,this,t.anchor)}}customElements.define("communities-component",R);export{R as default}; +import{S as t,i as o,a as n,b as e,s as i,e as a,n as m,d as s,c as r,o as c,f as l,t as p,g,h as u,j as h,k as d,l as f,m as b,p as x}from"./index-4348483d.js";import{w as j}from"./index-71440b21.js";import{communities as v,addMarkersCommunities as w}from"../../../../../../../../../js/communities.js";import{loadLocaleContent as k}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function y(t,o,n){const e=t.slice();return e[6]=o[n],e}function z(t){let o,n,i,a,m,r,c,j,w,k,z,E,O,R,T,A,C,H=t[0].heading+"",L=t[0].p1+"",M=t[0].subheading1+"",N=v,S=[];for(let o=0;on(0,e=t)));let m=k(a,"communities-component",i);function s(t,o){let n=t([51.505,-.09],3);w(n,o)}c((()=>{}));return[e,i,a,m,s,t=>s(t,e)]}class R extends t{constructor(t){super(),this.shadowRoot.innerHTML="",o(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},O,E,i,{},null),t&&t.target&&e(t.target,this,t.anchor)}}customElements.define("communities-component",R);export{R as default}; diff --git a/Server/public/js/components/cooperatives-component.js b/Server/public/js/components/cooperatives-component.js index 0bfd95f..2f9f984 100644 --- a/Server/public/js/components/cooperatives-component.js +++ b/Server/public/js/components/cooperatives-component.js @@ -1 +1 @@ -import{S as t,i as e,a as o,b as n,s as i,e as a,n as r,d as s,c,o as m,f as l,t as p,g,h as d,j as h,k as f,l as b,m as u,p as w}from"./index-4348483d.js";import{w as x}from"./index-71440b21.js";import{coops as v,addMarkersCoops as k}from"../../../../../../../../../js/coops.js";import{loadLocaleContent as j}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function y(t,e,o){const n=t.slice();return n[6]=e[o],n}function z(t){let e,o,i,a,r,c,m,x,k,j,z,E,O,R,T,_,A,C,H,L,M,N,S,q=t[0].heading+"",B=t[0].p1+"",F=t[0].p2+"",G=t[0].subheading1+"",I=t[0].subheading2+"",J=v,K=[];for(let e=0;eo(0,n=t)));let r=j(a,"cooperatives-component",i);function s(t,e){let o=t([51.505,-.09],3);k(o,e)}m((()=>{}));return[n,i,a,r,s,t=>s(t,n)]}class R extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:o(this.attributes),customElement:!0},O,E,i,{},null),t&&t.target&&n(t.target,this,t.anchor)}}customElements.define("cooperatives-component",R);export{R as default}; +import{S as t,i as e,a as o,b as n,s as i,e as a,n as r,d as s,c,o as m,f as l,t as p,g,h as d,j as h,k as f,l as u,m as b,p as w}from"./index-4348483d.js";import{w as x}from"./index-71440b21.js";import{coops as v,addMarkersCoops as k}from"../../../../../../../../../js/coops.js";import{loadLocaleContent as j}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function y(t,e,o){const n=t.slice();return n[6]=e[o],n}function z(t){let e,o,i,a,r,c,m,x,k,j,z,E,O,R,T,_,A,C,H,L,M=t[0].heading+"",N=t[0].p1+"",S=t[0].p2+"",q=t[0].subheading1+"",B=v,F=[];for(let e=0;eo(0,n=t)));let r=j(a,"cooperatives-component",i);function s(t,e){let o=t([51.505,-.09],3);k(o,e)}m((()=>{}));return[n,i,a,r,s,t=>s(t,n)]}class R extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:o(this.attributes),customElement:!0},O,E,i,{},null),t&&t.target&&n(t.target,this,t.anchor)}}customElements.define("cooperatives-component",R);export{R as default}; diff --git a/Server/public/js/components/groups-component.js b/Server/public/js/components/groups-component.js index b298430..34e4988 100644 --- a/Server/public/js/components/groups-component.js +++ b/Server/public/js/components/groups-component.js @@ -1 +1 @@ -import{S as t,i as o,a as n,b as e,s as r,e as a,n as i,d as s,c as m,o as c,f as l,t as p,g,h,j as u,k as d,l as b,m as f,p as x}from"./index-4348483d.js";import{w as j}from"./index-71440b21.js";import{groups as v,addMarkersGroups as w}from"../../../../../../../../../js/groups.js";import{loadLocaleContent as k}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function y(t,o,n){const e=t.slice();return e[6]=o[n],e}function z(t){let o,n,r,a,i,m,c,j,w,k,z,E,O,R,T,A,C,H,L,M,N,S,_,q=t[0].heading+"",B=t[0].p1+"",F=t[0].p2+"",G=t[0].subheading1+"",I=t[0].subheading2+"",J=v,K=[];for(let o=0;on(0,e=t)));let i=k(a,"groups-component",r);function s(t,o){let n=t([51.505,-.09],3);w(n,o)}c((()=>{}));return[e,r,a,i,s,t=>s(t,e)]}class R extends t{constructor(t){super(),this.shadowRoot.innerHTML="",o(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},O,E,r,{},null),t&&t.target&&e(t.target,this,t.anchor)}}customElements.define("groups-component",R);export{R as default}; +import{S as t,i as o,a as n,b as e,s as r,e as a,n as i,d as s,c as m,o as c,f as l,t as p,g,h,j as u,k as d,l as f,m as b,p as x}from"./index-4348483d.js";import{w as j}from"./index-71440b21.js";import{groups as v,addMarkersGroups as w}from"../../../../../../../../../js/groups.js";import{loadLocaleContent as k}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function y(t,o,n){const e=t.slice();return e[6]=o[n],e}function z(t){let o,n,r,a,i,m,c,j,w,k,z,E,O,R,T,A,C,H,L,M,N=t[0].heading+"",S=t[0].p1+"",_=t[0].p2+"",q=t[0].subheading1+"",B=v,F=[];for(let o=0;on(0,e=t)));let i=k(a,"groups-component",r);function s(t,o){let n=t([51.505,-.09],3);w(n,o)}c((()=>{}));return[e,r,a,i,s,t=>s(t,e)]}class R extends t{constructor(t){super(),this.shadowRoot.innerHTML="",o(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},O,E,r,{},null),t&&t.target&&e(t.target,this,t.anchor)}}customElements.define("groups-component",R);export{R as default}; diff --git a/Server/public/js/components/join-us-component.js b/Server/public/js/components/join-us-component.js index fe73a9f..0117eda 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-4348483d.js";import{w as b}from"./index-71440b21.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}from"../../../../../../../../../js/libraries/serverTools.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,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","/"+o[3]+"/groups"),g(co,"href","/"+o[3]+"/communities"),g(vo,"href","/"+o[3]+"/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 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=b({});m(o,e,(o=>i(0,r=o)));let a=P(e,"join-us-component",n);function s(o,t,i){let r=o([51.505,-.09],3);j(r,t,i),x(r,t,i),y(r,t,i)}l((()=>{}));return[r,n,e,a,s,o=>s(o,r,a)]}class A extends o{constructor(o){super(),this.shadowRoot.innerHTML="",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 n,s as e,e as r,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-4348483d.js";import{w as b}from"./index-71440b21.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}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function w(o){let t,i,e,r,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,no,eo,ro,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+"",nt=o[0].or+"",et=o[0].DiscordServer+"",rt=o[0].helpStart+"";return{c(){t=c("div"),i=c("div"),e=c("h1"),r=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(),no=c("ol"),eo=c("li"),ro=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(nt),Ho=u(),No=c("a"),Lo=p(et),Mo=p(rt),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(ro,"href","/"+o[6]+"/groups"),g(co,"href","/"+o[6]+"/communities"),g(vo,"href","/"+o[6]+"/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[8]),g(i,"id","text-container"),g(t,"id","container")},m(o,s){n(o,t,s),f(t,i),f(i,e),f(e,r),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($,no),f(no,eo),f(eo,ro),f(ro,ao),f(eo,so),f(no,mo),f(no,lo),f(lo,co),f(co,po),f(lo,uo),f(lo,go),f(no,ho),f(no,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(r,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&&nt!==(nt=o[0].or+"")&&v(Do,nt),1&t&&et!==(et=o[0].DiscordServer+"")&&v(Lo,et),1&t&&rt!==(rt=o[0].helpStart+"")&&v(Mo,rt),1&t&&Bo!==(Bo=o[8])&&h(zo,"callback",Bo)},d(o){o&&s(t)}}}function k(o){let t,i=0!=Object.keys(o[0]).length,e=i&&w(o);return{c(){e&&e.c(),t=r(),this.c=a},m(o,i){e&&e.m(o,i),n(o,t,i)},p(o,[n]){1&n&&(i=0!=Object.keys(o[0]).length),i?e?e.p(o,n):(e=w(o),e.c(),e.m(t.parentNode,t)):e&&(e.d(1),e=null)},i:a,o:a,d(o){e&&e.d(o),o&&s(t)}}}function O(o,t,i){let n,e,r,a,s,c=b({});m(o,c,(o=>i(0,a=o)));let p=b({});m(o,p,(o=>i(11,r=o)));let u=b({});m(o,u,(o=>i(10,e=o)));let d=b({});m(o,d,(o=>i(9,n=o))),P(p,"groups-component"),P(u,"communities-component"),P(d,"cooperatives-component");let g=P(c,"join-us-component",s);function h(o,t){let i=o([51.505,-.09],3);j(i,r),y(i,e),x(i,n)}l((()=>{}));return[a,s,c,p,u,d,g,h,o=>h(o)]}class A extends o{constructor(o){super(),this.shadowRoot.innerHTML="",t(this,{target:this.shadowRoot,props:i(this.attributes),customElement:!0},O,k,e,{},null),o&&o.target&&n(o.target,this,o.anchor)}}customElements.define("join-us-component",A);export{A as default}; diff --git a/Server/public/js/groups.js b/Server/public/js/groups.js index 90a0334..e78d9ec 100644 --- a/Server/public/js/groups.js +++ b/Server/public/js/groups.js @@ -1,4 +1,9 @@ export let groups = [ + { + location: ["CanadaHalifax",[44.65166135030067, -63.59289968306866]], + members: 2, + contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + }, { location: ["DenmarkCopenhagen",[55.6840661150132, 12.557133959514688]], members: 1, diff --git a/Server/public/locales/en/groups-component.json b/Server/public/locales/en/groups-component.json index 7c20d4e..1dd917c 100644 --- a/Server/public/locales/en/groups-component.json +++ b/Server/public/locales/en/groups-component.json @@ -7,11 +7,12 @@ "location": "Location", "members": "Members", "contact": "Contact", + "DiscordInviteLink": "Discord invite link", + "WhatsAppInviteLink": "WhatsApp invite link", "DenmarkCopenhagen": "Denmark, Copenhagen", "DenmarkKolding": "Denmark, Kolding", "EstoniaKohtlaJarve": "Estonia, Kohtla-Järve", "GreeceAthens": "Greece, Athens", "LatviaRiga": "Latvia, Riga", - "DiscordInviteLink": "Discord invite link", - "WhatsAppInviteLink": "WhatsApp invite link" + "CanadaHalifax": "Canada, Halifax" } \ No newline at end of file diff --git a/Server/public/locales/ru/groups-component.json b/Server/public/locales/ru/groups-component.json index fdedcbf..debc525 100644 --- a/Server/public/locales/ru/groups-component.json +++ b/Server/public/locales/ru/groups-component.json @@ -7,11 +7,12 @@ "location": "Локация", "members": "Участники", "contact": "Контакт", + "DiscordInviteLink": "Discord ссылка", + "WhatsAppInviteLink": "WhatsApp ссылка", "DenmarkCopenhagen": "Дания, Копенгаген", "DenmarkKolding": "Дания, Колдинг", "EstoniaKohtlaJarve": "Эстония, Кохтла-Ярве", "GreeceAthens": "Греция, Афины", "LatviaRiga": "Латвия, Рига", - "DiscordInviteLink": "Discord ссылка", - "WhatsAppInviteLink": "WhatsApp ссылка" + "CanadaHalifax": "Канада, Галифакс" } \ No newline at end of file