From 83d0ba1a71415bd1d52bb9bfe6f5187cc15c28da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Henke?= Date: Mon, 14 Nov 2022 11:20:42 +0100 Subject: [PATCH] https://gitlab.com/jottyfan/camporganizer2/-/issues/17 --- .../module/registration/KeycloakRepository.java | 2 ++ src/main/resources/static/images/nextcloud.png | Bin 6709 -> 0 bytes .../resources/templates/business/booker.html | 6 +++--- .../resources/templates/business/bookings.html | 4 ++-- .../resources/templates/business/business.html | 6 +++--- src/main/resources/templates/business/camp.html | 4 ++-- .../resources/templates/business/privileges.html | 4 ++-- .../templates/confirmation/confirmation.html | 2 +- .../resources/templates/confirmation/person.html | 4 ++-- src/main/resources/templates/dashboard.html | 7 ++++--- src/main/resources/templates/registration.html | 2 +- 11 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 src/main/resources/static/images/nextcloud.png diff --git a/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java b/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java index 52dcf80..4ce8700 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java +++ b/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java @@ -20,6 +20,8 @@ public class KeycloakRepository { * @param password */ public void register(String login, String password) { + // see https://www.keycloak.org/docs-api/17.0/rest-api/index.html#_users_resource + // https://canada1.discourse-cdn.com/free1/uploads/keycloak/original/2X/3/379bbfe8857de117771149174a96e4216ebe9c76.png // TODO Auto-generated method stub LOGGER.error("not yet implemented registration of user {} in keycloak", login); } diff --git a/src/main/resources/static/images/nextcloud.png b/src/main/resources/static/images/nextcloud.png deleted file mode 100644 index 2e4bb48aaa49870e2d80fbcfeb4991662f304615..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6709 zcmeHMc|4Ts+aFZ6M3yWmlMphCnX!#6jcqUpM+h}D&ofMx88c&Mtf90Vq?8s!Whq-n zi;7T|&|AmSf@2FUN=hneQQl`pi{9UP&+qN?d4K;ko9Djo@AbW|`+Hy4ea|!YxVt*Y zNU2G|U@#e?qpb(@7cO{9EP_7S(a~>Uumw5MUOpTTG7rvVF=+Hq5YCBWf^d*er@>(S z-tvvUtY@Z+XGZlNONd^ZG9B_ZGCA_VZMz@EoI5ftf7XDhAi>!Vf8M-p)^%ET<)9PC zszBX2b@|H8v1B`K#>f0;r0mTTQ!fp7ybZW|WsypNs9p@Vh5Gp~x5G&Rx?6|sH-xvW ztJTo`+>xiDxI%i5FW~)#u)$1Gazc!w+c8j%IFu6}aGHAf(;KY`>!3fPC>h+zp0|=u zrV=7|L`mG(X(BzbX!oa{J-x8OY`{fJ^0c^K>6#UXVEckh!%V!Z9K6q{)jrt*lKv%F3(eIOLy*3+IRDV z!AY$d(J^{vQpSptml9vqRhFN`={K$0mT}6}=|FQvnwrZS3sW16$)S6PwIhagvc=p6 zrAV$rCC-bE%Dj<^et#~xs~SXf>r#hZkK9-QUbxeK)iY2(>(2Vz;G4?c6)6Y_@=n7b z#x2oRxOP)1>7nx$R?Vde^%Yy%nC_RVOHU{6?Kx+fVRvB*C82*>tuS5}X6s{qO+_AE zVYk5Au2-I|DY{p6MpqGB)~=-JF40fcj@d84s-RXF*AXu~W)0OYH35ax3fi#>e88!r$e+#R`hf-%PjCc*S@MHhsCV|5dI5p z7#{TTxKXJ1n?XrO**iZ&n@U#ZSjg$KMOh)my>eE6Uh1GYBd&O7abMitzb1OTcr>tj ziJC;=u!BlO!F~r-{L-zSMS0}rqqJOb?7CXju`ahqaa~V8R4Rg%w1B&Co~y&RK`7Bix{{m83~x5+m-%X%k+o- zlDqc)A62^EnQvcWCoAST>)4XlDV4O9he9h{>3zGTDu33YDi5_f^NPB0?;80(6Tdrs_#?m!u!scV5o%TrU`Lq=m zGFk!&MX&0^V-LUK=Aw}YTb*PHrxf|OExfp$zn2ZKKpykj>i&w*veT}B5|lYIx|T2= zEoF4M?)WL+!F3tM$lyWKt)=a89eZPo3l^4zRXdF511=?P@*6MREb|RJ*U+}bRd;=# znwxr`_67%?H}=vaPY8|dJ>x6z>j+8X+|ZgM%L2yF!m6{b`{XfA3`RF9(n{0RL+<|J zjs+shiv#nj>wxql0nWjV$VDkA`{1~XHwHL3lJVi#9o;qVtwRdFA0FYIi;!hoWK3?E z?+QokvMDdie~7x>+IKFOeoMd2INqgq?ULo4XA{IO!lK(*Mgw;rI8VRz`j|Y+XsuG! zMLsiGSra9H+1fU!ecR?7O>3+D{c*Q9t4=*C*-V^v9?b_^v!0_q9DJ)Vme6^RyyjHA zzu4fz-0?tcR(0>#yC{SDO4;p9y1qo&tVkm9#VdrRml+HuvV%?_xDyG4ulp3VJLSaf zw{&b=r+$62=XDQ1^>O&fz7u%geIF9@y-!FetuOB=*?yyNb4S4{Vnl?Zzx0xL1Me07 zIgyb}r3Lk}at>?O*eUBxZlj;DOBHYV#OF;!OfQjBQ!4Vce2`GoN5dbLJ74wN*$E|^ z1#-=bBbf84W<;lYcI-f7OZOF(_E%QZqY|Z2DI!+;`G-`CNHsPVwe;mV(|cBzX_YpO zHc@o~_PyKx%qiu*sdB(FKCS6i!RVgVO_Z}KnMj(p=jvRoy(L+$@7G_vu0M)s^DAub zoqmW~{Ael@Jab3gUOvSqX~9ydt-AT5%MJY^Jq!xy*2BXZtWWY)imc4~*0TxvxYjco zGqUl#5G9?F@&b3!Cvg!u=}V6@l!LogjDGBi$Xb&yt9tpi`RA=-N8W4I4tAb&ST}3T zj2P%VXgS0ZSBb>{o?LBf(g}CiVEdD7*0pO0IscHUuECb4V*5^<@i4hozY6VFFdmuC z6R(c>IPG%fszz-U>v~3UK@|)pn?i@q4Ih#Vp2`SAk^u$a5`YAxzUJ(CNT+MFx@el1$suidQqc8sAd3^BvKZ9JVX!%a>#Ig zSZFvK&$rYR^5UUuK{rYhE`)GGEH!;d?r;Kw1;TMi91@MNO?7=aBh`aQ12e#ThtEsDXp#0|8JNG};t_#vm|e zsQLELD2epVI-LDQMMzH+pUgxVBGIU@upcbg96RoJe}8Mi_JWRYln2OWM6#%$9TyDe zte)?b85+r+?=zAO3c7@GhXOPd6qL~Od>aQM$^Dy+K*k_?7*l8=K+i`4)NeRuBr8;i z0jMZ26byp`VMEM@Kj1lZ+V=(eVLpP9e+dL~_l^Gt^jE!vu?Tg=+cKz;0;fb-y+ zj-*38Sga8ig8_^XMreu&0*Aw45M)y{7C|!ss3v3+iW!=Mok!uuqC=HH4xJyBfC_-9 zC;((&1W*uI6D)whfq)^x6pJ%PP-%u#3f7biVrXVUD#1G7ZQO~LniwSddyji4nL}f+ z!Ynmi=;4w4?*m@+Fwm1j7KmnOY;1(Vni%1r7Y<`;_#Na8ve;0P3pfqYNDM|e0#Nbx z5F;5%HhLI22t+Z%gM_}KN?}RC zExr^B-i1LG8VbQ6AgH%56}O%ogc3F_Q2zw}7beeO1~2^o#`7Kejm3t=;W1btZY(#- zR*=g1XP&BjDwA+3uwXgm3ze!^#TR|FVNJY?$jiKBFpes`&5QCr@ zQp{*%G?fZc<}%_NJDWk{@W?FCCJ4#_Xq}_f{|#`C!G%r*!`X~~3Vl9gPL_G+4ixiTA9S8U$0O?7`S>L*1eNn2 ze0)i_|DXqm`j?ZR()X8KzvTKU1%3+rE4zNl^-~J`6!=$m{lCd2_5BVT42Qnx@u2(X zsk)U`(7pE}inD_)EJ5(J)jdFhdL)^SzHI0R;BLWNWW8=SALMWdyI}7X z;N#^~wT!W=bLZRLG3q9#B;%wM-jA=_G-aHMlBi7AsVmhidA8JBBffb{YUr)H10sLr z#$=1V5nWV5QoAbcHdNSjIi~lJpU)HL>a>MJgX5OFGWjCeFE_mnEXUDjd}|UTC(l@; zs?>%D4u@>Wy>vXQ{n_P=paIE0Pw^F$*OEFu;|A+L6;m8u%D9?5oL&?v+hHUFpKW-x zW6Zuyqs3~*&#CygQMvvP9d*cE_gifIk%j%iJs+j(-268;)~YlN2U8Y)c164^KFF$y z=NijguxD<1(79CI1y2%>QTSANFr7M+nUE_rpyWb1IVhGT(xIfpdq4@kYOxF0`4YjU zIG<_raGG@y_j?Sh(7(T}@u_`pkVKzi+oG3VJwDMXNk--g>OP8-yL(%*4OFLaWshP< zLj!m^u*#Yz(S)>#VEJ`1*Sa5Atwdj1k<{sR*^d=V&@1e!gql}$g@>hD-0W5-MzJw#CsY{JCuQjly+ zEyaXoL}^7`H9o7}w0*K}?bv6nVy-csp5D?&iKU+2wp=6AW9KLU$M&=NM)w#I*GRUV zi1&dgjJX)iAZe3=+)c`irTTx_;+~ZN(F4hslHzfVP5gKiar1Imv3jCcAx9YA$7mSIgNVAWXs&DI)g zQeo18sJb-)Vd$0Ioyl!zBYCdQ9p$XRdk6c@)I8DL>8v+vyL`&`v(q`MT|-yiUT>Rn zUq+B9THc7)bhAyRY-45S(q6!C3?Nj_wC`Ll;{W^MY%KSfexbT^nF%d*Z11%;+tAk+ zOO|$Qu*gyDKZeVeI8C~d`ao4@>uZ@U2DA4L4L=GVDMoi3@}5z8YvhV~UFjDS6Z5?1 zEY$)#7&W6R^Cn+8Z&)nn+4JYermfFq(y{Amx1rLf#f~m)ew_W`!v|$#UeNBYhXC}i Q9vF;h=W2Uq{g$Nv2HIt3S^xk5 diff --git a/src/main/resources/templates/business/booker.html b/src/main/resources/templates/business/booker.html index 8797d10..f1e5dcc 100644 --- a/src/main/resources/templates/business/booker.html +++ b/src/main/resources/templates/business/booker.html @@ -7,9 +7,9 @@
- - - + Hauptseite + Finanzübersicht + Buchungsübersicht
diff --git a/src/main/resources/templates/business/bookings.html b/src/main/resources/templates/business/bookings.html index 1b7adb8..1d1b7bc 100644 --- a/src/main/resources/templates/business/bookings.html +++ b/src/main/resources/templates/business/bookings.html @@ -7,8 +7,8 @@
- - + Hauptseite + Finanzübersicht
diff --git a/src/main/resources/templates/business/business.html b/src/main/resources/templates/business/business.html index ce0983b..be154b1 100644 --- a/src/main/resources/templates/business/business.html +++ b/src/main/resources/templates/business/business.html @@ -7,9 +7,9 @@
- - - + Hauptseite + Buchungsübersicht + Nutzerverwaltung
diff --git a/src/main/resources/templates/business/camp.html b/src/main/resources/templates/business/camp.html index c95b27f..3a4cb8e 100644 --- a/src/main/resources/templates/business/camp.html +++ b/src/main/resources/templates/business/camp.html @@ -7,8 +7,8 @@
- - + Hauptseite + Finanzübersicht
diff --git a/src/main/resources/templates/business/privileges.html b/src/main/resources/templates/business/privileges.html index 087dab6..15db0a9 100644 --- a/src/main/resources/templates/business/privileges.html +++ b/src/main/resources/templates/business/privileges.html @@ -8,8 +8,8 @@
- - + Hauptseite + Finanzübersicht
diff --git a/src/main/resources/templates/confirmation/confirmation.html b/src/main/resources/templates/confirmation/confirmation.html index 9cd41fa..677d515 100644 --- a/src/main/resources/templates/confirmation/confirmation.html +++ b/src/main/resources/templates/confirmation/confirmation.html @@ -7,7 +7,7 @@
- + Hauptseite
diff --git a/src/main/resources/templates/confirmation/person.html b/src/main/resources/templates/confirmation/person.html index 881c438..efbb123 100644 --- a/src/main/resources/templates/confirmation/person.html +++ b/src/main/resources/templates/confirmation/person.html @@ -7,8 +7,8 @@
- - + Hauptseite + Anmeldungen
diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html index 14cf830..5bef3d0 100644 --- a/src/main/resources/templates/dashboard.html +++ b/src/main/resources/templates/dashboard.html @@ -7,9 +7,10 @@
- + Profil + Abrechnung + Bestätigung + Nextcloud
diff --git a/src/main/resources/templates/registration.html b/src/main/resources/templates/registration.html index b8ca905..b3f874b 100644 --- a/src/main/resources/templates/registration.html +++ b/src/main/resources/templates/registration.html @@ -7,7 +7,7 @@
- + Startseite laden