diff --git a/Server/app/svelte/src/navbar/navbar-logged.svelte b/Server/app/svelte/src/navbar/navbar-logged.svelte index c6bd220..637c729 100644 --- a/Server/app/svelte/src/navbar/navbar-logged.svelte +++ b/Server/app/svelte/src/navbar/navbar-logged.svelte @@ -101,7 +101,11 @@ - + + + + + {@html $content.orgName} diff --git a/Server/config/libsoc.org.conf b/Server/config/libsoc.org.conf index 06b4f1e..fa36e31 100644 --- a/Server/config/libsoc.org.conf +++ b/Server/config/libsoc.org.conf @@ -6,6 +6,13 @@ server { add_header alt-svc 'h3=":443"; ma=2592000, h3-23=":443"; ma=86400, h3-29=":443"; ma=2592000'; add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload"; + + gzip on; + gunzip on; + gzip_types text/plain application/javascript application/x-javascript text/javascript text/xml text/css; + gzip_proxied no-cache no-store private expired auth; + gzip_min_length 1000; + location ~* \.(?:ico|gif|jpe?g|png|svg|webp)$ { expires 1d; diff --git a/Server/public/css/common.css b/Server/public/css/common.css index 2cbbc6c..23b129a 100644 --- a/Server/public/css/common.css +++ b/Server/public/css/common.css @@ -60,9 +60,11 @@ body { font-style: normal; font-display: swap; src: - url('/fonts/LoraSerif/Lora-Regular.ttf') format('ttf'), - url('/fonts/LoraSerif/Lora-Regular.woff') format('woff'), - url('/fonts/LoraSerif/Lora-Regular.woff2') format('woff'); + url('/fonts/LoraSerif/Lora-Regular.woff2') format('woff'), + url('/fonts/LoraSerif/Lora-Regular.woff') format('woff'), + url('/fonts/LoraSerif/Lora-Regular.ttf') format('ttf'); + + } .serif { diff --git a/Server/public/img/common/flag.png b/Server/public/img/common/flag.png index 70ede68..e38a2ed 100644 Binary files a/Server/public/img/common/flag.png and b/Server/public/img/common/flag.png differ diff --git a/Server/public/img/common/flag.webp b/Server/public/img/common/flag.webp new file mode 100644 index 0000000..0a53473 Binary files /dev/null and b/Server/public/img/common/flag.webp differ diff --git a/Server/public/img/common/flag_full.png b/Server/public/img/common/flag_full.png new file mode 100644 index 0000000..70ede68 Binary files /dev/null and b/Server/public/img/common/flag_full.png differ diff --git a/Server/public/img/crowd.png b/Server/public/img/crowd.png index e362606..85e9fe5 100644 Binary files a/Server/public/img/crowd.png and b/Server/public/img/crowd.png differ diff --git a/Server/public/img/crowd.webp b/Server/public/img/crowd.webp index 708ad3a..86a294d 100644 Binary files a/Server/public/img/crowd.webp and b/Server/public/img/crowd.webp differ diff --git a/Server/public/img/crowd_orig.png b/Server/public/img/crowd_orig.png new file mode 100644 index 0000000..e362606 Binary files /dev/null and b/Server/public/img/crowd_orig.png differ diff --git a/Server/public/js/components/navbar-logged.js b/Server/public/js/components/navbar-logged.js index 6078bcc..47e0919 100644 --- a/Server/public/js/components/navbar-logged.js +++ b/Server/public/js/components/navbar-logged.js @@ -1 +1 @@ -import{S as e,i as t,a as n,b as i,s,e as o,n as l,d as r,c as a,o as c,h as u,j as d,t as p,k as h,w as m,l as f,m as g,y as b,p as y,r as w,f as v}from"./index-0d9f0c09.js";import{w as j}from"./index-1c123138.js";import{loadLocaleContent as k,locales as H}from"../../../../../../../../../js/libraries/serverTools.js";function T(e,t,n){const i=e.slice();return i[23]=t[n][0],i[24]=t[n][1],i}function x(e){let t,n,s,o,l,a,c,v,j,k,x,W,M,O,U,E,N,S,R,z,I,q,A,B,C,D,F,G,J,K,P,Q,V,X,Y,Z,$,_,ee,te,ne,ie,se,oe,le,re,ae,ce,ue,de,pe,he,me,fe,ge=e[5].orgName+"",be=e[5].joinUs+"",ye=e[5].manifesto+"",we=e[5].initiatives+"",ve=e[5].groups+"",je=e[5].parties+"",ke=e[5].tradeUnions+"",He=e[5].cooperatives+"",Te=e[5].communes+"",xe=e[5].partners+"",Le=e[5].profile+"",We=Object.entries(H),Me=[];for(let t=0;t',l=d(),a=u("a"),c=u("img"),j=d(),k=u("span"),x=d(),W=u("nav"),M=u("ul"),O=u("li"),U=u("a"),E=p(be),N=d(),S=u("li"),R=u("a"),z=p(ye),I=d(),q=u("li"),A=u("button"),B=p(we),C=d(),D=u("div"),F=u("a"),G=p(ve),J=d(),K=u("a"),P=p(je),Q=d(),V=u("a"),X=p(ke),Y=d(),Z=u("a"),$=p(He),_=d(),ee=u("a"),te=p(Te),ne=d(),ie=u("a"),se=p(xe),oe=d(),le=u("li"),re=u("a"),ae=p(Le),ce=d(),ue=u("li"),de=u("button"),de.innerHTML=' \n \n globe',pe=d(),he=u("div");for(let e=0;e{e.style.display="none"}),100)}function O(e,t,n){let i,s,o,l,r,u,d=j(0),p=j({});a(e,p,(e=>n(5,i=e)));let h=k(p,"navbar-component",d);function m(e){let t=e.style.display;n(3,r.style.display="none",r),n(2,l.style.display="none",l),e.style.display="block"==t?"none":"block"}function f(e){localStorage.setItem("locale",e);let t=location.href.split("/"),n=Object.keys(H);t=t.filter((e=>!n.includes(e)));let i=t.slice(0,t.length-1).join("/")+"/"+e+"/"+t[t.length-1];location.href=i}c((()=>{!function(){if("ru"==h){let e=()=>{null==u?setTimeout(e,100):(window.innerWidth<1700&&window.innerWidth>1400||window.innerWidth<400)&&"100%"!=u.style.lineHeight?(n(4,u.style.lineHeight="120%",u),n(4,u.style.top="1rem",u),n(4,u.style.width="16rem",u)):(window.innerWidth>1700||window.innerWidth>400&&window.innerWidth<1400)&&"400%"!=u.style.lineHeight&&(n(4,u.style.lineHeight="400%",u),n(4,u.style.top="0rem",u),n(4,u.style.width="auto",u))};e(),addEventListener("resize",e)}}()}));return[s,o,l,r,u,i,d,p,h,function(){s.checked?n(1,o.style.background="white",o):setTimeout((()=>{n(1,o.style.position="relative",o),n(1,o.style.background="",o),n(1,o.style.boxShadow="",o)}),510)},m,f,function(e){v[e?"unshift":"push"]((()=>{s=e,n(0,s)}))},function(e){v[e?"unshift":"push"]((()=>{u=e,n(4,u)}))},()=>m(r),()=>M(r),function(e){v[e?"unshift":"push"]((()=>{r=e,n(3,r)}))},()=>m(l),()=>M(l),e=>f(e),function(e){v[e?"unshift":"push"]((()=>{l=e,n(2,l)}))},function(e){v[e?"unshift":"push"]((()=>{o=e,n(1,o)}))}]}class U extends e{constructor(e){super(),this.shadowRoot.innerHTML="",t(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},O,W,s,{},null),e&&e.target&&i(e.target,this,e.anchor)}}customElements.define("navbar-logged",U);export{U as default}; +import{S as e,i as t,a as n,b as i,s,e as o,n as l,d as r,c as a,o as c,h as u,j as d,t as p,k as h,l as m,m as f,y as g,p as b,r as y,f as w}from"./index-0d9f0c09.js";import{w as v}from"./index-1c123138.js";import{loadLocaleContent as j,locales as k}from"../../../../../../../../../js/libraries/serverTools.js";function H(e,t,n){const i=e.slice();return i[23]=t[n][0],i[24]=t[n][1],i}function T(e){let t,n,s,o,l,a,c,w,v,j,T,L,M,W,O,U,E,N,S,R,z,I,q,A,B,C,D,F,G,J,K,P,Q,V,X,Y,Z,$,_,ee,te,ne,ie,se,oe,le,re,ae,ce,ue,de,pe,he,me=e[5].orgName+"",fe=e[5].joinUs+"",ge=e[5].manifesto+"",be=e[5].initiatives+"",ye=e[5].groups+"",we=e[5].parties+"",ve=e[5].tradeUnions+"",je=e[5].cooperatives+"",ke=e[5].communes+"",He=e[5].partners+"",Te=e[5].profile+"",xe=Object.entries(k),Le=[];for(let t=0;t',l=d(),a=u("a"),c=u("picture"),c.innerHTML=' \n \n ',w=d(),v=u("span"),j=d(),T=u("nav"),L=u("ul"),M=u("li"),W=u("a"),O=p(fe),U=d(),E=u("li"),N=u("a"),S=p(ge),R=d(),z=u("li"),I=u("button"),q=p(be),A=d(),B=u("div"),C=u("a"),D=p(ye),F=d(),G=u("a"),J=p(we),K=d(),P=u("a"),Q=p(ve),V=d(),X=u("a"),Y=p(je),Z=d(),$=u("a"),_=p(ke),ee=d(),te=u("a"),ne=p(He),ie=d(),se=u("li"),oe=u("a"),le=p(Te),re=d(),ae=u("li"),ce=u("button"),ce.innerHTML=' \n \n globe',ue=d(),de=u("div");for(let e=0;e{e.style.display="none"}),100)}function W(e,t,n){let i,s,o,l,r,u,d=v(0),p=v({});a(e,p,(e=>n(5,i=e)));let h=j(p,"navbar-component",d);function m(e){let t=e.style.display;n(3,r.style.display="none",r),n(2,l.style.display="none",l),e.style.display="block"==t?"none":"block"}function f(e){localStorage.setItem("locale",e);let t=location.href.split("/"),n=Object.keys(k);t=t.filter((e=>!n.includes(e)));let i=t.slice(0,t.length-1).join("/")+"/"+e+"/"+t[t.length-1];location.href=i}c((()=>{!function(){if("ru"==h){let e=()=>{null==u?setTimeout(e,100):(window.innerWidth<1700&&window.innerWidth>1400||window.innerWidth<400)&&"100%"!=u.style.lineHeight?(n(4,u.style.lineHeight="120%",u),n(4,u.style.top="1rem",u),n(4,u.style.width="16rem",u)):(window.innerWidth>1700||window.innerWidth>400&&window.innerWidth<1400)&&"400%"!=u.style.lineHeight&&(n(4,u.style.lineHeight="400%",u),n(4,u.style.top="0rem",u),n(4,u.style.width="auto",u))};e(),addEventListener("resize",e)}}()}));return[s,o,l,r,u,i,d,p,h,function(){s.checked?n(1,o.style.background="white",o):setTimeout((()=>{n(1,o.style.position="relative",o),n(1,o.style.background="",o),n(1,o.style.boxShadow="",o)}),510)},m,f,function(e){w[e?"unshift":"push"]((()=>{s=e,n(0,s)}))},function(e){w[e?"unshift":"push"]((()=>{u=e,n(4,u)}))},()=>m(r),()=>M(r),function(e){w[e?"unshift":"push"]((()=>{r=e,n(3,r)}))},()=>m(l),()=>M(l),e=>f(e),function(e){w[e?"unshift":"push"]((()=>{l=e,n(2,l)}))},function(e){w[e?"unshift":"push"]((()=>{o=e,n(1,o)}))}]}class O extends e{constructor(e){super(),this.shadowRoot.innerHTML="",t(this,{target:this.shadowRoot,props:n(this.attributes),customElement:!0},W,L,s,{},null),e&&e.target&&i(e.target,this,e.anchor)}}customElements.define("navbar-logged",O);export{O as default};