From 72b9dc2a90cc9dd6ecb252be2f4bc492c7baa994 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Thu, 17 Mar 2022 16:55:42 +0400 Subject: [PATCH] #7 -- add organizers page --- data/db.mv.db | Bin 65536 -> 65536 bytes .../ulstu/configuration/MvcConfiguration.java | 1 + .../configuration/SecurityConfiguration.java | 2 +- src/main/resources/templates/default.html | 3 ++ src/main/resources/templates/organizers.html | 29 ++++++++++++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/templates/organizers.html diff --git a/data/db.mv.db b/data/db.mv.db index 9e2a8ec6f2ab158a9afcf4bc604d9d1b4095b66e..22d3d8d7536fa95612db6002fc8d5bf104b9cf0f 100644 GIT binary patch delta 6529 zcmeI1Uu+ab9LIOBw-j62axJvO&jtlZgqkNHp;Uq7Y-GvN}U2 z4)64V5$h>1tV!QIO+%yjK{?y=*OWs7Q4`47Yx8?Sqy z%*xLWw$;VT+uU0wZePNF!tH;Htzx((+*0?4!MeP4;v8Fc8#n9<6V0)TJ^9Xwni`=& zd8dM9L?#j2WCO<-?Hl2qhOe(z@|7(0r3k-c7+pE%Hod7XQ)Z`O=U`v9ah<3jsjPAh zcSTIm-RIrLq*C97-pOu#v~%-=J?$H|bZmvsH7Wz{X}2M!EOuwz9S!=cyS$fl7xl12 zb!}ltox}_Es7~#PxyDpg&gciNy*V2kY8BHA6Mu1=z%()yDAZcvq-o);!NGWF70c0I zQFGg-jwat_gP_z%@EACF-1d{ro795Paf%~HE{+^2qbYzN&5a%ab`VK!yIfae8gxKu zZbDgJ0l&lf;$3iK>L8X*IRWw8(i$R$qYHBu6ieoEQpwI{fO0z^Od?)+~cBnKf3%lLq|9Z`` z1v#u}o2oE1^f`NE<>C}Y7#a*A$TUfI6fvW@Q}=g0Y1(9FvnZs*2#+%U3~MB&B!7Y( zFQf`47{Vwk(y?Ph80~gv+7@kp93{qN8w9|yYb3_O`jwHyFvG;KiW6h(M3@+bRPF11 z25j+&nwA9K6WcIN&B*V&LEhr5X?Hv1${IM@^eDRnr6>XxZ|C0?!(!ndSz2{FRPA{&I)+$Ei(7&_09df{ifQq z{JG!r7@m6w=WyTaK z;anR>)~|ga1R`$XCV}w0vb>*4XKWb$&d|n@RuIwwj$x#YWuIla#`-&onC$aFK}<$U z5d;e{nJ5Eu7bz7;7@tI`kupdZk8QZjQ6kF3Oh#pzC=ezSnW0{)i568+lLX9U^dt~X z%w(h#QNm32lqh61D;+j(XE2j-nFGtIGK(-76^a?zLQKXg3)hmVp|9hJ$zi6^IYQ-S zS~V33=Vgyc+@-GJD4vH|plG3Yyk)o8BB~ON4gfQAC$Wg#$RbXTV~glr3oPRI#3J&6 zMRbToe9*Uuxl$JKAhw7*eT#Uyv_*Wcq(wY~E#ieDi`arK;{Dhn*3DxPpT-uk3R}d( zr7Ysl*doprSj5keMTEnEEF!$p7V%U~tF2-X2RHF4pr-g5o0Caa2Ag4M4K9YClK;Y*m=*g}2V@IKQ-S*UrS5%L2> z_+g;k=KuV-j?GR9evCm6P6dw55BBEP4~*tUbm4f2<}k>jrcQRE`xP&cN}UhQzxF2z z&WC(V1G-lLQw@+kcEc!5H3KFo&SZa&jn#jIYH*J|FV&`oj&cYRVcJu3O&u0$s+d(2 z1MRcAEx|uMDFF$%kuNy%Q^+RUM2rvw*`ZERWG!oEsHwCBNQqsZovVJh_Mv#3;VR*A zT@_dDE}ck@RWFYBv4_i;Rb|}avNohHCt0X2C)*f?QR=R6ai)543_ZkE26t8H4nE2) z3GS*_!Vj#Js+&VNIs@-_!jm+3jj?mL7U5{o@#P)m%&phOqYzEb|7g1D)@Ffd0x(jk zqZDsjeRI&{Q1NU6&p}qegLiU3?;SXH-1vG*5!%ZfY*`}>I#CujesN6}`bi0oHsRTz ouVlEp45;}pa(LHf;a;@2rRWy25Pli_<0NBhaQB_DpkeC#1KveZTmS$7 delta 8429 zcmd^EU2GiH6`ozM|C=m!tT>6|V8@A-IGfen`JYuooe&h$;>0SDSRypJJ2RV@IBVnB zA+1!_h_Bi*s^+|tOXX7q zph4%t_8ooD$(3eV~e_XttX3GCc=l0=315p-mA{T zh0M0$mfquR$!Gj7vLsVpyJ1^TI@5!HE7g|XRJ}BuPF0khimu?LXsgT*UnhUt_T001 zY)u)S4)QZ)KRA~Mx}vnLZJSg!D_!JF@<4O_=n?{PsfkOy6}`?pXea*zi~Y69r}UoD z8cwb}*7v;>KWNuy2cn0+FOBRs$w8Qo&kq9l{3L7x9RvWTt%{S-9bmxRQhDi2;FFWl z(OHI9UtgDpnsh*DllhtQ?Q=`z#e(`uv^NB7Zx}v)V&wBQ2!LvFJS$ z9!YY|b5&RV&08(WH(xak1AURc3m@p7T7B(v$65f-LJ1aSSQF@LTAHb8I*RPMBlkm# zMGJ}(1fn1YqL$7=!ekMl@qlni*kZRu*diz`#h}z8Q2L|!PX8bUsbxheT;w1%PzO@2 zxAiY50|KO=F5t)zmu50Dh2twv&0VTb1E={kXb}F%(O;94x|Ebp3vX(udhL0p|W-3?44*G8l&qS#1|;uyao?hU6_zSj3$ade#K3`}#kOEgEH z^oH}Bv^D29`mQz1Z_EM0Z`6SsPHfMJXXnI*2nu6WQ_M!a1GS9CQo5UoLC$D5RZeGX za=N+HN;%=XYJWKNP+O?(?xq>3s!SU77jn$SCe8QX{4XEr4(~5 zS2GQOd2AX9Xv$+Y3pcrxCCdDx@k-f5K+hgHd=14}l zwe4c~hCP_>{GfW>&SnQUfw%6Z#crnO;1>_wb;q&2`zP-_h^p8D@LG8Jz(yVHIzkqt z;Y6mWw%)GAH_E^J*<$n{v0c$Uqr&u zzC;V@_J4sL)n_OE+1{`0z3rQ^QW`C5*>gCo9L=Q*KdXNK=#MkomEn=U9+zurv?f#h zxu~U;S4SQR-yZrw%ddyEYNz#!R7+v>@vv~fsf_;nRrE#V)Ku#s^a>PZ=jb~GqfmLj zX6w_W%wK!`sV#Lfw%s3|RJI5iE7jU=5CM~0iY}olE~8?6qXxBP=)ywxQ?0s1M!Eru zTa9F-MJj&Cs|F;6Ngb*4s=-dE8g$q7G)YmCBAiNDRf=V_laR6kjNDRq{0NcxS?bu+{G(YLB9}=wKaGx4qE!M`chzb)$}hz-LQb(q3qC zhcvun<;f&D$@!gU$SQhrt7d+j8#h(q@_#HR^EGl(LUM^pB8`}&XPYRfWIc;Af`X(i z1Gn8ANLDXA^nUwJG_v8N9VxG+IgVNMP0g}MFXlLO*=k-g)oED5kbrZvsKp`a%J}j2 zTA-GS@)NiyweQOy5j)02>=RtXK1)UH-?@l=yP=5vDHXB94MgmQMk00(6|q;Sh<&D! zi2ble#QuSZ*em1p(;y^bw-OP%9*NjTiHJqZV)LNg>B3JU4f`jeVbPMrc@WaD-(nip z;TrZERKxzGPQ$)QfpMH_SoD)?KfEVF!=4(RkTq;`z{oKYX;`PRhTSA4N4512?k(-7 zm1UFFkCX~Hf+!|Bav(L^phXRKsX>c}T1`$FV-4CoN-8Ot3<(&7sulei3=ID(CHAL| ziFwq?lHNT6*hpSWpd5jo1j?U8mLx=CHh%c1GuQN>Y;1lt%9SE25=&%IMlC)l;}#v1 zQHu}CxJ3tL%wmHwZqY#*v)G`FTG614nQTzTEH)_P7FDj);>wj;d{9O$u3Y(mjVf1m nFL_W#Z}LGIv+$rSEPKb)Xig^hN(u^BQmtO#YPKCdcz)_Xz(wCh diff --git a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java index 292b005..92b7272 100644 --- a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java @@ -24,6 +24,7 @@ public class MvcConfiguration implements WebMvcConfigurer { registry.addViewController("/loginError"); registry.addViewController("/index"); registry.addViewController("/admin"); + registry.addViewController("/organizers"); registry.addViewController("/docs"); registry.addViewController("/editNews"); } diff --git a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java index f316307..19a8a6f 100644 --- a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java @@ -45,7 +45,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { log.debug("Security enabled"); http.authorizeRequests() .antMatchers("/").permitAll() - .antMatchers("/login", "/index", "/news/**", "/meetings/**", "/files/**", "/docs/**", "/webjars/**", "/h2-console/*", "/h2-console").permitAll() + .antMatchers("/login", "/index", "/news/**", "/meetings/**", "/files/**", "/docs/**", "/organizers", "/webjars/**", "/h2-console/*", "/h2-console").permitAll() .antMatchers("/swagger-ui.html").hasAuthority(UserRoleConstants.ADMIN) .anyRequest().authenticated() .and() diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index bcf3b65..dfe0b85 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -38,6 +38,9 @@
  • Заседания
    • +
  • + Организаторы +
  • Документы
    • diff --git a/src/main/resources/templates/organizers.html b/src/main/resources/templates/organizers.html new file mode 100644 index 0000000..4b518ec --- /dev/null +++ b/src/main/resources/templates/organizers.html @@ -0,0 +1,29 @@ + + + + +
    +

    Состав организаторов семинара

    +
      +
    • + Ярушкина Н.Г., профессор, д.т.н., профессор +
      • +
    • + Мошкин В.С., доцент, к.т.н. +
      • +
    • + Романов А.А., зав. кафедрой, доцент, к.т.н., доцент +
      • +
    • + Гуськов Г.Ю., доцент, к.т.н. +
      • +
    • + Филиппов А.А., доцент, к.т.н. +
      • +
    +
    +