From c98b78a44a67501e119ab9db7116e7fc3d1d8d43 Mon Sep 17 00:00:00 2001 From: Theerth1 Date: Tue, 17 Mar 2026 19:31:43 -0400 Subject: [PATCH 1/7] initial structures --- .gitignore | 1 + package-lock.json | 3 +++ {src/app => public}/favicon.ico | Bin webapp/.gitadd | 0 webapp/server/.gitadd | 0 webapp/server/mongodb/actions/.gitadd | 0 webapp/server/mongodb/index.js | 0 webapp/server/mongodb/models/.gitadd | 0 webapp/server/utils/.gitadd | 0 webapp/src/.gitadd | 0 webapp/src/components/.gitadd | 0 webapp/src/pages/api/.gitadd | 0 webapp/src/pages/index.js | 0 {src/app => webapp/src/pages}/layout.tsx | 0 {src/app => webapp/src/pages}/page.tsx | 0 webapp/src/styles/.gitadd | 0 {src/app => webapp/src/styles}/globals.css | 0 17 files changed, 4 insertions(+) rename {src/app => public}/favicon.ico (100%) create mode 100644 webapp/.gitadd create mode 100644 webapp/server/.gitadd create mode 100644 webapp/server/mongodb/actions/.gitadd create mode 100644 webapp/server/mongodb/index.js create mode 100644 webapp/server/mongodb/models/.gitadd create mode 100644 webapp/server/utils/.gitadd create mode 100644 webapp/src/.gitadd create mode 100644 webapp/src/components/.gitadd create mode 100644 webapp/src/pages/api/.gitadd create mode 100644 webapp/src/pages/index.js rename {src/app => webapp/src/pages}/layout.tsx (100%) rename {src/app => webapp/src/pages}/page.tsx (100%) create mode 100644 webapp/src/styles/.gitadd rename {src/app => webapp/src/styles}/globals.css (100%) diff --git a/.gitignore b/.gitignore index 5ef6a52..7f3fcc5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ # dependencies /node_modules +.env /.pnp .pnp.* .yarn/* diff --git a/package-lock.json b/package-lock.json index f15a1ff..bf28413 100644 --- a/package-lock.json +++ b/package-lock.json @@ -952,6 +952,7 @@ "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "csstype": "^3.0.2" } @@ -1449,6 +1450,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz", "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -1458,6 +1460,7 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz", "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==", "license": "MIT", + "peer": true, "dependencies": { "scheduler": "^0.27.0" }, diff --git a/src/app/favicon.ico b/public/favicon.ico similarity index 100% rename from src/app/favicon.ico rename to public/favicon.ico diff --git a/webapp/.gitadd b/webapp/.gitadd new file mode 100644 index 0000000..e69de29 diff --git a/webapp/server/.gitadd b/webapp/server/.gitadd new file mode 100644 index 0000000..e69de29 diff --git a/webapp/server/mongodb/actions/.gitadd b/webapp/server/mongodb/actions/.gitadd new file mode 100644 index 0000000..e69de29 diff --git a/webapp/server/mongodb/index.js b/webapp/server/mongodb/index.js new file mode 100644 index 0000000..e69de29 diff --git a/webapp/server/mongodb/models/.gitadd b/webapp/server/mongodb/models/.gitadd new file mode 100644 index 0000000..e69de29 diff --git a/webapp/server/utils/.gitadd b/webapp/server/utils/.gitadd new file mode 100644 index 0000000..e69de29 diff --git a/webapp/src/.gitadd b/webapp/src/.gitadd new file mode 100644 index 0000000..e69de29 diff --git a/webapp/src/components/.gitadd b/webapp/src/components/.gitadd new file mode 100644 index 0000000..e69de29 diff --git a/webapp/src/pages/api/.gitadd b/webapp/src/pages/api/.gitadd new file mode 100644 index 0000000..e69de29 diff --git a/webapp/src/pages/index.js b/webapp/src/pages/index.js new file mode 100644 index 0000000..e69de29 diff --git a/src/app/layout.tsx b/webapp/src/pages/layout.tsx similarity index 100% rename from src/app/layout.tsx rename to webapp/src/pages/layout.tsx diff --git a/src/app/page.tsx b/webapp/src/pages/page.tsx similarity index 100% rename from src/app/page.tsx rename to webapp/src/pages/page.tsx diff --git a/webapp/src/styles/.gitadd b/webapp/src/styles/.gitadd new file mode 100644 index 0000000..e69de29 diff --git a/src/app/globals.css b/webapp/src/styles/globals.css similarity index 100% rename from src/app/globals.css rename to webapp/src/styles/globals.css From 50326a4ecb4041b4416ca0932a420117981a34ac Mon Sep 17 00:00:00 2001 From: Theerth1 Date: Tue, 31 Mar 2026 19:59:51 -0400 Subject: [PATCH 2/7] changing file structure --- public/favicon.ico | Bin 25931 -> 0 bytes webapp/.gitadd | 0 webapp/server/.gitadd | 0 webapp/server/mongodb/actions/.gitadd | 0 webapp/server/mongodb/index.js | 0 webapp/server/mongodb/models/.gitadd | 0 webapp/src/pages/_app.tsx | 6 +++++ webapp/src/pages/_document.tsx | 16 ++++++++++++ webapp/src/pages/layout.tsx | 34 -------------------------- 9 files changed, 22 insertions(+), 34 deletions(-) delete mode 100644 public/favicon.ico delete mode 100644 webapp/.gitadd delete mode 100644 webapp/server/.gitadd delete mode 100644 webapp/server/mongodb/actions/.gitadd delete mode 100644 webapp/server/mongodb/index.js delete mode 100644 webapp/server/mongodb/models/.gitadd create mode 100644 webapp/src/pages/_app.tsx create mode 100644 webapp/src/pages/_document.tsx delete mode 100644 webapp/src/pages/layout.tsx diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 zcmeHv30#a{`}aL_*G&7qml|y<+KVaDM2m#dVr!KsA!#An?kSQM(q<_dDNCpjEux83 zLb9Z^XxbDl(w>%i@8hT6>)&Gu{h#Oeyszu?xtw#Zb1mO{pgX9699l+Qppw7jXaYf~-84xW z)w4x8?=youko|}Vr~(D$UXIbiXABHh`p1?nn8Po~fxRJv}|0e(BPs|G`(TT%kKVJAdg5*Z|x0leQq0 zkdUBvb#>9F()jo|T~kx@OM8$9wzs~t2l;K=woNssA3l6|sx2r3+kdfVW@e^8e*E}v zA1y5{bRi+3Z`uD3{F7LgFJDdvm;nJilkzDku>BwXH(8ItVCXk*-lSJnR?-2UN%hJ){&rlvg`CDTj z)Bzo!3v7Ou#83zEDEFcKt(f1E0~=rqeEbTnMvWR#{+9pg%7G8y>u1OVRUSoox-ovF z2Ydma(;=YuBY(eI|04{hXzZD6_f(v~H;C~y5=DhAC{MMS>2fm~1H_t2$56pc$NH8( z5bH|<)71dV-_oCHIrzrT`2s-5w_+2CM0$95I6X8p^r!gHp+j_gd;9O<1~CEQQGS8) zS9Qh3#p&JM-G8rHekNmKVewU;pJRcTAog68KYo^dRo}(M>36U4Us zfgYWSiHZL3;lpWT=zNAW>Dh#mB!_@Lg%$ms8N-;aPqMn+C2HqZgz&9~Eu z4|Kp<`$q)Uw1R?y(~S>ePdonHxpV1#eSP1B;Ogo+-Pk}6#0GsZZ5!||ev2MGdh}_m z{DeR7?0-1^zVs&`AV6Vt;r3`I`OI_wgs*w=eO%_#7Kepl{B@xiyCANc(l zzIyd4y|c6PXWq9-|KM8(zIk8LPk(>a)zyFWjhT!$HJ$qX1vo@d25W<fvZQ2zUz5WRc(UnFMKHwe1| zWmlB1qdbiA(C0jmnV<}GfbKtmcu^2*P^O?MBLZKt|As~ge8&AAO~2K@zbXelK|4T<{|y4`raF{=72kC2Kn(L4YyenWgrPiv z@^mr$t{#X5VuIMeL!7Ab6_kG$&#&5p*Z{+?5U|TZ`B!7llpVmp@skYz&n^8QfPJzL z0G6K_OJM9x+Wu2gfN45phANGt{7=C>i34CV{Xqlx(fWpeAoj^N0Biu`w+MVcCUyU* zDZuzO0>4Z6fbu^T_arWW5n!E45vX8N=bxTVeFoep_G#VmNlQzAI_KTIc{6>c+04vr zx@W}zE5JNSU>!THJ{J=cqjz+4{L4A{Ob9$ZJ*S1?Ggg3klFp!+Y1@K+pK1DqI|_gq z5ZDXVpge8-cs!o|;K73#YXZ3AShj50wBvuq3NTOZ`M&qtjj#GOFfgExjg8Gn8>Vq5 z`85n+9|!iLCZF5$HJ$Iu($dm?8~-ofu}tEc+-pyke=3!im#6pk_Wo8IA|fJwD&~~F zc16osQ)EBo58U7XDuMexaPRjU@h8tXe%S{fA0NH3vGJFhuyyO!Uyl2^&EOpX{9As0 zWj+P>{@}jxH)8|r;2HdupP!vie{sJ28b&bo!8`D^x}TE$%zXNb^X1p@0PJ86`dZyj z%ce7*{^oo+6%&~I!8hQy-vQ7E)0t0ybH4l%KltWOo~8cO`T=157JqL(oq_rC%ea&4 z2NcTJe-HgFjNg-gZ$6!Y`SMHrlj}Etf7?r!zQTPPSv}{so2e>Fjs1{gzk~LGeesX%r(Lh6rbhSo_n)@@G-FTQy93;l#E)hgP@d_SGvyCp0~o(Y;Ee8{ zdVUDbHm5`2taPUOY^MAGOw*>=s7=Gst=D+p+2yON!0%Hk` zz5mAhyT4lS*T3LS^WSxUy86q&GnoHxzQ6vm8)VS}_zuqG?+3td68_x;etQAdu@sc6 zQJ&5|4(I?~3d-QOAODHpZ=hlSg(lBZ!JZWCtHHSj`0Wh93-Uk)_S%zsJ~aD>{`A0~ z9{AG(e|q3g5B%wYKRxiL2Y$8(4w6bzchKuloQW#e&S3n+P- z8!ds-%f;TJ1>)v)##>gd{PdS2Oc3VaR`fr=`O8QIO(6(N!A?pr5C#6fc~Ge@N%Vvu zaoAX2&(a6eWy_q&UwOhU)|P3J0Qc%OdhzW=F4D|pt0E4osw;%<%Dn58hAWD^XnZD= z>9~H(3bmLtxpF?a7su6J7M*x1By7YSUbxGi)Ot0P77`}P3{)&5Un{KD?`-e?r21!4vTTnN(4Y6Lin?UkSM z`MXCTC1@4A4~mvz%Rh2&EwY))LeoT=*`tMoqcEXI>TZU9WTP#l?uFv+@Dn~b(>xh2 z;>B?;Tz2SR&KVb>vGiBSB`@U7VIWFSo=LDSb9F{GF^DbmWAfpms8Sx9OX4CnBJca3 zlj9(x!dIjN?OG1X4l*imJNvRCk}F%!?SOfiOq5y^mZW)jFL@a|r-@d#f7 z2gmU8L3IZq0ynIws=}~m^#@&C%J6QFo~Mo4V`>v7MI-_!EBMMtb%_M&kvAaN)@ZVw z+`toz&WG#HkWDjnZE!6nk{e-oFdL^$YnbOCN}JC&{$#$O27@|Tn-skXr)2ml2~O!5 zX+gYoxhoc7qoU?C^3~&!U?kRFtnSEecWuH0B0OvLodgUAi}8p1 zrO6RSXHH}DMc$&|?D004DiOVMHV8kXCP@7NKB zgaZq^^O<7PoKEp72kby@W0Z!Y*Ay{&vfg#C&gG@YVR9g?FEocMUi1gSN$+V+ayF45{a zuDZDTN}mS|;BO%gEf}pjBfN2-gIrU#G5~cucA;dokXW89%>AyXJJI z9X4UlIWA|ZYHgbI z5?oFk@A=Ik7lrEQPDH!H+b`7_Y~aDb_qa=B2^Y&Ow41cU=4WDd40dp5(QS-WMN-=Y z9g;6_-JdNU;|6cPwf$ak*aJIcwL@1n$#l~zi{c{EW?T;DaW*E8DYq?Umtz{nJ&w-M zEMyTDrC&9K$d|kZe2#ws6)L=7K+{ zQw{XnV6UC$6-rW0emqm8wJoeZK)wJIcV?dST}Z;G0Arq{dVDu0&4kd%N!3F1*;*pW zR&qUiFzK=@44#QGw7k1`3t_d8&*kBV->O##t|tonFc2YWrL7_eqg+=+k;!F-`^b8> z#KWCE8%u4k@EprxqiV$VmmtiWxDLgnGu$Vs<8rppV5EajBXL4nyyZM$SWVm!wnCj-B!Wjqj5-5dNXukI2$$|Bu3Lrw}z65Lc=1G z^-#WuQOj$hwNGG?*CM_TO8Bg-1+qc>J7k5c51U8g?ZU5n?HYor;~JIjoWH-G>AoUP ztrWWLbRNqIjW#RT*WqZgPJXU7C)VaW5}MiijYbABmzoru6EmQ*N8cVK7a3|aOB#O& zBl8JY2WKfmj;h#Q!pN%9o@VNLv{OUL?rixHwOZuvX7{IJ{(EdPpuVFoQqIOa7giLVkBOKL@^smUA!tZ1CKRK}#SSM)iQHk)*R~?M!qkCruaS!#oIL1c z?J;U~&FfH#*98^G?i}pA{ z9Jg36t4=%6mhY(quYq*vSxptes9qy|7xSlH?G=S@>u>Ebe;|LVhs~@+06N<4CViBk zUiY$thvX;>Tby6z9Y1edAMQaiH zm^r3v#$Q#2T=X>bsY#D%s!bhs^M9PMAcHbCc0FMHV{u-dwlL;a1eJ63v5U*?Q_8JO zT#50!RD619#j_Uf))0ooADz~*9&lN!bBDRUgE>Vud-i5ck%vT=r^yD*^?Mp@Q^v+V zG#-?gKlr}Eeqifb{|So?HM&g91P8|av8hQoCmQXkd?7wIJwb z_^v8bbg`SAn{I*4bH$u(RZ6*xUhuA~hc=8czK8SHEKTzSxgbwi~9(OqJB&gwb^l4+m`k*Q;_?>Y-APi1{k zAHQ)P)G)f|AyjSgcCFps)Fh6Bca*Xznq36!pV6Az&m{O8$wGFD? zY&O*3*J0;_EqM#jh6^gMQKpXV?#1?>$ml1xvh8nSN>-?H=V;nJIwB07YX$e6vLxH( zqYwQ>qxwR(i4f)DLd)-$P>T-no_c!LsN@)8`e;W@)-Hj0>nJ-}Kla4-ZdPJzI&Mce zv)V_j;(3ERN3_@I$N<^|4Lf`B;8n+bX@bHbcZTopEmDI*Jfl)-pFDvo6svPRoo@(x z);_{lY<;);XzT`dBFpRmGrr}z5u1=pC^S-{ce6iXQlLGcItwJ^mZx{m$&DA_oEZ)B{_bYPq-HA zcH8WGoBG(aBU_j)vEy+_71T34@4dmSg!|M8Vf92Zj6WH7Q7t#OHQqWgFE3ARt+%!T z?oLovLVlnf?2c7pTc)~cc^($_8nyKwsN`RA-23ed3sdj(ys%pjjM+9JrctL;dy8a( z@en&CQmnV(()bu|Y%G1-4a(6x{aLytn$T-;(&{QIJB9vMox11U-1HpD@d(QkaJdEb zG{)+6Dos_L+O3NpWo^=gR?evp|CqEG?L&Ut#D*KLaRFOgOEK(Kq1@!EGcTfo+%A&I z=dLbB+d$u{sh?u)xP{PF8L%;YPPW53+@{>5W=Jt#wQpN;0_HYdw1{ksf_XhO4#2F= zyPx6Lx2<92L-;L5PD`zn6zwIH`Jk($?Qw({erA$^bC;q33hv!d!>%wRhj# zal^hk+WGNg;rJtb-EB(?czvOM=H7dl=vblBwAv>}%1@{}mnpUznfq1cE^sgsL0*4I zJ##!*B?=vI_OEVis5o+_IwMIRrpQyT_Sq~ZU%oY7c5JMIADzpD!Upz9h@iWg_>>~j zOLS;wp^i$-E?4<_cp?RiS%Rd?i;f*mOz=~(&3lo<=@(nR!_Rqiprh@weZlL!t#NCc zO!QTcInq|%#>OVgobj{~ixEUec`E25zJ~*DofsQdzIa@5^nOXj2T;8O`l--(QyU^$t?TGY^7#&FQ+2SS3B#qK*k3`ye?8jUYSajE5iBbJls75CCc(m3dk{t?- zopcER9{Z?TC)mk~gpi^kbbu>b-+a{m#8-y2^p$ka4n60w;Sc2}HMf<8JUvhCL0B&Btk)T`ctE$*qNW8L$`7!r^9T+>=<=2qaq-;ll2{`{Rg zc5a0ZUI$oG&j-qVOuKa=*v4aY#IsoM+1|c4Z)<}lEDvy;5huB@1RJPquU2U*U-;gu z=En2m+qjBzR#DEJDO`WU)hdd{Vj%^0V*KoyZ|5lzV87&g_j~NCjwv0uQVqXOb*QrQ zy|Qn`hxx(58c70$E;L(X0uZZ72M1!6oeg)(cdKO ze0gDaTz+ohR-#d)NbAH4x{I(21yjwvBQfmpLu$)|m{XolbgF!pmsqJ#D}(ylp6uC> z{bqtcI#hT#HW=wl7>p!38sKsJ`r8}lt-q%Keqy%u(xk=yiIJiUw6|5IvkS+#?JTBl z8H5(Q?l#wzazujH!8o>1xtn8#_w+397*_cy8!pQGP%K(Ga3pAjsaTbbXJlQF_+m+-UpUUent@xM zg%jqLUExj~o^vQ3Gl*>wh=_gOr2*|U64_iXb+-111aH}$TjeajM+I20xw(((>fej-@CIz4S1pi$(#}P7`4({6QS2CaQS4NPENDp>sAqD z$bH4KGzXGffkJ7R>V>)>tC)uax{UsN*dbeNC*v}#8Y#OWYwL4t$ePR?VTyIs!wea+ z5Urmc)X|^`MG~*dS6pGSbU+gPJoq*^a=_>$n4|P^w$sMBBy@f*Z^Jg6?n5?oId6f{ z$LW4M|4m502z0t7g<#Bx%X;9<=)smFolV&(V^(7Cv2-sxbxopQ!)*#ZRhTBpx1)Fc zNm1T%bONzv6@#|dz(w02AH8OXe>kQ#1FMCzO}2J_mST)+ExmBr9cva-@?;wnmWMOk z{3_~EX_xadgJGv&H@zK_8{(x84`}+c?oSBX*Ge3VdfTt&F}yCpFP?CpW+BE^cWY0^ zb&uBN!Ja3UzYHK-CTyA5=L zEMW{l3Usky#ly=7px648W31UNV@K)&Ub&zP1c7%)`{);I4b0Q<)B}3;NMG2JH=X$U zfIW4)4n9ZM`-yRj67I)YSLDK)qfUJ_ij}a#aZN~9EXrh8eZY2&=uY%2N0UFF7<~%M zsB8=erOWZ>Ct_#^tHZ|*q`H;A)5;ycw*IcmVxi8_0Xk}aJA^ath+E;xg!x+As(M#0=)3!NJR6H&9+zd#iP(m0PIW8$ z1Y^VX`>jm`W!=WpF*{ioM?C9`yOR>@0q=u7o>BP-eSHqCgMDj!2anwH?s%i2p+Q7D zzszIf5XJpE)IG4;d_(La-xenmF(tgAxK`Y4sQ}BSJEPs6N_U2vI{8=0C_F?@7<(G; zo$~G=8p+076G;`}>{MQ>t>7cm=zGtfbdDXm6||jUU|?X?CaE?(<6bKDYKeHlz}DA8 zXT={X=yp_R;HfJ9h%?eWvQ!dRgz&Su*JfNt!Wu>|XfU&68iRikRrHRW|ZxzRR^`eIGt zIeiDgVS>IeExKVRWW8-=A=yA`}`)ZkWBrZD`hpWIxBGkh&f#ijr449~m`j6{4jiJ*C!oVA8ZC?$1RM#K(_b zL9TW)kN*Y4%^-qPpMP7d4)o?Nk#>aoYHT(*g)qmRUb?**F@pnNiy6Fv9rEiUqD(^O zzyS?nBrX63BTRYduaG(0VVG2yJRe%o&rVrLjbxTaAFTd8s;<<@Qs>u(<193R8>}2_ zuwp{7;H2a*X7_jryzriZXMg?bTuegABb^87@SsKkr2)0Gyiax8KQWstw^v#ix45EVrcEhr>!NMhprl$InQMzjSFH54x5k9qHc`@9uKQzvL4ihcq{^B zPrVR=o_ic%Y>6&rMN)hTZsI7I<3&`#(nl+3y3ys9A~&^=4?PL&nd8)`OfG#n zwAMN$1&>K++c{^|7<4P=2y(B{jJsQ0a#U;HTo4ZmWZYvI{+s;Td{Yzem%0*k#)vjpB zia;J&>}ICate44SFYY3vEelqStQWFihx%^vQ@Do(sOy7yR2@WNv7Y9I^yL=nZr3mb zXKV5t@=?-Sk|b{XMhA7ZGB@2hqsx}4xwCW!in#C zI@}scZlr3-NFJ@NFaJlhyfcw{k^vvtGl`N9xSo**rDW4S}i zM9{fMPWo%4wYDG~BZ18BD+}h|GQKc-g^{++3MY>}W_uq7jGHx{mwE9fZiPCoxN$+7 zrODGGJrOkcPQUB(FD5aoS4g~7#6NR^ma7-!>mHuJfY5kTe6PpNNKC9GGRiu^L31uG z$7v`*JknQHsYB!Tm_W{a32TM099djW%5e+j0Ve_ct}IM>XLF1Ap+YvcrLV=|CKo6S zb+9Nl3_YdKP6%Cxy@6TxZ>;4&nTneadr z_ES90ydCev)LV!dN=#(*f}|ZORFdvkYBni^aLbUk>BajeWIOcmHP#8S)*2U~QKI%S zyrLmtPqb&TphJ;>yAxri#;{uyk`JJqODDw%(Z=2`1uc}br^V%>j!gS)D*q*f_-qf8&D;W1dJgQMlaH5er zN2U<%Smb7==vE}dDI8K7cKz!vs^73o9f>2sgiTzWcwY|BMYHH5%Vn7#kiw&eItCqa zIkR2~Q}>X=Ar8W|^Ms41Fm8o6IB2_j60eOeBB1Br!boW7JnoeX6Gs)?7rW0^5psc- zjS16yb>dFn>KPOF;imD}e!enuIniFzv}n$m2#gCCv4jM#ArwlzZ$7@9&XkFxZ4n!V zj3dyiwW4Ki2QG{@i>yuZXQizw_OkZI^-3otXC{!(lUpJF33gI60ak;Uqitp74|B6I zgg{b=Iz}WkhCGj1M=hu4#Aw173YxIVbISaoc z-nLZC*6Tgivd5V`K%GxhBsp@SUU60-rfc$=wb>zdJzXS&-5(NRRodFk;Kxk!S(O(a0e7oY=E( zAyS;Ow?6Q&XA+cnkCb{28_1N8H#?J!*$MmIwLq^*T_9-z^&UE@A(z9oGYtFy6EZef LrJugUA?W`A8`#=m diff --git a/webapp/.gitadd b/webapp/.gitadd deleted file mode 100644 index e69de29..0000000 diff --git a/webapp/server/.gitadd b/webapp/server/.gitadd deleted file mode 100644 index e69de29..0000000 diff --git a/webapp/server/mongodb/actions/.gitadd b/webapp/server/mongodb/actions/.gitadd deleted file mode 100644 index e69de29..0000000 diff --git a/webapp/server/mongodb/index.js b/webapp/server/mongodb/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/webapp/server/mongodb/models/.gitadd b/webapp/server/mongodb/models/.gitadd deleted file mode 100644 index e69de29..0000000 diff --git a/webapp/src/pages/_app.tsx b/webapp/src/pages/_app.tsx new file mode 100644 index 0000000..61f64e1 --- /dev/null +++ b/webapp/src/pages/_app.tsx @@ -0,0 +1,6 @@ +import "@/styles/globals.css"; +import type { AppProps } from "next/app"; + +export default function App({ Component, pageProps }: AppProps) { + return ; +} \ No newline at end of file diff --git a/webapp/src/pages/_document.tsx b/webapp/src/pages/_document.tsx new file mode 100644 index 0000000..93812e7 --- /dev/null +++ b/webapp/src/pages/_document.tsx @@ -0,0 +1,16 @@ +import { Html, Head, Main, NextScript } from "next/document"; + +export default function Document() { + return ( + + + +
+ + + + ); +} \ No newline at end of file diff --git a/webapp/src/pages/layout.tsx b/webapp/src/pages/layout.tsx deleted file mode 100644 index f7fa87e..0000000 --- a/webapp/src/pages/layout.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import type { Metadata } from "next"; -import { Geist, Geist_Mono } from "next/font/google"; -import "./globals.css"; - -const geistSans = Geist({ - variable: "--font-geist-sans", - subsets: ["latin"], -}); - -const geistMono = Geist_Mono({ - variable: "--font-geist-mono", - subsets: ["latin"], -}); - -export const metadata: Metadata = { - title: "Create Next App", - description: "Generated by create next app", -}; - -export default function RootLayout({ - children, -}: Readonly<{ - children: React.ReactNode; -}>) { - return ( - - - {children} - - - ); -} From eef0cd2886ec31e3f1b18972493cf7fcd48a08b3 Mon Sep 17 00:00:00 2001 From: drinashah Date: Wed, 1 Apr 2026 15:29:12 -0400 Subject: [PATCH 3/7] add mongodb connection --- webapp/server/mongodb/index.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/webapp/server/mongodb/index.js b/webapp/server/mongodb/index.js index e69de29..8a0ab8a 100644 --- a/webapp/server/mongodb/index.js +++ b/webapp/server/mongodb/index.js @@ -0,0 +1,30 @@ +import mongoose from "mongoose"; + +const MONGODB_URI = process.env.MONGODB_URI; + +if (!MONGODB_URI) { + throw new Error("Please define the MONGODB_URI environment variable"); +} + +let cached = global.mongoose; + +if (!cached) { + cached = global.mongoose = { conn: null, promise: null }; +} + +async function connectDB() { + if (cached.conn) { + return cached.conn; + } + + if (!cached.promise) { + cached.promise = mongoose.connect(MONGODB_URI).then((mongoose) => { + return mongoose; + }); + } + + cached.conn = await cached.promise; + return cached.conn; +} + +export default connectDB; \ No newline at end of file From 7b37a2c74210a3f8a7534722abf3358785e9f12a Mon Sep 17 00:00:00 2001 From: drinashah Date: Thu, 2 Apr 2026 17:35:52 -0400 Subject: [PATCH 4/7] add animal model, actions, and API routes --- src/pages/api/admin/animals.js | 14 +++++++++++ src/pages/api/animal.js | 25 +++++++++++++++++++ src/pages/index.js | 3 +++ .../server/mongodb/actions/animalActions.js | 20 +++++++++++++++ webapp/server/mongodb/models/Animal.js | 11 ++++++++ 5 files changed, 73 insertions(+) create mode 100644 src/pages/api/admin/animals.js create mode 100644 src/pages/api/animal.js create mode 100644 src/pages/index.js create mode 100644 webapp/server/mongodb/actions/animalActions.js create mode 100644 webapp/server/mongodb/models/Animal.js diff --git a/src/pages/api/admin/animals.js b/src/pages/api/admin/animals.js new file mode 100644 index 0000000..9e7cb2f --- /dev/null +++ b/src/pages/api/admin/animals.js @@ -0,0 +1,14 @@ +import { getAllAnimals } from "../../../../webapp/server/mongodb/actions/animalActions.js"; + +export default async function handler(req, res) { + if (req.method === "GET") { + try { + const animals = await getAllAnimals(); + return res.status(200).json(animals); + } catch (err) { + return res.status(500).json({ error: err.message }); + } + } + + return res.status(405).json({ error: "Method not allowed" }); +} diff --git a/src/pages/api/animal.js b/src/pages/api/animal.js new file mode 100644 index 0000000..55b2096 --- /dev/null +++ b/src/pages/api/animal.js @@ -0,0 +1,25 @@ +import { createAnimal, updateAnimal } from "../../../webapp/server/mongodb/actions/animalActions.js"; + +export default async function handler(req, res) { + if (req.method === "POST") { + try { + const animal = await createAnimal(req.body); + return res.status(201).json(animal); + } catch (err) { + return res.status(400).json({ error: err.message }); + } + } + + if (req.method === "PATCH") { + try { + const { id, ...data } = req.body; + const animal = await updateAnimal(id, data); + if (!animal) return res.status(404).json({ error: "Animal not found" }); + return res.status(200).json(animal); + } catch (err) { + return res.status(400).json({ error: err.message }); + } + } + + return res.status(405).json({ error: "Method not allowed" }); +} diff --git a/src/pages/index.js b/src/pages/index.js new file mode 100644 index 0000000..f953d16 --- /dev/null +++ b/src/pages/index.js @@ -0,0 +1,3 @@ +export default function Home() { + return
Animal Training App
; +} diff --git a/webapp/server/mongodb/actions/animalActions.js b/webapp/server/mongodb/actions/animalActions.js new file mode 100644 index 0000000..afbecf1 --- /dev/null +++ b/webapp/server/mongodb/actions/animalActions.js @@ -0,0 +1,20 @@ +import connectDB from "../index.js"; +import Animal from "../models/Animal.js"; + +export async function createAnimal(data) { + await connectDB(); + const animal = await Animal.create(data); + return animal; +} + +export async function updateAnimal(id, data) { + await connectDB(); + const animal = await Animal.findByIdAndUpdate(id, data, { new: true }); + return animal; +} + +export async function getAllAnimals() { + await connectDB(); + const animals = await Animal.find({}).populate("owner", "fullName email"); + return animals; +} diff --git a/webapp/server/mongodb/models/Animal.js b/webapp/server/mongodb/models/Animal.js new file mode 100644 index 0000000..6c839b6 --- /dev/null +++ b/webapp/server/mongodb/models/Animal.js @@ -0,0 +1,11 @@ +import mongoose from "mongoose"; + +const AnimalSchema = new mongoose.Schema({ + name: { type: String, required: true }, + breed: { type: String, required: true }, + owner: { type: mongoose.Schema.Types.ObjectId, ref: "User", required: true }, + hoursTrained: { type: Number, default: 0 }, + profilePicture: { type: String, default: "" }, +}); + +export default mongoose.models.Animal || mongoose.model("Animal", AnimalSchema); From 41bb773beaaa826a462b8d0b1585a53ef3249383 Mon Sep 17 00:00:00 2001 From: Theerth1 Date: Fri, 3 Apr 2026 01:47:27 -0400 Subject: [PATCH 5/7] first round of backend updates for users. also modified the file structure and it should be correct now. --- package-lock.json | 134 +++++++++++++++++++ package.json | 11 +- {webapp/src => src/components}/.gitadd | 0 {webapp/src => src}/pages/_app.tsx | 0 {webapp/src => src}/pages/_document.tsx | 0 src/pages/api/admin/users.ts | 23 ++++ src/pages/api/animal.js | 2 +- src/pages/api/user.ts | 28 ++++ src/pages/api/user/verify.ts | 28 ++++ src/pages/index.js | 82 ++++++++++++ {webapp/src => src}/styles/globals.css | 2 +- tsconfig.json | 2 +- webapp/server/mongodb/actions/userActions.js | 43 ++++++ webapp/server/mongodb/models/User.js | 10 ++ webapp/src/components/.gitadd | 0 webapp/src/pages/api/.gitadd | 0 webapp/src/pages/index.js | 0 webapp/src/pages/page.tsx | 65 --------- webapp/src/styles/.gitadd | 0 19 files changed, 357 insertions(+), 73 deletions(-) rename {webapp/src => src/components}/.gitadd (100%) rename {webapp/src => src}/pages/_app.tsx (100%) rename {webapp/src => src}/pages/_document.tsx (100%) create mode 100644 src/pages/api/admin/users.ts create mode 100644 src/pages/api/user.ts create mode 100644 src/pages/api/user/verify.ts rename {webapp/src => src}/styles/globals.css (99%) create mode 100644 webapp/server/mongodb/actions/userActions.js create mode 100644 webapp/server/mongodb/models/User.js delete mode 100644 webapp/src/components/.gitadd delete mode 100644 webapp/src/pages/api/.gitadd delete mode 100644 webapp/src/pages/index.js delete mode 100644 webapp/src/pages/page.tsx delete mode 100644 webapp/src/styles/.gitadd diff --git a/package-lock.json b/package-lock.json index bf28413..5ab3150 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "project2-f25", "version": "0.1.0", "dependencies": { + "argon2": "^0.44.0", "next": "16.0.1", "react": "19.2.0", "react-dom": "19.2.0" @@ -44,6 +45,12 @@ "tslib": "^2.4.0" } }, + "node_modules/@epic-web/invariant": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz", + "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==", + "license": "MIT" + }, "node_modules/@img/colour": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.0.0.tgz", @@ -656,6 +663,15 @@ "node": ">= 10" } }, + "node_modules/@phc/format": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz", + "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, "node_modules/@swc/helpers": { "version": "0.5.15", "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz", @@ -967,6 +983,22 @@ "@types/react": "^19.2.0" } }, + "node_modules/argon2": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.44.0.tgz", + "integrity": "sha512-zHPGN3S55sihSQo0dBbK0A5qpi2R31z7HZDZnry3ifOyj8bZZnpZND2gpmhnRGO1V/d555RwBqIK5W4Mrmv3ig==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@phc/format": "^1.0.0", + "cross-env": "^10.0.0", + "node-addon-api": "^8.5.0", + "node-gyp-build": "^4.8.4" + }, + "engines": { + "node": ">=16.17.0" + } + }, "node_modules/caniuse-lite": { "version": "1.0.30001751", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz", @@ -993,6 +1025,37 @@ "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==", "license": "MIT" }, + "node_modules/cross-env": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz", + "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==", + "license": "MIT", + "dependencies": { + "@epic-web/invariant": "^1.0.0", + "cross-spawn": "^7.0.6" + }, + "bin": { + "cross-env": "dist/bin/cross-env.js", + "cross-env-shell": "dist/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/csstype": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", @@ -1031,6 +1094,12 @@ "dev": true, "license": "ISC" }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" + }, "node_modules/jiti": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", @@ -1410,6 +1479,35 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/node-addon-api": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.7.0.tgz", + "integrity": "sha512-9MdFxmkKaOYVTV+XVRG8ArDwwQ77XIgIPyKASB1k3JPq3M8fGQQQE3YpMOrKm6g//Ktx8ivZr8xo1Qmtqub+GA==", + "license": "MIT", + "engines": { + "node": "^18 || ^20 || >= 21" + } + }, + "node_modules/node-gyp-build": { + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", + "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==", + "license": "MIT", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -1530,6 +1628,27 @@ "@img/sharp-win32-x64": "0.34.4" } }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -1609,6 +1728,21 @@ "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "dev": true, "license": "MIT" + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } } } } diff --git a/package.json b/package.json index 693e5fc..4a30477 100644 --- a/package.json +++ b/package.json @@ -8,16 +8,17 @@ "start": "next start" }, "dependencies": { + "argon2": "^0.44.0", + "next": "16.0.1", "react": "19.2.0", - "react-dom": "19.2.0", - "next": "16.0.1" + "react-dom": "19.2.0" }, "devDependencies": { - "typescript": "^5", + "@tailwindcss/postcss": "^4", "@types/node": "^20", "@types/react": "^19", "@types/react-dom": "^19", - "@tailwindcss/postcss": "^4", - "tailwindcss": "^4" + "tailwindcss": "^4", + "typescript": "^5" } } diff --git a/webapp/src/.gitadd b/src/components/.gitadd similarity index 100% rename from webapp/src/.gitadd rename to src/components/.gitadd diff --git a/webapp/src/pages/_app.tsx b/src/pages/_app.tsx similarity index 100% rename from webapp/src/pages/_app.tsx rename to src/pages/_app.tsx diff --git a/webapp/src/pages/_document.tsx b/src/pages/_document.tsx similarity index 100% rename from webapp/src/pages/_document.tsx rename to src/pages/_document.tsx diff --git a/src/pages/api/admin/users.ts b/src/pages/api/admin/users.ts new file mode 100644 index 0000000..16296ce --- /dev/null +++ b/src/pages/api/admin/users.ts @@ -0,0 +1,23 @@ +import { NextApiRequest, NextApiResponse } from 'next'; +import connectDB from '../../../../webapp/server/mongodb'; +import User from '../../../../webapp/server/mongodb/models/user'; + +// we need the id to be passed in of the person requesting this info +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + try { + if (req.method !== 'GET') { + throw new Error('Invalid HTTP method'); + } + await connectDB(); + const requesterId = req.headers['user-id']; + const requester = await User.findById(requesterId); + + if (!requester || !requester.isAdmin) { + return res.status(500).json({ error: "Unauthorized"}); + } + const users = await User.find().select('-password'); + return res.status(200).json(users); + } catch (error) { + return res.status(500).json({ error: 'There was an error' }); + } +} diff --git a/src/pages/api/animal.js b/src/pages/api/animal.js index 55b2096..a8ea6d3 100644 --- a/src/pages/api/animal.js +++ b/src/pages/api/animal.js @@ -1,4 +1,4 @@ -import { createAnimal, updateAnimal } from "../../../webapp/server/mongodb/actions/animalActions.js"; +import { createAnimal, updateAnimal } from "../../../server/mongodb/actions/animalActions.js"; export default async function handler(req, res) { if (req.method === "POST") { diff --git a/src/pages/api/user.ts b/src/pages/api/user.ts new file mode 100644 index 0000000..40c3757 --- /dev/null +++ b/src/pages/api/user.ts @@ -0,0 +1,28 @@ +import { NextApiRequest, NextApiResponse } from 'next'; +import { createUser } from '../../../webapp/server/mongodb/actions/userActions'; + +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + try { + if (req.method !== 'POST') { + throw new Error('Invalid HTTP method'); + } + const { fullName, email, password } = req.body; + if (!fullName || !email || !password) { + return res.status(400).json({ + error: 'All required user information is not present.' + }); + } + const newUser = await createUser(req.body); + return res.status(200).json({ + message: 'User was created successfully', + user: newUser + }); + } catch(err) { + if (err instanceof Error) { + if (err.message === "Email is already used") { + return res.status(400).json({ err: err.message }); + } + return res.status(500).json({ err: 'There was an error'}); + } + } +} \ No newline at end of file diff --git a/src/pages/api/user/verify.ts b/src/pages/api/user/verify.ts new file mode 100644 index 0000000..7c49bd7 --- /dev/null +++ b/src/pages/api/user/verify.ts @@ -0,0 +1,28 @@ +import { NextApiRequest, NextApiResponse } from "next"; +import connectDB from "../../../../webapp/server/mongodb"; +import User from "../../../../webapp/server/mongodb/models/user"; +import * as argon2 from 'argon2'; + +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + try { + if (req.method !== 'POST') { + throw new Error('Invalid HTTP method'); + } + await connectDB(); + const { email, password } = req.body; + const user = await User.findOne({ email }); + if (!user) { + return res.status(500).json({ error: 'Invalid Username/Password'} ); + } + const isPassValid = await argon2.verify(user.password, password); + if (!isPassValid) { + return res.status(500).json({ error: 'Invalid Username/Password'} ); + } + return res.status(200).json({ + id: user._id, + isAdmin: user.isAdmin + }); // whenever the user logs in, their id and admin status is saved for the duration of their stay on the site + } catch(error) { + return res.status(500).json({ error: 'There was an error' }); + } +} \ No newline at end of file diff --git a/src/pages/index.js b/src/pages/index.js index f953d16..459dc21 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -1,3 +1,85 @@ export default function Home() { return
Animal Training App
; } + + +// i dont know if this is right because the index.tsx file in the github parent repo is like this: + +/* +import Image from "next/image"; +import { Geist, Geist_Mono } from "next/font/google"; + +const geistSans = Geist({ + variable: "--font-geist-sans", + subsets: ["latin"], +}); + +const geistMono = Geist_Mono({ + variable: "--font-geist-mono", + subsets: ["latin"], +}); + +export default function Home() { + return ( +
+
+ Next.js logo +
+

+ To get started, edit the page.tsx file. +

+

+ Looking for a starting point or more instructions? Head over to{" "} + + Templates + {" "} + or the{" "} + + Learning + {" "} + center. +

+
+ +
+
+ ); +} +*/ \ No newline at end of file diff --git a/webapp/src/styles/globals.css b/src/styles/globals.css similarity index 99% rename from webapp/src/styles/globals.css rename to src/styles/globals.css index a2dc41e..9159b88 100644 --- a/webapp/src/styles/globals.css +++ b/src/styles/globals.css @@ -23,4 +23,4 @@ body { background: var(--background); color: var(--foreground); font-family: Arial, Helvetica, sans-serif; -} +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index cf9c65d..821e1f1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,7 +19,7 @@ } ], "paths": { - "@/*": ["./src/*"] + "@/*": ["src/*"] } }, "include": [ diff --git a/webapp/server/mongodb/actions/userActions.js b/webapp/server/mongodb/actions/userActions.js new file mode 100644 index 0000000..c922e46 --- /dev/null +++ b/webapp/server/mongodb/actions/userActions.js @@ -0,0 +1,43 @@ +import connectDB from ".."; +import User from "../models/user"; +import * as argon2 from 'argon2'; + +export async function createUser(data) { + await connectDB(); + const existing = await User.findOne({ email: data.email }); + if (existing) { + throw new Error("Email is already used"); + } + const hashPass = await argon2.hash(data["password"]); + const user = await User.create({ ...data, password: hashPass }); + return user; +} +export async function updateUser(id, data) { + await connectDB(); + if (data.password) { + data.password = await argon2.hash(data.password); + } + const updatedUser = await User.findByIdAndUpdate(id, data, { new: true }); + if (!updatedUser) { + throw new Error("User not found."); + } + return updatedUser; +} +export async function getUser(id) { + await connectDB(); + const inDB = await User.findById(id).select('-password'); // filters out password + if (!inDB) { + throw new Error("User not found."); + } + return inDB; // don't need to do inDB.data +} +export async function deleteUser(id) { + await connectDB(); + const inDB = await User.findById(id); // i think you can also do User.findByIdAndDelete(id); + if (!inDB) { + throw new Error("User not found."); + } + await inDB.deleteOne(); + return { success: true, + message: "User was deleted" }; +} diff --git a/webapp/server/mongodb/models/User.js b/webapp/server/mongodb/models/User.js new file mode 100644 index 0000000..0113bad --- /dev/null +++ b/webapp/server/mongodb/models/User.js @@ -0,0 +1,10 @@ +import mongoose from 'mongoose'; + +const userSchema = new Mongoose.schema({ + fullName: { type: String, required: true }, + email: { type: String, required: true, unique: true }, + password: { type: String, required: true }, // reminder: shouldn't be pure raw password (use argon hashing) + admin: { type: Boolean, default: false } +}); + +export default mongoose.models.User || mongoose.model('User', userSchema); \ No newline at end of file diff --git a/webapp/src/components/.gitadd b/webapp/src/components/.gitadd deleted file mode 100644 index e69de29..0000000 diff --git a/webapp/src/pages/api/.gitadd b/webapp/src/pages/api/.gitadd deleted file mode 100644 index e69de29..0000000 diff --git a/webapp/src/pages/index.js b/webapp/src/pages/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/webapp/src/pages/page.tsx b/webapp/src/pages/page.tsx deleted file mode 100644 index 295f8fd..0000000 --- a/webapp/src/pages/page.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import Image from "next/image"; - -export default function Home() { - return ( -
-
- Next.js logo -
-

- To get started, edit the page.tsx file. -

-

- Looking for a starting point or more instructions? Head over to{" "} - - Templates - {" "} - or the{" "} - - Learning - {" "} - center. -

-
- -
-
- ); -} diff --git a/webapp/src/styles/.gitadd b/webapp/src/styles/.gitadd deleted file mode 100644 index e69de29..0000000 From 36f1df43c0c1b54434f59a71546031dbedf8e0ea Mon Sep 17 00:00:00 2001 From: Theerth1 Date: Fri, 3 Apr 2026 02:19:12 -0400 Subject: [PATCH 6/7] final initial touches on backend for user --- src/pages/api/admin/users.ts | 2 +- src/pages/api/user.ts | 65 +++++++++++++++++++--------- src/pages/api/user/verify.ts | 2 +- webapp/server/mongodb/models/User.js | 2 +- 4 files changed, 47 insertions(+), 24 deletions(-) diff --git a/src/pages/api/admin/users.ts b/src/pages/api/admin/users.ts index 16296ce..981e6a4 100644 --- a/src/pages/api/admin/users.ts +++ b/src/pages/api/admin/users.ts @@ -12,7 +12,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) const requesterId = req.headers['user-id']; const requester = await User.findById(requesterId); - if (!requester || !requester.isAdmin) { + if (!requester || !requester.admin) { return res.status(500).json({ error: "Unauthorized"}); } const users = await User.find().select('-password'); diff --git a/src/pages/api/user.ts b/src/pages/api/user.ts index 40c3757..13b6278 100644 --- a/src/pages/api/user.ts +++ b/src/pages/api/user.ts @@ -1,28 +1,51 @@ import { NextApiRequest, NextApiResponse } from 'next'; -import { createUser } from '../../../webapp/server/mongodb/actions/userActions'; +import { createUser, deleteUser } from '../../../webapp/server/mongodb/actions/userActions'; +import User from '../../../webapp/server/mongodb/models/user'; +import * as argon2 from 'argon2'; +import connectDB from '../../../webapp/server/mongodb'; export default async function handler(req: NextApiRequest, res: NextApiResponse) { - try { - if (req.method !== 'POST') { - throw new Error('Invalid HTTP method'); - } - const { fullName, email, password } = req.body; - if (!fullName || !email || !password) { - return res.status(400).json({ - error: 'All required user information is not present.' - }); + if (req.method === 'POST') { + try { + await connectDB(); + const { fullName, email, password } = req.body; + if (!fullName || !email || !password) { + return res.status(400).json({ error: 'All required user information is not present.' }); + } + const newUser = await createUser(req.body); + return res.status(200).json({ message: 'User was created successfully', user: newUser }); + } catch(err) { + if (err instanceof Error) { + if (err.message === "Email is already used") { + return res.status(400).json({ err: err.message }); + } + } + return res.status(500).json({ err: 'There was an error'}); } - const newUser = await createUser(req.body); - return res.status(200).json({ - message: 'User was created successfully', - user: newUser - }); - } catch(err) { - if (err instanceof Error) { - if (err.message === "Email is already used") { - return res.status(400).json({ err: err.message }); + } + else if (req.method === 'DELETE') { + try { + const { id, email, password } = req.body; + if (!id || !email || !password) { + return res.status(400).json({ error: "Missing required fields" }); } - return res.status(500).json({ err: 'There was an error'}); + // we need to check if the inputted password is the same + await connectDB(); + const accessor = await User.findById(id); + if (!accessor) { + return res.status(500).json({ error: "Account not created" }); + } + const passwordValidity = await argon2.verify(accessor.password, password); + if (!passwordValidity || email !== accessor.email) { + return res.status(500).json({ error: 'Invalid credentials' }); + } + const result = await deleteUser(id); + return res.status(200).json(result); + } catch (err) { + return res.status(500).json({ err: 'There was an error deleting the user.' }); } } -} \ No newline at end of file + else { + return res.status(500).json({ error: 'Invalid HTTP method'}); + } +} diff --git a/src/pages/api/user/verify.ts b/src/pages/api/user/verify.ts index 7c49bd7..27bcb79 100644 --- a/src/pages/api/user/verify.ts +++ b/src/pages/api/user/verify.ts @@ -20,7 +20,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) } return res.status(200).json({ id: user._id, - isAdmin: user.isAdmin + admin: user.admin }); // whenever the user logs in, their id and admin status is saved for the duration of their stay on the site } catch(error) { return res.status(500).json({ error: 'There was an error' }); diff --git a/webapp/server/mongodb/models/User.js b/webapp/server/mongodb/models/User.js index 0113bad..8d590da 100644 --- a/webapp/server/mongodb/models/User.js +++ b/webapp/server/mongodb/models/User.js @@ -1,6 +1,6 @@ import mongoose from 'mongoose'; -const userSchema = new Mongoose.schema({ +const userSchema = new mongoose.Schema({ fullName: { type: String, required: true }, email: { type: String, required: true, unique: true }, password: { type: String, required: true }, // reminder: shouldn't be pure raw password (use argon hashing) From c8a61a7ed708db80d55d61b80be4c6291996a29b Mon Sep 17 00:00:00 2001 From: Theerth1 Date: Fri, 3 Apr 2026 02:31:12 -0400 Subject: [PATCH 7/7] added comments to files for better readability --- src/pages/api/admin/users.ts | 2 ++ src/pages/api/user.ts | 2 ++ src/pages/api/user/verify.ts | 2 ++ webapp/server/mongodb/actions/userActions.js | 2 ++ webapp/server/mongodb/models/User.js | 1 + 5 files changed, 9 insertions(+) diff --git a/src/pages/api/admin/users.ts b/src/pages/api/admin/users.ts index 981e6a4..7db80ee 100644 --- a/src/pages/api/admin/users.ts +++ b/src/pages/api/admin/users.ts @@ -1,3 +1,5 @@ +// allows you to get all user information, given that you are an admin + import { NextApiRequest, NextApiResponse } from 'next'; import connectDB from '../../../../webapp/server/mongodb'; import User from '../../../../webapp/server/mongodb/models/user'; diff --git a/src/pages/api/user.ts b/src/pages/api/user.ts index 13b6278..d02daf0 100644 --- a/src/pages/api/user.ts +++ b/src/pages/api/user.ts @@ -1,3 +1,5 @@ +// creates and deletes accounts + import { NextApiRequest, NextApiResponse } from 'next'; import { createUser, deleteUser } from '../../../webapp/server/mongodb/actions/userActions'; import User from '../../../webapp/server/mongodb/models/user'; diff --git a/src/pages/api/user/verify.ts b/src/pages/api/user/verify.ts index 27bcb79..c0b7771 100644 --- a/src/pages/api/user/verify.ts +++ b/src/pages/api/user/verify.ts @@ -1,3 +1,5 @@ +// verifies if person logging in puts in correct credentials + import { NextApiRequest, NextApiResponse } from "next"; import connectDB from "../../../../webapp/server/mongodb"; import User from "../../../../webapp/server/mongodb/models/user"; diff --git a/webapp/server/mongodb/actions/userActions.js b/webapp/server/mongodb/actions/userActions.js index c922e46..814000d 100644 --- a/webapp/server/mongodb/actions/userActions.js +++ b/webapp/server/mongodb/actions/userActions.js @@ -1,3 +1,5 @@ +// contains functions for each part of CRUD (specifically for users) + import connectDB from ".."; import User from "../models/user"; import * as argon2 from 'argon2'; diff --git a/webapp/server/mongodb/models/User.js b/webapp/server/mongodb/models/User.js index 8d590da..989cf13 100644 --- a/webapp/server/mongodb/models/User.js +++ b/webapp/server/mongodb/models/User.js @@ -1,3 +1,4 @@ +// contains the schema required for a user (necesitates that users have baseline attributes like name, email, password, and if they are an admin) import mongoose from 'mongoose'; const userSchema = new mongoose.Schema({