{$content.communes}
- {$content.p1}
+{$content.p1}
{$content.subheading1}
{$content["map-prompt"]}
{#each Object.entries(communesByCountry) as [name,communes]}{$content[name]}
{#each communes as commune}
- n(0,e=t)));let a=x({});c(t,a,(t=>n(1,m=t))),y(a,"countries",r);let i=y(a,"communes-component",r);function l(t,o){let n=t([22,0],2);v(n,o)}s((()=>{}));return[e,m,r,a,i,l,t=>l(t,m),t=>m[t]]}class A extends t{constructor(t){super(),this.shadowRoot.innerHTML="",o(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},T,R,m,{},null),t&&t.target&&e(t.target,this,t.anchor)}}customElements.define("communes-component",A);export{A as default};
diff --git a/Server/public/js/components/cooperatives-component.js b/Server/public/js/components/cooperatives-component.js
index 4ffaaa3..a42dc49 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 r,n as a,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{addMarkersCoops as v,coopsByCountry 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[7]=e[o][0],n[8]=e[o][1],n}function z(t,e,o){const n=t.slice();return n[11]=e[o],n}function D(t){let e,o,i,r,a,c,m,x,v,j,z,D,E,O,R,T,_,A=t[1].cooperatives+"",C=t[1].p1+"",H=t[1].subheading1+"",L=Object.entries(k),M=[];for(let e=0;eo(0,n=t)));let a=x({});c(t,a,(t=>o(1,i=t))),j(a,"countries",r);let s=j(a,"cooperatives-component",r);function l(t,e){let o=t([22,0],2);v(o,e)}m((()=>{}));return[n,i,r,a,s,l,t=>l(t,i)]}class _ extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:o(this.attributes),customElement:!0},T,R,i,{},null),t&&t.target&&n(t.target,this,t.anchor)}}customElements.define("cooperatives-component",_);export{_ as default};
+import{S as t,i as e,a as o,b as n,s as i,e as r,n as a,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{addMarkersCoops as v,coopsByCountry as j}from"../../../../../../../../../js/coops.js";import{loadLocaleContent as k}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function y(t,e,o){const n=t.slice();return n[8]=e[o][0],n[9]=e[o][1],n}function z(t,e,o){const n=t.slice();return n[12]=e[o],n}function D(t){let e,o,i,r,a,c,m,x,v,k,z,D,E,O,R,T,_,A,C,H,L=t[1].cooperatives+"",M=t[1].p1+"",S=t[1].subheading1+"",q=t[1]["map-prompt"]+"",B=Object.entries(j),F=[];for(let e=0;eo(0,n=t)));let a=x({});c(t,a,(t=>o(1,i=t))),k(a,"countries",r);let s=k(a,"cooperatives-component",r);function l(t,e){let o=t([22,0],2);v(o,e)}m((()=>{}));return[n,i,r,a,s,l,t=>l(t,i),t=>i[t]]}class _ extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:o(this.attributes),customElement:!0},T,R,i,{},null),t&&t.target&&n(t.target,this,t.anchor)}}customElements.define("cooperatives-component",_);export{_ as default};
diff --git a/Server/public/js/components/groups-component.js b/Server/public/js/components/groups-component.js
index 8591966..4a4c60a 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 i,n as a,d as s,c,o as m,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{addMarkersGroups as v,groupsByCountry as w}from"../../../../../../../../../js/groups.js";import{loadLocaleContent as y}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function k(t,o,n){const e=t.slice();return e[6]=o[n][0],e[7]=o[n][1],e}function z(t,o,n){const e=t.slice();return e[10]=o[n],e}function D(t){let o,n,r,i,a,c,m,j,v,y,z,D,E,O,R,T,A,C=t[1].groups+"",H=t[1].p1+"",L=t[1].subheading1+"",M=Object.entries(w),S=[];for(let o=0;on(0,e=t)));let a=j({});function s(t,o){let n=t([22,0],2);v(n,o)}c(t,a,(t=>n(1,r=t))),y(a,"groups-component",i),y(a,"countries",i),m((()=>{}));return[e,r,i,a,s,t=>s(t,r)]}class A extends t{constructor(t){super(),this.shadowRoot.innerHTML="",o(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},T,R,r,{},null),t&&t.target&&e(t.target,this,t.anchor)}}customElements.define("groups-component",A);export{A 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 m,c as s,o as c,f as l,t as p,g,h as u,j as d,k as h,l as f,m as b,p as j}from"./index-4348483d.js";import{w as x}from"./index-71440b21.js";import{addMarkersGroups as v,groupsByCountry as w}from"../../../../../../../../../js/groups.js";import{loadLocaleContent as y}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function k(t,o,n){const e=t.slice();return e[7]=o[n][0],e[8]=o[n][1],e}function z(t,o,n){const e=t.slice();return e[11]=o[n],e}function D(t){let o,n,r,a,i,s,c,x,v,y,z,D,E,O,R,T,A,C,H,L,M=t[1].groups+"",S=t[1].p1+"",_=t[1].subheading1+"",q=t[1]["map-prompt"]+"",B=Object.entries(w),F=[];for(let o=0;on(0,e=t)));let i=x({});function m(t,o){let n=t([22,0],2);v(n,o)}s(t,i,(t=>n(1,r=t))),y(i,"groups-component",a),y(i,"countries",a),c((()=>{}));return[e,r,a,i,m,t=>m(t,r),t=>r[t]]}class A extends t{constructor(t){super(),this.shadowRoot.innerHTML="",o(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},T,R,r,{},null),t&&t.target&&e(t.target,this,t.anchor)}}customElements.define("groups-component",A);export{A as default};
diff --git a/Server/public/js/components/parties-component.js b/Server/public/js/components/parties-component.js
index f82e500..0d66c8c 100644
--- a/Server/public/js/components/parties-component.js
+++ b/Server/public/js/components/parties-component.js
@@ -1 +1 @@
-import{S as t,i as e,a as n,b as o,s as i,e as r,n as a,d as m,c as s,o as l,f as c,t as g,g as p,h as d,j as h,k as f,l as u,m as b,p as x}from"./index-4348483d.js";import{w as y}from"./index-71440b21.js";import{addMarkersParties as w,partiesByCountry as j}from"../../../../../../../../../js/parties.js";import{loadLocaleContent as v}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function k(t,e,n){const o=t.slice();return o[6]=e[n][0],o[7]=e[n][1],o}function z(t,e,n){const o=t.slice();return o[10]=e[n],o}function D(t){let e,n,i,r,a,s,l,y,w,v,z,D,E,O,R,T,A,C=t[1].parties+"",H=t[1].p1+"",L=t[1].subheading1+"",M=Object.entries(j),S=[];for(let e=0;en(0,o=t)));let a=y({});function m(t,e){let n=t([22,0],2);w(n,e)}s(t,a,(t=>n(1,i=t))),v(a,"countries",r),v(a,"parties-component",r),l((()=>{}));return[o,i,r,a,m,t=>m(t,i)]}class A extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},T,R,i,{},null),t&&t.target&&o(t.target,this,t.anchor)}}customElements.define("parties-component",A);export{A as default};
+import{S as t,i as e,a as n,b as o,s as i,e as r,n as a,d as m,c as s,o as l,f as c,t as p,g,h as d,j as h,k as f,l as u,m as b,p as x}from"./index-4348483d.js";import{w as y}from"./index-71440b21.js";import{addMarkersParties as w,partiesByCountry as j}from"../../../../../../../../../js/parties.js";import{loadLocaleContent as v}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function k(t,e,n){const o=t.slice();return o[6]=e[n][0],o[7]=e[n][1],o}function z(t,e,n){const o=t.slice();return o[10]=e[n],o}function D(t){let e,n,i,r,a,s,l,y,w,v,z,D,E,O,R,T,A,C,H,L,M=t[1].parties+"",S=t[1].p1+"",_=t[1].subheading1+"",q=t[1]["map-prompt"]+"",B=Object.entries(j),F=[];for(let e=0;en(0,o=t)));let a=y({});function m(t,e){let n=t([22,0],2);w(n,e)}s(t,a,(t=>n(1,i=t))),v(a,"countries",r),v(a,"parties-component",r),l((()=>{}));return[o,i,r,a,m,t=>m(t,i)]}class A extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},T,R,i,{},null),t&&t.target&&o(t.target,this,t.anchor)}}customElements.define("parties-component",A);export{A as default};
diff --git a/Server/public/js/coops.js b/Server/public/js/coops.js
index 1ece495..0933ca3 100644
--- a/Server/public/js/coops.js
+++ b/Server/public/js/coops.js
@@ -56,8 +56,8 @@ export function addMarkersCoops(map,content) {
}
else if (field=="location") {
let location = g[field][0]
- let town = location[1]=="" ? "" : ", " + content[location[1]]
- text += fieldText + content[location[0]] + town + "
" + let locationString = location.map(x => content[x]).join(", ") + text += fieldText + locationString + "
" coordinates = g[field][1] } else if (field=="market" || field=="status" || field=="description") { diff --git a/Server/public/js/groups.js b/Server/public/js/groups.js index b88b237..5b14ad6 100644 --- a/Server/public/js/groups.js +++ b/Server/public/js/groups.js @@ -30,7 +30,7 @@ export let groups = [ contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { - location: [["Ireland",""], [53.280192832733576, -7.688103518964818]], + location: [["Ireland"], [53.280192832733576, -7.688103518964818]], members: 6, contact: ["https://discord.gg/4BUau4AZre","DiscordInviteLink"] }, @@ -39,6 +39,11 @@ export let groups = [ members: 2, contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, + { + location: [["USA","Florida"], [26.945024427155868, -81.22162645059898]], + members: 2, + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] + } ] export let groupsByCountry = {} @@ -68,8 +73,8 @@ function addMarkersToLayer(g,layer,content) { } else if (field=="location") { let location = g[field][0] - let town = location[1]=="" ? "" : ", " + content[location[1]] - text += fieldText + content[location[0]] + town + "
" + let locationString = location.map(x => content[x]).join(", ") + text += fieldText + locationString + "
" coordinates = g[field][1] } else { @@ -99,7 +104,7 @@ export function addMarkersGroups(map,content) { addMarkersToLayer(g,groupsMarkersLayerOut,content) } else { - let locationName = [gs[0].location[0][0],""] + let locationName = [gs[0].location[0][0]] let locationCoordinates = [0,0] let members = 0 let contact = gs[0].contact diff --git a/Server/public/js/parties.js b/Server/public/js/parties.js index a4bb166..ff47c87 100644 --- a/Server/public/js/parties.js +++ b/Server/public/js/parties.js @@ -41,7 +41,8 @@ export function addMarkersParties(map,content) { text += fieldText + "" + g.website + "" + "
" } else if (field=="location") { - text += fieldText + content[g[field][0]] + "
" + let locationString = location.map(x => content[x]).join(", ") + text += fieldText + locationString + "
" coordinates = g[field][1] } else if (field=="description") { diff --git a/Server/public/js/partners.js b/Server/public/js/partners.js index 9e03324..05fd226 100644 --- a/Server/public/js/partners.js +++ b/Server/public/js/partners.js @@ -2,7 +2,7 @@ export let partners = [ { name: "Gaia's Fall", type: "typeGaiasFall", - location: [["Online",""],[0,0]], + location: [["Online"],[0,0]], link: "https://discord.libsoc.org/invite/", description: "descriptionGaiasFall", logo: "gaias_fall" diff --git a/Server/public/locales/en/countries.json b/Server/public/locales/en/countries.json index ed39046..8ef45c9 100644 --- a/Server/public/locales/en/countries.json +++ b/Server/public/locales/en/countries.json @@ -1,4 +1,5 @@ { + "map-prompt": "Want to appear on our map? Contact us!", "Online": "Online", "Denmark": "Denmark", "Estonia": "Estonia", @@ -8,11 +9,13 @@ "Germany": "Germany", "Copenhagen": "Copenhagen", "Ireland": "Ireland", + "USA": "USA", "Montreal": "Montreal", "Kolding": "Kolding", "KohtlaJarve": "Kohtla-Järve", "Athens": "Athens", "Riga": "Riga", "Halifax": "Halifax", - "Wiesbaden": "Wiesbaden" + "Wiesbaden": "Wiesbaden", + "Florida": "Florida" } \ No newline at end of file diff --git a/Server/public/locales/ru/countries.json b/Server/public/locales/ru/countries.json index ba0ef03..938a4be 100644 --- a/Server/public/locales/ru/countries.json +++ b/Server/public/locales/ru/countries.json @@ -1,4 +1,5 @@ { + "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!", "Online": "Онлайн", "Denmark": "Дания", "Estonia": "Эстония", @@ -7,6 +8,7 @@ "Canada": "Канада", "Ireland": "Ирландия", "Germany": "Германия", + "USA": "CША", "Copenhagen": "Копенгаген", "Kolding": "Колдинг", "KohtlaJarve": "Кохтла-Ярве", @@ -14,5 +16,6 @@ "Riga": "Рига", "Halifax": "Галифакс", "Montreal": "Монреаль", - "Wiesbaden": "Висбаден" + "Wiesbaden": "Висбаден", + "Florida": "Флорида" } \ No newline at end of file
{$content.location}: {$content[commune.location[0][0]] + (commune.location[0][1]=="" ? "" : ", " + $content[commune.location[0][1]])}
+{$content.location}: {commune.location[0].map(x => $content[x]).join(", ")}
{$content.status}: {$content[commune.status]}
{$content.members}: {commune.members}
{$content.contact}: {$content[commune.contact[1]]}
@@ -58,6 +59,14 @@ ",o(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},T,R,m,{},null),t&&t.target&&e(t.target,this,t.anchor)}}customElements.define("communes-component",A);export{A as default}; +import{S as t,i as o,a as n,b as e,s as m,e as r,n as a,d as i,c,o as s,f as l,t as p,g as u,h as g,j as d,k as h,l as f,m as b,p as j}from"./index-4348483d.js";import{w as x}from"./index-71440b21.js";import{addMarkersCommunes as v,communesByCountry as w}from"../../../../../../../../../js/communes.js";import{loadLocaleContent as y}from"../../../../../../../../../js/libraries/serverTools.js";import"../../../../../../../../../js/components/map-component.js";function k(t,o,n){const e=t.slice();return e[8]=o[n][0],e[9]=o[n][1],e}function z(t,o,n){const e=t.slice();return e[12]=o[n],e}function D(t){let o,n,m,r,a,c,s,x,v,y,z,D,E,O,R,T,A,C,H,L,M=t[1].communes+"",S=t[1].p1+"",_=t[1].subheading1+"",q=t[1]["map-prompt"]+"",B=Object.entries(w),F=[];for(let o=0;o" + let locationString = location.map(x => content[x]).join(", ") + text += fieldText + locationString + "
" coordinates = g[field][1] } else if (field=="market" || field=="status" || field=="description") { diff --git a/Server/public/js/groups.js b/Server/public/js/groups.js index b88b237..5b14ad6 100644 --- a/Server/public/js/groups.js +++ b/Server/public/js/groups.js @@ -30,7 +30,7 @@ export let groups = [ contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { - location: [["Ireland",""], [53.280192832733576, -7.688103518964818]], + location: [["Ireland"], [53.280192832733576, -7.688103518964818]], members: 6, contact: ["https://discord.gg/4BUau4AZre","DiscordInviteLink"] }, @@ -39,6 +39,11 @@ export let groups = [ members: 2, contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, + { + location: [["USA","Florida"], [26.945024427155868, -81.22162645059898]], + members: 2, + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] + } ] export let groupsByCountry = {} @@ -68,8 +73,8 @@ function addMarkersToLayer(g,layer,content) { } else if (field=="location") { let location = g[field][0] - let town = location[1]=="" ? "" : ", " + content[location[1]] - text += fieldText + content[location[0]] + town + "
" + let locationString = location.map(x => content[x]).join(", ") + text += fieldText + locationString + "
" coordinates = g[field][1] } else { @@ -99,7 +104,7 @@ export function addMarkersGroups(map,content) { addMarkersToLayer(g,groupsMarkersLayerOut,content) } else { - let locationName = [gs[0].location[0][0],""] + let locationName = [gs[0].location[0][0]] let locationCoordinates = [0,0] let members = 0 let contact = gs[0].contact diff --git a/Server/public/js/parties.js b/Server/public/js/parties.js index a4bb166..ff47c87 100644 --- a/Server/public/js/parties.js +++ b/Server/public/js/parties.js @@ -41,7 +41,8 @@ export function addMarkersParties(map,content) { text += fieldText + "" + g.website + "" + "
" } else if (field=="location") { - text += fieldText + content[g[field][0]] + "
" + let locationString = location.map(x => content[x]).join(", ") + text += fieldText + locationString + "
" coordinates = g[field][1] } else if (field=="description") { diff --git a/Server/public/js/partners.js b/Server/public/js/partners.js index 9e03324..05fd226 100644 --- a/Server/public/js/partners.js +++ b/Server/public/js/partners.js @@ -2,7 +2,7 @@ export let partners = [ { name: "Gaia's Fall", type: "typeGaiasFall", - location: [["Online",""],[0,0]], + location: [["Online"],[0,0]], link: "https://discord.libsoc.org/invite/", description: "descriptionGaiasFall", logo: "gaias_fall" diff --git a/Server/public/locales/en/countries.json b/Server/public/locales/en/countries.json index ed39046..8ef45c9 100644 --- a/Server/public/locales/en/countries.json +++ b/Server/public/locales/en/countries.json @@ -1,4 +1,5 @@ { + "map-prompt": "Want to appear on our map? Contact us!", "Online": "Online", "Denmark": "Denmark", "Estonia": "Estonia", @@ -8,11 +9,13 @@ "Germany": "Germany", "Copenhagen": "Copenhagen", "Ireland": "Ireland", + "USA": "USA", "Montreal": "Montreal", "Kolding": "Kolding", "KohtlaJarve": "Kohtla-Järve", "Athens": "Athens", "Riga": "Riga", "Halifax": "Halifax", - "Wiesbaden": "Wiesbaden" + "Wiesbaden": "Wiesbaden", + "Florida": "Florida" } \ No newline at end of file diff --git a/Server/public/locales/ru/countries.json b/Server/public/locales/ru/countries.json index ba0ef03..938a4be 100644 --- a/Server/public/locales/ru/countries.json +++ b/Server/public/locales/ru/countries.json @@ -1,4 +1,5 @@ { + "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!", "Online": "Онлайн", "Denmark": "Дания", "Estonia": "Эстония", @@ -7,6 +8,7 @@ "Canada": "Канада", "Ireland": "Ирландия", "Germany": "Германия", + "USA": "CША", "Copenhagen": "Копенгаген", "Kolding": "Колдинг", "KohtlaJarve": "Кохтла-Ярве", @@ -14,5 +16,6 @@ "Riga": "Рига", "Halifax": "Галифакс", "Montreal": "Монреаль", - "Wiesbaden": "Висбаден" + "Wiesbaden": "Висбаден", + "Florida": "Флорида" } \ No newline at end of file