From f049f51de2cf286601a0ee7e3d7995cb691a83a9 Mon Sep 17 00:00:00 2001 From: imagede Date: Mon, 9 Mar 2026 18:40:16 +0100 Subject: [PATCH] Refactor: Improve Startup Script, i18n-EN and ItemCard --- 00-backend/datasource/database.sqlite | Bin 27684864 -> 27684864 bytes .../util/DanielDimensionException.java | 17 ----------------- .../public/locales/en/translation.json | 4 ++-- 01-frontend/src/helper/homepage/ItemCard.tsx | 7 ++++++- start.sh | 7 +++---- 5 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 00-backend/src/main/java/de/htwsaar/webshop/util/DanielDimensionException.java diff --git a/00-backend/datasource/database.sqlite b/00-backend/datasource/database.sqlite index 9b0642d10751dd09e59fa6357f98148880655d37..23b59ab95611f68b99cb022b3df6a6eec101ff9c 100644 GIT binary patch delta 3625 zcma*odt6jy9>?+X%*>fHbIzPO5FkQ`2o4+&QBg6Z5*QG<4Wl5EriOsXRph3b%FV+-E??O9Sys=U+7-dq zqQ^Iya|^3VswaoI3XSRxL6vFiIIT0#U%0gpB&cg__eiubsnw63;omuWf+0AuaqWTL z^}p_yOYOI|E-|UwZRr-;I;u6Ewx0Y_c2xK!%ZDrTw}tebZTe&DaY1d-c6x`~5=7cQ zx-~$@{Mq>B;*C=`vQPH(IbS+@srx(S){~>m>Q-B>nYNB;O{XU>`R0wx=E~%Ahl?+E z?+G7z{~udFH>V72|2$7(20Y1E;~$9BDcx@GO}nj%^*X08o&_^k`ww4*>9x=Ju{RC@b@fCXP*P;r-1a^<_&7wdb4sC#UAc zj+y01iZ95|8B;zpwsK*5K|y*+T25|eE3*XX+u48tv0`X7`KA8#p!zu((hc6J20c48I)eVNn=@~F>v)- zY*tJlhGfP9c;1xTP*YMn0^h2;z6E!qwdGk(?9(M^r?TQPuEUTg1G@HF!YVjqiTLy-e-3?1Uj0ER1>ck|`&Xma-!8?B6uSk%0$r2ei44 zY#Qch&pC$DFh%Qg4A2`sr~S|+8LXgy7kI-R-~+zk2SdOghC%=Y!krKV!yp)jdk$R+ z$#JStrT|U~6R(S3i0i}xF;W!FeP*|LrFp)2lv%+?+mog`({xjS%ak}`tb4lisNmk4 zxQ)5Hl6SH8+{_UW3Slr3Y!L3r&5Ylm zG|#%Wlpb=OPixdplrHSp#~)=q1LjAr8iQ;%S1T8NU2yeWYIj>)+xz|RjQtd=Cfx~R z(8!yswid%QWud)m-7jzMyfniYi&f#EWDE+sxw^HPB{jrkX1)By%4yrvSA?;i3qNdi z8G}M^u6m?bBd+RW!Y%!r+^7U9)z)@dRu0M=taGiw)*h=_`AE*P{AwMqoREK1+LUff zzZ~j{Ivx?~$vYmQS#oYac(|`Vn%#b08{NG9m?P=t?Wgm^y%+IrvfX-?OB3<8$g_lt z2gGlseUfJJR;rX3IZHk#m5BjTlpHEIiY~>D!(Eb&DhDk6N~?5Dd>sex6e>E>9AxlmIbC`cRgo0gKaW#;?~dZ;%U>Z#`XJYK_^T+{gKOOo8fYgD-ua z-u|D;bv9UC<*FL4uJWUUUp*7p|H1h*@3r55lCrDo;>z@wLe%woc86y}n7W$b>Sa@9 zTwTH8>Wj?V^Fg>;L|;x+)mL!2tg3Ce)JLk%(4Hu@0DG23soV8T-|iEmLL@}ND2Rs9 z5CdaiER2I#7!MO*BE-QYxC`Q8G9wNAQ|kC0;w<+(qI~-Lk46*7G#41 za=;1GVFu(v9?XP%m<0uJAIye1a6in2c`zRyfI?URMNkYSunsHV{jZ^hZFDyya{i?+wf;N3GYB3ybFJU_uv%# z72byr;6peKe}gmdclZeY0sn-L;VgUtpTcKw4$i~p@CEe4zu-%_00Zz9d=1~gxA1Sc z2;adaxD4OJ4{!y3grDGN_yvB2tMD8A2d=^Ia2;-J@QGoaK+#e36a$5)7%2k9L@`rD zibSzcWQvudP`oJKlshOs6km!TWeCNeGL#ZP38dUf38D<61XG4nLMS6Bp_DMnNQ#XT zPKltXlt@YxWfUcvGMaMpw;V&$Sjsp`EM+`p0%am4jxvdI7bTuDnUX-cn{p53Udj|o zA|;8EOtDi^D5;dGlr+jTN;)Njl1a&;WK$fJ9Ey`Noic-xOUa|mq~ud(Q3@#cQD#%- zQ0}M9rOczur#wI@q%5EmQHm)gl!cU1$|6b`rJPbhsiagR zq%5T@qdZ7iPI-v3g0hmbiqb@BrnFF6DQ%S1l!qy6DD9NBly#K#lns=Pln%-xlupVf z%4W)=6phkFd5p4!;-Yj@wo?)HbAg#TbI#$aavkJ)Kt#L(Wr~b90u==&Q6v@36uD>$UAgP1M1n&e zRLV6yD(HcW>S;gei3suhYz+b+5#W-9U;lx>%UgZ zH)F@4tuU)c1Vu}-sE4s!wx~UxvWSimflf)M)0yPkI%T7BMwz1|$+z86dC~6FJlT_# z*DkyJieo)@O00rW>C^?fP4g2y{%s!FeYwIb7=)nL+Fo6&Ff*CAe1rcms zXRGwqES`6|?hUYg<$q|!$x2r(wfykzyN#ZgmMuPj?!A!yCR*95up za|S~+#6T>>LA*CVC!uGNA=+ltd=Df{GTZccAx?>Vy#)sn(#1NHF4-isH;=o1uVeC_ zdjB;AAKg2YA!r*i-t5tb$M;WNANQ2>#Y`T%snEG%r^ngZKNa-hasAWMLFP}t3(h{V z<9KJVb)b7Dr`?76@Yw$8^=}gob{}7;5URH=|%%6_Ruo+n4jU9v^FDCNo{mE+QnN|Vy5jp$2=Hv7g|PFh1O5#EBn1h;L* zgQtrRG9(KR9x9HT51u8Kn`MWlUGDuXt8AUkey6Lb=yUIwvk7Oi97>UHiq)tS3vBV$ zeb#H@UeRsySIU)8DOdVJTxtywlcZ>=+NvqTY(LAF#9n2e?TXSU{%U<6XYa8#DigJd zerj^8d`qmAPFo#PnzdXpSyRLdk|cg(%abj5LYLGcEwCEB9e!$+#mM7$&7tZiM(t*# zS{tNX(**?-UvyWcWu+disyRRF!opKpxm~Rd#@iQsxVGrsA-`q5-MrcPea>#@?A*gq z>IQ=l=xvEnn+2?XajJw>i;Pzf3IX2p@oFhQj#lxj4AgF^Y7>@KiE1~N$Ru^P5a6vz zQnwidqbo2)g+xe#A&?A1Aq9p(Dh!7aFcL<=Xcz-&kPaE}5IhWH;Sm@I;~^6!Ko&S) zB20qGFa@SUHarSBkPFjbI?RAPm5khh8lPpo`GlKId~pkfLf@7dT4+~Xo6-~ z18czr>tH=>fEIWWTHz(w2yM^~o4^en@G@)$4LV^9Y=v#m1+T!XupM^5PS^#n!ESgR z_P`sk7rNn1cnkKyes~*x2M3@B4uS^`!SCTPc;N^fg?Hc&a146kU3d@r;C(m_e}ofo z5>CON-~;$GoQ5;-A)JMe;2eAm=ivf;0)K(O!r$N`{2l%Q|Ab5MDSQT>!x!)+T!ydU z3VaP$;a~6#d<);fzu_8Oha2!c+=N^3ANVi)06)S{a2xKx&+rTU5AMRR@EhEN`z?Vf z!bV{9jDaySCdP;HWz39)u`(iKVDDl*4$H$_!^lFe8~!%xGo|lg6Yo8O%e> z!^~Lb5oR1Sp2=h;FjW)3r#DQ4y|CCuZ@d}aZ&kSS#rF^icem?g}U%u;3 {(item.price100 / 100 * (1 - item.discount100 / 100)).toFixed(2)} € + {item.discount100 == 0 ? <> : + + {(- item.discount100)}% + + } { @@ -83,4 +88,4 @@ export default function ItemCard({item}: { item: ItemWithImage }) { ) -} \ No newline at end of file +} diff --git a/start.sh b/start.sh index 08615ef..52320ce 100755 --- a/start.sh +++ b/start.sh @@ -1,7 +1,6 @@ #!/bin/sh -# Function to clean up background processes on script exit cleanup() { echo "[DPS] Cleaning up..." pkill $backend_pid # pkill because subshells @@ -10,8 +9,8 @@ cleanup() { exit } -# Trap SIGINT (Ctrl+C) -trap cleanup SIGINT +# Trap INT (Ctrl+C) +trap cleanup INT echo "[DPS] trapped" cd ./00-backend @@ -25,5 +24,5 @@ frontend_pid=$! echo "[DPS] Frontend started with PID $frontend_pid" echo "[DPS] Ctrl+C to stop" -# Wait indefinitely; cleanup will handle interruption +# Wait for cleanup wait