From bd8a82375090f663eff3d5be49e88dafd02b58b9 Mon Sep 17 00:00:00 2001 From: a-ill Date: Sat, 15 Jul 2023 14:29:26 +0300 Subject: [PATCH] Update --- Server/app/svelte/public/js/communes.js | 6 +++--- Server/app/svelte/public/js/coops.js | 4 ++-- Server/app/svelte/public/js/groups.js | 12 ++++++------ .../svelte/public/locales/en/partners-component.json | 4 ++-- .../svelte/public/locales/ru/partners-component.json | 4 ++-- Server/app/svelte/src/footer/footer-component.svelte | 2 +- Server/public/js/communes.js | 6 +++--- Server/public/js/components/footer-component.js | 2 +- Server/public/js/coops.js | 4 ++-- Server/public/js/groups.js | 12 ++++++------ Server/public/locales/en/partners-component.json | 4 ++-- Server/public/locales/ru/partners-component.json | 4 ++-- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Server/app/svelte/public/js/communes.js b/Server/app/svelte/public/js/communes.js index 9aaf4e2..0ccc7bd 100644 --- a/Server/app/svelte/public/js/communes.js +++ b/Server/app/svelte/public/js/communes.js @@ -4,19 +4,19 @@ export let communes = [ location: [["Canada","Montreal"],[45.55541047232767, -73.42859611607271]], status: "forming", members: 2, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Estonia","KohtlaJarve"],[59.409521829709504, 27.288415912535914]], status: "forming", members: 2, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Latvia",""],[56.934159375258055, 25.269099001330265]], status: "forming", members: 1, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] } ] diff --git a/Server/app/svelte/public/js/coops.js b/Server/app/svelte/public/js/coops.js index 5576119..ab76235 100644 --- a/Server/app/svelte/public/js/coops.js +++ b/Server/app/svelte/public/js/coops.js @@ -7,7 +7,7 @@ export let coops = [ workers: 2, status: "inDevelopment", website: "chrn.health", - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"], + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"], description: "descriptionChironHealth" }, { @@ -18,7 +18,7 @@ export let coops = [ workers: 1, status: "inDevelopment", website: "-", - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"], + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"], description: "kuuskDescription" } ] diff --git a/Server/app/svelte/public/js/groups.js b/Server/app/svelte/public/js/groups.js index 665c3fe..e489e91 100644 --- a/Server/app/svelte/public/js/groups.js +++ b/Server/app/svelte/public/js/groups.js @@ -2,27 +2,27 @@ export let groups = [ { location: [["Canada","Halifax"],[44.65166135030067, -63.59289968306866]], members: 2, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Denmark","Copenhagen"],[55.6840661150132, 12.557133959514688]], members: 1, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Denmark","Kolding"], [55.49261908652738, 9.470268969851743]], members: 1, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Estonia","KohtlaJarve"], [59.40629447076191, 27.280605339416322]], members: 3, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Greece","Athens"], [37.94877252621736, 23.677622972996158]], members: 1, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Ireland",""], [53.280192832733576, -7.688103518964818]], @@ -32,7 +32,7 @@ export let groups = [ { location: [["Latvia","Riga"], [56.94748425529816, 24.003027136431925]], members: 2, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, ] diff --git a/Server/app/svelte/public/locales/en/partners-component.json b/Server/app/svelte/public/locales/en/partners-component.json index ee81699..f677ace 100644 --- a/Server/app/svelte/public/locales/en/partners-component.json +++ b/Server/app/svelte/public/locales/en/partners-component.json @@ -8,7 +8,7 @@ "type": "Type", "link": "Link", "description": "Description", - "typeGaiasFall": "a place to discuss and organize", - "descriptionGaiasFall": "Gaia's Fall is a server that promotes Solarpunk ideals, environmentalism, anarchism, and anti-capitalism. We encourage civil debates, discussions of theories and possibilities, and the creation of communities focused on shaping a better world. It is our official Discord server where we organize and work together." + "typeGaiasFall": "a place for discussions", + "descriptionGaiasFall": "Gaia's Fall is a server that promotes Solarpunk ideals, environmentalism, anarchism, and anti-capitalism. We encourage civil debates, discussions of theories and possibilities, and the creation of communities focused on shaping a better world." } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/ru/partners-component.json b/Server/app/svelte/public/locales/ru/partners-component.json index 8974ffc..3ebd453 100644 --- a/Server/app/svelte/public/locales/ru/partners-component.json +++ b/Server/app/svelte/public/locales/ru/partners-component.json @@ -8,6 +8,6 @@ "type": "Тип", "link": "Ссылка", "description": "Описание", - "typeGaiasFall": "место для общения и организации", - "descriptionGaiasFall": "Gaia's Fall — это сервер, который продвигает идеалы соларпанка, защиту окружающей среды, анархизм и антикапитализм. Мы поощряем гражданские дебаты, обсуждение теорий и возможностей, а также создание сообществ, сосредоточенных на формировании лучшего мира. Это наш официальный сервер Discord, на котором мы организуемся и работаем вместе." + "typeGaiasFall": "место для общения", + "descriptionGaiasFall": "Gaia's Fall — это сервер, который продвигает идеалы соларпанка, защиту окружающей среды, анархизм и антикапитализм. Мы поощряем гражданские дебаты, обсуждение теорий и возможностей, а также создание сообществ, сосредоточенных на формировании лучшего мира." } \ No newline at end of file diff --git a/Server/app/svelte/src/footer/footer-component.svelte b/Server/app/svelte/src/footer/footer-component.svelte index f84728f..1509015 100644 --- a/Server/app/svelte/src/footer/footer-component.svelte +++ b/Server/app/svelte/src/footer/footer-component.svelte @@ -25,7 +25,7 @@

{$content.contactUs}

-

Discord: {$content.inviteLink}

+

Discord: {$content.inviteLink}

WhatsApp: {$content.inviteLink}

diff --git a/Server/public/js/communes.js b/Server/public/js/communes.js index 9aaf4e2..0ccc7bd 100644 --- a/Server/public/js/communes.js +++ b/Server/public/js/communes.js @@ -4,19 +4,19 @@ export let communes = [ location: [["Canada","Montreal"],[45.55541047232767, -73.42859611607271]], status: "forming", members: 2, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Estonia","KohtlaJarve"],[59.409521829709504, 27.288415912535914]], status: "forming", members: 2, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Latvia",""],[56.934159375258055, 25.269099001330265]], status: "forming", members: 1, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] } ] diff --git a/Server/public/js/components/footer-component.js b/Server/public/js/components/footer-component.js index 7cfa93e..008f55c 100644 --- a/Server/public/js/components/footer-component.js +++ b/Server/public/js/components/footer-component.js @@ -1 +1 @@ -import{S as t,i as e,a as o,b as r,s as a,e as i,n,d as s,c as m,f as c,t as f,g as d,h as l,v as g,l as h,q as p,m as u}from"./index-4348483d.js";import{w as b}from"./index-71440b21.js";import{loadLocaleContent as w}from"../../../../../../../../../js/libraries/serverTools.js";function v(t){let e,o,a,i,n,m,b,w,v,y,x,k,L,j,_,z,B,C,T,U,A,H,M=t[1].contactUs+"",R=t[1].inviteLink+"",D=t[1].inviteLink+"";return{c(){e=c("footer"),o=c("div"),a=c("div"),i=c("div"),n=c("h2"),m=f(M),b=d(),w=c("p"),v=f("Discord: "),y=c("a"),x=f(R),k=d(),L=c("p"),j=f("WhatsApp: "),_=c("a"),z=f(D),B=d(),C=c("button"),C.innerHTML='',T=d(),U=c("p"),U.innerHTML='Licensed under a Creative Commons CC BY 4.0 license',l(y,"href","https://discord.gg/xAPZmyr8B6"),l(y,"target","_blank"),l(y,"rel","noreferrer"),g(y,"margin-left","1.8rem"),l(_,"href","https://chat.whatsapp.com/BhnmUNljUxJ2AjeHUwyTKh"),l(_,"target","_blank"),l(_,"rel","noreferrer"),g(_,"margin-left","0.5rem"),l(i,"id","contact-us-container"),l(a,"id","footer-grid-content-container"),l(a,"class","logged"),l(C,"id","footer-up"),l(C,"aria-label","go up"),l(U,"id","footer-copyright"),l(o,"id","footer-content-container")},m(s,c){r(s,e,c),h(e,o),h(o,a),h(a,i),h(i,n),h(n,m),h(i,b),h(i,w),h(w,v),h(w,y),h(y,x),h(i,k),h(i,L),h(L,j),h(L,_),h(_,z),h(o,B),h(o,C),h(o,T),h(o,U),A||(H=p(C,"click",t[4]),A=!0)},p(t,e){2&e&&M!==(M=t[1].contactUs+"")&&u(m,M),2&e&&R!==(R=t[1].inviteLink+"")&&u(x,R),2&e&&D!==(D=t[1].inviteLink+"")&&u(z,D)},d(t){t&&s(e),A=!1,H()}}}function y(t){let e,o=2==t[0]&&v(t);return{c(){o&&o.c(),e=i()},m(t,a){o&&o.m(t,a),r(t,e,a)},p(t,r){2==t[0]?o?o.p(t,r):(o=v(t),o.c(),o.m(e.parentNode,e)):o&&(o.d(1),o=null)},d(t){o&&o.d(t),t&&s(e)}}}function x(t){let e,o=t[0],m=y(t);return{c(){m.c(),e=i(),this.c=n},m(t,o){m.m(t,o),r(t,e,o)},p(t,[r]){1&r&&a(o,o=t[0])?(m.d(1),m=y(t),m.c(),m.m(e.parentNode,e)):m.p(t,r)},i:n,o:n,d(t){t&&s(e),m.d(t)}}}function k(t,e,o){let r,a,i=b(0);m(t,i,(t=>o(0,r=t)));let n=b({});m(t,n,(t=>o(1,a=t))),w(n,"countries",i),w(n,"footer-component",i);return[r,a,i,n,()=>{location.href="#"}]}class L extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:o(this.attributes),customElement:!0},k,x,a,{},null),t&&t.target&&r(t.target,this,t.anchor)}}customElements.define("footer-component",L);export{L as default}; +import{S as t,i as e,a as o,b as r,s as a,e as i,n,d as s,c as m,f as c,t as f,g as d,h as l,v as g,l as h,q as p,m as u}from"./index-4348483d.js";import{w as b}from"./index-71440b21.js";import{loadLocaleContent as w}from"../../../../../../../../../js/libraries/serverTools.js";function v(t){let e,o,a,i,n,m,b,w,v,k,y,x,L,j,z,U,_,C,T,B,H,M,R=t[1].contactUs+"",A=t[1].inviteLink+"",D=t[1].inviteLink+"";return{c(){e=c("footer"),o=c("div"),a=c("div"),i=c("div"),n=c("h2"),m=f(R),b=d(),w=c("p"),v=f("Discord: "),k=c("a"),y=f(A),x=d(),L=c("p"),j=f("WhatsApp: "),z=c("a"),U=f(D),_=d(),C=c("button"),C.innerHTML='',T=d(),B=c("p"),B.innerHTML='Licensed under a Creative Commons CC BY 4.0 license',l(k,"href","https://discord.gg/Qk8KUk787z"),l(k,"target","_blank"),l(k,"rel","noreferrer"),g(k,"margin-left","1.8rem"),l(z,"href","https://chat.whatsapp.com/BhnmUNljUxJ2AjeHUwyTKh"),l(z,"target","_blank"),l(z,"rel","noreferrer"),g(z,"margin-left","0.5rem"),l(i,"id","contact-us-container"),l(a,"id","footer-grid-content-container"),l(a,"class","logged"),l(C,"id","footer-up"),l(C,"aria-label","go up"),l(B,"id","footer-copyright"),l(o,"id","footer-content-container")},m(s,c){r(s,e,c),h(e,o),h(o,a),h(a,i),h(i,n),h(n,m),h(i,b),h(i,w),h(w,v),h(w,k),h(k,y),h(i,x),h(i,L),h(L,j),h(L,z),h(z,U),h(o,_),h(o,C),h(o,T),h(o,B),H||(M=p(C,"click",t[4]),H=!0)},p(t,e){2&e&&R!==(R=t[1].contactUs+"")&&u(m,R),2&e&&A!==(A=t[1].inviteLink+"")&&u(y,A),2&e&&D!==(D=t[1].inviteLink+"")&&u(U,D)},d(t){t&&s(e),H=!1,M()}}}function k(t){let e,o=2==t[0]&&v(t);return{c(){o&&o.c(),e=i()},m(t,a){o&&o.m(t,a),r(t,e,a)},p(t,r){2==t[0]?o?o.p(t,r):(o=v(t),o.c(),o.m(e.parentNode,e)):o&&(o.d(1),o=null)},d(t){o&&o.d(t),t&&s(e)}}}function y(t){let e,o=t[0],m=k(t);return{c(){m.c(),e=i(),this.c=n},m(t,o){m.m(t,o),r(t,e,o)},p(t,[r]){1&r&&a(o,o=t[0])?(m.d(1),m=k(t),m.c(),m.m(e.parentNode,e)):m.p(t,r)},i:n,o:n,d(t){t&&s(e),m.d(t)}}}function x(t,e,o){let r,a,i=b(0);m(t,i,(t=>o(0,r=t)));let n=b({});m(t,n,(t=>o(1,a=t))),w(n,"countries",i),w(n,"footer-component",i);return[r,a,i,n,()=>{location.href="#"}]}class L extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:o(this.attributes),customElement:!0},x,y,a,{},null),t&&t.target&&r(t.target,this,t.anchor)}}customElements.define("footer-component",L);export{L as default}; diff --git a/Server/public/js/coops.js b/Server/public/js/coops.js index 5576119..ab76235 100644 --- a/Server/public/js/coops.js +++ b/Server/public/js/coops.js @@ -7,7 +7,7 @@ export let coops = [ workers: 2, status: "inDevelopment", website: "chrn.health", - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"], + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"], description: "descriptionChironHealth" }, { @@ -18,7 +18,7 @@ export let coops = [ workers: 1, status: "inDevelopment", website: "-", - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"], + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"], description: "kuuskDescription" } ] diff --git a/Server/public/js/groups.js b/Server/public/js/groups.js index 665c3fe..e489e91 100644 --- a/Server/public/js/groups.js +++ b/Server/public/js/groups.js @@ -2,27 +2,27 @@ export let groups = [ { location: [["Canada","Halifax"],[44.65166135030067, -63.59289968306866]], members: 2, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Denmark","Copenhagen"],[55.6840661150132, 12.557133959514688]], members: 1, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Denmark","Kolding"], [55.49261908652738, 9.470268969851743]], members: 1, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Estonia","KohtlaJarve"], [59.40629447076191, 27.280605339416322]], members: 3, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Greece","Athens"], [37.94877252621736, 23.677622972996158]], members: 1, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, { location: [["Ireland",""], [53.280192832733576, -7.688103518964818]], @@ -32,7 +32,7 @@ export let groups = [ { location: [["Latvia","Riga"], [56.94748425529816, 24.003027136431925]], members: 2, - contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"] + contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"] }, ] diff --git a/Server/public/locales/en/partners-component.json b/Server/public/locales/en/partners-component.json index ee81699..f677ace 100644 --- a/Server/public/locales/en/partners-component.json +++ b/Server/public/locales/en/partners-component.json @@ -8,7 +8,7 @@ "type": "Type", "link": "Link", "description": "Description", - "typeGaiasFall": "a place to discuss and organize", - "descriptionGaiasFall": "Gaia's Fall is a server that promotes Solarpunk ideals, environmentalism, anarchism, and anti-capitalism. We encourage civil debates, discussions of theories and possibilities, and the creation of communities focused on shaping a better world. It is our official Discord server where we organize and work together." + "typeGaiasFall": "a place for discussions", + "descriptionGaiasFall": "Gaia's Fall is a server that promotes Solarpunk ideals, environmentalism, anarchism, and anti-capitalism. We encourage civil debates, discussions of theories and possibilities, and the creation of communities focused on shaping a better world." } \ No newline at end of file diff --git a/Server/public/locales/ru/partners-component.json b/Server/public/locales/ru/partners-component.json index 8974ffc..3ebd453 100644 --- a/Server/public/locales/ru/partners-component.json +++ b/Server/public/locales/ru/partners-component.json @@ -8,6 +8,6 @@ "type": "Тип", "link": "Ссылка", "description": "Описание", - "typeGaiasFall": "место для общения и организации", - "descriptionGaiasFall": "Gaia's Fall — это сервер, который продвигает идеалы соларпанка, защиту окружающей среды, анархизм и антикапитализм. Мы поощряем гражданские дебаты, обсуждение теорий и возможностей, а также создание сообществ, сосредоточенных на формировании лучшего мира. Это наш официальный сервер Discord, на котором мы организуемся и работаем вместе." + "typeGaiasFall": "место для общения", + "descriptionGaiasFall": "Gaia's Fall — это сервер, который продвигает идеалы соларпанка, защиту окружающей среды, анархизм и антикапитализм. Мы поощряем гражданские дебаты, обсуждение теорий и возможностей, а также создание сообществ, сосредоточенных на формировании лучшего мира." } \ No newline at end of file