From cedcc6ee0ad1f43eb055220d9fbfee5245f4b144 Mon Sep 17 00:00:00 2001 From: a-ill Date: Mon, 7 Aug 2023 12:00:15 +0300 Subject: [PATCH] Added prompt under "join us" map --- Server/app/svelte/public/locales/en/join-us-component.json | 3 ++- Server/app/svelte/src/join-us-component.svelte | 7 ++++++- Server/public/js/components/join-us-component.js | 2 +- Server/public/locales/en/join-us-component.json | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Server/app/svelte/public/locales/en/join-us-component.json b/Server/app/svelte/public/locales/en/join-us-component.json index 6f84f8b..e290c57 100644 --- a/Server/app/svelte/public/locales/en/join-us-component.json +++ b/Server/app/svelte/public/locales/en/join-us-component.json @@ -30,5 +30,6 @@ "market": "Market", "workers": "Workers", "description": "Description", - "website": "Website" + "website": "Website", + "map-prompt": "Want to appear on our map? Sign up and go to your profile!" } \ No newline at end of file diff --git a/Server/app/svelte/src/join-us-component.svelte b/Server/app/svelte/src/join-us-component.svelte index 678d108..2788e66 100644 --- a/Server/app/svelte/src/join-us-component.svelte +++ b/Server/app/svelte/src/join-us-component.svelte @@ -105,6 +105,7 @@

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

mapCallback(createMap,$content,locale)} colors={["#23AC20","#CA2437","#217BC9","#FFD326"]}> +

{$content["map-prompt"]}

{/if} @@ -114,6 +115,10 @@ ",t(this,{target:this.shadowRoot,props:i(this.attributes),customElement:!0},z,S,r,{},null),o&&o.target&&e(o.target,this,o.anchor)}}customElements.define("join-us-component",C);export{C as default}; +import{S as o,i as t,a as i,b as e,s as r,e as n,n as s,d as a,c as m,o as l,h as p,t as c,j as u,w as g,k as d,x as h,l as f,y as b}from"./index-0d9f0c09.js";import{w as v}from"./index-1c123138.js";import{loadLocaleContent as k,getData as j}from"../../../../../../../../../js/libraries/serverTools.js";import{addMarkersEntries as w}from"../../../../../../../../../js/libraries/mapTools.js";import{addGroupPinContent as y,addCommunePinContent as x,addCoopPinContent as P,addPartyPinContent as T}from"../../../../../../../../../js/mapFuncs.js";import"../../../../../../../../../js/components/map-component.js";function A(o){let t,i,r,n,s,m,l,v,k,j,w,y,x,P,T,A,N,S,z,C,D,O,U,H,L,F,G,K,M,B,E,J,Q,R,W,Y,_,q,I,V,X,Z,$,oo,to,io,eo,ro,no,so,ao,mo,lo,po,co,uo,go,ho,fo,bo,vo,ko,jo,wo,yo,xo,Po,To,Ao,No,So,zo,Co,Do,Oo,Uo,Ho,Lo,Fo,Go,Ko,Mo,Bo,Eo,Jo,Qo,Ro=o[1].heading+"",Wo=o[1].condition1+"",Yo=o[1].condition2+"",_o=o[1].condition3+"",qo=o[1].conditionsOutcome+"",Io=o[1].subheading1+"",Vo=o[1].valueProposition1+"",Xo=o[1].valueProposition2+"",Zo=o[1].valueProposition3+"",$o=o[1].valueProposition4+"",ot=o[1].valueProposition5+"",tt=o[1].subheading2+"",it=o[1].findOur+"",et=o[1].group+"",rt=o[1].commune+"",nt=o[1].cooperative+"",st=o[1].or+"",at=o[1].party+"",mt=o[1].nearYou+"",lt=o[1].noneNear+"",pt=o[1].WhatsAppGroup+"",ct=o[1].or+"",ut=o[1].DiscordServer+"",gt=o[1].helpStart+"",dt=o[1]["map-prompt"]+"";return{c(){t=p("div"),i=p("div"),r=p("h1"),n=c(Ro),s=u(),m=p("img"),v=u(),k=p("ol"),j=p("li"),w=c(Wo),y=u(),x=p("li"),P=c(Yo),T=u(),A=p("li"),N=c(_o),S=u(),z=p("p"),C=u(),D=p("h2"),O=c(Io),U=u(),H=p("ol"),L=p("li"),F=c(Vo),G=u(),K=p("li"),M=c(Xo),B=u(),E=p("li"),J=c(Zo),Q=u(),R=p("li"),W=c($o),Y=u(),_=p("p"),q=c(ot),I=u(),V=p("h2"),X=c(tt),Z=u(),$=p("div"),oo=p("p"),to=c(it),io=u(),eo=p("ol"),ro=p("li"),no=p("a"),so=c(et),ao=c(","),mo=u(),lo=p("li"),po=p("a"),co=c(rt),uo=u(),go=p("li"),ho=p("a"),fo=c(nt),bo=u(),vo=c(st),ko=u(),jo=p("li"),wo=p("a"),yo=c(at),xo=u(),Po=p("p"),To=c(mt),Ao=u(),No=p("p"),So=c(lt),zo=u(),Co=p("a"),Do=c(pt),Oo=u(),Uo=c(ct),Ho=u(),Lo=p("a"),Fo=c(ut),Go=c(gt),Ko=u(),Mo=p("map-component"),Eo=u(),Jo=p("p"),Qo=c(dt),g(m.src,l="/img/common/join-group.svg")||d(m,"src","/img/common/join-group.svg"),d(m,"id","join-group"),d(m,"alt","join group"),d(k,"id","condition-list"),d(H,"id","value-proposition-list"),d(no,"href","/"+o[4]+"/groups"),d(po,"href","/"+o[4]+"/communes"),d(ho,"href","/"+o[4]+"/cooperatives"),d(wo,"href","/"+o[4]+"/parties"),d(eo,"id","entities-list"),d($,"id","call-to-action-list"),d(Co,"href","https://chat.whatsapp.com/BhnmUNljUxJ2AjeHUwyTKh"),d(Co,"target","_blank"),d(Co,"rel","noreferrer"),d(Lo,"href","https://discord.gg/Qk8KUk787z"),d(Lo,"target","_blank"),d(Lo,"rel","noreferrer"),h(Mo,"id","map"),h(Mo,"callback",Bo=o[6]),h(Mo,"colors",["#23AC20","#CA2437","#217BC9","#FFD326"]),d(Jo,"id","add-prompt"),d(i,"id","text-container"),d(t,"id","container")},m(o,a){e(o,t,a),f(t,i),f(i,r),f(r,n),f(i,s),f(i,m),f(i,v),f(i,k),f(k,j),f(j,w),f(k,y),f(k,x),f(x,P),f(k,T),f(k,A),f(A,N),f(k,S),f(k,z),z.innerHTML=qo,f(i,C),f(i,D),f(D,O),f(i,U),f(i,H),f(H,L),f(L,F),f(H,G),f(H,K),f(K,M),f(H,B),f(H,E),f(E,J),f(H,Q),f(H,R),f(R,W),f(H,Y),f(H,_),f(_,q),f(i,I),f(i,V),f(V,X),f(i,Z),f(i,$),f($,oo),f(oo,to),f($,io),f($,eo),f(eo,ro),f(ro,no),f(no,so),f(ro,ao),f(eo,mo),f(eo,lo),f(lo,po),f(po,co),f(eo,uo),f(eo,go),f(go,ho),f(ho,fo),f(go,bo),f(go,vo),f(eo,ko),f(eo,jo),f(jo,wo),f(wo,yo),f($,xo),f($,Po),f(Po,To),f(i,Ao),f(i,No),f(No,So),f(No,zo),f(No,Co),f(Co,Do),f(No,Oo),f(No,Uo),f(No,Ho),f(No,Lo),f(Lo,Fo),f(No,Go),f(i,Ko),f(i,Mo),f(i,Eo),f(i,Jo),f(Jo,Qo)},p(o,t){2&t&&Ro!==(Ro=o[1].heading+"")&&b(n,Ro),2&t&&Wo!==(Wo=o[1].condition1+"")&&b(w,Wo),2&t&&Yo!==(Yo=o[1].condition2+"")&&b(P,Yo),2&t&&_o!==(_o=o[1].condition3+"")&&b(N,_o),2&t&&qo!==(qo=o[1].conditionsOutcome+"")&&(z.innerHTML=qo),2&t&&Io!==(Io=o[1].subheading1+"")&&b(O,Io),2&t&&Vo!==(Vo=o[1].valueProposition1+"")&&b(F,Vo),2&t&&Xo!==(Xo=o[1].valueProposition2+"")&&b(M,Xo),2&t&&Zo!==(Zo=o[1].valueProposition3+"")&&b(J,Zo),2&t&&$o!==($o=o[1].valueProposition4+"")&&b(W,$o),2&t&&ot!==(ot=o[1].valueProposition5+"")&&b(q,ot),2&t&&tt!==(tt=o[1].subheading2+"")&&b(X,tt),2&t&&it!==(it=o[1].findOur+"")&&b(to,it),2&t&&et!==(et=o[1].group+"")&&b(so,et),2&t&&rt!==(rt=o[1].commune+"")&&b(co,rt),2&t&&nt!==(nt=o[1].cooperative+"")&&b(fo,nt),2&t&&st!==(st=o[1].or+"")&&b(vo,st),2&t&&at!==(at=o[1].party+"")&&b(yo,at),2&t&&mt!==(mt=o[1].nearYou+"")&&b(To,mt),2&t&<!==(lt=o[1].noneNear+"")&&b(So,lt),2&t&&pt!==(pt=o[1].WhatsAppGroup+"")&&b(Do,pt),2&t&&ct!==(ct=o[1].or+"")&&b(Uo,ct),2&t&&ut!==(ut=o[1].DiscordServer+"")&&b(Fo,ut),2&t&>!==(gt=o[1].helpStart+"")&&b(Go,gt),2&t&&Bo!==(Bo=o[6])&&h(Mo,"callback",Bo),2&t&&dt!==(dt=o[1]["map-prompt"]+"")&&b(Qo,dt)},d(o){o&&a(t)}}}function N(o){let t,i=10==o[0]&&A(o);return{c(){i&&i.c(),t=n()},m(o,r){i&&i.m(o,r),e(o,t,r)},p(o,e){10==o[0]?i?i.p(o,e):(i=A(o),i.c(),i.m(t.parentNode,t)):i&&(i.d(1),i=null)},d(o){i&&i.d(o),o&&a(t)}}}function S(o){let t,i=o[0],m=N(o);return{c(){m.c(),t=n(),this.c=s},m(o,i){m.m(o,i),e(o,t,i)},p(o,[e]){1&e&&r(i,i=o[0])?(m.d(1),m=N(o),m.c(),m.m(t.parentNode,t)):m.p(o,e)},i:s,o:s,d(o){o&&a(t),m.d(o)}}}function z(o,t,i){let e,r,n=v(0);m(o,n,(o=>i(0,e=o)));let s=v({});m(o,s,(o=>i(1,r=o)));let a={},p={};k(s,"groups-component",n),k(s,"communes-component",n),k(s,"cooperatives-component",n),k(s,"parties-component",n),k(s,"countries",n);let c=k(s,"join-us-component",n),u=(o,t)=>{a[t]=JSON.parse(o),p[t]={};for(let o of a[t]){let i=o.country;null==o.contact&&(o.contact="https://discord.gg/Qk8KUk787z"),i in p[t]?p[t][i].push(o):p[t][i]=[o]}n.update((o=>o+1))};function g(o,t,i){let e=o([22,0],2),r={enableCountryGrouping:!0},n=w(a.groups,p.groups,e,t,i,y,"green",r),s=w(a.communes,p.communes,e,t,i,x,"red",r),m=w(a.cooperatives,p.cooperatives,e,t,i,P,"blue",r),l=w(a.parties,p.parties,e,t,i,T,"gold",r),c={};c[t.groups]=n,c[t.communes]=s,c[t.cooperatives]=m,c[t.parties]=l,L.control.layers(null,c).addTo(e)}j("/assets/groups.json",(o=>u(o,"groups"))),j("/assets/communes.json",(o=>u(o,"communes"))),j("/assets/cooperatives.json",(o=>u(o,"cooperatives"))),j("/assets/parties.json",(o=>u(o,"parties"))),l((()=>{}));return[e,r,n,s,c,g,o=>g(o,r,c)]}class C extends o{constructor(o){super(),this.shadowRoot.innerHTML="",t(this,{target:this.shadowRoot,props:i(this.attributes),customElement:!0},z,S,r,{},null),o&&o.target&&e(o.target,this,o.anchor)}}customElements.define("join-us-component",C);export{C as default}; diff --git a/Server/public/locales/en/join-us-component.json b/Server/public/locales/en/join-us-component.json index 6f84f8b..e290c57 100644 --- a/Server/public/locales/en/join-us-component.json +++ b/Server/public/locales/en/join-us-component.json @@ -30,5 +30,6 @@ "market": "Market", "workers": "Workers", "description": "Description", - "website": "Website" + "website": "Website", + "map-prompt": "Want to appear on our map? Sign up and go to your profile!" } \ No newline at end of file