From 1eaa39eb9b17291d96c455ee18c8e08b77d7a776 Mon Sep 17 00:00:00 2001 From: Fredrik Marjoni Date: Tue, 24 Feb 2026 16:24:22 +0100 Subject: [PATCH 01/12] feat: add release/v1.0.0 branch --- target/classes/edu/group5/app/App.class | Bin 543 -> 543 bytes .../test-classes/edu/group5/app/AppTest.class | Bin 503 -> 503 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/target/classes/edu/group5/app/App.class b/target/classes/edu/group5/app/App.class index c24ab2785e980a5735ae85d7eb8f51f23e9eca54..ad2ebf1389aedb0b93d60b5a2d6ce766e4738b17 100644 GIT binary patch delta 295 zcmYLCJ8r^I5S%q8kLMV|pZoyhlEwu^(xgh05_7 zo~{ zna$I2ny8R%w`l86e>I}}CGj&;7RY>L6g&mY#GLQ%Q25GZhtbFe&l%m*0dtWji4rb& lW6XD181FVHSDRa0{s%ZL0R?V(3Tb935*>6|Ab5-xdVeQJC|&>n delta 313 zcmYL_Jx;?w5QX0uhs9=r;6TEE97{Abi-Zs~6o`frkpkM4yo!RHcx4QSP<|f8d$6jlQ_T<0)bFs8IsU^ z&`(-rdOT45=f~2Fs-O5|l_0N8mgVtXUSw%6L=)=*kwgm{gjU@%%+*aX9GCsFFnTmS zrlc#-CPXHks6mlW?5Wb$s!MAL{#Blu>fTIm>HKArXL8R2xv7{P&J;)D*f{zCz1H#; z)5(t8OgaC69qe)zU=RCTam{D78Q0z*qLp{7{TsLofS2aA=O*piCBOl?ED&O*hu$C6 Ci!Dt6 diff --git a/target/test-classes/edu/group5/app/AppTest.class b/target/test-classes/edu/group5/app/AppTest.class index 7f3006a1c9f7ef09dffeff2b6cd7fb41eeb5bd4a..bda56ec799a80af4c3dfa2cd7c8cb5a7874c94dd 100644 GIT binary patch delta 257 zcmZvWzYf7*6vfZ&A0J;^)Sp%t8WR?SQA}Pz3>J~-ENPi}g{Gs$E0~DE19%~uxL-*u z?r=_S&bhzbr~cHP$Ln?nFhL-orH4QlFjBwk5{&6)9ZBdY*)UN^Pe)6lhK4|$5N08H z=~4zZn(zp6l_XKToyEI|FMEsrJR4JIPkgRM11Scp;BClG?B?Kt;yI5ctBL^$i`D)V n*d5*oWll9zzO5>|0*yGyLBuM??0N)v4++gTY?#7 delta 249 zcmYL@y$%6E6ot?1&Kkz7f7Ui6G*+Wfipnd9LNpRvOLnO}!$j#RR7BwcywG;IGn;UW zb8~X;`DQXVbA#9W@dPkODB-{r;0hiJIvV&AMU(`jLK#Ybh5>`zrfHlUmdP<@;G=c4 z5~yfD6yz5BU92~k^NjURKC#R=V1`CoB{!kXXnW%u*ww~0QWFCbbyAfdpn)bih8Crc jElY)1t8qgT3 From 8d00462fa7fb78d332aaa83c74416a22f6519b27 Mon Sep 17 00:00:00 2001 From: Fredrik Marjoni Date: Tue, 24 Feb 2026 16:32:10 +0100 Subject: [PATCH 02/12] perf: Update pom.xml to have correct dependencies and plugins --- .vscode/settings.json | 3 + pom.xml | 141 +++++++++--------- target/classes/edu/group5/app/App.class | Bin 543 -> 543 bytes .../test-classes/edu/group5/app/AppTest.class | Bin 503 -> 503 bytes 4 files changed, 71 insertions(+), 73 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..dc3b895 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 52c5902..c05c7cd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,90 +1,85 @@ + 4.0.0 edu.group5.app Help-Me-Help 1.0-SNAPSHOT - Help-Me-Help - - http://www.example.com + https://git.ntnu.no/Group-5/Help-Me-Help - UTF-8 - 17 - + UTF-8 + 25 + 25.0.1 + 6.0.1 + - - - org.junit - junit-bom - 5.11.0 - pom - import - + + + org.junit.jupiter + junit-jupiter + ${junit.version} + test + + + + + org.openjfx + javafx-controls + ${javafx.version} + - - - - org.junit.jupiter - junit-jupiter-api - test - - - - org.junit.jupiter - junit-jupiter-params - test - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.1 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.5.4 + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + + edu.ntnu.idi.idatt2003.group18v26.App + + + + + + + + org.openjfx + javafx-maven-plugin + 0.0.8 + + edu.ntnu.idi.idatt2003.group18v26.App + + - - - - - - maven-clean-plugin - 3.4.0 - - - - maven-resources-plugin - 3.3.1 - - - maven-compiler-plugin - 3.13.0 - - - maven-surefire-plugin - 3.3.0 - - - maven-jar-plugin - 3.4.2 - - - maven-install-plugin - 3.1.2 - - - maven-deploy-plugin - 3.1.2 - - - - maven-site-plugin - 3.12.1 - - - maven-project-info-reports-plugin - 3.6.1 - - - - + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.12.0 + + + diff --git a/target/classes/edu/group5/app/App.class b/target/classes/edu/group5/app/App.class index ad2ebf1389aedb0b93d60b5a2d6ce766e4738b17..e3679e1b8be800f5bef6f802b19397fadbe36584 100644 GIT binary patch delta 17 ZcmbQwGM|Ox)W2Q(7#J8_H*$zG0RTIS1*QN1 delta 17 ZcmbQwGM|Ox)W2Q(7#J9AH*$zG0RTH<1)cx^ diff --git a/target/test-classes/edu/group5/app/AppTest.class b/target/test-classes/edu/group5/app/AppTest.class index bda56ec799a80af4c3dfa2cd7c8cb5a7874c94dd..4c6649954e613037560eadfde5c4dcaf50c01019 100644 GIT binary patch delta 17 Zcmey){GFNO)W2Q(7#J8_H*&mZ1OP}I2P*&o delta 17 Zcmey){GFNO)W2Q(7#J9AH*&mZ1OP|#2O|Ig From def3c0accec9b03f86b1f9823f391aff40bf8cbb Mon Sep 17 00:00:00 2001 From: Fredrik Marjoni Date: Tue, 24 Feb 2026 16:37:28 +0100 Subject: [PATCH 03/12] fix: fix plugins to find main class when executing mvn commands --- pom.xml | 6 +++--- target/Help-Me-Help-1.0-SNAPSHOT.jar | Bin 2749 -> 2712 bytes .../TEST-edu.group5.app.AppTest.xml | 14 +++++++------- .../edu.group5.app.AppTest.txt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index c05c7cd..4895163 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 edu.group5.app @@ -58,7 +58,7 @@ - edu.ntnu.idi.idatt2003.group18v26.App + edu.group5.app.App @@ -70,7 +70,7 @@ javafx-maven-plugin 0.0.8 - edu.ntnu.idi.idatt2003.group18v26.App + edu.group5.app.App diff --git a/target/Help-Me-Help-1.0-SNAPSHOT.jar b/target/Help-Me-Help-1.0-SNAPSHOT.jar index 566599bf00052d0d66996f3907cf83a67f270eb9..eab6441b82f8cfe26dae56ab7211f4defc98c006 100644 GIT binary patch delta 1375 zcmdlhIzyBTmF;cm|7}T>EydfB@_JgKJVZ<~UCl`LmbLr{hq*)>WHK{XL!Sd~3rl`)v#|dVJlv zgPrrtVcERw=!gZ!g{{^eJCdxsB-y8Wwd;>NFB*do{zp==S5r?0EiTNiz&IjvGxl z$vL@@DS=hWm1pVZ$=8@>3N}Z?#H=*t{LjR|AjiYNV8k$4kyByv0%no=qhYcBw+%#U z-5=RkT#QTJzSNbYRiWjW#3JUk1|MIk`n}fLsC+xq+V}VS&+b8!E^HA|3)IXis$IAK z{l}fx`Obw$a*4TkoVq#ldb=&ZfY`?wn_kZR{-faO{EFufA39Fpwo{+TBz5k|O!HtZ zdsmIa+=mp-6`Ckd=+@k|UwX0Po0;{QI-g2ZUrOzb(R=vm#3Q!7aq_mk`Rca}58I^% zC5j2Y|G>cTwn%I3-)Zgqdy^u3`p2A~8&-z_ooVhsy4wqFV z6b2vc{u3=TX-C7i+9k({-PW7-nYenp_o_|mMSv)&{qUb^r^yYx`-Duv)R4Lyt3r_x_g5EKK?wpuR013 znKYE9o)h{}C%gIE-`LH!CVB}+)m~Ve8uuhb@ZuEjvx}GUzkaY@HtN*MpCLbM|6M-u zJwMpplwC5D$!W4r!<}kf=_?+~eOsUXf5quCNAqCtPc@|y8#Di~^@|SVZI5rQR^{aF z%}H4}HRbdbf%>-4%Ed01l2*+QvEG;Xe3OVt!3;HP)92H^vO1@pFA5Dh_IlB3-=W**s(KAKsJxT#iCo9#i+M6c02=dv(;qw@yKJQ_SsqB|Q&5 z>bRqR>sO!H>M;-u}$?x0VY2o3QkY@1qm4C;v`9`amLXM)J>_iQXk!l=nPbt=-Cy z`#7Q9E5`b6h@mmlm#vS^X5GA)qWdp(ajDf!f8}RtrJw40|6K2_eLwGr&95JFcIDhR z_qXz&xmucjIcv6-9CL_lbFl%yv%8ki9?9;)SZyCD@Y5_9&IlC!1 zyUKG&i(dv7DXA%?`T^dIOd`yXQU{ck139D_zfR8OkOHgh;*e&NW1PI4Ll$f#kZb47 z$iU$18sezy>F1`On^=~bhhhe($O0M-2Xb(h0K;3yipdI`x?rOMIHei40C|eQY|J}( z7AFs)pjgK##s~~BP7QgCd=EE_VM${*GprPt?7+nXHq@U>n&}oBR9JBGTrMfLB6g4- E0FN^>DgXcg delta 1457 zcmbOsx>uApz?+$ci-CcIf#Fg}@I+n}ULY0Y>DBKM%)r19IMGfz;j{0V(>~t1dKY=U zb+yi&Ilno`;EM5sr$u^RzB-=17fV-d3Hsox<9#;xLlI99#|cf}^Jjt$t{Go6e)P0R z>+BiNi(kD?UgOpC@ZA<Gn}Gubd}btp{sW71;s+c3F`NtRJ_@(iW~RxwwerJpDNWtu4v zVHWd3$uQiTnSr5!hk?Op@_9zR`hxsiy^7qNtzq8&(uM;2lt0Sf`Enub)jH1pZC%q` zZ5z5=xP-Pm60_Vr`N)H=hx44eq6KcEH78ey&|h(=~$ZCZ#~)Ox~-S78LOnx*-4x&r+VsN zUQL}Z*H(S5=lYwoy7^nuH%D4nf2jIhT^(C>d;gAO&63YU#gemX+VXP0d_;;aTgx!dZR7M`xTCYn0tHJ8hF~gx~MIc+gch_xMGZ zOOtdi2i+`HYYO^0vn^-q6UT}lKJJ%9^X=Yp?Js*&enz3$JV=f`h(;JGDpgod-x8$+a^0kz%^N(={f^Gt z_bRmQPrryCbGdJx5%<0|l76}wa-t(4>u(u?v-3rx|K z!~kXCfFI5hV0i2J9moS23e}icP=KNtRJy^{0~x5ARTvovw?+5xa8QTvx5`^09W};q5uE@ diff --git a/target/surefire-reports/TEST-edu.group5.app.AppTest.xml b/target/surefire-reports/TEST-edu.group5.app.AppTest.xml index 05989b0..0e96d45 100644 --- a/target/surefire-reports/TEST-edu.group5.app.AppTest.xml +++ b/target/surefire-reports/TEST-edu.group5.app.AppTest.xml @@ -1,10 +1,10 @@ - + - + @@ -15,9 +15,9 @@ - + - + @@ -30,7 +30,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -59,5 +59,5 @@ - + \ No newline at end of file diff --git a/target/surefire-reports/edu.group5.app.AppTest.txt b/target/surefire-reports/edu.group5.app.AppTest.txt index 92fe711..d31b8d2 100644 --- a/target/surefire-reports/edu.group5.app.AppTest.txt +++ b/target/surefire-reports/edu.group5.app.AppTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: edu.group5.app.AppTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.047 s -- in edu.group5.app.AppTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.082 s -- in edu.group5.app.AppTest From f5d6711af6c008bb950adbfbf72216e3054895c3 Mon Sep 17 00:00:00 2001 From: Fredrik Marjoni Date: Tue, 24 Feb 2026 16:39:53 +0100 Subject: [PATCH 04/12] test[pom.xml]: test mvn commands with updated plugins and dependencies --- target/Help-Me-Help-1.0-SNAPSHOT.jar | Bin 2712 -> 0 bytes target/classes/edu/group5/app/App.class | Bin 543 -> 543 bytes target/maven-archiver/pom.properties | 3 - .../default-testCompile/createdFiles.lst | 1 - .../default-testCompile/inputFiles.lst | 1 - .../TEST-edu.group5.app.AppTest.xml | 63 ------------------ .../edu.group5.app.AppTest.txt | 4 -- .../test-classes/edu/group5/app/AppTest.class | Bin 503 -> 0 bytes 8 files changed, 72 deletions(-) delete mode 100644 target/Help-Me-Help-1.0-SNAPSHOT.jar delete mode 100644 target/maven-archiver/pom.properties delete mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst delete mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst delete mode 100644 target/surefire-reports/TEST-edu.group5.app.AppTest.xml delete mode 100644 target/surefire-reports/edu.group5.app.AppTest.txt delete mode 100644 target/test-classes/edu/group5/app/AppTest.class diff --git a/target/Help-Me-Help-1.0-SNAPSHOT.jar b/target/Help-Me-Help-1.0-SNAPSHOT.jar deleted file mode 100644 index eab6441b82f8cfe26dae56ab7211f4defc98c006..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2712 zcmWIWW@h1HVBlb2aBqo-VL$?$K(?=Ih@-BjpPPOFP?-o&83$O|-}Xs1RY2($AO?ye zl=(XPdAhjMI%FWgaG+YD{sw=FXRzqWwQtu72(Z3CxF&UDj`L)ZKYRIn zIu7M)UA4*7-_zO7w>Ipu-^L)L$Jd=Z*g4M}md(qKj#zM9*lO*uW7$T%9`D8ID86puoFRE3EJ1xSj~gA$||9+bI>WvO|16w6^M2D(`f;vzl#7HJdI z>yesMpzE8e3!=e}fW#^&q+GmazlmUEV322GV35G{o?}6QUUE)iadB?oX|KZp0=C=x z_w;OAw)VaI>s6(RVUHFmb!g}{aZTM-P>YCJPB+~Y3hJDfP$Bo(X{Kt}J7-$?fnsAcSdE?!euP-cE zZQ!GG;E(cqTVJ7vleK(Su6+2Uhv)6=2sTgsPS)?crKU-o@qSpD_*t)KZ{TSM(bHNw z!lqXwvx;{~T+vv)ry=L|xid#v61LxdxjG_o!x4?GcP)GtJI{8XSS#hqvvhNTiiB1l z&ymnq{4O=8+2s_c3G?l|{(R$^SDF!Ca!*l#{?D-z}|`l)yNHe>l-KfU*4pAZpMon2lZ0h($?kFG9&WXqvnX1n3cwy z|A8?f$HTy2L|U{K!({y7lir?!3--E&6(HRZTSVnKF-+m za_09R1yAQ!Jb(DmaRRrU`a~wFb5CZP2W#28Y8>W1q;Rg#M0rBD=C1wHixuC@%+&c* zqWV&5Z;al*bf>%*R#tB$i~% zK2ZE>siB%>;>K&$-4p!x@#o2X)lqoJq@gtRoY0Rt+0Ebn#%{hf(Mve0_QKlKxF;ck z7pHiiUA&C{^@H`YQKwe^4Eb66@A8T7`N8g{?2?&GPLq8a?o{haU-4M(+xqPPD^8a= zng@e_swtJ&nE8jTUvwaEdwgrPDkpDmPRhcmDW`#+4y|15aw%!m>=5gHiO)BQm=w%V zvo?J`?JKKu>iMG3pkuEWt@fRnT@af2^ISD|A@8TYg!+tE%bd+K_Wt2L>CfdTq~$Sn z&r0z?gS1yiJ$&mFWH-g!zE{%o;6rZCotQr>IwFEhnI)IKF*^E5IdaD1zh4bnn)R4; zf~KcAEpOe>{+Z2T=cEib@g>POoQ%$7EDGJk8vMvh?(NTPe`~4WzX?mf_&z!zd-Ct( zqYotFW+eZ-ndn`zMS0J|)!MBLxsMaty<)8Ih8P+%ecAfxY}U<-DZ2ks7nfSy^jChS zR{E)~_s{j-+V}I0*!=n-XIIXBbAK!UnX9Ggm$PPT$uWn>R=!?6ukJrPB0GVKrLDmL6so{fHcYhD;y+^km?Pg8Cy+?(CiJ=4EHIlUd62$RI?&9S72%eIs~wg`inz^)AR@+%+%E=p~JRF@pzQ4a6-d451IuXV8O! z2Oq$9@Kwaw^xz(T!_2qyF*7rN=6Ak-KfeH6AqnAOLBN-2V6i$(;s8qs1VV{rNJ8^L zKWUZe@j&&TA4@Z;e&Ul=g1k0amdAH_k)^#5O{@z<5-n^HT6NDbS2x9QT=vVt=+X3; zlCD6T5SetM21P!xr%GF^F03W^mw9Tcdo#VI^OsGY$vqF`rebzDQyht7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/surefire-reports/edu.group5.app.AppTest.txt b/target/surefire-reports/edu.group5.app.AppTest.txt deleted file mode 100644 index d31b8d2..0000000 --- a/target/surefire-reports/edu.group5.app.AppTest.txt +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------------------- -Test set: edu.group5.app.AppTest -------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.082 s -- in edu.group5.app.AppTest diff --git a/target/test-classes/edu/group5/app/AppTest.class b/target/test-classes/edu/group5/app/AppTest.class deleted file mode 100644 index 4c6649954e613037560eadfde5c4dcaf50c01019..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmZutO-sW-6r4@dMq{)e*4lyxy;Tq9Af75h5IqG2Efu_N+oj!-?uN}qf0rl4gFnC@ zCBCEuFTK3k_vSHgXMTRaz5(2#=fPp_S@i3n zYv(d!=*F9`4;b3nT<6I&QrVj@&(h9^CMUJtW3H@RijmAD$wf+O%dOOk)Q)0pX5k{I z4^mB~6^1Oyu<$eR(L&q9KEv_mttiWcDU|{opu^zva&m$Xl{paCB{RD;z5;VyLyd&D}ZueTb6h0p~t YrI7oH=D(0nt3VSj8QdgxNUVeIAF#x0fB*mh From a3fd4ca8a39fd8d6eeb59d4cb127449147f95f81 Mon Sep 17 00:00:00 2001 From: Fredrik Marjoni Date: Wed, 25 Feb 2026 12:22:20 +0100 Subject: [PATCH 05/12] test: test running mvn and getting files in target --- target/classes/edu/group5/app/App.class | Bin 543 -> 543 bytes .../test-classes/edu/group5/app/AppTest.class | Bin 0 -> 503 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 target/test-classes/edu/group5/app/AppTest.class diff --git a/target/classes/edu/group5/app/App.class b/target/classes/edu/group5/app/App.class index 34b6a5bb4f60fde7eed7b1825511cb22f4cb7834..e3679e1b8be800f5bef6f802b19397fadbe36584 100644 GIT binary patch delta 295 zcmYLCJ8r^I5S%q8kLMV|pZoyhlEwu^(npa}A}CNwOFTtH4wj4+DHUgU;s9JAO(;O3 z-~e-d451IuXV8O! z2Oq$9@Kwaw^xz(T!_2qyF*7rN=6Ak-KfeH6AqnAOLBN-2V6i$(;s8qs1VV{rNJ8^L zKWUZe@j&&TA4@Z;e&Ul=g1k0amdAH_k)^#5O{@z<5-n^HT6NDbS2x9QT=vVt=+X3; zlCD6T5SetM21P!xr%GF^F03W^mw9Tcdo#VI^OsGY$vqF`rebzDQyht7_S@i3n zYv(d!=*F9`4;b3nT<6I&QrVj@&(h9^CMUJtW3H@RijmAD$wf+O%dOOk)Q)0pX5k{I z4^mB~6^1Oyu<$eR(L&q9KEv_mttiWcDU|{opu^zva&m$Xl{paCB{RD;z5;VyLyd&D}ZueTb6h0p~t YrI7oH=D(0nt3VSj8QdgxNUVeIAF#x0fB*mh literal 0 HcmV?d00001 From b037659f1936349c395ed571273b464cc5c06930 Mon Sep 17 00:00:00 2001 From: Fredrik Marjoni Date: Thu, 26 Feb 2026 09:07:44 +0100 Subject: [PATCH 06/12] feat: add User superclass --- src/main/java/edu/group5/app/model/user/User.java | 5 +++++ .../classes/edu/group5/app/model/user/User.class | Bin 0 -> 289 bytes 2 files changed, 5 insertions(+) create mode 100644 src/main/java/edu/group5/app/model/user/User.java create mode 100644 target/classes/edu/group5/app/model/user/User.class diff --git a/src/main/java/edu/group5/app/model/user/User.java b/src/main/java/edu/group5/app/model/user/User.java new file mode 100644 index 0000000..e163785 --- /dev/null +++ b/src/main/java/edu/group5/app/model/user/User.java @@ -0,0 +1,5 @@ +package edu.group5.app.model.user; + +public class User { + +} diff --git a/target/classes/edu/group5/app/model/user/User.class b/target/classes/edu/group5/app/model/user/User.class new file mode 100644 index 0000000000000000000000000000000000000000..950b2f7160ec2652685a7081f89e90b9a1c868d5 GIT binary patch literal 289 zcmaKnziz@n48}i)gh2SKJ^+FZ7&Fi?9d4yLf>n~-HG&c$A3!d{dSTSf?<&_Bs9DKeQK#5y^t zv?A0$bgruzp*EiE2>zVMBGk}qBS4+di*>G6_M9lQkx8ZqFL9B|Y$uI&`mg9$M|~j- zd+tqZ|UY#q9z#jM?a3pt|8L|>j4FuC08dolOh?uSo9%wP!&phDR KVMXXNJ@g(l06rT4 literal 0 HcmV?d00001 From 9f6125464eabe917356268e490fe605507f5a771 Mon Sep 17 00:00:00 2001 From: Fredrik Marjoni Date: Thu, 26 Feb 2026 09:13:00 +0100 Subject: [PATCH 07/12] feat[model]: add classes to make it visual on GitHub --- .../edu/group5/app/model/donation/Donation.java | 5 +++++ .../app/model/organization/Organization.java | 5 +++++ .../edu/group5/app/model/donation/Donation.class | Bin 0 -> 309 bytes .../app/model/organization/Organization.class | Bin 0 -> 329 bytes 4 files changed, 10 insertions(+) create mode 100644 src/main/java/edu/group5/app/model/donation/Donation.java create mode 100644 src/main/java/edu/group5/app/model/organization/Organization.java create mode 100644 target/classes/edu/group5/app/model/donation/Donation.class create mode 100644 target/classes/edu/group5/app/model/organization/Organization.class diff --git a/src/main/java/edu/group5/app/model/donation/Donation.java b/src/main/java/edu/group5/app/model/donation/Donation.java new file mode 100644 index 0000000..a127439 --- /dev/null +++ b/src/main/java/edu/group5/app/model/donation/Donation.java @@ -0,0 +1,5 @@ +package edu.group5.app.model.donation; + +public class Donation { + +} diff --git a/src/main/java/edu/group5/app/model/organization/Organization.java b/src/main/java/edu/group5/app/model/organization/Organization.java new file mode 100644 index 0000000..825945f --- /dev/null +++ b/src/main/java/edu/group5/app/model/organization/Organization.java @@ -0,0 +1,5 @@ +package edu.group5.app.model.organization; + +public class Organization { + +} diff --git a/target/classes/edu/group5/app/model/donation/Donation.class b/target/classes/edu/group5/app/model/donation/Donation.class new file mode 100644 index 0000000000000000000000000000000000000000..687d00e7e82e816b337c9de3a13b0be79dc8c689 GIT binary patch literal 309 zcma)%F>b;@5JmqO8-oJ@aRV9z6xk|OqBJC_EGR(qYkLKY%&ui@?nM=eA_vH!B4!cv zG=Jv*(Tv{w{hxmUe4!u0BaBp5i%n_k;#J6^5PO@cTx8bBN?Rj7Z%qiF(BH|U6uC4T zu}F3*tq9F`ZFKcPXpARofu|D>)9hH7#OlW2g(ud| OwGX&<*%6*uJ@hV=jz&NL literal 0 HcmV?d00001 diff --git a/target/classes/edu/group5/app/model/organization/Organization.class b/target/classes/edu/group5/app/model/organization/Organization.class new file mode 100644 index 0000000000000000000000000000000000000000..af118ddfe1be2c754d3f950677451cf175401840 GIT binary patch literal 329 zcmb7pP5!g$MX ztZKHES{7SfwuJt@v8H_>^rly9LOho<8G1M!AVHrn%8k`e-LBC7nTuKzE^}9My=HF$ z{}1E##k>-3^5d-T2-(VYzSNH<+`c$eo&{S>Aa3$+NTuK;nF^^r1IhI#PCjH1A(ITx TkcBhJ!M;zVo(mC%k`YFK{nk$L literal 0 HcmV?d00001 From 18eeadfb80ac72f0c62bcef40d88b46af030c651 Mon Sep 17 00:00:00 2001 From: Emil Fagerjord Date: Thu, 26 Feb 2026 09:18:11 +0100 Subject: [PATCH 08/12] init: Create .gitignore --- .gitignore | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bee94ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +############################## +## Java +############################## +.mtj.tmp/ +*.class +*.jar +*.war +*.ear +*.nar + +############################## +## Maven +############################## +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +pom.xml.bak +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar + +############################## +## IntelliJ +############################## +out/ +.idea/* +*.iml +*.ipr +*.iws + +############################## +## Database +############################## +*.db +*.DS_Store From 0857d0383e94802d01d825b09e7fa38ab4a4ec1e Mon Sep 17 00:00:00 2001 From: Fredrik Marjoni Date: Thu, 26 Feb 2026 09:33:26 +0100 Subject: [PATCH 09/12] feat: add classes to make MVC structure visable --- src/main/java/edu/group5/app/control/Wrapper.java | 5 +++++ src/main/java/edu/group5/app/utils/Utilities.java | 5 +++++ src/main/java/edu/group5/app/view/View.java | 5 +++++ .../classes/edu/group5/app/control/Wrapper.class | Bin 0 -> 292 bytes .../classes/edu/group5/app/utils/Utilities.class | Bin 0 -> 294 bytes target/classes/edu/group5/app/view/View.class | Bin 0 -> 277 bytes 6 files changed, 15 insertions(+) create mode 100644 src/main/java/edu/group5/app/control/Wrapper.java create mode 100644 src/main/java/edu/group5/app/utils/Utilities.java create mode 100644 src/main/java/edu/group5/app/view/View.java create mode 100644 target/classes/edu/group5/app/control/Wrapper.class create mode 100644 target/classes/edu/group5/app/utils/Utilities.class create mode 100644 target/classes/edu/group5/app/view/View.class diff --git a/src/main/java/edu/group5/app/control/Wrapper.java b/src/main/java/edu/group5/app/control/Wrapper.java new file mode 100644 index 0000000..9655c26 --- /dev/null +++ b/src/main/java/edu/group5/app/control/Wrapper.java @@ -0,0 +1,5 @@ +package edu.group5.app.control; + +public class Wrapper { + +} diff --git a/src/main/java/edu/group5/app/utils/Utilities.java b/src/main/java/edu/group5/app/utils/Utilities.java new file mode 100644 index 0000000..ce21d22 --- /dev/null +++ b/src/main/java/edu/group5/app/utils/Utilities.java @@ -0,0 +1,5 @@ +package edu.group5.app.utils; + +public class Utilities { + +} diff --git a/src/main/java/edu/group5/app/view/View.java b/src/main/java/edu/group5/app/view/View.java new file mode 100644 index 0000000..2c36e4f --- /dev/null +++ b/src/main/java/edu/group5/app/view/View.java @@ -0,0 +1,5 @@ +package edu.group5.app.view; + +public class View { + +} diff --git a/target/classes/edu/group5/app/control/Wrapper.class b/target/classes/edu/group5/app/control/Wrapper.class new file mode 100644 index 0000000000000000000000000000000000000000..cbe1488afa5505ae5be72d25b2d2162ef4e4ed8a GIT binary patch literal 292 zcmaKnv2MaZ42FM)gg{6E^#KrUz|fnRsJbASqB2myd3emm)S(Z+Lm_;K zxyx^Vwru~tTz~%nEYT0)5e8~si-R?FITNxhMP`c1nq2HGld>UvLjNScq{wA)5bN}$ zvWn1r)rGF!2#xV%OYj$FuOc+ijuD_q=q0*P@AYS@?1xNqMR-n3CiAVd+VP|4S4Vv& z43qy|%n8xP)HYKq?RLcvcQ4KuMqnHK5;&4O&l)m`I|IS=2d!@|c!*eC8$8fqjqiED M@rjAhW%baz0k+0J=l}o! literal 0 HcmV?d00001 diff --git a/target/classes/edu/group5/app/utils/Utilities.class b/target/classes/edu/group5/app/utils/Utilities.class new file mode 100644 index 0000000000000000000000000000000000000000..9fb7579e2b9762b92ce78ed4e63a7b77762bc6e5 GIT binary patch literal 294 zcmaKn!A`n9|(W*}&TQ+TskT6{9Z>F(|qWxFoc`5%5|~O4g35%4DA=U zguC>Ai)TVIuUwOxH}Y4I_w%dYRb-afgeo3<4xV{|s5U6!y=3 NB=t&?oE8QcoB)e9K-&NS literal 0 HcmV?d00001 diff --git a/target/classes/edu/group5/app/view/View.class b/target/classes/edu/group5/app/view/View.class new file mode 100644 index 0000000000000000000000000000000000000000..bc21f75c019877955f50631d6137819bf7288900 GIT binary patch literal 277 zcmZ{fJ&wXa427RVLLmH#3enL41ygOcXdA><5fq^GlQ4ooA&IgHoQrBD3J$=bR(PUq zX+HbevY-9@yFUP|(05@GhH77mL!Oq|hmct&E?Qkhz;Iy``X_mjB9_TPY{HX@3POFM z6J2}}YLjU|u$Spxd8nb;hJ!kx=j%kR%X6smoeX0|82D)<<3Q%x=>MW!9Q6-j)!&6cJ)YHseq80^kJfFl`KrproH8gOR6XxzA9!DE^>c%a2>SGmKn!-~*l HTIjt1jj%a; literal 0 HcmV?d00001 From d3dd369e440b55c28b309b76635cb925550c3970 Mon Sep 17 00:00:00 2001 From: Lucy Ciara Herud-Thomassen <86323303+LucyCiara@users.noreply.github.com> Date: Thu, 26 Feb 2026 09:47:41 +0100 Subject: [PATCH 10/12] chore: remove unnecessary folders --- .vscode/settings.json | 3 --- target/classes/edu/group5/app/App.class | Bin 543 -> 0 bytes .../classes/edu/group5/app/control/Wrapper.class | Bin 292 -> 0 bytes .../edu/group5/app/model/donation/Donation.class | Bin 309 -> 0 bytes .../app/model/organization/Organization.class | Bin 329 -> 0 bytes .../classes/edu/group5/app/model/user/User.class | Bin 289 -> 0 bytes .../classes/edu/group5/app/utils/Utilities.class | Bin 294 -> 0 bytes target/classes/edu/group5/app/view/View.class | Bin 277 -> 0 bytes .../compile/default-compile/createdFiles.lst | 1 - .../compile/default-compile/inputFiles.lst | 1 - target/test-classes/edu/group5/app/AppTest.class | Bin 503 -> 0 bytes 11 files changed, 5 deletions(-) delete mode 100644 .vscode/settings.json delete mode 100644 target/classes/edu/group5/app/App.class delete mode 100644 target/classes/edu/group5/app/control/Wrapper.class delete mode 100644 target/classes/edu/group5/app/model/donation/Donation.class delete mode 100644 target/classes/edu/group5/app/model/organization/Organization.class delete mode 100644 target/classes/edu/group5/app/model/user/User.class delete mode 100644 target/classes/edu/group5/app/utils/Utilities.class delete mode 100644 target/classes/edu/group5/app/view/View.class delete mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 target/test-classes/edu/group5/app/AppTest.class diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index dc3b895..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "interactive" -} \ No newline at end of file diff --git a/target/classes/edu/group5/app/App.class b/target/classes/edu/group5/app/App.class deleted file mode 100644 index e3679e1b8be800f5bef6f802b19397fadbe36584..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmZuu%SyvQ6g|^d9!6XH@~y3_)`eM#i;5tkxCkm#>cZ8u9paQE6VgQRvvi^0!VmDH z#G6*A#S%Do?!9x)J#+K*{qYIl0{a>=3}rD)Y&TL#cx3Z1w9mp&Lyn;|;!oW6c;MPM z{gD{N422UJ$oP~Y+iLe1a_4F&Ok`nL$fLkebYvi|6TdH_JKpyMi92e*y&jKbn*SDa z@uM6wRGt5mJEZD!88Fma56;X%H;!cBcG^7ytEgxw&-v>&RR63emm)S(Z+Lm_;K zxyx^Vwru~tTz~%nEYT0)5e8~si-R?FITNxhMP`c1nq2HGld>UvLjNScq{wA)5bN}$ zvWn1r)rGF!2#xV%OYj$FuOc+ijuD_q=q0*P@AYS@?1xNqMR-n3CiAVd+VP|4S4Vv& z43qy|%n8xP)HYKq?RLcvcQ4KuMqnHK5;&4O&l)m`I|IS=2d!@|c!*eC8$8fqjqiED M@rjAhW%baz0k+0J=l}o! diff --git a/target/classes/edu/group5/app/model/donation/Donation.class b/target/classes/edu/group5/app/model/donation/Donation.class deleted file mode 100644 index 687d00e7e82e816b337c9de3a13b0be79dc8c689..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcma)%F>b;@5JmqO8-oJ@aRV9z6xk|OqBJC_EGR(qYkLKY%&ui@?nM=eA_vH!B4!cv zG=Jv*(Tv{w{hxmUe4!u0BaBp5i%n_k;#J6^5PO@cTx8bBN?Rj7Z%qiF(BH|U6uC4T zu}F3*tq9F`ZFKcPXpARofu|D>)9hH7#OlW2g(ud| OwGX&<*%6*uJ@hV=jz&NL diff --git a/target/classes/edu/group5/app/model/organization/Organization.class b/target/classes/edu/group5/app/model/organization/Organization.class deleted file mode 100644 index af118ddfe1be2c754d3f950677451cf175401840..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmb7pP5!g$MX ztZKHES{7SfwuJt@v8H_>^rly9LOho<8G1M!AVHrn%8k`e-LBC7nTuKzE^}9My=HF$ z{}1E##k>-3^5d-T2-(VYzSNH<+`c$eo&{S>Aa3$+NTuK;nF^^r1IhI#PCjH1A(ITx TkcBhJ!M;zVo(mC%k`YFK{nk$L diff --git a/target/classes/edu/group5/app/model/user/User.class b/target/classes/edu/group5/app/model/user/User.class deleted file mode 100644 index 950b2f7160ec2652685a7081f89e90b9a1c868d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmaKnziz@n48}i)gh2SKJ^+FZ7&Fi?9d4yLf>n~-HG&c$A3!d{dSTSf?<&_Bs9DKeQK#5y^t zv?A0$bgruzp*EiE2>zVMBGk}qBS4+di*>G6_M9lQkx8ZqFL9B|Y$uI&`mg9$M|~j- zd+tqZ|UY#q9z#jM?a3pt|8L|>j4FuC08dolOh?uSo9%wP!&phDR KVMXXNJ@g(l06rT4 diff --git a/target/classes/edu/group5/app/utils/Utilities.class b/target/classes/edu/group5/app/utils/Utilities.class deleted file mode 100644 index 9fb7579e2b9762b92ce78ed4e63a7b77762bc6e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmaKn!A`n9|(W*}&TQ+TskT6{9Z>F(|qWxFoc`5%5|~O4g35%4DA=U zguC>Ai)TVIuUwOxH}Y4I_w%dYRb-afgeo3<4xV{|s5U6!y=3 NB=t&?oE8QcoB)e9K-&NS diff --git a/target/classes/edu/group5/app/view/View.class b/target/classes/edu/group5/app/view/View.class deleted file mode 100644 index bc21f75c019877955f50631d6137819bf7288900..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmZ{fJ&wXa427RVLLmH#3enL41ygOcXdA><5fq^GlQ4ooA&IgHoQrBD3J$=bR(PUq zX+HbevY-9@yFUP|(05@GhH77mL!Oq|hmct&E?Qkhz;Iy``X_mjB9_TPY{HX@3POFM z6J2}}YLjU|u$Spxd8nb;hJ!kx=j%kR%X6smoeX0|82D)<<3Q%x=>MW!9Q6-j)!&6cJ)YHseq80^kJfFl`KrproH8gOR6XxzA9!DE^>c%a2>SGmKn!-~*l HTIjt1jj%a; diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 28e9804..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -edu\group5\app\App.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 16a5464..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -C:\Users\marjo\Documents\Github\Help-Me-Help\src\main\java\edu\group5\app\App.java diff --git a/target/test-classes/edu/group5/app/AppTest.class b/target/test-classes/edu/group5/app/AppTest.class deleted file mode 100644 index 4c6649954e613037560eadfde5c4dcaf50c01019..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmZutO-sW-6r4@dMq{)e*4lyxy;Tq9Af75h5IqG2Efu_N+oj!-?uN}qf0rl4gFnC@ zCBCEuFTK3k_vSHgXMTRaz5(2#=fPp_S@i3n zYv(d!=*F9`4;b3nT<6I&QrVj@&(h9^CMUJtW3H@RijmAD$wf+O%dOOk)Q)0pX5k{I z4^mB~6^1Oyu<$eR(L&q9KEv_mttiWcDU|{opu^zva&m$Xl{paCB{RD;z5;VyLyd&D}ZueTb6h0p~t YrI7oH=D(0nt3VSj8QdgxNUVeIAF#x0fB*mh From 8f1ffa67c8b6802e8d9da1e515aae3eca8e12b1a Mon Sep 17 00:00:00 2001 From: Lucy Ciara Herud-Thomassen <86323303+LucyCiara@users.noreply.github.com> Date: Thu, 26 Feb 2026 10:08:02 +0100 Subject: [PATCH 11/12] update[gitignore]: add .vscode/ and target/ to gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index bee94ec..48a9ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ *.war *.ear *.nar +target/ ############################## ## Maven @@ -37,3 +38,8 @@ out/ ############################## *.db *.DS_Store + +############################## +## VSCode +############################## +.vscode/ From 35f6a167d4f084fcfc7a16668472e2e072611f8e Mon Sep 17 00:00:00 2001 From: Lucy Ciara Herud-Thomassen <86323303+LucyCiara@users.noreply.github.com> Date: Thu, 26 Feb 2026 11:05:10 +0100 Subject: [PATCH 12/12] update: remove unnecessary workflow steps causing issues, and re-add release branches to workflow --- .github/workflows/main.yaml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 9ad367c..3dbf59e 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - release/* workflow_dispatch: # Allows manual triggering of the workflow @@ -33,16 +34,6 @@ jobs: java-version: '25' - name: Run Tests run: mvn clean test - - name: Upload Test Results - uses: actions/upload-artifact@v3 - with: - name: surefire-reports - path: target/surefire-reports/ - - name: Upload Coverage Report - uses: actions/upload-artifact@v3 - with: - name: jacoco-report - path: target/jacoco/coverage-reports/jacoco.xml package: name: Package @@ -62,15 +53,4 @@ jobs: name: packaged-app path: target/Help-Me-Help-1.0-SNAPSHOT-jar-with-dependencies.jar - deployPages: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: self-hosted - steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '25' +