From 61c2ba7801d3b0776cb2126b0980dedee172bfb0 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 29 Aug 2024 23:25:25 +0200
Subject: [PATCH 01/60] create button components

---
 resources/js/components/Common/FormButton.vue | 33 +++++++++++++++++++
 resources/js/components/Common/LinkButton.vue | 19 +++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 resources/js/components/Common/FormButton.vue
 create mode 100644 resources/js/components/Common/LinkButton.vue

diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
new file mode 100644
index 00000000..71619adf
--- /dev/null
+++ b/resources/js/components/Common/FormButton.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+  import { useForm } from "@inertiajs/vue3";
+
+  const form = useForm({});
+
+  const props = withDefaults(defineProps<{
+    small?: boolean
+    class?: string
+    href: string,
+    method?: "post" | "get" | "put" | "patch" | "delete"
+    options?: object
+  }>(), { method: 'get' });
+
+
+  function handleSubmit() {
+    form[props.method](props.href, props.options);
+  }
+</script>
+
+<template>
+  <form @submit.prevent="handleSubmit">
+    <button
+      type="submit"
+      class="bg-primary px-3 semibold text-white  font-semibold shadow-sm hover:bg-primary-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
+      :class="`${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${props.class}`"
+    >
+      <slot />
+    </button>
+  </form>
+
+</template>
+
+
diff --git a/resources/js/components/Common/LinkButton.vue b/resources/js/components/Common/LinkButton.vue
new file mode 100644
index 00000000..1b737fb8
--- /dev/null
+++ b/resources/js/components/Common/LinkButton.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+  const props = defineProps<{
+    small?: boolean
+    class?: string
+    href: string
+  }>();
+</script>
+
+<template>
+  <a
+    :href="href"
+    class="bg-primary px-3 semibold text-white  font-semibold shadow-sm hover:bg-primary-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
+    :class="`${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${props.class}`"
+  >
+    <slot />
+  </a>
+</template>
+
+

From 29a2aa329566cf9d07a688dbcff797412947ce16 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 29 Aug 2024 23:25:46 +0200
Subject: [PATCH 02/60] update favicon

---
 public/favicon.ico            |   0
 public/favicon.png            | Bin 0 -> 5348 bytes
 public/favicon.svg            |   4 ++++
 resources/views/app.blade.php |   1 +
 4 files changed, 5 insertions(+)
 delete mode 100644 public/favicon.ico
 create mode 100644 public/favicon.png
 create mode 100644 public/favicon.svg

diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index e69de29b..00000000
diff --git a/public/favicon.png b/public/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c92ba5cc4db39c7b221a997684c2bf9c4f3cb17b
GIT binary patch
literal 5348
zcmaJ_cU;on_kL@ZqqNlArbU`*&K#MUXksdE#njZuy~-JmRIn^ZDt_F1mMc@!)ZCbR
zkIKFG-iZT&ANczH{e>4VxR-O!dCqg5bMJ*vU2Ro*I!-zO0O-}#Ao>76LHbAm&|D(D
znYriNk_I0fl$CYWm6dP0y1Upqys`m+yHWm8kJXwLxm)1|t@=U?w%7DJbkjDoLFfuP
zmHcatAD`XO6ve;4BclE(?DOn%*Ild9_1XDvg@J`PX^;W3k7NaF)Iy0GbRw4WvfJ&o
zzLB+F0R!K}r`AI+)L5jfSwHDoewNc<^g*1CQQ`xO?a;FI!;3R}h)4jwV=3QFoXq$P
z?>4<cqt@c~O!D<S{d|&EZJSSqu{FQSZ3TgJ@wN9Yk!D7Zkqc&TOlFg^lhpf}!&>x9
z!-hm{`3(fp@1PxPlun)uTSXkO+STjZZTarAJ>75Xx<BH8z8R__tQ17Wf{4|7r{y1K
z@t@@_EgUT`@%u(XXHInCm8a;7uq<Ua{48p>*0fMudW~O&NpUA^!7rS`zgDquPIjgp
z{YQ@CeSc%z;GR)R<EFq`1e*0R<)zAZVH@b&ZHk0PjROW+5-dh^zpv9>oW+MX2vT2}
zrks;5`H5A~<_)-lh^wJsV0gC&vMIsUJ^DK}fw3FM<AI6;_g@Kcyc(%2mn=0@Apnv5
z%&gCgA<fXbs+o9@DmX%ZQ9QYu;!T>Qext6XLcL0J<GLub__Ok80AQL^hbY0k$G4_@
z{0x`U+V^IvP2F86)m@9mS*e(B(vBO+rDb7r@)2-ABG9VP(`;S8XxwcwS9+Y|9bkDh
zsJ+pUed&4{M-dwRiB9O*bv|SMYE#yDzN1NguSfl7O2jfNc=V)4pU3V2Az?8!cqZnc
z9<w5Ulzxwrgy(-gQY~~TS8b>33=f0)jTyhv@rYQ$61rNqpJaWv?p?>O6fjT()Q@%^
z@PK_Vr$Ix8S-Pu#h?P$Ei-?Rxw9nZdMohP$YgdnQ)sk>l9FOO^Q*=TUMKVUI(<5fe
z{pP^>1zmdvl&dd2aT{~^CP#y+8ln9Wq^OyB{Y(Ob{MtgK!duJRhMzAqzL<YGQ*7i2
znmg@3`0>kiXbBb$G`_IhJ}YLSM=)auJ}8CRgBxl?G{ELX?F{0v18!4tZT;~{ntQc8
zWJ&0@BJFIvWFK-pv*zn=3^Kzd((|+X$!`x>Bm=-RJecLj2zNC{7$WR-kR>poLQ7HK
zM=X56tOf6@x2H+86&1moYdbl=ZFj=N(lIe~Ou+7D4Kb8gM$=K&M;MdRjaGnOtfmGc
z<q*?fEB(3Fx7oW*bv2gCgxCza^Fb8ARYw=Ni75-Z?m7)s+g~4aqV0}Hzj=8Ww2Uf%
znxmnEYi@n_Ln(n^FLOj=NQ$dumwxy!4S`@bZ9B!~xSQkzX_OPGfI3?ei`byk8jUuO
z@K^_I9d_Ky`@*#&V73%Nj7=Ut4aV-)E1+(re8vj^vw|MW<ah@zRDthiz0n3j32_f$
z&$U%dC>xcrQ!{>9l``&)-jP<h`efho72EIugtD?felSk<*_{+r;wKU~)l|1-1J&UX
zEi+iC6^n+A4f?vz4wwQElU+%*<2-veaPTew1L{wa(i%s_1G_XfvBD;BbMqSoe;I#_
zac_|=ja`S6gV*n9r#>rK*m5RzlY_l^u+t+T_R2mV7Yyb3qnR{ePbAUT+Y29+{w%8R
zm0$tGI^8L&o>Yb<FaVrRE;H9ZQ8~S!zZA&g-*UE%#k`?rxdUV#!gc$dqSU-Ipu93R
zxe8gNq%%vaw+h)tMzoH(9--5^e-oI2funi&_tO^t_4SgU3!|-;CM*ZH@8y@_t7t<c
zzTq++i|ZR4#-i$Y_i*2^;Iz}lk8GkGS-;-^1DdMA`xl=y9A@d}cNKeBmvM}vC;_?g
z@};rj@#JK&3B;LY>6b2_7;FX*;M^y_v374mKs(WC<>7fU^de@X2=6M}rW<j{AN_eY
zlGW4&G88~Ws_(XkbbQCXUjZ{ND?XoEqwinv+hWrI?D^rs#StHxnYR>lgkB@-uxppK
zgtP(01Oy6a;5DR`>RrXW(q&s#P86od47+%FxW_3!W7l7x?{Ed1QA_4@V7g)XUetI8
zwAnRRT{B6LT#*4K)pm_{x(HYEyX;rw5Ph1q|0slX0L2R_wSW3mnxZbG$-zsF_19ho
zMG}|**NMrK!jh5<W3O*9E8G&j;6Z}NRlpg3W>-X5RzMtvr7F0{#N?30mFqL(TY!8o
z^myk8$Gt`8^^-W3A#p*NVm5mYat8id_|-90VJGC_6PymvsHIh;v5a1JzdR}Hl}v^@
zDT&`ziGXq(g@(-itG?Wt4PEwhJ0j7@m7L;IP$7&;2>Dy>Mu2sl+5hPVt4T6b0cN^V
zO&CW0UgtEhWO99m$xUGPecN)*NJvLDX$pS#E5vqnrH6_F2-b2kmodFk(b6lCc!w;&
zb}fhMEg-{KCq%8I*KL5L2-nfnhd173Qa$?=9XQENO*UfV^Zbwy)}iMd8Hk1R*0CI4
z&Mx)o90Ro(%7uT#W-tKSFV2d>a>Fdno&}c<5dKg!Drsq@F~>%WGA3m<d-uRTk&XIv
zgQ$icgYGLQFy?rS;S$*>0qt^vh=z-<rSO1_{KqGH^s(pqf8~O=6IFNyAsFUK(5Dm>
zab<wTnm4Zj-v|H3Phh_JHK?kzl>Di3ub!;$VW0rGDk`Q}{%Nc+GLGrwxv|ix48eu)
z(HtP)<>xoZ#RQQ17v}{|nO<kIKs}3brjIb6A?Dc&qxY+&yoj{GsOR2K;S_!-vT$K^
z|Kod3VH0u>ZVrssR4IiH<v>7k=zh%{2eReo<^-b#Y8C6R#kVzAdVG@vC;=J!SD}-_
zpuAPN2EVLK1wRx{EK!gWVDU88SlI*ZTcx$jMne(p3*asZQz}5nzAbzSE)C&f?Va8{
za2PYg^4Nv}iWjxgC-uy+raGTG8ss89yl~)-DH7PY>)+^!&mk3S3Vkr4ijP>hi~Q9_
z-wlEWebnVT@!>abV@b`Wm?I_Qg;a*f?`hSX_$j>}n<U<|jo=4_UM}~r#6T7$7z_5B
zyj3;Hji_kz=J->?e6wYTbxF8vOy6{GT`83!|8rt|2PU*5^aaPxHWoEI(!+fNXmfae
z5dBAG@se1C58rE~8cC@yQ*C>U-zN5p^IT(W)>zQalOz+>w(#HBy{4srx0;akI;m~H
zhRm7=^n@S|K0us-@rP^P-IL^zw#U)XL6WrCBXi?(j6&I0eB3t2-XxO{H5#7_GW7X+
zYw5~?&qniAFR}*N!vsZs-k3F5YFFV~Y~8z>avsULFBPq*Mj08(PVIY0{7);Ake);e
zbE$J{E(f}3UxEf_^qZQ>T%GLHWCBK&BSgBF!z|3UmWa*b<U(&&=bEHxftGw*tz57t
zQh#~|2)@@cF1jAfyR4^X3R_i#X#U$LDhu*|G@IH<)T0D4h-DIdqdt)#nn$O^7V#@d
z^3rw4uGp2~YS-=Qm*W5Sr@VOaWg%I|wd2jFdX!$=!@p1ZgF<9*_?UIBFNj>PANjg>
zuiP#4Zo(gB)J0)Lw<%VqP9J#jScM2@GsQ8}ePp1aDx5K?+Wq+Ss}f*exVOtfeNUOk
z=ETqki2=_Zv1Q~iQ3b@0k8jgKtB><THg%*o84E%+oxm==zhLiy0dx{CAt}T!3_98_
zenleq$4oBC{zVZ=W2GA8{xI%4ya2YmlMD=~8g!SL1kt#}AQtDvLaQYYGRUi&7H@Co
z8(AU*qiBY{&&;CJc1ldW_JFvXfYiWTp%BXsTU5c{CghmeFz0BLd@%GH@V1;#6ot~u
z*3M(X{t(v4-dikk!61jIVS#|F`NFrph1h5Yp}BD5`zP&2@S52?QWV#ztX_=<P`tbl
z2>I0lGZz&#m=5NT%p(EaxTCY3&%oXm11b|6`VP-Bj<pviOcj}yOesmz03#nAZ)2FE
zN(^Z2APakO8!s@M>Ox9D6=vJzg?nj;nHqoU-~(}S@x)0_Q4(Y`FXMyXw_C)K+We_e
zz02RMQS%?PQk(^K=_wlxCGCn6t=Ye7K$>99$aoudsi-PMb4}sNCYWNjk^$Zc_fv!9
z>Rt{W#)r1lzB*w9p4&Typ21>MA^fSOPWJXvl|>06U`oY61giV@pV*EFSQE#`CrXxk
zqYq6hC(C0TuK~r$avpn9%6~8X9pHcphPE+BenTyMG9)uIbnA!F2Rw2H%2<%c*|*BY
zzR9~efqhI)Ml@QKP<!`;GtTv?TuiBD=Z*FsOR7LsacRW?ou0cwoNJJc2~$|B%k(kU
z#;+?9a2+W(Nka)ho%5LbLR*=+UidD}Pvlck%ziES5x=$bW6_O~R*&9plasSc#rLgF
zCW+<Raiddw{9$GY_Y;ZKD6vI;*2pq)jFPqHbbe4%iVk;nZ1lAK+1#OvS#>fglWo#w
zuCXknM<gX5!_B@rBQb!BBv*3iUo)Gu5dYC-c=meYn>(*tV;+s|-v%a!CjB&u46#K_
z5_k0J?Tq932krOUU!6P*7Rx`o!hhQ@C8XyIQ{P%d>x>C*T_vo5>PA3eZuz8V08@21
zRMu`~Kv$H5%ep%f7|0T#;}!%dktF1ob+goXrl~gtRUSrWR}$iw|6bD5<wS+oXQNkR
zgj80=NI<tu0QQR`lt5_srxw-!>>6;oIvwky9Q#j~);B4sT>8IJx5-C4X8K<^sREul
zS6s0%y8~ja_^w)Q7H=$%jiKj4?%o=@3H;ljlz|`3K);wng7Tj(9kwmF6yawySoLVV
z_7nmz^PjI4?>IWHp9NAyc=9{u-c8D!x=FtmmLCHN53JW8xl!x6bZR-_^WRril)`RZ
z+i*@^h<-nMh5dXRSbj6np4`7;<8h?wF@rqV&r5n359CvI@3(j{-Oc$Tz==u>BX7;P
zDxVkZwsjbAwa0%tBnjpxcB)S5iCJ>z;A9PQO?cS3XAO{~BSa7;lq#AG&iw`x)o_u2
z`=@pTS(U_b8_+cw|4AIQ-z<6nuYV<IpaNvRXGp3C34;XI<=eI<ysVi^k2`x<DFWyU
z)!DSKMS!cM<m7|~A?~-XV)=lV7i`uh2=_>MSbbkMpWaKi$fW^b&v8%;dz(WIgV^v$
z!lX2NZAd8TSPjhWoj@~1`6IX|LLA~3LS;=!xL$o;OF==G%KkxO9yq@}dR}=(1B_O-
zu|70!cRME(?z?y2HUtRJ%Ka(o%*?noO$1l@`^t=QS&=FqP+vj_^4vl>zk$7dYenur
z*PFnylQd7xm%Il^qAypmE!iq9x6e#oD^_YlD%bmd68kt~ed5?H;N_11i`0TY-uk&F
zXntma?<93M(grDP5cR8tC$inhNMz^w;U?IhHQ{!q<wr$_PGS~hcel4NRLdLp?eKwt
zNd)6)QilT!zq9fE5oo9sCphJN{ILABdfF}b@QDRoXlJGUnZmid4)}itDuJpf73R+4
zUF_;n5+iBp{aBnAQB}Xdy$q8<UaOrfv&CiznqPmg77OJ+;bX1e3#1>}H7Bvf?SELp
z^Y}%}R0;n^XzMVh9_xPYmj}o;dribqUy}4MZ4o5j*xC`tkVV+fzVzNDzVuZmJ2LLe
z3{LbY4G6=Vg~|Aw#RdC+>0UDp`<O&pO2E0CD5`MsfHktc_eQ8j(#LwE0H)P+pv~-o
z_9J<D{cZJsH!yJ`U^$@bFX4gM<0lXX#A#itzTVr<r5lwEs4Z68cR+xX7-4%7KQqkb
z?}1NAD0z8_2B_-ZQ$-yfUbVi&<e#VamJ$$6Mz+j%g6?;Bdf1kksPiqH7cIrm6FUfx
zFS9n4LLSw+z?<V|*l22j8vQ<n6EADNid&gw33|t3tbt6ccI)44a5#~Bf*@pG4XRn-
z^%PghPVOn`l6)U!k~TNnDi+jXXm&;gl&^Ki25w=V58;0uV)9n0NT(Bd!wKQu7--Gd
zjT3Gd2m}H|p-&G5LHb*b1;WkxE2Sg}DBec<?_}JM_jGC4L*>g-09xgwd*XF!9=uJ+
zD;j8J;HN-fAjE|Iv@+!HgkN&_@gg_RCM~7ngLu3S!KV8v>EM;~v+P)t5jz{(zd(`s
zId?gE47AVBC5Eg#Qv~e0zaI|5U!A-I29osGui(%k-J@i)g0&)z=dJ%e_2s-gb}f3c
z7sf#qP+UT=oR~t9m#y*wSoza15wIT`!&v1&z7C4ux+jFdY>q?2SDj^J=mHrOt>R~r
z?V4Nr<9TU-NMS%|ituBJnzHe7t`59BlIdYtwp$bVE0?>}cssR=yggmykr)f6?Eirq
zasM4=WYlXn+#Mnb@fz?#Px84(8B-|CeyKl?1i~BInts+zUZmsTRC~`pBvt>NvdO$;
zpB*{v;4k~l9*{2<lO=d){Oc)id>HIHRlv_vqT5d*Ip1AA8}{rr+^QHkAMZg6$pn-#
zgn?tF5NwLP3Dk|@O&4Af$&}4bZJ^Bh307pMUK7OlJ`T`tsW$j|kUTiPo%Ewd1U!06
zk(OIJ7mGUbIw@VEe)J-CHl(fDh+BBc^3@gTes%?ig<|k3P}d{W$7?Vvw6MM%G2*rt
z=nG6U1eBH&Nvvs&;L-CWSl`e0%OLKGV77B4*h{}G_hcDqx79I?fscPZ4ygZNu{k!4
zxgWk{>hoP-6~IOV*E%<U>0p@4%D`EUHvudY)I<!`$J={+#;-tP{H047;t%~!sM^TN
z>h<FB{b?=J0(P2!dd&i;`Arb&cvDnK?j)Ai%s9R2S8KrF=%h~+dz+Wd(F4jj$f8KI
oZg=erW=?SZ!vFdc34WJIeH48{0e{GUi)^Q^q75m2^78%v0qU(YRsaA1

literal 0
HcmV?d00001

diff --git a/public/favicon.svg b/public/favicon.svg
new file mode 100644
index 00000000..385cb539
--- /dev/null
+++ b/public/favicon.svg
@@ -0,0 +1,4 @@
+<svg class="size-10" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M7.02484 14.3074C6.60832 14.3074 6.3744 13.828 6.63076 13.4997L15.3851 2.28913C15.7308 1.84642 16.4312 2.22227 16.2534 2.75511L13.6884 10.4434C13.6668 10.5082 13.715 10.575 13.7832 10.575H16.4951C16.9018 10.575 17.1384 11.0347 16.902 11.3656L9.30015 22.0091C8.96935 22.4723 8.24533 22.1111 8.41638 21.5683L10.6633 14.4375C10.6836 14.373 10.6355 14.3074 10.5679 14.3074H7.02484Z" fill="#262C89"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.2545 17.8224V6.2803L15.3847 2.28313C15.731 1.84101 16.4307 2.21751 16.2525 2.75005L13.6885 10.4136C13.6668 10.4784 13.715 10.5453 13.7834 10.5453H16.4935C16.9005 10.5453 17.137 11.0056 16.9 11.3365L12.2545 17.8224Z" fill="#6566C2"/>
+</svg>
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index 9911d029..18c39277 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
+    <link rel="shortcut icon" href="/favicon.png" type="image/x-icon">
     @vite('resources/js/app.ts')
     @inertiaHead
 </head>

From 9d1aa3d42b27884b9db509f9f79a13d3478d99c8 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 29 Aug 2024 23:29:06 +0200
Subject: [PATCH 03/60] clean up route files structure

---
 .../Controllers/AdminDashboardController.php  | 16 ---------
 .../AuthenticateSessionController.php         |  4 +--
 app/Http/Controllers/ContestController.php    |  2 +-
 .../Controllers/ProfileUserController.php     |  2 +-
 app/Http/Controllers/SchoolsController.php    |  2 +-
 resources/js/Pages/Admin/Quizzes.vue          | 11 ++++++
 resources/js/Pages/Admin/SchoolsPanel.vue     | 11 ++++++
 resources/js/Pages/Auth/Admin/Dashboard.vue   |  9 -----
 resources/js/Pages/Profile.vue                | 34 -------------------
 resources/js/Pages/SchoolsPanel.vue           |  0
 resources/js/Pages/{ => User}/Dashboard.vue   |  2 --
 resources/js/Pages/User/Profile.vue           | 24 +++++++++++++
 resources/js/Types/Page.d.ts                  |  4 +++
 routes/web.php                                |  5 +--
 tests/Feature/SchoolTest.php                  |  2 +-
 15 files changed, 57 insertions(+), 71 deletions(-)
 delete mode 100644 app/Http/Controllers/AdminDashboardController.php
 create mode 100644 resources/js/Pages/Admin/SchoolsPanel.vue
 delete mode 100644 resources/js/Pages/Auth/Admin/Dashboard.vue
 delete mode 100644 resources/js/Pages/Profile.vue
 delete mode 100644 resources/js/Pages/SchoolsPanel.vue
 rename resources/js/Pages/{ => User}/Dashboard.vue (99%)
 create mode 100644 resources/js/Pages/User/Profile.vue
 create mode 100644 resources/js/Types/Page.d.ts

diff --git a/app/Http/Controllers/AdminDashboardController.php b/app/Http/Controllers/AdminDashboardController.php
deleted file mode 100644
index 6ebdf585..00000000
--- a/app/Http/Controllers/AdminDashboardController.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers;
-
-use Inertia\Inertia;
-use Inertia\Response;
-
-class AdminDashboardController extends Controller
-{
-    public function index(): Response
-    {
-        return Inertia::render("Auth/Admin/Dashboard");
-    }
-}
diff --git a/app/Http/Controllers/AuthenticateSessionController.php b/app/Http/Controllers/AuthenticateSessionController.php
index 5f6b9911..49504cae 100644
--- a/app/Http/Controllers/AuthenticateSessionController.php
+++ b/app/Http/Controllers/AuthenticateSessionController.php
@@ -22,8 +22,8 @@ public function authenticate(AuthenticateSessionRequest $request): RedirectRespo
             $request->session()->regenerate();
 
             return $request->user()->hasRole(["admin", "super_admin"])
-                ? Redirect::route("admin.dashboard")->with("success", "Witaj na Panelu Administratora")
-                : Redirect::route("dashboard")->with("success");
+                ? Redirect::route("admin.quizzes.index")
+                : Redirect::route("dashboard");
         }
 
         throw ValidationException::withMessages([
diff --git a/app/Http/Controllers/ContestController.php b/app/Http/Controllers/ContestController.php
index df030400..d757266a 100644
--- a/app/Http/Controllers/ContestController.php
+++ b/app/Http/Controllers/ContestController.php
@@ -20,6 +20,6 @@ public function index(): Response
 
     public function create(): Response
     {
-        return Inertia::render("Dashboard");
+        return Inertia::render("User/Dashboard");
     }
 }
diff --git a/app/Http/Controllers/ProfileUserController.php b/app/Http/Controllers/ProfileUserController.php
index 97806e27..671342aa 100644
--- a/app/Http/Controllers/ProfileUserController.php
+++ b/app/Http/Controllers/ProfileUserController.php
@@ -19,7 +19,7 @@ public function create(Request $request): Response
         $user = $request->user()->load("school");
 
         return Inertia::render(
-            "Profile",
+            "User/Profile",
             [
                 "user" => UserResource::make($user),
                 "status" => session("status"),
diff --git a/app/Http/Controllers/SchoolsController.php b/app/Http/Controllers/SchoolsController.php
index bfc69547..9f7ae7b1 100644
--- a/app/Http/Controllers/SchoolsController.php
+++ b/app/Http/Controllers/SchoolsController.php
@@ -26,7 +26,7 @@ class SchoolsController extends Controller
 {
     public function index(): Response
     {
-        return Inertia::render("SchoolsPanel", ["schools" => SchoolResource::collection(School::all())]);
+        return Inertia::render("Admin/SchoolsPanel", ["schools" => SchoolResource::collection(School::all())]);
     }
 
     public function store(SchoolRequest $request): RedirectResponse
diff --git a/resources/js/Pages/Admin/Quizzes.vue b/resources/js/Pages/Admin/Quizzes.vue
index e69de29b..31d2c341 100644
--- a/resources/js/Pages/Admin/Quizzes.vue
+++ b/resources/js/Pages/Admin/Quizzes.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import {Head} from "@inertiajs/vue3";
+</script>
+
+<template>
+  <Head>
+    <title>Testy</title>
+  </Head>
+
+  Quizzes - CRUD
+</template>
diff --git a/resources/js/Pages/Admin/SchoolsPanel.vue b/resources/js/Pages/Admin/SchoolsPanel.vue
new file mode 100644
index 00000000..c9f4550a
--- /dev/null
+++ b/resources/js/Pages/Admin/SchoolsPanel.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import {Head} from "@inertiajs/vue3";
+</script>
+
+<template>
+  <Head>
+    <title>Szkoły</title>
+  </Head>
+
+  Quizzes - CRUD
+</template>
diff --git a/resources/js/Pages/Auth/Admin/Dashboard.vue b/resources/js/Pages/Auth/Admin/Dashboard.vue
deleted file mode 100644
index 7436d1e8..00000000
--- a/resources/js/Pages/Auth/Admin/Dashboard.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<script setup lang="ts">
-
-</script>
-
-<template>
-  <div>
-    Admin Dashboard
-  </div>
-</template>
diff --git a/resources/js/Pages/Profile.vue b/resources/js/Pages/Profile.vue
deleted file mode 100644
index c1b524bd..00000000
--- a/resources/js/Pages/Profile.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<script setup lang="ts">
-import { defineProps } from 'vue'
-import BackgroundEffect from '@/components/Home/BackgroundEffect.vue'
-import Footer from '@/components/Common/Footer.vue'
-import Header from '@/components/Common/Header.vue'
-import PasswordUpdate from '@/components/Profile/PasswordUpdateSection.vue'
-import UserData from '@/components/Profile/UserDataSection.vue'
-import { type User } from '@/Types/User'
-import { Head } from '@inertiajs/vue3'
-
-
-defineProps<{
-  user: User
-  errors: Record<string, string>
-  }>()
-
-</script>
-
-<template>
-  <Head>
-    <title>Profile</title>
-    <meta name="Profil" content="Profil użytkownika">
-  </Head>
-  <BackgroundEffect />
-  <div class="inset-0 bg-white/60 fixed -z-10" />
-  <div class="flex flex-col items-center h-screen">
-    <Header title="Profil" />
-    <div class="flex flex-col justify-center gap-x-[5vw] gap-y-12 px-[5vw] w-full lg:flex-row py-4 sm:py-16">
-      <UserData :user="user" />
-      <PasswordUpdate :errors="errors" />
-    </div>
-    <Footer />
-  </div>
-</template>
diff --git a/resources/js/Pages/SchoolsPanel.vue b/resources/js/Pages/SchoolsPanel.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
similarity index 99%
rename from resources/js/Pages/Dashboard.vue
rename to resources/js/Pages/User/Dashboard.vue
index cf5bfd82..4b602b26 100644
--- a/resources/js/Pages/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-
 import {useForm} from '@inertiajs/vue3'
 
 const form = useForm({})
@@ -11,7 +10,6 @@ function logout() {
 function submit() {
   form.get('/profile')
 }
-
 </script>
 
 <template>
diff --git a/resources/js/Pages/User/Profile.vue b/resources/js/Pages/User/Profile.vue
new file mode 100644
index 00000000..3e7d43e6
--- /dev/null
+++ b/resources/js/Pages/User/Profile.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { defineProps } from 'vue'
+import PasswordUpdate from '@/components/Profile/PasswordUpdateSection.vue'
+import UserData from '@/components/Profile/UserDataSection.vue'
+import { type User } from '@/Types/User'
+import { Head } from '@inertiajs/vue3'
+
+defineProps<{
+  user: User
+  errors: Record<string, string>
+  }>()
+</script>
+
+<template>
+  <Head>
+    <title>Profile</title>
+    <meta name="Profil" content="Profil użytkownika">
+  </Head>
+
+  <div class="flex flex-col justify-center gap-x-[5vw] gap-y-12 px-[5vw] w-full lg:flex-row py-4 sm:py-16">
+    <UserData :user="user" />
+    <PasswordUpdate :errors="errors" />
+  </div>
+</template>
diff --git a/resources/js/Types/Page.d.ts b/resources/js/Types/Page.d.ts
new file mode 100644
index 00000000..e5f4d35b
--- /dev/null
+++ b/resources/js/Types/Page.d.ts
@@ -0,0 +1,4 @@
+export interface Page {
+  title: string,
+  href: string
+}
diff --git a/routes/web.php b/routes/web.php
index 1a7bc7ea..35949aac 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use App\Http\Controllers\AdminDashboardController;
 use App\Http\Controllers\AnswerRecordController;
 use App\Http\Controllers\AuthenticateSessionController;
 use App\Http\Controllers\ContestController;
@@ -35,7 +34,7 @@
 
 Route::middleware("auth")->group(function (): void {
     Route::get("/dashboard", [ContestController::class, "create"])->name("dashboard");
-    Route::get("/auth/logout", [AuthenticateSessionController::class, "logout"])->name("logout");
+    Route::post("/auth/logout", [AuthenticateSessionController::class, "logout"])->name("logout");
     Route::get("/profile", [ProfileUserController::class, "create"])->name("profile");
     Route::patch("/profile/password", [ProfileUserController::class, "update"])->name("profile.password.update");
 });
@@ -64,8 +63,6 @@
     Route::post("/answers/{answer}/correct", [QuestionAnswerController::class, "markAsCorrect"])->can("update,answer")->name("admin.answers.correct");
     Route::post("/answers/{answer}/invalid", [QuestionAnswerController::class, "markAsInvalid"])->can("update,answer")->name("admin.answers.invalid");
 
-    Route::get("/dashboard", [AdminDashboardController::class, "index"])->name("admin.dashboard");
-
     Route::get("/schools", [SchoolsController::class, "index"])->name("admin.schools.index");
     Route::post("/schools", [SchoolsController::class, "store"])->name("admin.schools.store");
     Route::patch("/schools/{school}", [SchoolsController::class, "update"])->name("admin.schools.update");
diff --git a/tests/Feature/SchoolTest.php b/tests/Feature/SchoolTest.php
index 9f25f8d0..74988f5d 100644
--- a/tests/Feature/SchoolTest.php
+++ b/tests/Feature/SchoolTest.php
@@ -33,7 +33,7 @@ public function testAdminCanViewSchools(): void
             ->get("/admin/schools")
             ->assertInertia(
                 fn(Assert $page) => $page
-                    ->component("SchoolsPanel")
+                    ->component("Admin/SchoolsPanel")
                     ->has("schools", 3),
             );
     }

From 61e2cc7c9ba8b676688479e734818d70532d0037 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 29 Aug 2024 23:30:29 +0200
Subject: [PATCH 04/60] create layouts

---
 resources/js/Layouts/AdminLayout.vue      | 17 ++++++++++++
 resources/js/Layouts/BaseLayout.vue       | 18 +++++++++++++
 resources/js/Layouts/UserLayout.vue       | 15 +++++++++++
 resources/js/app.ts                       | 21 ++++++++++++++-
 resources/js/components/Common/Header.vue | 33 ++++++++++++++++++++---
 5 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 resources/js/Layouts/AdminLayout.vue
 create mode 100644 resources/js/Layouts/BaseLayout.vue
 create mode 100644 resources/js/Layouts/UserLayout.vue

diff --git a/resources/js/Layouts/AdminLayout.vue b/resources/js/Layouts/AdminLayout.vue
new file mode 100644
index 00000000..306d5684
--- /dev/null
+++ b/resources/js/Layouts/AdminLayout.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import type {Page} from "@/Types/Page";
+import BaseLayout from "@/Layouts/BaseLayout.vue";
+
+const pages: Page[] = [
+  { title: 'Testy', href: '/admin/quizzes' },
+  { title: 'Szkoły', href: '/admin/schools' },
+  { title: 'Uczniowie', href: '/admin/users' },
+  { title: 'Ranking', href: '/admin/ranking' },
+]
+</script>
+
+<template>
+  <BaseLayout :pages>
+    <slot />
+  </BaseLayout>
+</template>
diff --git a/resources/js/Layouts/BaseLayout.vue b/resources/js/Layouts/BaseLayout.vue
new file mode 100644
index 00000000..e24e27d0
--- /dev/null
+++ b/resources/js/Layouts/BaseLayout.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import type {Page} from "@/Types/Page";
+import Header from "@/components/Common/Header.vue";
+import Footer from "@/components/Common/Footer.vue";
+import BackgroundEffect from "@/components/Home/BackgroundEffect.vue";
+
+defineProps<{ pages: Page[] }>();
+</script>
+
+<template>
+  <BackgroundEffect />
+  <div class="inset-0 bg-white/60 fixed -z-10" />
+  <div class="flex flex-col items-center h-full min-h-screen">
+    <Header :pages />
+    <slot/>
+    <Footer />
+  </div>
+</template>
diff --git a/resources/js/Layouts/UserLayout.vue b/resources/js/Layouts/UserLayout.vue
new file mode 100644
index 00000000..6c7d554c
--- /dev/null
+++ b/resources/js/Layouts/UserLayout.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import type {Page} from "@/Types/Page";
+import BaseLayout from "@/Layouts/BaseLayout.vue";
+
+const pages: Page[] = [
+  { title: 'Konkursy', href: '/dashboard' },
+  { title: 'Mój Profil', href: '/profile' },
+]
+</script>
+
+<template>
+  <BaseLayout :pages>
+    <slot />
+  </BaseLayout>
+</template>
diff --git a/resources/js/app.ts b/resources/js/app.ts
index 9acf177a..0655ed30 100644
--- a/resources/js/app.ts
+++ b/resources/js/app.ts
@@ -2,10 +2,29 @@ import '../css/app.css'
 import { createApp, h, type DefineComponent } from 'vue'
 import { createInertiaApp } from '@inertiajs/vue3'
 import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'
+import UserLayout from "@/Layouts/UserLayout.vue";
+import AdminLayout from "@/Layouts/AdminLayout.vue";
 
 createInertiaApp({
   title: (title) => `${title}`,
-  resolve: async (name) => await resolvePageComponent(`./Pages/${name}.vue`, import.meta.glob<DefineComponent>('./Pages/**/*.vue')),
+  resolve: async (name) => {
+    const page = await resolvePageComponent(
+      `./Pages/${name}.vue`,
+      import.meta.glob<DefineComponent>('./Pages/**/*.vue')
+    );
+
+    if (name.startsWith('Admin/')) {
+      page.default.layout ??= AdminLayout;
+    }
+
+    if (name.startsWith('User/')) {
+      page.default.layout ??= UserLayout;
+    }
+
+    console.log(name);
+
+    return page;
+  },
   setup({ el, App, props, plugin }) {
     createApp({ render: () => h(App, props) })
       .use(plugin)
diff --git a/resources/js/components/Common/Header.vue b/resources/js/components/Common/Header.vue
index e1142b73..589e02a5 100644
--- a/resources/js/components/Common/Header.vue
+++ b/resources/js/components/Common/Header.vue
@@ -1,9 +1,36 @@
 <script setup lang="ts">
-defineProps<{title:string}>()
+import {type Page} from '@/Types/Page'
+import FormButton from "@/components/Common/FormButton.vue";
+
+const props = defineProps<{ pages: Page[] }>();
+
+const isSelected = (page: Page) => page.href === window.location.pathname;
 </script>
 
 <template>
-  <header class="w-full font-bold p-5 bg-white/50">
-    {{ title }}
+  <header class="w-full">
+    <nav class="mx-auto flex items-center justify-between gap-x-6 p-6 px-[8vw]" aria-label="Global">
+      <div class="flex gap-x-12 items-center">
+        <a href="/">
+          <svg class="size-10" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M7.02484 14.3074C6.60832 14.3074 6.3744 13.828 6.63076 13.4997L15.3851 2.28913C15.7308 1.84642 16.4312 2.22227 16.2534 2.75511L13.6884 10.4434C13.6668 10.5082 13.715 10.575 13.7832 10.575H16.4951C16.9018 10.575 17.1384 11.0347 16.902 11.3656L9.30015 22.0091C8.96935 22.4723 8.24533 22.1111 8.41638 21.5683L10.6633 14.4375C10.6836 14.373 10.6355 14.3074 10.5679 14.3074H7.02484Z" fill="#262C89"/>
+            <path fill-rule="evenodd" clip-rule="evenodd" d="M12.2545 17.8224V6.2803L15.3847 2.28313C15.731 1.84101 16.4307 2.21751 16.2525 2.75005L13.6885 10.4136C13.6668 10.4784 13.715 10.5453 13.7834 10.5453H16.4935C16.9005 10.5453 17.137 11.0056 16.9 11.3365L12.2545 17.8224Z" fill="#6566C2"/>
+          </svg>
+        </a>
+
+        <a
+          v-for="item in pages"
+          :key="item.title"
+          :href="item.href"
+          class="font-semibold leading-6 text-gray-900"
+          :class="{'text-primary': isSelected(item) }"
+        >
+          {{ item.title }}
+        </a>
+      </div>
+      <div class="flex flex-1 items-center justify-end gap-x-6">
+        <FormButton method="post" href="/auth/logout" small>Log out</FormButton>
+      </div>
+    </nav>
   </header>
 </template>

From bfb38d2c5a6188ad3a1dcf08f7a74e718ed531c2 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 29 Aug 2024 23:38:04 +0200
Subject: [PATCH 05/60] fix code style

---
 resources/js/Layouts/AdminLayout.vue          |  4 +--
 resources/js/Layouts/BaseLayout.vue           | 12 ++++-----
 resources/js/Layouts/UserLayout.vue           |  4 +--
 resources/js/Pages/Admin/Quizzes.vue          |  2 +-
 resources/js/Pages/Admin/SchoolsPanel.vue     |  2 +-
 resources/js/Types/Page.d.ts                  |  2 +-
 resources/js/app.ts                           | 16 ++++++------
 resources/js/components/Common/FormButton.vue | 26 +++++++++----------
 resources/js/components/Common/Header.vue     | 10 +++----
 resources/js/components/Common/LinkButton.vue |  4 +--
 10 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/resources/js/Layouts/AdminLayout.vue b/resources/js/Layouts/AdminLayout.vue
index 306d5684..63f11e52 100644
--- a/resources/js/Layouts/AdminLayout.vue
+++ b/resources/js/Layouts/AdminLayout.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type {Page} from "@/Types/Page";
-import BaseLayout from "@/Layouts/BaseLayout.vue";
+import type {Page} from '@/Types/Page'
+import BaseLayout from '@/Layouts/BaseLayout.vue'
 
 const pages: Page[] = [
   { title: 'Testy', href: '/admin/quizzes' },
diff --git a/resources/js/Layouts/BaseLayout.vue b/resources/js/Layouts/BaseLayout.vue
index e24e27d0..5034e5e7 100644
--- a/resources/js/Layouts/BaseLayout.vue
+++ b/resources/js/Layouts/BaseLayout.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type {Page} from "@/Types/Page";
-import Header from "@/components/Common/Header.vue";
-import Footer from "@/components/Common/Footer.vue";
-import BackgroundEffect from "@/components/Home/BackgroundEffect.vue";
+import type {Page} from '@/Types/Page'
+import Header from '@/components/Common/Header.vue'
+import Footer from '@/components/Common/Footer.vue'
+import BackgroundEffect from '@/components/Home/BackgroundEffect.vue'
 
-defineProps<{ pages: Page[] }>();
+defineProps<{ pages: Page[] }>()
 </script>
 
 <template>
@@ -12,7 +12,7 @@ defineProps<{ pages: Page[] }>();
   <div class="inset-0 bg-white/60 fixed -z-10" />
   <div class="flex flex-col items-center h-full min-h-screen">
     <Header :pages />
-    <slot/>
+    <slot />
     <Footer />
   </div>
 </template>
diff --git a/resources/js/Layouts/UserLayout.vue b/resources/js/Layouts/UserLayout.vue
index 6c7d554c..a3185575 100644
--- a/resources/js/Layouts/UserLayout.vue
+++ b/resources/js/Layouts/UserLayout.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type {Page} from "@/Types/Page";
-import BaseLayout from "@/Layouts/BaseLayout.vue";
+import type {Page} from '@/Types/Page'
+import BaseLayout from '@/Layouts/BaseLayout.vue'
 
 const pages: Page[] = [
   { title: 'Konkursy', href: '/dashboard' },
diff --git a/resources/js/Pages/Admin/Quizzes.vue b/resources/js/Pages/Admin/Quizzes.vue
index 31d2c341..55b0d386 100644
--- a/resources/js/Pages/Admin/Quizzes.vue
+++ b/resources/js/Pages/Admin/Quizzes.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {Head} from "@inertiajs/vue3";
+import {Head} from '@inertiajs/vue3'
 </script>
 
 <template>
diff --git a/resources/js/Pages/Admin/SchoolsPanel.vue b/resources/js/Pages/Admin/SchoolsPanel.vue
index c9f4550a..efb8d5a9 100644
--- a/resources/js/Pages/Admin/SchoolsPanel.vue
+++ b/resources/js/Pages/Admin/SchoolsPanel.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {Head} from "@inertiajs/vue3";
+import {Head} from '@inertiajs/vue3'
 </script>
 
 <template>
diff --git a/resources/js/Types/Page.d.ts b/resources/js/Types/Page.d.ts
index e5f4d35b..6622f9b8 100644
--- a/resources/js/Types/Page.d.ts
+++ b/resources/js/Types/Page.d.ts
@@ -1,4 +1,4 @@
 export interface Page {
-  title: string,
+  title: string
   href: string
 }
diff --git a/resources/js/app.ts b/resources/js/app.ts
index 0655ed30..e47ca08f 100644
--- a/resources/js/app.ts
+++ b/resources/js/app.ts
@@ -2,28 +2,28 @@ import '../css/app.css'
 import { createApp, h, type DefineComponent } from 'vue'
 import { createInertiaApp } from '@inertiajs/vue3'
 import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'
-import UserLayout from "@/Layouts/UserLayout.vue";
-import AdminLayout from "@/Layouts/AdminLayout.vue";
+import UserLayout from '@/Layouts/UserLayout.vue'
+import AdminLayout from '@/Layouts/AdminLayout.vue'
 
 createInertiaApp({
   title: (title) => `${title}`,
   resolve: async (name) => {
     const page = await resolvePageComponent(
       `./Pages/${name}.vue`,
-      import.meta.glob<DefineComponent>('./Pages/**/*.vue')
-    );
+      import.meta.glob<DefineComponent>('./Pages/**/*.vue'),
+    )
 
     if (name.startsWith('Admin/')) {
-      page.default.layout ??= AdminLayout;
+      page.default.layout ??= AdminLayout
     }
 
     if (name.startsWith('User/')) {
-      page.default.layout ??= UserLayout;
+      page.default.layout ??= UserLayout
     }
 
-    console.log(name);
+    console.log(name)
 
-    return page;
+    return page
   },
   setup({ el, App, props, plugin }) {
     createApp({ render: () => h(App, props) })
diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
index 71619adf..c2bccf1f 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -1,20 +1,19 @@
 <script setup lang="ts">
-  import { useForm } from "@inertiajs/vue3";
+import { useForm } from '@inertiajs/vue3'
 
-  const form = useForm({});
+const form = useForm({})
 
-  const props = withDefaults(defineProps<{
-    small?: boolean
-    class?: string
-    href: string,
-    method?: "post" | "get" | "put" | "patch" | "delete"
-    options?: object
-  }>(), { method: 'get' });
+const props = withDefaults(defineProps<{
+  small?: boolean
+  class?: string
+  href: string
+  method?: 'post' | 'get' | 'put' | 'patch' | 'delete'
+  options?: any
+}>(), { method: 'get', class: '', options: {} })
 
-
-  function handleSubmit() {
-    form[props.method](props.href, props.options);
-  }
+function handleSubmit() {
+  form[props.method](props.href, props.options)
+}
 </script>
 
 <template>
@@ -27,7 +26,6 @@
       <slot />
     </button>
   </form>
-
 </template>
 
 
diff --git a/resources/js/components/Common/Header.vue b/resources/js/components/Common/Header.vue
index 589e02a5..862f6c00 100644
--- a/resources/js/components/Common/Header.vue
+++ b/resources/js/components/Common/Header.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import {type Page} from '@/Types/Page'
-import FormButton from "@/components/Common/FormButton.vue";
+import FormButton from '@/components/Common/FormButton.vue'
 
-const props = defineProps<{ pages: Page[] }>();
+defineProps<{ pages: Page[] }>()
 
-const isSelected = (page: Page) => page.href === window.location.pathname;
+const isSelected = (page: Page) => page.href === window.location.pathname
 </script>
 
 <template>
@@ -13,8 +13,8 @@ const isSelected = (page: Page) => page.href === window.location.pathname;
       <div class="flex gap-x-12 items-center">
         <a href="/">
           <svg class="size-10" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M7.02484 14.3074C6.60832 14.3074 6.3744 13.828 6.63076 13.4997L15.3851 2.28913C15.7308 1.84642 16.4312 2.22227 16.2534 2.75511L13.6884 10.4434C13.6668 10.5082 13.715 10.575 13.7832 10.575H16.4951C16.9018 10.575 17.1384 11.0347 16.902 11.3656L9.30015 22.0091C8.96935 22.4723 8.24533 22.1111 8.41638 21.5683L10.6633 14.4375C10.6836 14.373 10.6355 14.3074 10.5679 14.3074H7.02484Z" fill="#262C89"/>
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M12.2545 17.8224V6.2803L15.3847 2.28313C15.731 1.84101 16.4307 2.21751 16.2525 2.75005L13.6885 10.4136C13.6668 10.4784 13.715 10.5453 13.7834 10.5453H16.4935C16.9005 10.5453 17.137 11.0056 16.9 11.3365L12.2545 17.8224Z" fill="#6566C2"/>
+            <path d="M7.02484 14.3074C6.60832 14.3074 6.3744 13.828 6.63076 13.4997L15.3851 2.28913C15.7308 1.84642 16.4312 2.22227 16.2534 2.75511L13.6884 10.4434C13.6668 10.5082 13.715 10.575 13.7832 10.575H16.4951C16.9018 10.575 17.1384 11.0347 16.902 11.3656L9.30015 22.0091C8.96935 22.4723 8.24533 22.1111 8.41638 21.5683L10.6633 14.4375C10.6836 14.373 10.6355 14.3074 10.5679 14.3074H7.02484Z" fill="#262C89" />
+            <path fill-rule="evenodd" clip-rule="evenodd" d="M12.2545 17.8224V6.2803L15.3847 2.28313C15.731 1.84101 16.4307 2.21751 16.2525 2.75005L13.6885 10.4136C13.6668 10.4784 13.715 10.5453 13.7834 10.5453H16.4935C16.9005 10.5453 17.137 11.0056 16.9 11.3365L12.2545 17.8224Z" fill="#6566C2" />
           </svg>
         </a>
 
diff --git a/resources/js/components/Common/LinkButton.vue b/resources/js/components/Common/LinkButton.vue
index 1b737fb8..d649512c 100644
--- a/resources/js/components/Common/LinkButton.vue
+++ b/resources/js/components/Common/LinkButton.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-  const props = defineProps<{
+const props = defineProps<{
     small?: boolean
     class?: string
     href: string
-  }>();
+  }>()
 </script>
 
 <template>

From ac37bb685da4423aa940b562d0a6eb8019da87f5 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 09:49:05 +0200
Subject: [PATCH 06/60] add mobile version

---
 package-lock.json                             | 42 ++++++++++++
 package.json                                  |  3 +-
 resources/js/app.ts                           |  2 -
 resources/js/components/Common/FormButton.vue |  2 +-
 resources/js/components/Common/Header.vue     | 67 +++++++++++++++++--
 5 files changed, 108 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d83488d7..12fd58f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,6 +6,7 @@
         "": {
             "name": "interns2024b",
             "dependencies": {
+                "@headlessui/vue": "^1.7.22",
                 "@heroicons/vue": "^2.1.5",
                 "@inertiajs/vue3": "^1.0.14",
                 "@tailwindcss/forms": "^0.5.7",
@@ -778,6 +779,21 @@
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
             }
         },
+        "node_modules/@headlessui/vue": {
+            "version": "1.7.22",
+            "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.7.22.tgz",
+            "integrity": "sha512-Hoffjoolq1rY+LOfJ+B/OvkhuBXXBFgd8oBlN+l1TApma2dB0En0ucFZrwQtb33SmcCqd32EQd0y07oziXWNYg==",
+            "license": "MIT",
+            "dependencies": {
+                "@tanstack/vue-virtual": "^3.0.0-beta.60"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "vue": "^3.2.0"
+            }
+        },
         "node_modules/@heroicons/vue": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@heroicons/vue/-/vue-2.1.5.tgz",
@@ -1246,6 +1262,32 @@
                 "tailwindcss": ">=3.0.0 || insiders"
             }
         },
+        "node_modules/@tanstack/virtual-core": {
+            "version": "3.10.6",
+            "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.10.6.tgz",
+            "integrity": "sha512-1giLc4dzgEKLMx5pgKjL6HlG5fjZMgCjzlKAlpr7yoUtetVPELgER1NtephAI910nMwfPTHNyWKSFmJdHkz2Cw==",
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/tannerlinsley"
+            }
+        },
+        "node_modules/@tanstack/vue-virtual": {
+            "version": "3.10.6",
+            "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.10.6.tgz",
+            "integrity": "sha512-uVyUAV7rugRxgrw/f3J6FX6TGhxWAjXdT0PAbVNcIFNrj1Ftu/NT9bFLxKVQTkd8hnM6y8ijAlJ1xtBDGmo4gQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@tanstack/virtual-core": "3.10.6"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/tannerlinsley"
+            },
+            "peerDependencies": {
+                "vue": "^2.7.0 || ^3.0.0"
+            }
+        },
         "node_modules/@types/estree": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
diff --git a/package.json b/package.json
index e776905f..8f6eb85c 100644
--- a/package.json
+++ b/package.json
@@ -10,13 +10,14 @@
         "tsc": "vue-tsc"
     },
     "dependencies": {
+        "@headlessui/vue": "^1.7.22",
         "@heroicons/vue": "^2.1.5",
         "@inertiajs/vue3": "^1.0.14",
         "@tailwindcss/forms": "^0.5.7",
         "@tailwindcss/typography": "^0.5.10",
-        "tailwindcss": "^3.4.8",
         "laravel-vite-plugin": "^1.0.2",
         "lodash": "^4.17.21",
+        "tailwindcss": "^3.4.8",
         "vue": "^3.4.21"
     },
     "devDependencies": {
diff --git a/resources/js/app.ts b/resources/js/app.ts
index e47ca08f..45482eaf 100644
--- a/resources/js/app.ts
+++ b/resources/js/app.ts
@@ -21,8 +21,6 @@ createInertiaApp({
       page.default.layout ??= UserLayout
     }
 
-    console.log(name)
-
     return page
   },
   setup({ el, App, props, plugin }) {
diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
index c2bccf1f..8617f7ce 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -17,7 +17,7 @@ function handleSubmit() {
 </script>
 
 <template>
-  <form @submit.prevent="handleSubmit">
+  <form :class="props.class" @submit.prevent="handleSubmit">
     <button
       type="submit"
       class="bg-primary px-3 semibold text-white  font-semibold shadow-sm hover:bg-primary-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
diff --git a/resources/js/components/Common/Header.vue b/resources/js/components/Common/Header.vue
index 862f6c00..d08f15d5 100644
--- a/resources/js/components/Common/Header.vue
+++ b/resources/js/components/Common/Header.vue
@@ -1,15 +1,19 @@
 <script setup lang="ts">
 import {type Page} from '@/Types/Page'
 import FormButton from '@/components/Common/FormButton.vue'
+import { TransitionRoot, Dialog, TransitionChild, DialogPanel, DialogTitle } from '@headlessui/vue'
+import { Bars3Icon, XMarkIcon } from '@heroicons/vue/24/outline'
+import {ref} from 'vue'
 
 defineProps<{ pages: Page[] }>()
 
+const open = ref<boolean>(true)
 const isSelected = (page: Page) => page.href === window.location.pathname
 </script>
 
 <template>
   <header class="w-full">
-    <nav class="mx-auto flex items-center justify-between gap-x-6 p-6 px-[8vw]" aria-label="Global">
+    <nav class="flex w-full mx-auto items-center justify-between gap-x-6 p-6 px-[8vw]">
       <div class="flex gap-x-12 items-center">
         <a href="/">
           <svg class="size-10" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -22,15 +26,70 @@ const isSelected = (page: Page) => page.href === window.location.pathname
           v-for="item in pages"
           :key="item.title"
           :href="item.href"
-          class="font-semibold leading-6 text-gray-900"
+          class="hidden md:block font-semibold leading-6 text-gray-900"
           :class="{'text-primary': isSelected(item) }"
         >
           {{ item.title }}
         </a>
       </div>
-      <div class="flex flex-1 items-center justify-end gap-x-6">
-        <FormButton method="post" href="/auth/logout" small>Log out</FormButton>
+
+      <div class="hidden md:flex flex-1 items-center justify-end gap-x-6">
+        <FormButton method="post" href="/auth/logout" small>Wyloguj</FormButton>
+      </div>
+
+      <div class="flex md:hidden items-center">
+        <div class="relative inline-flex items-center justify-center rounded-md p-2 text-gray-400 hover:bg-gray-100 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-indigo-500" @click="open = true">
+          <span class="absolute -inset-0.5" />
+          <span class="sr-only">Otwórz menu główne</span>
+          <Bars3Icon class="block size-6" />
+        </div>
       </div>
     </nav>
+
+    <TransitionRoot as="template" :show="open">
+      <Dialog class="relative z-10" @close="open = false">
+        <div class="fixed inset-0" />
+
+        <div class="fixed inset-0 overflow-hidden">
+          <div class="absolute inset-0 overflow-hidden">
+            <div class="pointer-events-none fixed inset-y-0 right-0 flex max-w-full pl-10">
+              <TransitionChild as="template" enter="transform transition ease-in-out duration-500 sm:duration-700" enter-from="translate-x-full" enter-to="translate-x-0" leave="transform transition ease-in-out duration-500 sm:duration-700" leave-from="translate-x-0" leave-to="translate-x-full">
+                <DialogPanel class="pointer-events-auto w-screen max-w-80">
+                  <div class="flex h-full flex-col overflow-y-scroll bg-white py-6 shadow-xl">
+                    <div class="px-4 sm:px-6">
+                      <div class="flex items-start justify-between">
+                        <DialogTitle class="text-base font-semibold leading-6 text-gray-900">Menu Główne</DialogTitle>
+                        <div class="ml-3 flex h-7 items-center">
+                          <button type="button" class="relative rounded-md bg-white text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2" @click="open = false">
+                            <span class="absolute -inset-2.5" />
+                            <span class="sr-only">Zamknij Menu</span>
+                            <XMarkIcon class="size-6" aria-hidden="true" />
+                          </button>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="relative flex flex-col gap-4 mt-2 flex-1 px-6 py-2">
+                      <a
+                        v-for="item in pages"
+                        :key="item.title"
+                        :href="item.href"
+                        class="block font-semibold leading-6 text-gray-900 mr-10"
+                        :class="{'text-primary': isSelected(item) }"
+                      >
+                        {{ item.title }}
+                      </a>
+                    </div>
+
+                    <div class="flex flex-1 items-end justify-end px-6 py-2">
+                      <FormButton method="post" class="w-full" href="/auth/logout" small>Wyloguj</FormButton>
+                    </div>
+                  </div>
+                </DialogPanel>
+              </TransitionChild>
+            </div>
+          </div>
+        </div>
+      </Dialog>
+    </TransitionRoot>
   </header>
 </template>

From 0d709c68cad696795aa2332071ed156cd0ec3329 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 09:53:02 +0200
Subject: [PATCH 07/60] make mobile version hidden by default

---
 resources/js/components/Common/Header.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/Common/Header.vue b/resources/js/components/Common/Header.vue
index d08f15d5..58eaf24a 100644
--- a/resources/js/components/Common/Header.vue
+++ b/resources/js/components/Common/Header.vue
@@ -7,7 +7,7 @@ import {ref} from 'vue'
 
 defineProps<{ pages: Page[] }>()
 
-const open = ref<boolean>(true)
+const open = ref<boolean>(false)
 const isSelected = (page: Page) => page.href === window.location.pathname
 </script>
 

From 642bd6764143abc66bec202d2084162231924fed Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 11:10:15 +0200
Subject: [PATCH 08/60] change logout button to text

---
 resources/js/components/Common/FormButton.vue | 9 ++++-----
 resources/js/components/Common/Header.vue     | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
index 8617f7ce..a27c98ae 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -5,11 +5,12 @@ const form = useForm({})
 
 const props = withDefaults(defineProps<{
   small?: boolean
+  text?: boolean
   class?: string
   href: string
   method?: 'post' | 'get' | 'put' | 'patch' | 'delete'
   options?: any
-}>(), { method: 'get', class: '', options: {} })
+}>(), { method: 'get', class: '', options: {}})
 
 function handleSubmit() {
   form[props.method](props.href, props.options)
@@ -20,12 +21,10 @@ function handleSubmit() {
   <form :class="props.class" @submit.prevent="handleSubmit">
     <button
       type="submit"
-      class="bg-primary px-3 semibold text-white  font-semibold shadow-sm hover:bg-primary-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
-      :class="`${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${props.class}`"
+      class="px-3 font-semibold transition-colors duration-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
+      :class="`${text ? 'text-black hover:text-primary-800' : 'bg-primary text-white hover:bg-primary-600  shadow-sm '} ${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${props.class}`"
     >
       <slot />
     </button>
   </form>
 </template>
-
-
diff --git a/resources/js/components/Common/Header.vue b/resources/js/components/Common/Header.vue
index 58eaf24a..d7559ec1 100644
--- a/resources/js/components/Common/Header.vue
+++ b/resources/js/components/Common/Header.vue
@@ -26,7 +26,7 @@ const isSelected = (page: Page) => page.href === window.location.pathname
           v-for="item in pages"
           :key="item.title"
           :href="item.href"
-          class="hidden md:block font-semibold leading-6 text-gray-900"
+          class="hidden md:block font-semibold leading-6 text-gray-900 transition-colors duration-200 hover:text-primary-800"
           :class="{'text-primary': isSelected(item) }"
         >
           {{ item.title }}
@@ -34,7 +34,7 @@ const isSelected = (page: Page) => page.href === window.location.pathname
       </div>
 
       <div class="hidden md:flex flex-1 items-center justify-end gap-x-6">
-        <FormButton method="post" href="/auth/logout" small>Wyloguj</FormButton>
+        <FormButton method="post" href="/auth/logout" text>Wyloguj</FormButton>
       </div>
 
       <div class="flex md:hidden items-center">
@@ -58,7 +58,7 @@ const isSelected = (page: Page) => page.href === window.location.pathname
                   <div class="flex h-full flex-col overflow-y-scroll bg-white py-6 shadow-xl">
                     <div class="px-4 sm:px-6">
                       <div class="flex items-start justify-between">
-                        <DialogTitle class="text-base font-semibold leading-6 text-gray-900">Menu Główne</DialogTitle>
+                        <DialogTitle class="text-base font-semibold leading-6 text-gray-900">Interns 2024</DialogTitle>
                         <div class="ml-3 flex h-7 items-center">
                           <button type="button" class="relative rounded-md bg-white text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2" @click="open = false">
                             <span class="absolute -inset-2.5" />
@@ -81,7 +81,7 @@ const isSelected = (page: Page) => page.href === window.location.pathname
                     </div>
 
                     <div class="flex flex-1 items-end justify-end px-6 py-2">
-                      <FormButton method="post" class="w-full" href="/auth/logout" small>Wyloguj</FormButton>
+                      <FormButton method="post" class="w-full" href="/auth/logout" text>Wyloguj</FormButton>
                     </div>
                   </div>
                 </DialogPanel>

From bfbb89f4a5e26e3ac03744f70e9564e8fc7197bf Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 11:38:29 +0200
Subject: [PATCH 09/60] fix button styles

---
 resources/js/components/Common/FormButton.vue | 4 ++--
 resources/js/components/Common/Header.vue     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
index a27c98ae..dc5a31d8 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -21,8 +21,8 @@ function handleSubmit() {
   <form :class="props.class" @submit.prevent="handleSubmit">
     <button
       type="submit"
-      class="px-3 font-semibold transition-colors duration-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
-      :class="`${text ? 'text-black hover:text-primary-800' : 'bg-primary text-white hover:bg-primary-600  shadow-sm '} ${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${props.class}`"
+      class="font-semibold transition-colors duration-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
+      :class="`${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${text ? 'text-black hover:text-primary-800 px-0 py-0' : 'px-3 bg-primary text-white hover:bg-primary-600 shadow-sm'} ${props.class}`"
     >
       <slot />
     </button>
diff --git a/resources/js/components/Common/Header.vue b/resources/js/components/Common/Header.vue
index d7559ec1..3f5483e0 100644
--- a/resources/js/components/Common/Header.vue
+++ b/resources/js/components/Common/Header.vue
@@ -80,8 +80,8 @@ const isSelected = (page: Page) => page.href === window.location.pathname
                       </a>
                     </div>
 
-                    <div class="flex flex-1 items-end justify-end px-6 py-2">
-                      <FormButton method="post" class="w-full" href="/auth/logout" text>Wyloguj</FormButton>
+                    <div class="flex flex-1 items-end justify-center px-6 py-2">
+                      <FormButton method="post" class="" href="/auth/logout" text>Wyloguj</FormButton>
                     </div>
                   </div>
                 </DialogPanel>

From 965d63415a67e2853d146f21e7f00c6339cf4695 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 11:39:10 +0200
Subject: [PATCH 10/60] =?UTF-8?q?remove=20'm=C3=B3j'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/Layouts/UserLayout.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Layouts/UserLayout.vue b/resources/js/Layouts/UserLayout.vue
index a3185575..5f3e633d 100644
--- a/resources/js/Layouts/UserLayout.vue
+++ b/resources/js/Layouts/UserLayout.vue
@@ -4,7 +4,7 @@ import BaseLayout from '@/Layouts/BaseLayout.vue'
 
 const pages: Page[] = [
   { title: 'Konkursy', href: '/dashboard' },
-  { title: 'Mój Profil', href: '/profile' },
+  { title: 'Profil', href: '/profile' },
 ]
 </script>
 

From 24fc36a67768fa660a720fbcce226a43e0ff5863 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 11:53:10 +0200
Subject: [PATCH 11/60] fix linter errors

---
 resources/js/Pages/User/Quiz.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/Pages/User/Quiz.vue b/resources/js/Pages/User/Quiz.vue
index ba534139..8d98b40b 100644
--- a/resources/js/Pages/User/Quiz.vue
+++ b/resources/js/Pages/User/Quiz.vue
@@ -1,2 +1,3 @@
 <template>
-</template>
\ No newline at end of file
+  Quiz
+</template>

From 7ff4046e9b75b8e622c24e688b6517c34ad98eb4 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 12:03:36 +0200
Subject: [PATCH 12/60] fix Admin tests

---
 routes/web.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 047f527c..d45e1d68 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use App\Http\Controllers\AdminController;
 use App\Http\Controllers\AnswerRecordController;
 use App\Http\Controllers\AuthenticateSessionController;
 use App\Http\Controllers\ContestController;
@@ -85,8 +86,6 @@
         Route::patch("/users/anonymize/{user}", [UserController::class, "anonymize"])->name("admin.users.anonymize");
         Route::delete("/admins/{user}", [AdminController::class, "destroy"])->name("admin.admins.destroy");
     });
-
-    Route::get("/dashboard", [AdminDashboardController::class, "index"])->name("admin.dashboard");
 });
 
 Route::middleware(["auth"])->group(function (): void {

From 4b369a072d7e54e903754b491917da95ecd665d3 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 12:08:40 +0200
Subject: [PATCH 13/60] fix user tests

---
 tests/Feature/UserTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index a6c416c5..71d577d5 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -377,10 +377,6 @@ public function testUserCannotAccessCrud(): void
     public function guestCannotAccessCrud(): void
     {
         $user = User::factory()->create();
-        $this->from("/")
-            ->get("/admin/dashboard")
-            ->assertStatus(403)
-            ->assertRedirect("/");
 
         $this->from("/")
             ->get("/admin/users/")

From 0358ca97bc48905a5e6b96245ff160e67e0f8ac8 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 14:36:49 +0200
Subject: [PATCH 14/60] create guest layout

---
 .../PasswordResetLinkController.php           |  4 +-
 app/Http/Middleware/HandleInertiaRequests.php |  7 ++-
 resources/js/Layouts/BaseLayout.vue           | 20 ++++++--
 resources/js/Pages/Auth/ForgotPassword.vue    | 50 -------------------
 resources/js/Pages/Auth/ResetPassword.vue     | 46 -----------------
 resources/js/Pages/Guest/ForgotPassword.vue   | 32 ++++++++++++
 resources/js/Pages/Home.vue                   |  2 +-
 resources/js/Pages/User/ResetPassword.vue     | 39 +++++++++++++++
 resources/js/Types/PageProps.d.ts             |  7 +++
 resources/js/app.ts                           |  5 ++
 .../{Home => Common}/BackgroundEffect.vue     |  3 ++
 .../components/Common/BackgroundEffect2.vue   | 10 ----
 resources/js/components/Common/Header.vue     | 11 ++--
 13 files changed, 117 insertions(+), 119 deletions(-)
 delete mode 100644 resources/js/Pages/Auth/ForgotPassword.vue
 delete mode 100644 resources/js/Pages/Auth/ResetPassword.vue
 create mode 100644 resources/js/Pages/Guest/ForgotPassword.vue
 create mode 100644 resources/js/Pages/User/ResetPassword.vue
 create mode 100644 resources/js/Types/PageProps.d.ts
 rename resources/js/components/{Home => Common}/BackgroundEffect.vue (89%)
 delete mode 100644 resources/js/components/Common/BackgroundEffect2.vue

diff --git a/app/Http/Controllers/PasswordResetLinkController.php b/app/Http/Controllers/PasswordResetLinkController.php
index 0bdffc80..d2e87f50 100644
--- a/app/Http/Controllers/PasswordResetLinkController.php
+++ b/app/Http/Controllers/PasswordResetLinkController.php
@@ -19,7 +19,7 @@ class PasswordResetLinkController extends Controller
 {
     public function create(): Response
     {
-        return Inertia::render("Auth/ForgotPassword", ["status" => session()->get("status")]);
+        return Inertia::render("Guest/ForgotPassword", ["status" => session()->get("status")]);
     }
 
     public function store(ForgotPasswordRequest $request): RedirectResponse
@@ -37,7 +37,7 @@ public function store(ForgotPasswordRequest $request): RedirectResponse
 
     public function resetCreate(string $token): Response
     {
-        return Inertia::render("Auth/ResetPassword", ["token" => $token]);
+        return Inertia::render("User/ResetPassword", ["token" => $token]);
     }
 
     public function resetStore(ResetPasswordRequest $request): RedirectResponse
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
index 51156a35..49da7196 100644
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -4,6 +4,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Http\Resources\UserResource;
 use Illuminate\Http\Request;
 use Inertia\Middleware;
 
@@ -22,6 +23,10 @@ public function version(Request $request): ?string
      */
     public function share(Request $request): array
     {
-        return array_merge(parent::share($request), []);
+        return array_merge(parent::share($request), [
+            "appName" => config("app.name"),
+            "user" => fn() => $request->user() ? UserResource::make($request->user()) : null,
+            "status" => fn() => $request->session()->get("message"),
+        ]);
     }
 }
diff --git a/resources/js/Layouts/BaseLayout.vue b/resources/js/Layouts/BaseLayout.vue
index 6d7dc342..8f606af0 100644
--- a/resources/js/Layouts/BaseLayout.vue
+++ b/resources/js/Layouts/BaseLayout.vue
@@ -3,16 +3,28 @@
 import type {Page} from '@/Types/Page'
 import Header from '@/components/Common/Header.vue'
 import Footer from '@/components/Common/Footer.vue'
-import BackgroundEffect from '@/components/Home/BackgroundEffect.vue'
+import BackgroundEffect from '@/components/Common/BackgroundEffect.vue'
+import Banner from '@/components/Common/Banner.vue'
+import { usePage } from '@inertiajs/vue3'
+import {ref} from 'vue'
+import {type PageProps} from '@/Types/PageProps'
+
+const { pages } = defineProps<{ pages: Page[] }>()
+
+const props = usePage().props as PageProps
+const status = ref<string>(props.status ?? '')
 
-defineProps<{ pages: Page[] }>()
 </script>
 
 <template>
   <BackgroundEffect />
-  <div class="inset-0 bg-white/60 fixed -z-10" />
+
   <div class="flex flex-col items-center h-full min-h-screen">
-    <Header :pages />
+    <Transition>
+      <Banner v-if="status" :text="status" @click="status = ''" />
+    </Transition>
+
+    <Header :pages :user="props.user" :app-name="props.appName" />
     <slot />
     <Footer />
   </div>
diff --git a/resources/js/Pages/Auth/ForgotPassword.vue b/resources/js/Pages/Auth/ForgotPassword.vue
deleted file mode 100644
index e549f5c4..00000000
--- a/resources/js/Pages/Auth/ForgotPassword.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<script setup lang="ts">
-import { useForm } from '@inertiajs/vue3'
-import CustomInput from '@/components/Common/CustomInput.vue'
-import Header from '@/components/Common/Header.vue'
-import Banner from '@/components/Common/Banner.vue'
-import Footer from '@/components/Common/Footer.vue'
-import BackgroundEffect2 from '@/components/Common/BackgroundEffect2.vue'
-import { Head } from '@inertiajs/vue3'
-import { ref } from 'vue'
-
-defineProps<{
-  errors: Record<string, string>
-  status?: string
-}>()
-
-const form = useForm({ email: '' })
-
-const isVisible = ref<boolean>(false)
-
-function submit() {
-  form.post('/auth/forgot-password', {
-    onSuccess: () => {
-      isVisible.value = true
-    },
-  })
-}
-</script>
-
-<template>
-  <Head>
-    <title>Przypomnij hasło</title>
-    <meta name="Przypomnij hasło" content="Przypomnij hasło">
-  </Head>
-  <BackgroundEffect2 />
-  <div class="flex flex-col items-center h-screen w-full">
-    <Header title="Zmień hasło" />
-    <Transition>
-      <Banner v-if="status && isVisible" :text="status" @click="isVisible = false" />
-    </Transition>
-    <div class="sm:p-6 sm:pt-12 size-full flex justify-center sm:h-fit">
-      <form class="p-6 gap-4 flex flex-col size-full bg-white/50 sm:rounded-lg sm:max-w-lg sm:h-fit" @submit.prevent="submit">
-        <CustomInput v-model="form.email" label="E-mail" :error="form.errors.email" name="email" type="email" />
-        <button :disabled="form.processing" type="submit" class="bg-primary text-white font-bold py-3 px-4 rounded-lg disabled:bg-primary/70">
-          Przypomnij hasło
-        </button>
-      </form>
-    </div>
-    <Footer />
-  </div>
-</template>
diff --git a/resources/js/Pages/Auth/ResetPassword.vue b/resources/js/Pages/Auth/ResetPassword.vue
deleted file mode 100644
index 49094dd3..00000000
--- a/resources/js/Pages/Auth/ResetPassword.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script setup lang="ts">
-import { useForm } from '@inertiajs/vue3'
-import { Head } from '@inertiajs/vue3'
-import Header from '@/components/Common/Header.vue'
-import Footer from '@/components/Common/Footer.vue'
-import CustomInput from '@/components/Common/CustomInput.vue'
-import BackgroundEffect2 from '@/components/Common/BackgroundEffect2.vue'
-
-const props = defineProps<{
-  token: string
-  errors: Record<string, string>
-}>()
-
-const form = useForm({
-  email: '',
-  password: '',
-  password_confirmation: '',
-  token: props.token,
-})
-
-function submit() {
-  form.post('/auth/password/reset')
-}
-</script>
-
-<template>
-  <Head>
-    <title>Zmiana hasła</title>
-    <meta name="Zmiana hasła" content="Zmiana hasła">
-  </Head>
-  <BackgroundEffect2 />
-  <div class="flex flex-col items-center h-screen w-full">
-    <Header title="Zmień hasło" />
-    <div class="sm:p-6 sm:pt-12 size-full flex justify-center sm:h-fit">
-      <form class="p-6 gap-4 flex flex-col size-full bg-white/50 sm:rounded-lg sm:max-w-lg sm:h-fit" @submit.prevent="submit">
-        <CustomInput v-model="form.email" label="E-mail" :error="errors.email" name="email" type="email" />
-        <CustomInput v-model="form.password" label="Nowe hasło" :error="errors.password" name="password" type="password" />
-        <CustomInput v-model="form.password_confirmation" label="Powtórz hasło" :error="errors.password_confirmation" name="password_confirmation" type="password" />
-        <button :disabled="form.processing" type="submit" class="bg-primary text-white font-bold py-3 px-4 rounded-lg disabled:bg-primary/70">
-          Zmień hasło
-        </button>
-      </form>
-    </div>
-    <Footer />
-  </div>
-</template>
diff --git a/resources/js/Pages/Guest/ForgotPassword.vue b/resources/js/Pages/Guest/ForgotPassword.vue
new file mode 100644
index 00000000..8761fad6
--- /dev/null
+++ b/resources/js/Pages/Guest/ForgotPassword.vue
@@ -0,0 +1,32 @@
+<script setup lang="ts">
+import { useForm } from '@inertiajs/vue3'
+import CustomInput from '@/components/Common/CustomInput.vue'
+import { Head } from '@inertiajs/vue3'
+
+defineProps<{
+  errors: Record<string, string>
+  status?: string
+}>()
+
+const form = useForm({ email: '' })
+
+function submit() {
+  form.post('/auth/forgot-password')
+}
+</script>
+
+<template>
+  <Head>
+    <title>Przypomnij hasło</title>
+    <meta name="Przypomnij hasło" content="Przypomnij hasło">
+  </Head>
+
+  <div class="sm:p-6 sm:pt-12 size-full flex justify-center sm:h-fit">
+    <form class="p-6 gap-4 flex flex-col size-full bg-white shadow border sm:rounded-lg sm:max-w-lg sm:h-fit" @submit.prevent="submit">
+      <CustomInput v-model="form.email" label="E-mail" :error="form.errors.email" name="email" type="email" />
+      <button :disabled="form.processing" type="submit" class="bg-primary text-white font-bold py-3 px-4 rounded-lg disabled:bg-primary/70">
+        Przypomnij hasło
+      </button>
+    </form>
+  </div>
+</template>
diff --git a/resources/js/Pages/Home.vue b/resources/js/Pages/Home.vue
index 69626cbd..42097041 100644
--- a/resources/js/Pages/Home.vue
+++ b/resources/js/Pages/Home.vue
@@ -5,7 +5,7 @@ import Footer from '@/components/Common/Footer.vue'
 import AuthBanner from '@/components/Home/AuthBanner.vue'
 import GeneralSection from '@/components/Home/GeneralSection.vue'
 import AuthSection from '@/components/Home/AuthSection.vue'
-import BackgroundEffect from '@/components/Home/BackgroundEffect.vue'
+import BackgroundEffect from '@/components/Common/BackgroundEffect.vue'
 import {type School} from '@/Types/School'
 
 const isLogin = ref(null)
diff --git a/resources/js/Pages/User/ResetPassword.vue b/resources/js/Pages/User/ResetPassword.vue
new file mode 100644
index 00000000..5aebe857
--- /dev/null
+++ b/resources/js/Pages/User/ResetPassword.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import { useForm } from '@inertiajs/vue3'
+import { Head } from '@inertiajs/vue3'
+import CustomInput from '@/components/Common/CustomInput.vue'
+
+const props = defineProps<{
+  token: string
+  errors: Record<string, string>
+}>()
+
+const form = useForm({
+  email: '',
+  password: '',
+  password_confirmation: '',
+  token: props.token,
+})
+
+function submit() {
+  form.post('/auth/password/reset')
+}
+</script>
+
+<template>
+  <Head>
+    <title>Zmiana hasła</title>
+    <meta name="Zmiana hasła" content="Zmiana hasła">
+  </Head>
+
+  <div class="sm:p-6 sm:pt-12 size-full flex justify-center sm:h-fit">
+    <form class="p-6 gap-4 flex flex-col size-full bg-white/50 sm:rounded-lg sm:max-w-lg sm:h-fit" @submit.prevent="submit">
+      <CustomInput v-model="form.email" label="E-mail" :error="errors.email" name="email" type="email" />
+      <CustomInput v-model="form.password" label="Nowe hasło" :error="errors.password" name="password" type="password" />
+      <CustomInput v-model="form.password_confirmation" label="Powtórz hasło" :error="errors.password_confirmation" name="password_confirmation" type="password" />
+      <button :disabled="form.processing" type="submit" class="bg-primary text-white font-bold py-3 px-4 rounded-lg disabled:bg-primary/70">
+        Zmień hasło
+      </button>
+    </form>
+  </div>
+</template>
diff --git a/resources/js/Types/PageProps.d.ts b/resources/js/Types/PageProps.d.ts
new file mode 100644
index 00000000..31763d34
--- /dev/null
+++ b/resources/js/Types/PageProps.d.ts
@@ -0,0 +1,7 @@
+import {type User} from '@/Types/User'
+
+export interface PageProps {
+  appName: string
+  status?: string
+  user?: User
+}
diff --git a/resources/js/app.ts b/resources/js/app.ts
index 45482eaf..c60dfac8 100644
--- a/resources/js/app.ts
+++ b/resources/js/app.ts
@@ -4,6 +4,7 @@ import { createInertiaApp } from '@inertiajs/vue3'
 import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'
 import UserLayout from '@/Layouts/UserLayout.vue'
 import AdminLayout from '@/Layouts/AdminLayout.vue'
+import GuestLayout from '@/Layouts/GuestLayout.vue'
 
 createInertiaApp({
   title: (title) => `${title}`,
@@ -21,6 +22,10 @@ createInertiaApp({
       page.default.layout ??= UserLayout
     }
 
+    if (name.startsWith('Guest/')) {
+      page.default.layout ??= GuestLayout
+    }
+
     return page
   },
   setup({ el, App, props, plugin }) {
diff --git a/resources/js/components/Home/BackgroundEffect.vue b/resources/js/components/Common/BackgroundEffect.vue
similarity index 89%
rename from resources/js/components/Home/BackgroundEffect.vue
rename to resources/js/components/Common/BackgroundEffect.vue
index 405d0a35..c8a13a69 100644
--- a/resources/js/components/Home/BackgroundEffect.vue
+++ b/resources/js/components/Common/BackgroundEffect.vue
@@ -2,6 +2,8 @@
 
 import { ref, onMounted, onUnmounted } from 'vue'
 
+defineProps<{white?: boolean}>()
+
 const margin = ref(0)
 function setBannerVisibility() {
   const scrollHeight = window.document.documentElement.scrollHeight / 2
@@ -12,6 +14,7 @@ onUnmounted(() => window.removeEventListener('scroll', setBannerVisibility))
 </script>
 
 <template>
+  <div v-if="white" class="inset-0 bg-white/60 fixed -z-10" />
   <div :style="{marginTop: `${margin}rem`}" class="fixed blur-2xl size-7/12 -z-10">
     <div class="
       size-full
diff --git a/resources/js/components/Common/BackgroundEffect2.vue b/resources/js/components/Common/BackgroundEffect2.vue
deleted file mode 100644
index 1b1c024a..00000000
--- a/resources/js/components/Common/BackgroundEffect2.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<script setup lang="ts">
-import BackgroundEffect from '../Home/BackgroundEffect.vue'
-</script>
-
-<template>
-  <div class="absolute opacity-50 -z-50">
-    <BackgroundEffect />
-  </div>
-  <div class="bg-primary-600/10 size-full fixed top-0 left-0 -z-40" />
-</template>
diff --git a/resources/js/components/Common/Header.vue b/resources/js/components/Common/Header.vue
index 85130fc4..297a60f8 100644
--- a/resources/js/components/Common/Header.vue
+++ b/resources/js/components/Common/Header.vue
@@ -5,8 +5,9 @@ import FormButton from '@/components/Common/FormButton.vue'
 import { TransitionRoot, Dialog, TransitionChild, DialogPanel, DialogTitle } from '@headlessui/vue'
 import { Bars3Icon, XMarkIcon } from '@heroicons/vue/24/outline'
 import {ref} from 'vue'
+import {type User} from '@/Types/User'
 
-defineProps<{ pages: Page[] }>()
+defineProps<{ pages: Page[], user?: User, appName: string }>()
 
 const open = ref<boolean>(false)
 const isSelected = (page: Page) => page.href === window.location.pathname
@@ -34,11 +35,11 @@ const isSelected = (page: Page) => page.href === window.location.pathname
         </a>
       </div>
 
-      <div class="hidden md:flex flex-1 items-center justify-end gap-x-6">
+      <div v-if="user" class="hidden md:flex flex-1 items-center justify-end gap-x-6">
         <FormButton method="post" href="/auth/logout" text>Wyloguj</FormButton>
       </div>
 
-      <div class="flex md:hidden items-center">
+      <div v-if="pages.length > 0" class="flex md:hidden items-center">
         <div class="relative inline-flex items-center justify-center rounded-md p-2 text-gray-400 hover:bg-gray-100 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-indigo-500" @click="open = true">
           <span class="absolute -inset-0.5" />
           <span class="sr-only">Otwórz menu główne</span>
@@ -59,7 +60,7 @@ const isSelected = (page: Page) => page.href === window.location.pathname
                   <div class="flex h-full flex-col overflow-y-scroll bg-white py-6 shadow-xl">
                     <div class="px-4 sm:px-6">
                       <div class="flex items-start justify-between">
-                        <DialogTitle class="text-base font-semibold leading-6 text-gray-900">Interns 2024</DialogTitle>
+                        <DialogTitle class="text-base font-semibold leading-6 text-gray-900">{{ appName }}</DialogTitle>
                         <div class="ml-3 flex h-7 items-center">
                           <button type="button" class="relative rounded-md bg-white text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2" @click="open = false">
                             <span class="absolute -inset-2.5" />
@@ -81,7 +82,7 @@ const isSelected = (page: Page) => page.href === window.location.pathname
                       </a>
                     </div>
 
-                    <div class="flex flex-1 items-end justify-center px-6 py-2">
+                    <div v-if="user" class="flex flex-1 items-end justify-center px-6 py-2">
                       <FormButton method="post" class="" href="/auth/logout" text>Wyloguj</FormButton>
                     </div>
                   </div>

From 5136b3afa9b77a66d6f4bf4e8d79484333ad2f28 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 14:38:20 +0200
Subject: [PATCH 15/60] fix dashboard

---
 resources/js/Layouts/GuestLayout.vue  | 10 ++++++++++
 resources/js/Pages/User/Dashboard.vue | 27 +--------------------------
 2 files changed, 11 insertions(+), 26 deletions(-)
 create mode 100644 resources/js/Layouts/GuestLayout.vue

diff --git a/resources/js/Layouts/GuestLayout.vue b/resources/js/Layouts/GuestLayout.vue
new file mode 100644
index 00000000..bbaa0358
--- /dev/null
+++ b/resources/js/Layouts/GuestLayout.vue
@@ -0,0 +1,10 @@
+<script setup lang="ts">
+
+import BaseLayout from '@/Layouts/BaseLayout.vue'
+</script>
+
+<template>
+  <BaseLayout :pages="[]">
+    <slot />
+  </BaseLayout>
+</template>
diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 28102ed0..6cda4565 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -1,28 +1,3 @@
-<script setup lang="ts">
-
-import {useForm} from '@inertiajs/vue3'
-
-const form = useForm({})
-
-function logout() {
-  form.get('/auth/logout')
-}
-
-function submit() {
-  form.get('/profile')
-}
-</script>
-
 <template>
-  <div>
-    User Dashboard
-  </div>
-  <div>
-    <form @submit.prevent="submit">
-      <button type="submit">Profile</button>
-    </form>
-    <form @submit.prevent="logout">
-      <button type="submit">Logout</button>
-    </form>
-  </div>
+  User Dashboard
 </template>

From 3839e21c7faaa0aaba93acbe9abb1a8a1533a7b3 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 14:40:02 +0200
Subject: [PATCH 16/60] fix profile title

---
 resources/js/Pages/User/Profile.vue                 | 2 +-
 resources/js/components/Profile/UserDataSection.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/Pages/User/Profile.vue b/resources/js/Pages/User/Profile.vue
index 9be5d6af..d9379a86 100644
--- a/resources/js/Pages/User/Profile.vue
+++ b/resources/js/Pages/User/Profile.vue
@@ -14,7 +14,7 @@ defineProps<{
 
 <template>
   <Head>
-    <title>Profile</title>
+    <title>Profil</title>
     <meta name="Profil" content="Profil użytkownika">
   </Head>
 
diff --git a/resources/js/components/Profile/UserDataSection.vue b/resources/js/components/Profile/UserDataSection.vue
index 2404c24e..c5236085 100644
--- a/resources/js/components/Profile/UserDataSection.vue
+++ b/resources/js/components/Profile/UserDataSection.vue
@@ -7,7 +7,7 @@ defineProps<{ user: User }>()
 
 <template>
   <div class="flex flex-col gap-4 justify-content">
-    <b class="text-[1.2rem] sm:text-center lg:text-left">Twoje dane</b>
+    <b class="text-[1.2rem] sm:text-center lg:text-left">Dane o profilu</b>
     <div class="flex flex-col sm:grid sm:grid-cols-2 gap-4">
       <div class="w-full rounded-lg overflow-hidden bg-white/30 flex flex-col">
         <b class="bg-primary w-full text-white p-2 px-3">Imię</b>

From e7d66b710932d72f4438395bc193fe7c82a50e6e Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 14:42:26 +0200
Subject: [PATCH 17/60] fix user tests

---
 tests/Feature/UserTest.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index 71d577d5..efc8a593 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -348,11 +348,6 @@ public function testUserCannotAccessCrud(): void
     {
         $user = User::factory()->create();
 
-        $this->actingAs($user)
-            ->from("/dashboard")
-            ->get("/admin/dashboard")
-            ->assertStatus(403);
-
         $this->actingAs($user)
             ->from("/dashboard")
             ->get("/admin/users/")

From c39494fba652d9ff25233a232a792e991e73af13 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 14:53:31 +0200
Subject: [PATCH 18/60] move user crud to admin folder

---
 app/Http/Controllers/UserController.php       |  4 +--
 resources/js/Pages/Admin/Index.vue            | 28 ---------------
 resources/js/Pages/Admin/Show.vue             | 35 -------------------
 resources/js/Pages/Admin/{ => User}/Edit.vue  |  0
 resources/js/Pages/{ => Admin}/User/Index.vue |  0
 resources/js/Pages/{ => Admin}/User/Show.vue  |  0
 6 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 resources/js/Pages/Admin/Index.vue
 delete mode 100644 resources/js/Pages/Admin/Show.vue
 rename resources/js/Pages/Admin/{ => User}/Edit.vue (100%)
 rename resources/js/Pages/{ => Admin}/User/Index.vue (100%)
 rename resources/js/Pages/{ => Admin}/User/Show.vue (100%)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index bfcfe8e8..114e6afb 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -19,7 +19,7 @@ public function index(Request $request): Response
     {
         $users = User::query()->role("user")->with("school")->orderBy("id")->get();
 
-        return Inertia::render("User/Index", [
+        return Inertia::render("Admin/User/Index", [
             "users" => UserResource::collection($users),
             "isSuperAdmin" => $request->user()->hasRole("super_admin"),
         ]);
@@ -29,7 +29,7 @@ public function edit(User $user): Response
     {
         $this->authorize("update", $user);
 
-        return Inertia::render("User/Edit", [
+        return Inertia::render("Admin/User/Edit", [
             "user" => new UserResource($user),
             "schools" => School::all(),
         ]);
diff --git a/resources/js/Pages/Admin/Index.vue b/resources/js/Pages/Admin/Index.vue
deleted file mode 100644
index 30d108f3..00000000
--- a/resources/js/Pages/Admin/Index.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<script setup lang="ts">
-
-import {type User} from '@/Types/User'
-import Show from './Show.vue'
-import {useForm} from '@inertiajs/vue3'
-
-const form = useForm({})
-
-const props = defineProps<{
-  users: User[]
-}>()
-
-function addAdmin() {
-  form.get('/admin/admins/add')
-}
-</script>
-
-<template>
-  <h1 v-if="props.users.length > 0" class="text-xl">ADMINISTRATORZY</h1>
-  <div>
-    <form @submit.prevent="addAdmin">
-      <button type="submit">Dodaj nowego administratora</button>
-    </form>
-  </div>
-  <div v-for="item in props.users" :key="item.id">
-    <Show :user="item" />
-  </div>
-</template>
diff --git a/resources/js/Pages/Admin/Show.vue b/resources/js/Pages/Admin/Show.vue
deleted file mode 100644
index 28fa767f..00000000
--- a/resources/js/Pages/Admin/Show.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<script setup lang="ts">
-
-import {type User} from '@/Types/User'
-import {useForm} from '@inertiajs/vue3'
-
-const form = useForm({})
-const props = defineProps<{
-  user: User
-}>()
-
-function edit() {
-  form.get(`/admin/admins/${props.user.id}`)
-}
-
-function destroy() {
-  form.delete(`/admin/admins/${props.user.id}`)
-}
-</script>
-
-<template>
-  <div class="ml-8 border-2">
-    <div>ID: {{ props.user.id }}</div>
-    <div>Imię: {{ props.user.name }}</div>
-    <div>Nazwisko: {{ props.user.surname }}</div>
-    <div>E-mail: {{ props.user.email }}</div>
-    <div>Szkoła: {{ props.user.school.name }}</div>
-    <form @submit.prevent="edit">
-      <button type="submit">Edit</button>
-    </form>
-    <form @submit.prevent="destroy">
-      <button :disabled="form.processing" type="submit">Delete</button>
-    </form>
-  </div>
-</template>
-
diff --git a/resources/js/Pages/Admin/Edit.vue b/resources/js/Pages/Admin/User/Edit.vue
similarity index 100%
rename from resources/js/Pages/Admin/Edit.vue
rename to resources/js/Pages/Admin/User/Edit.vue
diff --git a/resources/js/Pages/User/Index.vue b/resources/js/Pages/Admin/User/Index.vue
similarity index 100%
rename from resources/js/Pages/User/Index.vue
rename to resources/js/Pages/Admin/User/Index.vue
diff --git a/resources/js/Pages/User/Show.vue b/resources/js/Pages/Admin/User/Show.vue
similarity index 100%
rename from resources/js/Pages/User/Show.vue
rename to resources/js/Pages/Admin/User/Show.vue

From fc9b6335b4c8f39be8ca0ccd21fdc3f6420d9142 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 17:19:59 +0200
Subject: [PATCH 19/60] refactor routes for admin/user CRUDs

---
 app/Http/Controllers/AdminController.php |  8 +--
 app/Http/Controllers/UserController.php  | 10 ++--
 app/Http/Resources/UserResource.php      |  4 +-
 app/Models/User.php                      |  5 --
 resources/js/Layouts/AdminLayout.vue     |  8 ++-
 resources/js/Pages/Admin/AddAdmin.vue    | 68 ------------------------
 resources/js/Pages/Admin/AdminsPanel.vue |  3 ++
 resources/js/Pages/Admin/CreateAdmin.vue |  3 ++
 resources/js/Pages/Admin/EditAdmin.vue   |  3 ++
 resources/js/Pages/Admin/EditUser.vue    |  3 ++
 resources/js/Pages/Admin/User/Edit.vue   | 57 --------------------
 resources/js/Pages/Admin/User/Index.vue  | 17 ------
 resources/js/Pages/Admin/User/Show.vue   | 39 --------------
 resources/js/Pages/Admin/UsersPanel.vue  |  3 ++
 resources/js/Types/User.d.ts             |  4 +-
 routes/web.php                           | 10 ++--
 tests/Feature/AdminTest.php              | 38 ++++++-------
 tests/Feature/UserTest.php               | 37 +++++++------
 18 files changed, 82 insertions(+), 238 deletions(-)
 delete mode 100644 resources/js/Pages/Admin/AddAdmin.vue
 create mode 100644 resources/js/Pages/Admin/AdminsPanel.vue
 create mode 100644 resources/js/Pages/Admin/CreateAdmin.vue
 create mode 100644 resources/js/Pages/Admin/EditAdmin.vue
 create mode 100644 resources/js/Pages/Admin/EditUser.vue
 delete mode 100644 resources/js/Pages/Admin/User/Edit.vue
 delete mode 100644 resources/js/Pages/Admin/User/Index.vue
 delete mode 100644 resources/js/Pages/Admin/User/Show.vue
 create mode 100644 resources/js/Pages/Admin/UsersPanel.vue

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 074724ab..62712d62 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -21,14 +21,14 @@ public function index(): Response
     {
         $users = User::query()->role("admin")->with("school")->orderBy("id")->get();
 
-        return Inertia::render("Admin/Index", [
+        return Inertia::render("Admin/AdminsPanel", [
             "users" => UserResource::collection($users),
         ]);
     }
 
-    public function showAddAdmin(): Response
+    public function create(): Response
     {
-        return Inertia::render("Admin/AddAdmin");
+        return Inertia::render("Admin/CreateAdmin");
     }
 
     public function store(RegisterUserRequest $request): RedirectResponse
@@ -52,7 +52,7 @@ public function edit(User $user): Response
     {
         $this->authorize("update", $user);
 
-        return Inertia::render("Admin/Edit", [
+        return Inertia::render("Admin/EditAdmin", [
             "user" => new UserResource($user),
             "schools" => School::all(),
         ]);
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 114e6afb..6a1c635d 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -5,6 +5,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\UserRequest;
+use App\Http\Resources\SchoolResource;
 use App\Http\Resources\UserResource;
 use App\Models\School;
 use App\Models\User;
@@ -19,9 +20,8 @@ public function index(Request $request): Response
     {
         $users = User::query()->role("user")->with("school")->orderBy("id")->get();
 
-        return Inertia::render("Admin/User/Index", [
+        return Inertia::render("Admin/UsersPanel", [
             "users" => UserResource::collection($users),
-            "isSuperAdmin" => $request->user()->hasRole("super_admin"),
         ]);
     }
 
@@ -29,9 +29,9 @@ public function edit(User $user): Response
     {
         $this->authorize("update", $user);
 
-        return Inertia::render("Admin/User/Edit", [
-            "user" => new UserResource($user),
-            "schools" => School::all(),
+        return Inertia::render("Admin/EditUser", [
+            "user" => UserResource::make($user),
+            "schools" => SchoolResource::collection(School::all()),
         ]);
     }
 
diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
index 1654e7c7..941162c2 100644
--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -20,7 +20,9 @@ public function toArray(Request $request): array
             "surname" => $this->surname,
             "email" => $this->email,
             "school" => SchoolResource::make($this->school),
-            "is_anonymized" => $this->is_anonymized,
+            "isAnonymized" => $this->is_anonymized,
+            "isAdmin" => $this->hasRole("admin"),
+            "isSuperAdmin" => $this->hasRole("super_admin"),
         ];
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 4550e65c..02fff6e7 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -48,11 +48,6 @@ public function school(): BelongsTo
         return $this->belongsTo(School::class);
     }
 
-    public function isAnonymized(): bool
-    {
-        return $this->is_anonymized;
-    }
-
     protected function casts(): array
     {
         return [
diff --git a/resources/js/Layouts/AdminLayout.vue b/resources/js/Layouts/AdminLayout.vue
index 5545e4cc..af3d8d77 100644
--- a/resources/js/Layouts/AdminLayout.vue
+++ b/resources/js/Layouts/AdminLayout.vue
@@ -2,13 +2,19 @@
 
 import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
+import {usePage} from '@inertiajs/vue3'
+import {type PageProps} from '@/Types/PageProps'
 
+const props = usePage().props as PageProps
 const pages: Page[] = [
   { title: 'Testy', href: '/admin/quizzes' },
   { title: 'Szkoły', href: '/admin/schools' },
   { title: 'Uczniowie', href: '/admin/users' },
-  { title: 'Ranking', href: '/admin/ranking' },
 ]
+
+if (props.user?.isSuperAdmin) {
+  pages.push({ title: 'Administratorzy', href: '/admin/admins'})
+}
 </script>
 
 <template>
diff --git a/resources/js/Pages/Admin/AddAdmin.vue b/resources/js/Pages/Admin/AddAdmin.vue
deleted file mode 100644
index f8431327..00000000
--- a/resources/js/Pages/Admin/AddAdmin.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<script setup lang="ts">
-
-import { useForm } from '@inertiajs/vue3'
-import { defineProps } from 'vue'
-
-const props = defineProps<{
-  errors: Record<string, string[]>
-}>()
-
-const form = useForm({
-  name: null,
-  surname: null,
-  email: null,
-  school_id: 1,
-  password: null,
-})
-
-function submit() {
-  form.post('/admin/admins/add')
-}
-</script>
-
-<template>
-  Dodawanie nowego administratora
-
-  <form @submit.prevent="submit">
-    <div>
-      <label for="name">Imię</label>
-      <div>
-        <input id="name" v-model="form.name" required name="name" type="text"
-               :class="{'ring-red focus:ring-red':props.errors.name}"
-        >
-        <div v-if="props.errors.name" class="text-red">{{ props.errors.name }}</div>
-      </div>
-    </div>
-
-    <div>
-      <label for="surname">Nazwisko</label>
-      <div>
-        <input id="surname" v-model="form.surname" required name="surname" type="text"
-               :class="{'ring-red focus:ring-red':props.errors.surname}"
-        >
-        <div v-if="props.errors.surname" class="text-red">{{ props.errors.surname }}</div>
-      </div>
-    </div>
-
-    <div>
-      <label for="email">E-mail</label>
-      <div>
-        <input id="email" v-model="form.email" required name="email" type="email"
-               :class="{'ring-red focus:ring-red':props.errors.email}"
-        >
-        <div v-if="props.errors.email" class="text-red">{{ props.errors.email }}</div>
-      </div>
-    </div>
-
-    <div>
-      <label for="password">Hasło</label>
-      <div>
-        <input id="password" v-model="form.password" required name="password" type="password" autocomplete="current-password"
-               :class="{'ring-red focus:ring-red':props.errors.password}"
-        >
-        <div v-if="props.errors.email" class="text-red">{{ props.errors.email }}</div>
-      </div>
-    </div>
-    <button type="submit">Dodaj</button>
-  </form>
-</template>
diff --git a/resources/js/Pages/Admin/AdminsPanel.vue b/resources/js/Pages/Admin/AdminsPanel.vue
new file mode 100644
index 00000000..44e07cb0
--- /dev/null
+++ b/resources/js/Pages/Admin/AdminsPanel.vue
@@ -0,0 +1,3 @@
+<template>
+  Admins Panel
+</template>
diff --git a/resources/js/Pages/Admin/CreateAdmin.vue b/resources/js/Pages/Admin/CreateAdmin.vue
new file mode 100644
index 00000000..0ad8c3d0
--- /dev/null
+++ b/resources/js/Pages/Admin/CreateAdmin.vue
@@ -0,0 +1,3 @@
+<template>
+  Create Admin
+</template>
diff --git a/resources/js/Pages/Admin/EditAdmin.vue b/resources/js/Pages/Admin/EditAdmin.vue
new file mode 100644
index 00000000..ddee353f
--- /dev/null
+++ b/resources/js/Pages/Admin/EditAdmin.vue
@@ -0,0 +1,3 @@
+<template>
+  Edit Admin
+</template>
diff --git a/resources/js/Pages/Admin/EditUser.vue b/resources/js/Pages/Admin/EditUser.vue
new file mode 100644
index 00000000..22ca2d90
--- /dev/null
+++ b/resources/js/Pages/Admin/EditUser.vue
@@ -0,0 +1,3 @@
+<template>
+  Edit User
+</template>
diff --git a/resources/js/Pages/Admin/User/Edit.vue b/resources/js/Pages/Admin/User/Edit.vue
deleted file mode 100644
index e99aad50..00000000
--- a/resources/js/Pages/Admin/User/Edit.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<script setup lang="ts">
-
-import { useForm } from '@inertiajs/vue3'
-import { defineProps } from 'vue'
-import { type User } from '@/Types/User'
-import { type School } from '@/Types/School'
-
-const props = defineProps<{
-  user: User
-  schools?: School[]
-}>()
-
-const form = useForm({
-  name: props.user.name,
-  surname: props.user.surname,
-  email: props.user.email,
-  school_id: props.user.school.id,
-})
-
-function update() {
-  form.patch(`/admin/admins/${props.user.id}`)
-}
-</script>
-
-<template>
-  <div>
-    <h1>Edycja Administratora</h1>
-    <form @submit.prevent="update">
-      <div>ID: {{ props.user.id }}</div>
-      <div>
-        <label for="name">Imię</label>
-        <input id="name" v-model="form.name" type="text">
-      </div>
-
-      <div>
-        <label for="surname">Nazwisko</label>
-        <input id="surname" v-model="form.surname" type="text">
-      </div>
-
-      <div>
-        <label for="email">E-mail</label>
-        <input id="email" v-model="form.email" type="email">
-      </div>
-
-      <div>
-        <label for="school">Szkoła</label>
-        <select id="school" v-model="form.school_id">
-          <option v-for="school in schools" :key="school.id" :value="school.id">
-            {{ school.name }}
-          </option>
-        </select>
-      </div>
-
-      <button type="submit">Zmień</button>
-    </form>
-  </div>
-</template>
diff --git a/resources/js/Pages/Admin/User/Index.vue b/resources/js/Pages/Admin/User/Index.vue
deleted file mode 100644
index b97b6c8f..00000000
--- a/resources/js/Pages/Admin/User/Index.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<script setup lang="ts">
-
-import {type User} from '@/Types/User'
-import Show from './Show.vue'
-
-const props = defineProps<{
-  users: User[]
-  isSuperAdmin: boolean
-}>()
-</script>
-
-<template>
-  <h1 v-if="props.users.length > 0" class="text-xl">UŻYTKOWNICY</h1>
-  <div v-for="item in props.users" :key="item.id">
-    <Show :user="item" :is-super-admin="props.isSuperAdmin" />
-  </div>
-</template>
diff --git a/resources/js/Pages/Admin/User/Show.vue b/resources/js/Pages/Admin/User/Show.vue
deleted file mode 100644
index bc119459..00000000
--- a/resources/js/Pages/Admin/User/Show.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<script setup lang="ts">
-
-import {type User} from '@/Types/User'
-import {useForm} from '@inertiajs/vue3'
-
-const form = useForm({})
-
-const props = defineProps<{
-  user: User
-  isSuperAdmin: boolean
-}>()
-
-function edit() {
-  form.get(`/admin/users/${props.user.id}`)
-}
-
-function anonymize() {
-  form.patch(`/admin/users/anonymize/${props.user.id}`)
-}
-</script>
-
-<template>
-  <div class="ml-8 border-2">
-    <div>ID: {{ props.user.id }}</div>
-    <div>Imię: {{ props.user.name }}</div>
-    <div>Nazwisko: {{ props.user.surname }}</div>
-    <div>E-mail: {{ props.user.email }}</div>
-    <div>Szkoła: {{ props.user.school.name }}</div>
-    <div v-if="!props.user.is_anonymized">
-      <form @submit.prevent="edit">
-        <button type="submit">Edit</button>
-      </form>
-      <form v-if="props.isSuperAdmin" @submit.prevent="anonymize">
-        <button :disabled="form.processing" type="submit">Anonymize</button>
-      </form>
-    </div>
-  </div>
-</template>
-
diff --git a/resources/js/Pages/Admin/UsersPanel.vue b/resources/js/Pages/Admin/UsersPanel.vue
new file mode 100644
index 00000000..a9e30509
--- /dev/null
+++ b/resources/js/Pages/Admin/UsersPanel.vue
@@ -0,0 +1,3 @@
+<template>
+  Users Panel
+</template>
diff --git a/resources/js/Types/User.d.ts b/resources/js/Types/User.d.ts
index cbdaadb6..d735d26a 100644
--- a/resources/js/Types/User.d.ts
+++ b/resources/js/Types/User.d.ts
@@ -5,6 +5,8 @@ export interface User {
   name: string
   surname: string
   email: string
-  is_anonymized: boolean
   school: School
+  isAnonymized: boolean
+  isAdmin: boolean
+  isSuperAdmin: boolean
 }
diff --git a/routes/web.php b/routes/web.php
index 79cef765..5cb78db1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -74,17 +74,17 @@
     Route::get("/schools/status", [SchoolsController::class, "status"])->name("admin.schools.status");
 
     Route::get("/users", [UserController::class, "index"])->name("admin.users.index");
-    Route::get("/users/{user}", [UserController::class, "edit"])->name("admin.users.edit");
+    Route::get("/users/{user}/edit", [UserController::class, "edit"])->name("admin.users.edit");
     Route::patch("/users/{user}", [UserController::class, "update"])->name("admin.users.update");
 
     Route::middleware(["role:super_admin"])->group(function (): void {
         Route::get("/admins", [AdminController::class, "index"])->name("admin.admins.index");
-        Route::get("/admins/add", [AdminController::class, "showAddAdmin"])->name("admin.admins.add");
-        Route::get("/admins/{user}", [AdminController::class, "edit"])->name("admin.admins.edit");
-        Route::post("/admins/add", [AdminController::class, "store"])->name("admin.admins.store");
+        Route::get("/admins/create", [AdminController::class, "create"])->name("admin.admins.create");
+        Route::get("/admins/{user}/edit", [AdminController::class, "edit"])->name("admin.admins.edit");
+        Route::post("/admins", [AdminController::class, "store"])->name("admin.admins.store");
         Route::patch("/admins/{user}", [AdminController::class, "update"])->name("admin.admins.update");
-        Route::patch("/users/anonymize/{user}", [UserController::class, "anonymize"])->name("admin.users.anonymize");
         Route::delete("/admins/{user}", [AdminController::class, "destroy"])->name("admin.admins.destroy");
+        Route::patch("/users/{user}/anonymize", [UserController::class, "anonymize"])->name("admin.users.anonymize");
     });
 });
 
diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php
index 2b7d1e31..d898260c 100644
--- a/tests/Feature/AdminTest.php
+++ b/tests/Feature/AdminTest.php
@@ -34,7 +34,7 @@ public function testSuperAdminCanViewAdmins(): void
             ->get("/admin/admins")
             ->assertInertia(
                 fn(Assert $page) => $page
-                    ->component("Admin/Index")
+                    ->component("Admin/AdminsPanel")
                     ->has("users", 1),
             );
     }
@@ -55,10 +55,10 @@ public function testSuperAdminCanViewAddAdminPanel(): void
         $this->assertDatabaseCount("users", 12);
 
         $this->actingAs($this->superAdmin)
-            ->get("/admin/admins/add")
+            ->get("/admin/admins/create")
             ->assertInertia(
                 fn(Assert $page) => $page
-                    ->component("Admin/AddAdmin"),
+                    ->component("Admin/CreateAdmin"),
             );
     }
 
@@ -68,7 +68,7 @@ public function testAdminCannotViewAddAdminPanel(): void
         $this->assertDatabaseCount("users", 12);
 
         $this->actingAs($this->admin)
-            ->get("/admin/admins/add")
+            ->get("/admin/admins/create")
             ->assertStatus(403);
     }
 
@@ -76,7 +76,7 @@ public function testSuperAdminCanAddAdmin(): void
     {
         $school = School::factory()->create();
         $this->actingAs($this->superAdmin)
-            ->post("/admin/admins/add", [
+            ->post("/admin/admins", [
                 "name" => "Admin Name",
                 "surname" => "Admin Surname",
                 "email" => "adminexample@admin.com",
@@ -96,7 +96,7 @@ public function testAdminCannotAddAdmin(): void
     {
         $school = School::factory()->create();
         $this->actingAs($this->admin)
-            ->post("/admin/admins/add", [
+            ->post("/admin/admins", [
                 "name" => "Admin Name",
                 "surname" => "Admin Surname",
                 "email" => "adminexample@admin.com",
@@ -118,10 +118,10 @@ public function testSuperAdminCanViewEditAdmin(): void
 
         $this->actingAs($this->superAdmin)
             ->from("/admin/admins")
-            ->get("/admin/admins/{$admin->id}")
+            ->get("/admin/admins/{$admin->id}/edit")
             ->assertInertia(
                 fn(Assert $page) => $page
-                    ->component("Admin/Edit")
+                    ->component("Admin/EditAdmin")
                     ->where("user.id", $admin->id),
             );
     }
@@ -132,7 +132,7 @@ public function testAdminCannotViewEditAdmin(): void
 
         $this->actingAs($this->admin)
             ->from("/admin/admins")
-            ->get("/admin/admins/{$admin->id}")
+            ->get("/admin/admins/{$admin->id}/edit")
             ->assertStatus(403);
     }
 
@@ -142,7 +142,7 @@ public function testSuperAdminCanEditAdmin(): void
         $admin = User::factory()->admin()->create(["school_id" => $school->id]);
 
         $this->actingAs($this->superAdmin)
-            ->from("/admin/admins/{$admin->id}")
+            ->from("/admin/admins/{$admin->id}/edit")
             ->patch("/admin/admins/{$admin->id}", [
                 "name" => "New Name",
                 "surname" => "New Surname",
@@ -167,7 +167,7 @@ public function testAdminCannotEditAdmin(): void
         $adminData = $admin->toArray();
 
         $this->actingAs($this->admin)
-            ->from("/admin/admins/{$admin->id}")
+            ->from("/admin/admins/{$admin->id}/edit")
             ->patch("/admin/admins/{$admin->id}", [
                 "name" => "New Name",
                 "surname" => "New Surname",
@@ -185,7 +185,7 @@ public function testSuperAdminCannotEditAdminWithInvalidData(): void
         $admin = User::factory()->create(["school_id" => $school->id]);
 
         $response = $this->actingAs($this->superAdmin)
-            ->from("/admin/admins/{$admin->id}")
+            ->from("/admin/admins/{$admin->id}/edit")
             ->patch("/admin/admins/{$admin->id}", [
                 "name" => "",
                 "surname" => "",
@@ -193,7 +193,7 @@ public function testSuperAdminCannotEditAdminWithInvalidData(): void
                 "school_id" => 999,
             ]);
 
-        $response->assertRedirect("/admin/admins/{$admin->id}");
+        $response->assertRedirect("/admin/admins/{$admin->id}/edit");
 
         $this->assertDatabaseHas("users", [
             "id" => $admin->id,
@@ -248,17 +248,17 @@ public function testUserCannotAccessAdminCrud(): void
 
         $this->actingAs($user)
             ->from("/dashboard")
-            ->get("/admin/admins/add")
+            ->get("/admin/admins/create")
             ->assertStatus(403);
 
         $this->actingAs($user)
             ->from("/dashboard")
-            ->get("/admin/admins/{$this->admin->id}")
+            ->get("/admin/admins/{$this->admin->id}/edit")
             ->assertStatus(403);
 
         $this->actingAs($user)
             ->from("/dashboard")
-            ->post("/admin/admins/add", ["name" => "new Name"])
+            ->post("/admin/admins", ["name" => "new Name"])
             ->assertForbidden();
 
         $this->actingAs($user)
@@ -281,15 +281,15 @@ public function guestCannotAccessAdminCrud(): void
             ->assertStatus(403);
 
         $this->from("/dashboard")
-            ->get("/admin/admins/add")
+            ->get("/admin/admins/create")
             ->assertStatus(403);
 
         $this->from("/dashboard")
-            ->get("/admin/admins/{$this->admin->id}")
+            ->get("/admin/admins/{$this->admin->id}/edit")
             ->assertStatus(403);
 
         $this->from("/dashboard")
-            ->post("/admin/admins/add", ["name" => "new Name"])
+            ->post("/admin/admins", ["name" => "new Name"])
             ->assertForbidden();
 
         $this->from("/dashboard")
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index efc8a593..fab5c16b 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -34,7 +34,7 @@ public function testAdminCanViewUsers(): void
             ->get("/admin/users")
             ->assertInertia(
                 fn(Assert $page) => $page
-                    ->component("User/Index")
+                    ->component("Admin/UsersPanel")
                     ->has("users", 10),
             );
     }
@@ -48,7 +48,7 @@ public function testSuperAdminCanViewUsers(): void
             ->get("/admin/users")
             ->assertInertia(
                 fn(Assert $page) => $page
-                    ->component("User/Index")
+                    ->component("Admin/UsersPanel")
                     ->has("users", 10),
             );
     }
@@ -59,10 +59,10 @@ public function testAdminCanViewEditUser(): void
 
         $this->actingAs($this->admin)
             ->from("/admin/users")
-            ->get("/admin/users/{$user->id}")
+            ->get("/admin/users/{$user->id}/edit")
             ->assertInertia(
                 fn(Assert $page) => $page
-                    ->component("User/Edit")
+                    ->component("Admin/EditUser")
                     ->where("user.id", $user->id),
             );
     }
@@ -73,10 +73,10 @@ public function testSuperAdminCanViewEditUser(): void
 
         $this->actingAs($this->superAdmin)
             ->from("/admin/users")
-            ->get("/admin/users/{$user->id}")
+            ->get("/admin/users/{$user->id}/edit")
             ->assertInertia(
                 fn(Assert $page) => $page
-                    ->component("User/Edit")
+                    ->component("Admin/EditUser")
                     ->where("user.id", $user->id),
             );
     }
@@ -84,14 +84,14 @@ public function testSuperAdminCanViewEditUser(): void
     public function testAdminCannotViewEditUserThatDoesNotExist(): void
     {
         $this->actingAs($this->admin)
-            ->get("/admin/users/999")
+            ->get("/admin/users/999/edit")
             ->assertStatus(404);
     }
 
     public function testSuperAdminCannotViewEditUserThatDoesNotExist(): void
     {
         $this->actingAs($this->superAdmin)
-            ->get("/admin/users/999")
+            ->get("/admin/users/999/edit")
             ->assertStatus(404);
     }
 
@@ -247,7 +247,7 @@ public function testSuperAdminCanAnonymizeUser(): void
         $user = User::factory()->create();
 
         $this->actingAs($this->superAdmin)
-            ->patch("/admin/users/anonymize/{$user->id}")
+            ->patch("/admin/users/{$user->id}/anonymize")
             ->assertRedirect()
             ->assertSessionHas("success");
 
@@ -265,11 +265,11 @@ public function testAdminAndSuperAdminCannotViewEditAnonymizedUser(): void
         $user = User::factory()->create(["is_anonymized" => true]);
 
         $this->actingAs($this->admin)
-            ->get("/admin/users/{$user->id}")
+            ->get("/admin/users/{$user->id}/edit")
             ->assertStatus(403);
 
         $this->actingAs($this->superAdmin)
-            ->get("/admin/users/{$user->id}")
+            ->get("/admin/users/{$user->id}/edit")
             ->assertStatus(403);
     }
 
@@ -313,7 +313,7 @@ public function testSuperAdminCannotAnonymizeAdmin(): void
         $admin = User::factory()->admin()->create();
 
         $this->actingAs($this->admin)
-            ->patch("/admin/users/anonymize/{$admin->id}")
+            ->patch("/admin/users/{$admin->id}/anonymize")
             ->assertForbidden();
     }
 
@@ -322,7 +322,7 @@ public function testSuperAdminCannotAnonymizeSuperAdmin(): void
         $superAdmin = User::factory()->superAdmin()->create();
 
         $this->actingAs($this->superAdmin)
-            ->patch("/admin/users/anonymize/{$superAdmin->id}")
+            ->patch("/admin/users/{$superAdmin->id}/anonymize")
             ->assertStatus(403);
     }
 
@@ -331,7 +331,7 @@ public function testAdminCannotAnonymizeUser(): void
         $user = User::factory()->create();
 
         $this->actingAs($this->admin)
-            ->patch("/admin/users/anonymize/{$user->id}")
+            ->patch("/admin/users/{$user->id}/anonymize")
             ->assertForbidden();
     }
 
@@ -340,7 +340,7 @@ public function testAdminCannotAnonymizeAdmin(): void
         $admin = User::factory()->admin()->create();
 
         $this->actingAs($this->admin)
-            ->patch("/admin/users/anonymize/{$admin->id}")
+            ->patch("/admin/users/{$admin->id}/anonymize")
             ->assertForbidden();
     }
 
@@ -355,7 +355,7 @@ public function testUserCannotAccessCrud(): void
 
         $this->actingAs($user)
             ->from("/dashboard")
-            ->get("/admin/users/{$user->id}")
+            ->get("/admin/users/{$user->id}/edit")
             ->assertStatus(403);
 
         $this->actingAs($user)
@@ -383,6 +383,11 @@ public function guestCannotAccessCrud(): void
             ->assertStatus(403)
             ->assertRedirect("/");
 
+        $this->from("/")
+            ->get("/admin/users/{$user->id}/edit")
+            ->assertStatus(403)
+            ->assertRedirect("/");
+
         $this->from("/")
             ->patch("/admin/users/{$user->id}", ["name" => "New Name"])
             ->assertStatus(403)

From 59f142b9dbe98cf01da5224b24d723017560ae8c Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 30 Aug 2024 18:40:12 +0200
Subject: [PATCH 20/60] fix status messages

---
 .../Controllers/PasswordResetLinkController.php     |  5 +++--
 app/Http/Middleware/HandleInertiaRequests.php       | 13 +++++++++++--
 resources/js/Layouts/AdminLayout.vue                |  6 +++---
 resources/js/Layouts/BaseLayout.vue                 | 12 ++++++------
 resources/js/Layouts/GuestLayout.vue                |  5 ++++-
 resources/js/Layouts/UserLayout.vue                 |  5 ++++-
 resources/js/Pages/Guest/ForgotPassword.vue         |  1 -
 resources/js/Types/PageProps.d.ts                   |  5 ++++-
 .../js/components/Profile/PasswordUpdateSection.vue |  2 +-
 9 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/PasswordResetLinkController.php b/app/Http/Controllers/PasswordResetLinkController.php
index d2e87f50..53d0a245 100644
--- a/app/Http/Controllers/PasswordResetLinkController.php
+++ b/app/Http/Controllers/PasswordResetLinkController.php
@@ -9,6 +9,7 @@
 use App\Models\User;
 use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Password;
 use Illuminate\Support\Str;
@@ -17,9 +18,9 @@
 
 class PasswordResetLinkController extends Controller
 {
-    public function create(): Response
+    public function create(Request $request): Response
     {
-        return Inertia::render("Guest/ForgotPassword", ["status" => session()->get("status")]);
+        return Inertia::render("Guest/ForgotPassword");
     }
 
     public function store(ForgotPasswordRequest $request): RedirectResponse
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
index 49da7196..37687acd 100644
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -5,6 +5,7 @@
 namespace App\Http\Middleware;
 
 use App\Http\Resources\UserResource;
+use Closure;
 use Illuminate\Http\Request;
 use Inertia\Middleware;
 
@@ -24,9 +25,17 @@ public function version(Request $request): ?string
     public function share(Request $request): array
     {
         return array_merge(parent::share($request), [
-            "appName" => config("app.name"),
+            "appName" => fn() => config("app.name"),
             "user" => fn() => $request->user() ? UserResource::make($request->user()) : null,
-            "status" => fn() => $request->session()->get("message"),
+            "flash" => $this->getFlashData($request),
         ]);
     }
+
+    protected function getFlashData(Request $request): Closure
+    {
+        return fn(): array => [
+            "errors" => $request->session()->get("errors"),
+            "status" => $request->session()->get("status"),
+        ];
+    }
 }
diff --git a/resources/js/Layouts/AdminLayout.vue b/resources/js/Layouts/AdminLayout.vue
index af3d8d77..5db4f04c 100644
--- a/resources/js/Layouts/AdminLayout.vue
+++ b/resources/js/Layouts/AdminLayout.vue
@@ -2,10 +2,10 @@
 
 import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
-import {usePage} from '@inertiajs/vue3'
 import {type PageProps} from '@/Types/PageProps'
 
-const props = usePage().props as PageProps
+defineProps<PageProps>()
+
 const pages: Page[] = [
   { title: 'Testy', href: '/admin/quizzes' },
   { title: 'Szkoły', href: '/admin/schools' },
@@ -18,7 +18,7 @@ if (props.user?.isSuperAdmin) {
 </script>
 
 <template>
-  <BaseLayout :pages>
+  <BaseLayout :pages :app-name :user :flash>
     <slot />
   </BaseLayout>
 </template>
diff --git a/resources/js/Layouts/BaseLayout.vue b/resources/js/Layouts/BaseLayout.vue
index 8f606af0..8ea2d36b 100644
--- a/resources/js/Layouts/BaseLayout.vue
+++ b/resources/js/Layouts/BaseLayout.vue
@@ -5,14 +5,15 @@ import Header from '@/components/Common/Header.vue'
 import Footer from '@/components/Common/Footer.vue'
 import BackgroundEffect from '@/components/Common/BackgroundEffect.vue'
 import Banner from '@/components/Common/Banner.vue'
-import { usePage } from '@inertiajs/vue3'
-import {ref} from 'vue'
+import {ref, watch} from 'vue'
 import {type PageProps} from '@/Types/PageProps'
 
-const { pages } = defineProps<{ pages: Page[] }>()
+const props = defineProps<{ pages: Page[] } & PageProps>()
+const status = ref<string>(props.flash.status)
 
-const props = usePage().props as PageProps
-const status = ref<string>(props.status ?? '')
+watch(() => props.flash, flash => {
+  status.value = flash.status
+}, { immediate: true })
 
 </script>
 
@@ -23,7 +24,6 @@ const status = ref<string>(props.status ?? '')
     <Transition>
       <Banner v-if="status" :text="status" @click="status = ''" />
     </Transition>
-
     <Header :pages :user="props.user" :app-name="props.appName" />
     <slot />
     <Footer />
diff --git a/resources/js/Layouts/GuestLayout.vue b/resources/js/Layouts/GuestLayout.vue
index bbaa0358..ed1ccc93 100644
--- a/resources/js/Layouts/GuestLayout.vue
+++ b/resources/js/Layouts/GuestLayout.vue
@@ -1,10 +1,13 @@
 <script setup lang="ts">
 
 import BaseLayout from '@/Layouts/BaseLayout.vue'
+import type {PageProps} from '@/Types/PageProps'
+
+defineProps<PageProps>()
 </script>
 
 <template>
-  <BaseLayout :pages="[]">
+  <BaseLayout :pages="[]" :app-name :user :flash>
     <slot />
   </BaseLayout>
 </template>
diff --git a/resources/js/Layouts/UserLayout.vue b/resources/js/Layouts/UserLayout.vue
index 5c79735d..6724b2e8 100644
--- a/resources/js/Layouts/UserLayout.vue
+++ b/resources/js/Layouts/UserLayout.vue
@@ -2,6 +2,9 @@
 
 import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
+import type {PageProps} from '@/Types/PageProps'
+
+defineProps<PageProps>()
 
 const pages: Page[] = [
   { title: 'Konkursy', href: '/dashboard' },
@@ -10,7 +13,7 @@ const pages: Page[] = [
 </script>
 
 <template>
-  <BaseLayout :pages>
+  <BaseLayout :pages :app-name :user :flash>
     <slot />
   </BaseLayout>
 </template>
diff --git a/resources/js/Pages/Guest/ForgotPassword.vue b/resources/js/Pages/Guest/ForgotPassword.vue
index 8761fad6..9c8d220b 100644
--- a/resources/js/Pages/Guest/ForgotPassword.vue
+++ b/resources/js/Pages/Guest/ForgotPassword.vue
@@ -5,7 +5,6 @@ import { Head } from '@inertiajs/vue3'
 
 defineProps<{
   errors: Record<string, string>
-  status?: string
 }>()
 
 const form = useForm({ email: '' })
diff --git a/resources/js/Types/PageProps.d.ts b/resources/js/Types/PageProps.d.ts
index 31763d34..c2dd8c87 100644
--- a/resources/js/Types/PageProps.d.ts
+++ b/resources/js/Types/PageProps.d.ts
@@ -2,6 +2,9 @@ import {type User} from '@/Types/User'
 
 export interface PageProps {
   appName: string
-  status?: string
+  flash: {
+    errors?: Record<string, string>
+    status?: string
+  }
   user?: User
 }
diff --git a/resources/js/components/Profile/PasswordUpdateSection.vue b/resources/js/components/Profile/PasswordUpdateSection.vue
index 5a76ca68..11c4a824 100644
--- a/resources/js/components/Profile/PasswordUpdateSection.vue
+++ b/resources/js/components/Profile/PasswordUpdateSection.vue
@@ -10,7 +10,7 @@ const form = useForm({
   password: '',
   password_confirmation: '',
 })
-console.log()
+
 function updatePassword() {
   form.patch('/profile/password', {
     preserveScroll: true,

From 964333d8f502a965074e404dba4caf22aae890da Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Mon, 2 Sep 2024 12:21:35 +0200
Subject: [PATCH 21/60] fix layouts

---
 resources/js/Layouts/AdminLayout.vue | 4 ++--
 resources/js/Layouts/BaseLayout.vue  | 2 +-
 resources/js/Layouts/GuestLayout.vue | 2 +-
 resources/js/Layouts/UserLayout.vue  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/js/Layouts/AdminLayout.vue b/resources/js/Layouts/AdminLayout.vue
index 5db4f04c..c4550ae6 100644
--- a/resources/js/Layouts/AdminLayout.vue
+++ b/resources/js/Layouts/AdminLayout.vue
@@ -4,7 +4,7 @@ import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
 import {type PageProps} from '@/Types/PageProps'
 
-defineProps<PageProps>()
+const props = defineProps<PageProps>()
 
 const pages: Page[] = [
   { title: 'Testy', href: '/admin/quizzes' },
@@ -18,7 +18,7 @@ if (props.user?.isSuperAdmin) {
 </script>
 
 <template>
-  <BaseLayout :pages :app-name :user :flash>
+  <BaseLayout :pages :app-name="appName" :user :flash>
     <slot />
   </BaseLayout>
 </template>
diff --git a/resources/js/Layouts/BaseLayout.vue b/resources/js/Layouts/BaseLayout.vue
index 8ea2d36b..8db9d890 100644
--- a/resources/js/Layouts/BaseLayout.vue
+++ b/resources/js/Layouts/BaseLayout.vue
@@ -9,7 +9,7 @@ import {ref, watch} from 'vue'
 import {type PageProps} from '@/Types/PageProps'
 
 const props = defineProps<{ pages: Page[] } & PageProps>()
-const status = ref<string>(props.flash.status)
+const status = ref<string | undefined>(props.flash.status)
 
 watch(() => props.flash, flash => {
   status.value = flash.status
diff --git a/resources/js/Layouts/GuestLayout.vue b/resources/js/Layouts/GuestLayout.vue
index ed1ccc93..60b9c18e 100644
--- a/resources/js/Layouts/GuestLayout.vue
+++ b/resources/js/Layouts/GuestLayout.vue
@@ -7,7 +7,7 @@ defineProps<PageProps>()
 </script>
 
 <template>
-  <BaseLayout :pages="[]" :app-name :user :flash>
+  <BaseLayout :pages="[]" :app-name="appName" :user :flash>
     <slot />
   </BaseLayout>
 </template>
diff --git a/resources/js/Layouts/UserLayout.vue b/resources/js/Layouts/UserLayout.vue
index 6724b2e8..eda3fd5c 100644
--- a/resources/js/Layouts/UserLayout.vue
+++ b/resources/js/Layouts/UserLayout.vue
@@ -13,7 +13,7 @@ const pages: Page[] = [
 </script>
 
 <template>
-  <BaseLayout :pages :app-name :user :flash>
+  <BaseLayout :pages :app-name="appName" :user :flash>
     <slot />
   </BaseLayout>
 </template>

From b945e51e77673ceeb1a88b6bfea8bd73411818c6 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Mon, 2 Sep 2024 13:53:45 +0200
Subject: [PATCH 22/60] implement user dashboard

---
 app/Http/Controllers/ContestController.php    | 21 +++++++-
 app/Http/Controllers/QuizController.php       | 11 ++++
 app/Http/Resources/QuizResource.php           |  6 ++-
 app/Http/Resources/QuizSubmissionResource.php |  1 +
 app/Models/Quiz.php                           | 30 +++++++++++
 app/Models/User.php                           | 14 +++++
 app/Policies/QuizPolicy.php                   |  5 ++
 ...103155_create_quiz_subscriptions_table.php | 26 +++++++++
 database/seeders/AdminSeeder.php              |  6 +++
 package-lock.json                             |  7 +++
 package.json                                  |  1 +
 resources/js/Pages/User/Dashboard.vue         | 53 ++++++++++++++++++-
 resources/js/Types/Quiz.d.ts                  |  4 +-
 resources/js/Types/QuizSubmission.d.ts        |  1 +
 resources/js/app.ts                           |  6 +++
 resources/js/components/Common/Divider.vue    |  7 +++
 resources/js/components/Common/FormButton.vue | 12 +++++
 routes/web.php                                |  1 +
 18 files changed, 208 insertions(+), 4 deletions(-)
 create mode 100644 database/migrations/2024_09_02_103155_create_quiz_subscriptions_table.php
 create mode 100644 resources/js/components/Common/Divider.vue

diff --git a/app/Http/Controllers/ContestController.php b/app/Http/Controllers/ContestController.php
index d757266a..2b27447a 100644
--- a/app/Http/Controllers/ContestController.php
+++ b/app/Http/Controllers/ContestController.php
@@ -4,8 +4,12 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Resources\QuizResource;
+use App\Http\Resources\QuizSubmissionResource;
 use App\Http\Resources\SchoolResource;
+use App\Models\Quiz;
 use App\Models\School;
+use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Inertia\Response;
 
@@ -18,8 +22,23 @@ public function index(): Response
         return Inertia::render("Home", ["schools" => SchoolResource::collection($schools)]);
     }
 
-    public function create(): Response
+    public function create(Request $request): Response
     {
+        $user = $request->user();
+        $submissions = $user->quizSubmissions()
+            ->with(["answerRecords.question.answers", "quiz"])
+            ->get();
+
+        $quizzes = Quiz::query()
+            ->whereNotNull("locked_at")
+            ->with("questions.answers")
+            ->get();
+
+        return Inertia::render("User/Dashboard", [
+            "submissions" => QuizSubmissionResource::collection($submissions),
+            "quizzes" => QuizResource::collection($quizzes),
+        ]);
+
         return Inertia::render("User/Dashboard");
     }
 }
diff --git a/app/Http/Controllers/QuizController.php b/app/Http/Controllers/QuizController.php
index 2d52ce39..f7c7d7a8 100644
--- a/app/Http/Controllers/QuizController.php
+++ b/app/Http/Controllers/QuizController.php
@@ -85,4 +85,15 @@ public function createSubmission(Request $request, Quiz $quiz): RedirectResponse
 
         return redirect("/submissions/{$submission->id}/");
     }
+
+    public function assign(Request $request, Quiz $quiz)
+    {
+        $user = $request->user();
+        $quiz->assignedUsers()->attach($user);
+        $quiz->save();
+
+        return redirect()
+            ->back()
+            ->with("status", "Zostałeś przypisany do testu");
+    }
 }
diff --git a/app/Http/Resources/QuizResource.php b/app/Http/Resources/QuizResource.php
index e60d5053..c8c19877 100644
--- a/app/Http/Resources/QuizResource.php
+++ b/app/Http/Resources/QuizResource.php
@@ -15,9 +15,13 @@ public function toArray($request): array
             "name" => $this->name,
             "createdAt" => $this->created_at,
             "updatedAt" => $this->updated_at,
+            "scheduledAt" => $this->scheduled_at,
             "duration" => $this->duration,
-            "locked" => $this->isLocked,
+            "state" => $this->state,
+            "canBeLocked" => $this->canBeLocked,
+            "canBeUnlocked" => $this->canBeUnlocked,
             "questions" => QuestionResource::collection($this->questions),
+            "isUserAssigned" => $this->isUserAssigned($request->user()),
         ];
     }
 }
diff --git a/app/Http/Resources/QuizSubmissionResource.php b/app/Http/Resources/QuizSubmissionResource.php
index 18cbcedc..4bc34380 100644
--- a/app/Http/Resources/QuizSubmissionResource.php
+++ b/app/Http/Resources/QuizSubmissionResource.php
@@ -18,6 +18,7 @@ public function toArray(Request $request): array
             "updatedAt" => $this->updated_at,
             "closedAt" => $this->closed_at,
             "closed" => $this->isClosed,
+            "quiz" => $this->quiz_id,
             "answers" => AnswerRecordResource::collection($this->answerRecords->shuffle()),
         ];
     }
diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php
index f1a306f7..15c4c3ab 100644
--- a/app/Models/Quiz.php
+++ b/app/Models/Quiz.php
@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Support\Collection;
@@ -21,11 +22,14 @@
  * @property ?Carbon $locked_at
  * @property ?int $duration
  * @property bool $isLocked
+ * @property bool $isPublished
  * @property bool $canBeLocked
  * @property bool $canBeUnlocked
+ * @property string $state
  * @property ?Carbon $closeAt
  * @property Collection<Question> $questions
  * @property Collection<Answer> $answers
+ * @property Collection<User> $assignedUsers
  */
 class Quiz extends Model
 {
@@ -47,11 +51,37 @@ public function answers(): HasManyThrough
         return $this->hasManyThrough(Answer::class, Question::class);
     }
 
+    public function assignedUsers(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, "quiz_assignments");
+    }
+
     public function isLocked(): Attribute
     {
         return Attribute::get(fn(): bool => $this->locked_at !== null);
     }
 
+    public function isPublished(): Attribute
+    {
+        return Attribute::get(fn(): bool => $this->isLocked && !$this->canBeUnlocked);
+    }
+
+    public function state(): Attribute
+    {
+        return Attribute::get(function (): string {
+            if ($this->isPublished) {
+                return "published";
+            }
+
+            return $this->isLocked ? "locked" : "unlocked";
+        });
+    }
+
+    public function isUserAssigned(User $user): bool
+    {
+        return $this->assignedUsers->contains($user);
+    }
+
     public function canBeUnlocked(): Attribute
     {
         return Attribute::get(fn(): bool => $this->isLocked && $this->scheduled_at > Carbon::now());
diff --git a/app/Models/User.php b/app/Models/User.php
index 02fff6e7..e25c127c 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -7,8 +7,10 @@
 use Carbon\Carbon;
 use Illuminate\Contracts\Auth\CanResetPassword;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Spatie\Permission\Traits\HasRoles;
@@ -25,6 +27,8 @@
  * @property Carbon $updated_at
  * @property School $school
  * @property boolean $is_anonymized
+ * @property Collection<QuizSubmission> $quizSubmissions
+ * @property Collection<Quiz> $assignedQuizzes
  */
 class User extends Authenticatable implements MustVerifyEmail, CanResetPassword
 {
@@ -48,6 +52,16 @@ public function school(): BelongsTo
         return $this->belongsTo(School::class);
     }
 
+    public function quizSubmissions(): HasMany
+    {
+        return $this->hasMany(QuizSubmission::class);
+    }
+
+    public function assignedQuizzes()
+    {
+        return $this->belongsToMany(Quiz::class, "quiz_assignments");
+    }
+
     protected function casts(): array
     {
         return [
diff --git a/app/Policies/QuizPolicy.php b/app/Policies/QuizPolicy.php
index 75bccea3..12c05c6c 100644
--- a/app/Policies/QuizPolicy.php
+++ b/app/Policies/QuizPolicy.php
@@ -37,4 +37,9 @@ public function unlock(User $user, Quiz $quiz): bool
     {
         return $quiz->canBeUnlocked;
     }
+
+    public function assign(User $user, Quiz $quiz): bool
+    {
+        return $quiz->isLocked && !$quiz->isPublished;
+    }
 }
diff --git a/database/migrations/2024_09_02_103155_create_quiz_subscriptions_table.php b/database/migrations/2024_09_02_103155_create_quiz_subscriptions_table.php
new file mode 100644
index 00000000..d60a0daa
--- /dev/null
+++ b/database/migrations/2024_09_02_103155_create_quiz_subscriptions_table.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Models\Quiz;
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::create("quiz_assignments", function (Blueprint $table): void {
+            $table->id();
+            $table->foreignIdFor(User::class)->constrained()->onDelete("cascade");
+            $table->foreignIdFor(Quiz::class)->constrained()->onDelete("cascade");
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists("quiz_assignments");
+    }
+};
diff --git a/database/seeders/AdminSeeder.php b/database/seeders/AdminSeeder.php
index a25b562f..3a878043 100644
--- a/database/seeders/AdminSeeder.php
+++ b/database/seeders/AdminSeeder.php
@@ -4,6 +4,8 @@
 
 namespace Database\Seeders;
 
+use App\Models\Quiz;
+use App\Models\QuizSubmission;
 use App\Models\School;
 use App\Models\User;
 use Carbon\Carbon;
@@ -53,5 +55,9 @@ public function run(): void
             ],
         );
         $user->syncRoles("user");
+
+        Quiz::factory()->count(3)->locked()->create();
+        Quiz::factory()->count(2)->locked()->create(["scheduled_at" => Carbon::now()->subMinutes(30)->timestamp]);
+        QuizSubmission::factory()->count(2)->create(["user_id" => $user->id]);
     }
 }
diff --git a/package-lock.json b/package-lock.json
index 12fd58f5..4e310499 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
                 "@inertiajs/vue3": "^1.0.14",
                 "@tailwindcss/forms": "^0.5.7",
                 "@tailwindcss/typography": "^0.5.10",
+                "dayjs": "^1.11.13",
                 "laravel-vite-plugin": "^1.0.2",
                 "lodash": "^4.17.21",
                 "tailwindcss": "^3.4.8",
@@ -2581,6 +2582,12 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/dayjs": {
+            "version": "1.11.13",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+            "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+            "license": "MIT"
+        },
         "node_modules/de-indent": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
diff --git a/package.json b/package.json
index 8f6eb85c..155483a1 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
         "@inertiajs/vue3": "^1.0.14",
         "@tailwindcss/forms": "^0.5.7",
         "@tailwindcss/typography": "^0.5.10",
+        "dayjs": "^1.11.13",
         "laravel-vite-plugin": "^1.0.2",
         "lodash": "^4.17.21",
         "tailwindcss": "^3.4.8",
diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 6cda4565..90d5b945 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -1,3 +1,54 @@
+<script setup lang="ts">
+import {type QuizSubmission} from '@/Types/QuizSubmission'
+import {type Quiz} from '@/Types/Quiz'
+import {computed} from 'vue'
+import dayjs from 'dayjs'
+import FormButton from '@/components/Common/FormButton.vue'
+import Divider from '@/components/Common/Divider.vue'
+
+const props = defineProps<{
+    submissions: QuizSubmission[]
+    quizzes: Quiz[]
+  }>()
+
+const started = computed(() => props.quizzes.filter(quiz => quiz.state == 'published'))
+const scheduled = computed(() => props.quizzes.filter(quiz => quiz.state == 'locked'))
+</script>
+
 <template>
-  User Dashboard
+  <div class="w-4/5">
+    <Divider>
+      <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Trwające konkursy</h1>
+    </Divider>
+    <div v-for="quiz in started" :key="quiz.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
+      <div>
+        <p class="font-semibold text-primary">{{ quiz.name }}</p>
+        <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
+      </div>
+      <FormButton class="min-w-24" small method="post" :href="`/quizzes/${quiz.id}/start`">Weź udział</FormButton>
+    </div>
+
+    <Divider>
+      <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Nadchodzące konkursy</h1>
+    </Divider>
+    <div v-for="quiz in scheduled" :key="quiz.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
+      <div>
+        <p class="font-semibold text-primary">{{ quiz.name }}</p>
+        <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
+      </div>
+      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24" small method="post" :href="`/quizzes/${quiz.id}/assign`">Zapisz się</FormButton>
+      <div v-else class="min-w-24 text-center border border-gray-500 text-gray-500 font-semibold rounded-md text-sm py-2 px-3 cursor-not-allowed">Zapisano</div>
+    </div>
+
+    <Divider>
+      <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Historia</h1>
+    </Divider>
+    <div v-for="submission in submissions" :key="submission.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
+      <div>
+        <p class="font-semibold text-primary">{{ submission.name }}</p>
+        <p class="text-xs py-1">{{ dayjs(submission.closedAt).fromNow() }}</p>
+      </div>
+      <FormButton class="min-w-24" small method="post" :href="`/submissions/${submission.id}/results`">Wyniki</FormButton>
+    </div>
+  </div>
 </template>
diff --git a/resources/js/Types/Quiz.d.ts b/resources/js/Types/Quiz.d.ts
index 5d3b430d..700c9a8d 100644
--- a/resources/js/Types/Quiz.d.ts
+++ b/resources/js/Types/Quiz.d.ts
@@ -5,7 +5,9 @@ export interface Quiz {
   name: string
   createdAt: number
   updatedAt: number
+  scheduledAt?: number
   duration?: number
-  locked: boolean
+  state:'published' | 'locked' | 'unlocked'
+  isUserAssigned: boolean
   questions: Question[]
 }
diff --git a/resources/js/Types/QuizSubmission.d.ts b/resources/js/Types/QuizSubmission.d.ts
index f57e5cfc..7c17c9c0 100644
--- a/resources/js/Types/QuizSubmission.d.ts
+++ b/resources/js/Types/QuizSubmission.d.ts
@@ -7,5 +7,6 @@ export interface QuizSubmission {
   updatedAt: string
   closedAt?: string
   closed: boolean
+  quiz: number
   answers: AnswerRecord[]
 }
diff --git a/resources/js/app.ts b/resources/js/app.ts
index c60dfac8..e4d19fb0 100644
--- a/resources/js/app.ts
+++ b/resources/js/app.ts
@@ -5,6 +5,12 @@ import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'
 import UserLayout from '@/Layouts/UserLayout.vue'
 import AdminLayout from '@/Layouts/AdminLayout.vue'
 import GuestLayout from '@/Layouts/GuestLayout.vue'
+import dayjs from 'dayjs'
+import relativeTime from 'dayjs/plugin/relativeTime'
+import 'dayjs/locale/pl'
+
+dayjs.extend(relativeTime)
+dayjs.locale('pl')
 
 createInertiaApp({
   title: (title) => `${title}`,
diff --git a/resources/js/components/Common/Divider.vue b/resources/js/components/Common/Divider.vue
new file mode 100644
index 00000000..48f731cd
--- /dev/null
+++ b/resources/js/components/Common/Divider.vue
@@ -0,0 +1,7 @@
+<template>
+  <div class="relative w-full flex items-center ">
+    <div class="w-10 border-t border-primary" />
+    <slot />
+    <div class="w-full border-t border-primary" />
+  </div>
+</template>
diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
index ff12fb41..6f9f7efa 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -5,6 +5,7 @@ import { useForm } from '@inertiajs/vue3'
 const form = useForm({})
 const props = withDefaults(defineProps<{
   small?: boolean
+  disabled?: boolean
   text?: boolean
   class?: string
   href: string
@@ -20,11 +21,22 @@ function handleSubmit() {
 <template>
   <form :class="props.class" @submit.prevent="handleSubmit">
     <button
+      v-if="!disabled"
       type="submit"
       class="font-semibold transition-colors duration-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
       :class="`${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${text ? 'text-black hover:text-primary-800 px-0 py-0' : 'px-3 bg-primary text-white hover:bg-primary-600 shadow-sm'} ${props.class}`"
     >
       <slot />
     </button>
+
+    <button
+      v-else
+      disabled
+      type="submit"
+      class="cursor-not-allowed font-semibold bg-primary-100 border px-3"
+      :class="`${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${props.class}`"
+    >
+      <slot />
+    </button>
   </form>
 </template>
diff --git a/routes/web.php b/routes/web.php
index 5cb78db1..fab85697 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -89,6 +89,7 @@
 });
 
 Route::middleware(["auth"])->group(function (): void {
+    Route::post("/quizzes/{quiz}/assign", [QuizController::class, "assign"])->can("assign,quiz")->name("quizzes.assign");
     Route::post("/quizzes/{quiz}/start", [QuizController::class, "createSubmission"])->middleware(EnsureQuizIsNotAlreadyStarted::class)->can("submit,quiz")->name("quizzes.start");
     Route::get("/submissions/{quizSubmission}/", [QuizSubmissionController::class, "show"])->can("view,quizSubmission")->name("submissions.show");
     Route::patch("/answers/{answerRecord}/{answer}", [AnswerRecordController::class, "answer"])->can("answer,answerRecord,answer")->name("answers.answer");

From 74f2d2879cd9adfaddbb1e8d682e5c8c7b95b135 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Mon, 2 Sep 2024 14:43:58 +0200
Subject: [PATCH 23/60] add mobile version

---
 resources/js/Pages/User/Dashboard.vue         | 25 ++++++++++---------
 resources/js/components/Common/FormButton.vue |  6 ++---
 tailwind.config.js                            |  1 +
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 90d5b945..9904b888 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -13,42 +13,43 @@ const props = defineProps<{
 
 const started = computed(() => props.quizzes.filter(quiz => quiz.state == 'published'))
 const scheduled = computed(() => props.quizzes.filter(quiz => quiz.state == 'locked'))
+const history = computed(() => props.submissions.filter(submission => submission.closed))
 </script>
 
 <template>
-  <div class="w-4/5">
-    <Divider>
+  <div class="w-full p-2 md:w-4/5">
+    <Divider v-if="started.length > 0">
       <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Trwające konkursy</h1>
     </Divider>
     <div v-for="quiz in started" :key="quiz.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
       <div>
-        <p class="font-semibold text-primary">{{ quiz.name }}</p>
+        <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.name }}</p>
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
-      <FormButton class="min-w-24" small method="post" :href="`/quizzes/${quiz.id}/start`">Weź udział</FormButton>
+      <FormButton class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/start`">Weź udział</FormButton>
     </div>
 
-    <Divider>
+    <Divider v-if="scheduled.length > 0">
       <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Nadchodzące konkursy</h1>
     </Divider>
     <div v-for="quiz in scheduled" :key="quiz.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
       <div>
-        <p class="font-semibold text-primary">{{ quiz.name }}</p>
+        <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.name }}</p>
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
-      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24" small method="post" :href="`/quizzes/${quiz.id}/assign`">Zapisz się</FormButton>
-      <div v-else class="min-w-24 text-center border border-gray-500 text-gray-500 font-semibold rounded-md text-sm py-2 px-3 cursor-not-allowed">Zapisano</div>
+      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/assign`">Zapisz się</FormButton>
+      <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="`/quizzes/${quiz.id}/assign`">Zapisano</FormButton>
     </div>
 
-    <Divider>
+    <Divider v-if="history.length > 0">
       <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Historia</h1>
     </Divider>
-    <div v-for="submission in submissions" :key="submission.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
+    <div v-for="submission in history" :key="submission.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
       <div>
-        <p class="font-semibold text-primary">{{ submission.name }}</p>
+        <p class="font-semibold text-sm 2xs:text-base text-primary">{{ submission.name }}</p>
         <p class="text-xs py-1">{{ dayjs(submission.closedAt).fromNow() }}</p>
       </div>
-      <FormButton class="min-w-24" small method="post" :href="`/submissions/${submission.id}/results`">Wyniki</FormButton>
+      <FormButton class="min-w-24 text-center" small method="post" :href="`/submissions/${submission.id}/results`">Wyniki</FormButton>
     </div>
   </div>
 </template>
diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
index 6f9f7efa..e861ceaa 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -24,7 +24,7 @@ function handleSubmit() {
       v-if="!disabled"
       type="submit"
       class="font-semibold transition-colors duration-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
-      :class="`${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${text ? 'text-black hover:text-primary-800 px-0 py-0' : 'px-3 bg-primary text-white hover:bg-primary-600 shadow-sm'} ${props.class}`"
+      :class="`${small ? 'rounded-md text-xs 2xs:text-sm py-2' : 'rounded-lg py-3'} ${text ? 'text-black hover:text-primary-800 px-0 py-0' : 'px-2 2xs:px-3 bg-primary text-white hover:bg-primary-600 shadow-sm'} ${props.class}`"
     >
       <slot />
     </button>
@@ -33,8 +33,8 @@ function handleSubmit() {
       v-else
       disabled
       type="submit"
-      class="cursor-not-allowed font-semibold bg-primary-100 border px-3"
-      :class="`${small ? 'rounded-md text-sm py-2' : 'rounded-lg py-3'} ${props.class}`"
+      class="border border-gray-500 text-gray-500 font-semibold px-2 2xs:px-3 cursor-not-allowed"
+      :class="`${small ? 'rounded-md text-xs 2xs:text-sm py-2' : 'rounded-lg py-3'} ${props.class}`"
     >
       <slot />
     </button>
diff --git a/tailwind.config.js b/tailwind.config.js
index 23bf9051..49e419e9 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -7,6 +7,7 @@ module.exports = {
     theme: {
         extend: {
             screens: {
+                '2xs': '380px',
                 'xs': '480px',
             },
             colors: {

From 6d146ff0d7c16d6f95a0291147792f32d5d0b039 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Mon, 2 Sep 2024 15:19:53 +0200
Subject: [PATCH 24/60] add non-content message

---
 database/seeders/AdminSeeder.php      |  1 +
 resources/js/Pages/User/Dashboard.vue | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/database/seeders/AdminSeeder.php b/database/seeders/AdminSeeder.php
index 3a878043..70016d5b 100644
--- a/database/seeders/AdminSeeder.php
+++ b/database/seeders/AdminSeeder.php
@@ -59,5 +59,6 @@ public function run(): void
         Quiz::factory()->count(3)->locked()->create();
         Quiz::factory()->count(2)->locked()->create(["scheduled_at" => Carbon::now()->subMinutes(30)->timestamp]);
         QuizSubmission::factory()->count(2)->create(["user_id" => $user->id]);
+        QuizSubmission::factory()->count(2)->closed()->create(["user_id" => $user->id]);
     }
 }
diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 9904b888..2874b75f 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import {type QuizSubmission} from '@/Types/QuizSubmission'
 import {type Quiz} from '@/Types/Quiz'
+import {Head} from '@inertiajs/vue3';
 import {computed} from 'vue'
 import dayjs from 'dayjs'
 import FormButton from '@/components/Common/FormButton.vue'
@@ -17,6 +18,10 @@ const history = computed(() => props.submissions.filter(submission => submission
 </script>
 
 <template>
+  <Head>
+    <title>Testy</title>
+  </Head>
+
   <div class="w-full p-2 md:w-4/5">
     <Divider v-if="started.length > 0">
       <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Trwające konkursy</h1>
@@ -29,7 +34,7 @@ const history = computed(() => props.submissions.filter(submission => submission
       <FormButton class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/start`">Weź udział</FormButton>
     </div>
 
-    <Divider v-if="scheduled.length > 0">
+    <Divider v-if="scheduled.length > 0 || started.length == 0">
       <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Nadchodzące konkursy</h1>
     </Divider>
     <div v-for="quiz in scheduled" :key="quiz.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
@@ -41,6 +46,10 @@ const history = computed(() => props.submissions.filter(submission => submission
       <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="`/quizzes/${quiz.id}/assign`">Zapisano</FormButton>
     </div>
 
+    <div v-if="scheduled.length == 0 && started.length == 0">
+      <p>Obecnie nie mamy zaplanowanych konkursów.</p>
+    </div>
+
     <Divider v-if="history.length > 0">
       <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Historia</h1>
     </Divider>

From 866ac55713c437b6505bad8eeefcb01ca9d53acb Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Mon, 2 Sep 2024 15:28:28 +0200
Subject: [PATCH 25/60] disable button while processing

---
 resources/js/components/Common/FormButton.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
index e861ceaa..78965063 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -21,7 +21,7 @@ function handleSubmit() {
 <template>
   <form :class="props.class" @submit.prevent="handleSubmit">
     <button
-      v-if="!disabled"
+      v-if="!disabled && !form.processing"
       type="submit"
       class="font-semibold transition-colors duration-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
       :class="`${small ? 'rounded-md text-xs 2xs:text-sm py-2' : 'rounded-lg py-3'} ${text ? 'text-black hover:text-primary-800 px-0 py-0' : 'px-2 2xs:px-3 bg-primary text-white hover:bg-primary-600 shadow-sm'} ${props.class}`"
@@ -33,8 +33,8 @@ function handleSubmit() {
       v-else
       disabled
       type="submit"
-      class="border border-gray-500 text-gray-500 font-semibold px-2 2xs:px-3 cursor-not-allowed"
-      :class="`${small ? 'rounded-md text-xs 2xs:text-sm py-2' : 'rounded-lg py-3'} ${props.class}`"
+      class="font-semibold text-gray-500 cursor-not-allowed"
+      :class="`${small ? 'rounded-md text-xs 2xs:text-sm py-2' : 'rounded-lg py-3'} ${text ? 'px-0 py-0' : 'border border-gray-500 font-semibold px-2 2xs:px-3 '} ${props.class}`"
     >
       <slot />
     </button>

From 649350c23300cbbcaca2830061ff22e9eb4b2b91 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Mon, 2 Sep 2024 17:37:49 +0200
Subject: [PATCH 26/60] add tests for quiz

---
 app/Models/Quiz.php         |  6 ++++++
 app/Policies/QuizPolicy.php |  2 +-
 tests/Feature/QuizTest.php  | 43 +++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php
index 15c4c3ab..28cb551c 100644
--- a/app/Models/Quiz.php
+++ b/app/Models/Quiz.php
@@ -30,6 +30,7 @@
  * @property Collection<Question> $questions
  * @property Collection<Answer> $answers
  * @property Collection<User> $assignedUsers
+ * @property Collection<QuizSubmission> $quizSubmissions
  */
 class Quiz extends Model
 {
@@ -56,6 +57,11 @@ public function assignedUsers(): BelongsToMany
         return $this->belongsToMany(User::class, "quiz_assignments");
     }
 
+    public function quizSubmissions(): HasMany
+    {
+        return $this->hasMany(QuizSubmission::class);
+    }
+
     public function isLocked(): Attribute
     {
         return Attribute::get(fn(): bool => $this->locked_at !== null);
diff --git a/app/Policies/QuizPolicy.php b/app/Policies/QuizPolicy.php
index 12c05c6c..06a16c2b 100644
--- a/app/Policies/QuizPolicy.php
+++ b/app/Policies/QuizPolicy.php
@@ -40,6 +40,6 @@ public function unlock(User $user, Quiz $quiz): bool
 
     public function assign(User $user, Quiz $quiz): bool
     {
-        return $quiz->isLocked && !$quiz->isPublished;
+        return $quiz->isLocked && !$quiz->isPublished && $quiz->quizSubmissions->where("user_id", $user->id)->isEmpty();
     }
 }
diff --git a/tests/Feature/QuizTest.php b/tests/Feature/QuizTest.php
index 39956fad..a484f41c 100644
--- a/tests/Feature/QuizTest.php
+++ b/tests/Feature/QuizTest.php
@@ -509,4 +509,47 @@ public function testUserCannotAccessToCrud(): void
             ->post("/admin/quizzes/{$quiz->id}/unlock")
             ->assertStatus(403);
     }
+
+    public function testUserCanAssignThemselvesToQuiz(): void
+    {
+        $quiz = Quiz::factory()->locked()->create();
+
+        $this->actingAs($this->user)
+            ->from("/")
+            ->post("/quizzes/{$quiz->id}/assign")
+            ->assertRedirect("/")
+            ->assertSessionHas(["status" => "Zostałeś przypisany do testu"]);
+    }
+
+    public function testUserCannotAssignThemselvesToUnlockedQuiz(): void
+    {
+        $quiz = Quiz::factory()->create();
+
+        $this->actingAs($this->user)
+            ->from("/")
+            ->post("/quizzes/{$quiz->id}/assign")
+            ->assertStatus(403);
+    }
+
+    public function testUserCannotAssignThemselvesToQuizWithPastScheduledTime(): void
+    {
+        $quiz = Quiz::factory()->locked()->create([
+            "scheduled_at" => Carbon::now()->subMinutes(60),
+        ]);
+
+        $this->actingAs($this->user)
+            ->from("/")
+            ->post("/quizzes/{$quiz->id}/assign")
+            ->assertStatus(403);
+    }
+
+    public function testUserCannotAssignThemselvesToStartedQuiz(): void
+    {
+        $quiz = QuizSubmission::factory()->create(["user_id" => $this->user->id])->quiz;
+
+        $this->actingAs($this->user)
+            ->from("/")
+            ->post("/quizzes/{$quiz->id}/assign")
+            ->assertStatus(403);
+    }
 }

From d9256b0077fa2e03ff59fb3b220f60fdc0b39c0c Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Mon, 2 Sep 2024 17:49:38 +0200
Subject: [PATCH 27/60] move user submission check to model

---
 app/Models/Quiz.php         | 5 +++++
 app/Policies/QuizPolicy.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php
index 28cb551c..3d87d6de 100644
--- a/app/Models/Quiz.php
+++ b/app/Models/Quiz.php
@@ -138,6 +138,11 @@ public function isReadyToBePublished(): bool
         return $this->scheduled_at !== null && $this->duration !== null && $this->allQuestionsHaveCorrectAnswer();
     }
 
+    public function hasSubmissionsFrom(User $user): bool
+    {
+        return !$this->quizSubmissions->where("user_id", $user->id)->isEmpty();
+    }
+
     protected function allQuestionsHaveCorrectAnswer(): bool
     {
         return $this->questions->every(fn(Question $question): bool => $question->hasCorrectAnswer);
diff --git a/app/Policies/QuizPolicy.php b/app/Policies/QuizPolicy.php
index 06a16c2b..2673f507 100644
--- a/app/Policies/QuizPolicy.php
+++ b/app/Policies/QuizPolicy.php
@@ -40,6 +40,6 @@ public function unlock(User $user, Quiz $quiz): bool
 
     public function assign(User $user, Quiz $quiz): bool
     {
-        return $quiz->isLocked && !$quiz->isPublished && $quiz->quizSubmissions->where("user_id", $user->id)->isEmpty();
+        return $quiz->isLocked && !$quiz->isPublished && !$quiz->hasSubmissionsFrom($user);
     }
 }

From a802f0e7e808956a6cda00b31e40c4d3ed8895e8 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Mon, 2 Sep 2024 17:52:46 +0200
Subject: [PATCH 28/60] remove extra semicolon

---
 resources/js/Pages/User/Dashboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 2874b75f..60ef9527 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {type QuizSubmission} from '@/Types/QuizSubmission'
 import {type Quiz} from '@/Types/Quiz'
-import {Head} from '@inertiajs/vue3';
+import {Head} from '@inertiajs/vue3'
 import {computed} from 'vue'
 import dayjs from 'dayjs'
 import FormButton from '@/components/Common/FormButton.vue'

From 331b2b66ef86ed0a6d189d8a28c5daae98e15f24 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Tue, 3 Sep 2024 09:45:58 +0200
Subject: [PATCH 29/60] fix code style

---
 app/Http/Controllers/ContestController.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Http/Controllers/ContestController.php b/app/Http/Controllers/ContestController.php
index 2b27447a..34e0fcf3 100644
--- a/app/Http/Controllers/ContestController.php
+++ b/app/Http/Controllers/ContestController.php
@@ -38,7 +38,5 @@ public function create(Request $request): Response
             "submissions" => QuizSubmissionResource::collection($submissions),
             "quizzes" => QuizResource::collection($quizzes),
         ]);
-
-        return Inertia::render("User/Dashboard");
     }
 }

From 682bd13b524d3ad93a74405f97e177fd30f156ba Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Tue, 3 Sep 2024 09:48:31 +0200
Subject: [PATCH 30/60] changed status to be gender-neutral

---
 app/Http/Controllers/QuizController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/QuizController.php b/app/Http/Controllers/QuizController.php
index f7c7d7a8..5407c011 100644
--- a/app/Http/Controllers/QuizController.php
+++ b/app/Http/Controllers/QuizController.php
@@ -94,6 +94,6 @@ public function assign(Request $request, Quiz $quiz)
 
         return redirect()
             ->back()
-            ->with("status", "Zostałeś przypisany do testu");
+            ->with("status", "Przypisano do testu");
     }
 }

From 998e2a5dff80d7696c22c8a010ca67b9e8316919 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Tue, 3 Sep 2024 09:58:46 +0200
Subject: [PATCH 31/60] fix tests

---
 tests/Feature/QuizTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Feature/QuizTest.php b/tests/Feature/QuizTest.php
index a484f41c..ed57a752 100644
--- a/tests/Feature/QuizTest.php
+++ b/tests/Feature/QuizTest.php
@@ -518,7 +518,7 @@ public function testUserCanAssignThemselvesToQuiz(): void
             ->from("/")
             ->post("/quizzes/{$quiz->id}/assign")
             ->assertRedirect("/")
-            ->assertSessionHas(["status" => "Zostałeś przypisany do testu"]);
+            ->assertSessionHas(["status" => "Przypisano do testu"]);
     }
 
     public function testUserCannotAssignThemselvesToUnlockedQuiz(): void

From 4548912e67ff5893c491646e9c4741d0aa31adad Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Tue, 3 Sep 2024 16:10:22 +0200
Subject: [PATCH 32/60] fix code style

---
 app/Http/Controllers/QuizController.php | 2 +-
 resources/js/Pages/User/Dashboard.vue   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/QuizController.php b/app/Http/Controllers/QuizController.php
index 5407c011..fae15ed7 100644
--- a/app/Http/Controllers/QuizController.php
+++ b/app/Http/Controllers/QuizController.php
@@ -86,7 +86,7 @@ public function createSubmission(Request $request, Quiz $quiz): RedirectResponse
         return redirect("/submissions/{$submission->id}/");
     }
 
-    public function assign(Request $request, Quiz $quiz)
+    public function assign(Request $request, Quiz $quiz): RedirectResponse
     {
         $user = $request->user();
         $quiz->assignedUsers()->attach($user);
diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 60ef9527..045cec78 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+
 import {type QuizSubmission} from '@/Types/QuizSubmission'
 import {type Quiz} from '@/Types/Quiz'
 import {Head} from '@inertiajs/vue3'
@@ -8,9 +9,9 @@ import FormButton from '@/components/Common/FormButton.vue'
 import Divider from '@/components/Common/Divider.vue'
 
 const props = defineProps<{
-    submissions: QuizSubmission[]
-    quizzes: Quiz[]
-  }>()
+  submissions: QuizSubmission[]
+  quizzes: Quiz[]
+}>()
 
 const started = computed(() => props.quizzes.filter(quiz => quiz.state == 'published'))
 const scheduled = computed(() => props.quizzes.filter(quiz => quiz.state == 'locked'))

From 2562715c64e438e2fab833ba26151fb7f12cfb39 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Tue, 3 Sep 2024 16:14:22 +0200
Subject: [PATCH 33/60] preserve scroll

---
 resources/js/Pages/User/Dashboard.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 045cec78..8c24a559 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -32,7 +32,9 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.name }}</p>
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
-      <FormButton class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/start`">Weź udział</FormButton>
+      <FormButton class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/start`" :options="{ preserveScroll: true }">
+        Weź udział
+      </FormButton>
     </div>
 
     <Divider v-if="scheduled.length > 0 || started.length == 0">
@@ -43,8 +45,12 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.name }}</p>
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
-      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/assign`">Zapisz się</FormButton>
-      <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="`/quizzes/${quiz.id}/assign`">Zapisano</FormButton>
+      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/assign`" :options="{ preserveScroll: true }">
+        Zapisz się
+      </FormButton>
+      <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="`/quizzes/${quiz.id}/assign`">
+        Zapisano
+      </FormButton>
     </div>
 
     <div v-if="scheduled.length == 0 && started.length == 0">
@@ -59,7 +65,9 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ submission.name }}</p>
         <p class="text-xs py-1">{{ dayjs(submission.closedAt).fromNow() }}</p>
       </div>
-      <FormButton class="min-w-24 text-center" small method="post" :href="`/submissions/${submission.id}/results`">Wyniki</FormButton>
+      <FormButton class="min-w-24 text-center" small method="post" :href="`/submissions/${submission.id}/results`" :options="{ preserveScroll: true }">
+        Wyniki
+      </FormButton>
     </div>
   </div>
 </template>

From d73adf106a7ac58b3603b65a220dbf089ab5ea35 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Tue, 3 Sep 2024 16:28:53 +0200
Subject: [PATCH 34/60] hide closed quizzes

---
 app/Models/QuizSubmission.php         | 2 +-
 resources/js/Pages/User/Dashboard.vue | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Models/QuizSubmission.php b/app/Models/QuizSubmission.php
index fb7b36f4..bc53c4e1 100644
--- a/app/Models/QuizSubmission.php
+++ b/app/Models/QuizSubmission.php
@@ -45,7 +45,7 @@ public function answerRecords(): HasMany
 
     public function isClosed(): Attribute
     {
-        return Attribute::get(fn(): bool => $this->closed_at !== null && $this->closed_at <= Carbon::now());
+        return Attribute::get(fn(): bool => $this->closed_at <= Carbon::now());
     }
 
     protected function casts(): array
diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 8c24a559..3181619c 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -13,7 +13,9 @@ const props = defineProps<{
   quizzes: Quiz[]
 }>()
 
-const started = computed(() => props.quizzes.filter(quiz => quiz.state == 'published'))
+const isClosed = (quiz: Quiz) => dayjs(quiz.scheduledAt).add(quiz.duration ?? 0, 'm').isBefore(Date.now());
+
+const started = computed(() => props.quizzes.filter(quiz => quiz.state == 'published' && !isClosed(quiz)))
 const scheduled = computed(() => props.quizzes.filter(quiz => quiz.state == 'locked'))
 const history = computed(() => props.submissions.filter(submission => submission.closed))
 </script>

From 74dc8baf0639755f3360dbbf3e770b866dabd805 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Tue, 3 Sep 2024 16:31:00 +0200
Subject: [PATCH 35/60] remove extra semicolon

---
 resources/js/Pages/User/Dashboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 3181619c..ef3a3b71 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -13,7 +13,7 @@ const props = defineProps<{
   quizzes: Quiz[]
 }>()
 
-const isClosed = (quiz: Quiz) => dayjs(quiz.scheduledAt).add(quiz.duration ?? 0, 'm').isBefore(Date.now());
+const isClosed = (quiz: Quiz) => dayjs(quiz.scheduledAt).add(quiz.duration ?? 0, 'm').isBefore(Date.now())
 
 const started = computed(() => props.quizzes.filter(quiz => quiz.state == 'published' && !isClosed(quiz)))
 const scheduled = computed(() => props.quizzes.filter(quiz => quiz.state == 'locked'))

From d890b1c6ec6b7a99523fd0edb5f462461b3d4f03 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Wed, 4 Sep 2024 14:26:31 +0200
Subject: [PATCH 36/60] fix code style

---
 app/Models/Quiz.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php
index 3d87d6de..29622742 100644
--- a/app/Models/Quiz.php
+++ b/app/Models/Quiz.php
@@ -140,7 +140,7 @@ public function isReadyToBePublished(): bool
 
     public function hasSubmissionsFrom(User $user): bool
     {
-        return !$this->quizSubmissions->where("user_id", $user->id)->isEmpty();
+        return $this->quizSubmissions->where("user_id", $user->id)->isNotEmpty();
     }
 
     protected function allQuestionsHaveCorrectAnswer(): bool

From 494abbc1dff2579d8bc67a452c5550c7813d4617 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Wed, 4 Sep 2024 14:26:39 +0200
Subject: [PATCH 37/60] rename migration

---
 ...le.php => 2024_09_02_103155_create_quiz_assignments_table.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename database/migrations/{2024_09_02_103155_create_quiz_subscriptions_table.php => 2024_09_02_103155_create_quiz_assignments_table.php} (100%)

diff --git a/database/migrations/2024_09_02_103155_create_quiz_subscriptions_table.php b/database/migrations/2024_09_02_103155_create_quiz_assignments_table.php
similarity index 100%
rename from database/migrations/2024_09_02_103155_create_quiz_subscriptions_table.php
rename to database/migrations/2024_09_02_103155_create_quiz_assignments_table.php

From d0a470ae0d498a0cdf9ba4416f51adb811df7d83 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Wed, 4 Sep 2024 16:01:48 +0200
Subject: [PATCH 38/60] add ziggy

---
 composer.json                                 |  3 +-
 composer.lock                                 | 72 ++++++++++++++++++-
 package-lock.json                             | 42 ++++++++++-
 package.json                                  |  4 +-
 resources/js/Layouts/AdminLayout.vue          |  9 +--
 resources/js/Layouts/UserLayout.vue           |  5 +-
 resources/js/Pages/Auth/Verify-Email.vue      |  5 +-
 resources/js/Pages/Guest/ForgotPassword.vue   |  3 +-
 resources/js/Pages/User/Dashboard.vue         | 11 +--
 resources/js/Pages/User/Edit.vue              |  3 +-
 resources/js/Pages/User/ResetPassword.vue     |  3 +-
 .../Profile/PasswordUpdateSection.vue         |  3 +-
 resources/views/app.blade.php                 |  1 +
 routes/web.php                                |  1 +
 14 files changed, 144 insertions(+), 21 deletions(-)

diff --git a/composer.json b/composer.json
index a2428f75..2fc85fa2 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,8 @@
         "laravel/sanctum": "^4.0",
         "laravel/tinker": "^2.9",
         "saloonphp/pagination-plugin": "^2.0",
-        "spatie/laravel-permission": "^6.9"
+        "spatie/laravel-permission": "^6.9",
+        "tightenco/ziggy": "^2.3"
     },
     "require-dev": {
         "blumilksoftware/codestyle": "^v3.0.0",
diff --git a/composer.lock b/composer.lock
index 0e948dfb..10d5d4ea 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "05d2a400bee7047a9832f9503b730a06",
+    "content-hash": "a44daa6de237a8a8c9bcbf09aa16216c",
     "packages": [
         {
             "name": "brick/math",
@@ -5766,6 +5766,76 @@
             ],
             "time": "2024-07-26T12:41:01+00:00"
         },
+        {
+            "name": "tightenco/ziggy",
+            "version": "v2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tighten/ziggy.git",
+                "reference": "5395ba7c6d6ea1709acf5435694c4732c2912b5e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tighten/ziggy/zipball/5395ba7c6d6ea1709acf5435694c4732c2912b5e",
+                "reference": "5395ba7c6d6ea1709acf5435694c4732c2912b5e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "laravel/framework": ">=9.0",
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "laravel/folio": "^1.1",
+                "orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
+                "pestphp/pest": "^2.26",
+                "pestphp/pest-plugin-laravel": "^2.4"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Tighten\\Ziggy\\ZiggyServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Tighten\\Ziggy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Daniel Coulbourne",
+                    "email": "daniel@tighten.co"
+                },
+                {
+                    "name": "Jake Bathman",
+                    "email": "jake@tighten.co"
+                },
+                {
+                    "name": "Jacob Baker-Kretzmar",
+                    "email": "jacob@tighten.co"
+                }
+            ],
+            "description": "Use your Laravel named routes in JavaScript.",
+            "homepage": "https://github.com/tighten/ziggy",
+            "keywords": [
+                "Ziggy",
+                "javascript",
+                "laravel",
+                "routes"
+            ],
+            "support": {
+                "issues": "https://github.com/tighten/ziggy/issues",
+                "source": "https://github.com/tighten/ziggy/tree/v2.3.0"
+            },
+            "time": "2024-07-21T16:18:39+00:00"
+        },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
             "version": "v2.2.7",
diff --git a/package-lock.json b/package-lock.json
index 4e310499..f3598da3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,10 +15,12 @@
                 "laravel-vite-plugin": "^1.0.2",
                 "lodash": "^4.17.21",
                 "tailwindcss": "^3.4.8",
-                "vue": "^3.4.21"
+                "vue": "^3.4.21",
+                "ziggy-js": "^2.3.0"
             },
             "devDependencies": {
                 "@blumilksoftware/eslint-config": "^2.0.0",
+                "@types/ziggy-js": "^1.3.3",
                 "@typescript-eslint/eslint-plugin": "^8.0.1",
                 "@vitejs/plugin-vue": "^5.0.4",
                 "autoprefixer": "^10.4.19",
@@ -1295,6 +1297,13 @@
             "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
             "license": "MIT"
         },
+        "node_modules/@types/history": {
+            "version": "4.7.11",
+            "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
+            "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@types/json-schema": {
             "version": "7.0.15",
             "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -1316,6 +1325,16 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@types/ziggy-js": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/@types/ziggy-js/-/ziggy-js-1.3.3.tgz",
+            "integrity": "sha512-vBsSiMYhpG6zMiFUFmGoeo/0Ff882m7GLmy2dutsnx9NI+bces+ap4e5tKrzy4TzAAFHlvU1Io6SN8IeUp689w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/history": "^4.7.11"
+            }
+        },
         "node_modules/@typescript-eslint/eslint-plugin": {
             "version": "8.1.0",
             "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.1.0.tgz",
@@ -6461,6 +6480,27 @@
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
             }
+        },
+        "node_modules/ziggy-js": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/ziggy-js/-/ziggy-js-2.3.0.tgz",
+            "integrity": "sha512-g2m/WgC/7KkqZzYFe87LmSVqVbZ6fGkx0RCKR+0mrUvn4xpou3h4s0IIxl7TYsyBspEFebGspdf01JFo1gaCZA==",
+            "license": "MIT",
+            "dependencies": {
+                "qs": "~6.9.7"
+            }
+        },
+        "node_modules/ziggy-js/node_modules/qs": {
+            "version": "6.9.7",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
+            "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         }
     }
 }
diff --git a/package.json b/package.json
index 155483a1..875d0f79 100644
--- a/package.json
+++ b/package.json
@@ -19,10 +19,12 @@
         "laravel-vite-plugin": "^1.0.2",
         "lodash": "^4.17.21",
         "tailwindcss": "^3.4.8",
-        "vue": "^3.4.21"
+        "vue": "^3.4.21",
+        "ziggy-js": "^2.3.0"
     },
     "devDependencies": {
         "@blumilksoftware/eslint-config": "^2.0.0",
+        "@types/ziggy-js": "^1.3.3",
         "@typescript-eslint/eslint-plugin": "^8.0.1",
         "@vitejs/plugin-vue": "^5.0.4",
         "autoprefixer": "^10.4.19",
diff --git a/resources/js/Layouts/AdminLayout.vue b/resources/js/Layouts/AdminLayout.vue
index c4550ae6..66d52339 100644
--- a/resources/js/Layouts/AdminLayout.vue
+++ b/resources/js/Layouts/AdminLayout.vue
@@ -3,17 +3,18 @@
 import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
 import {type PageProps} from '@/Types/PageProps'
+import { route } from "ziggy-js";
 
 const props = defineProps<PageProps>()
 
 const pages: Page[] = [
-  { title: 'Testy', href: '/admin/quizzes' },
-  { title: 'Szkoły', href: '/admin/schools' },
-  { title: 'Uczniowie', href: '/admin/users' },
+  { title: 'Testy', href: route('admin.quizzes.index') },
+  { title: 'Szkoły', href: route('admin.schools.index') },
+  { title: 'Uczniowie', href: route('admin.users.index') },
 ]
 
 if (props.user?.isSuperAdmin) {
-  pages.push({ title: 'Administratorzy', href: '/admin/admins'})
+  pages.push({ title: 'Administratorzy', href: route('admin.admins.index')})
 }
 </script>
 
diff --git a/resources/js/Layouts/UserLayout.vue b/resources/js/Layouts/UserLayout.vue
index eda3fd5c..f823cc7a 100644
--- a/resources/js/Layouts/UserLayout.vue
+++ b/resources/js/Layouts/UserLayout.vue
@@ -3,12 +3,13 @@
 import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
 import type {PageProps} from '@/Types/PageProps'
+import { route } from "ziggy-js";
 
 defineProps<PageProps>()
 
 const pages: Page[] = [
-  { title: 'Konkursy', href: '/dashboard' },
-  { title: 'Profil', href: '/profile' },
+  { title: 'Konkursy', href: route('dashboard') },
+  { title: 'Profil', href: route('profile') },
 ]
 </script>
 
diff --git a/resources/js/Pages/Auth/Verify-Email.vue b/resources/js/Pages/Auth/Verify-Email.vue
index 711ac358..a49f8e41 100644
--- a/resources/js/Pages/Auth/Verify-Email.vue
+++ b/resources/js/Pages/Auth/Verify-Email.vue
@@ -1,15 +1,16 @@
 <script setup lang="ts">
 
 import {useForm} from '@inertiajs/vue3'
+import { route } from "ziggy-js";
 
 const form = useForm({})
 
 function logout() {
-  form.get('/auth/logout')
+  form.post( route('logout'))
 }
 
 function sent() {
-  form.post('/email/verification-notification')
+  form.post(route('verification.send'))
 }
 
 </script>
diff --git a/resources/js/Pages/Guest/ForgotPassword.vue b/resources/js/Pages/Guest/ForgotPassword.vue
index 9c8d220b..87786761 100644
--- a/resources/js/Pages/Guest/ForgotPassword.vue
+++ b/resources/js/Pages/Guest/ForgotPassword.vue
@@ -2,6 +2,7 @@
 import { useForm } from '@inertiajs/vue3'
 import CustomInput from '@/components/Common/CustomInput.vue'
 import { Head } from '@inertiajs/vue3'
+import { route } from "ziggy-js";
 
 defineProps<{
   errors: Record<string, string>
@@ -10,7 +11,7 @@ defineProps<{
 const form = useForm({ email: '' })
 
 function submit() {
-  form.post('/auth/forgot-password')
+  form.post(route('password.email'));
 }
 </script>
 
diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index ef3a3b71..42efd86f 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -7,6 +7,7 @@ import {computed} from 'vue'
 import dayjs from 'dayjs'
 import FormButton from '@/components/Common/FormButton.vue'
 import Divider from '@/components/Common/Divider.vue'
+import { route } from "ziggy-js";
 
 const props = defineProps<{
   submissions: QuizSubmission[]
@@ -22,7 +23,7 @@ const history = computed(() => props.submissions.filter(submission => submission
 
 <template>
   <Head>
-    <title>Testy</title>
+    <title>Konkursy</title>
   </Head>
 
   <div class="w-full p-2 md:w-4/5">
@@ -34,7 +35,7 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.name }}</p>
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
-      <FormButton class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/start`" :options="{ preserveScroll: true }">
+      <FormButton class="min-w-24 text-center" small method="post" :href="route('quizzes.start', quiz.id)" :options="{ preserveScroll: true }">
         Weź udział
       </FormButton>
     </div>
@@ -47,10 +48,10 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.name }}</p>
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
-      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/assign`" :options="{ preserveScroll: true }">
+      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="route('quizzes.assign', quiz.id)" :options="{ preserveScroll: true }">
         Zapisz się
       </FormButton>
-      <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="`/quizzes/${quiz.id}/assign`">
+      <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="route('quizzes.assign')">
         Zapisano
       </FormButton>
     </div>
@@ -67,7 +68,7 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ submission.name }}</p>
         <p class="text-xs py-1">{{ dayjs(submission.closedAt).fromNow() }}</p>
       </div>
-      <FormButton class="min-w-24 text-center" small method="post" :href="`/submissions/${submission.id}/results`" :options="{ preserveScroll: true }">
+      <FormButton class="min-w-24 text-center" small method="get" :href="route('submissions.result', submission.id)" :options="{ preserveScroll: true }">
         Wyniki
       </FormButton>
     </div>
diff --git a/resources/js/Pages/User/Edit.vue b/resources/js/Pages/User/Edit.vue
index b6bf0de6..264a7e76 100644
--- a/resources/js/Pages/User/Edit.vue
+++ b/resources/js/Pages/User/Edit.vue
@@ -4,6 +4,7 @@ import { useForm } from '@inertiajs/vue3'
 import { defineProps } from 'vue'
 import { type User } from '@/Types/User'
 import { type School } from '@/Types/School'
+import { route } from "ziggy-js";
 
 const props = defineProps<{
   user: User
@@ -18,7 +19,7 @@ const form = useForm({
 })
 
 function update() {
-  form.patch(`/admin/users/${props.user.id}`)
+  form.patch(route('admin.users.update', props.user.id))
 }
 </script>
 
diff --git a/resources/js/Pages/User/ResetPassword.vue b/resources/js/Pages/User/ResetPassword.vue
index 5aebe857..5abb5ca5 100644
--- a/resources/js/Pages/User/ResetPassword.vue
+++ b/resources/js/Pages/User/ResetPassword.vue
@@ -2,6 +2,7 @@
 import { useForm } from '@inertiajs/vue3'
 import { Head } from '@inertiajs/vue3'
 import CustomInput from '@/components/Common/CustomInput.vue'
+import { route } from "ziggy-js";
 
 const props = defineProps<{
   token: string
@@ -16,7 +17,7 @@ const form = useForm({
 })
 
 function submit() {
-  form.post('/auth/password/reset')
+  form.post(route('password.update'))
 }
 </script>
 
diff --git a/resources/js/components/Profile/PasswordUpdateSection.vue b/resources/js/components/Profile/PasswordUpdateSection.vue
index 11c4a824..1764cec6 100644
--- a/resources/js/components/Profile/PasswordUpdateSection.vue
+++ b/resources/js/components/Profile/PasswordUpdateSection.vue
@@ -2,6 +2,7 @@
 
 import CustomInput from '@/components/Common/CustomInput.vue'
 import {useForm} from '@inertiajs/vue3'
+import { route } from "ziggy-js";
 
 defineProps< { errors: Record<string, string> }>()
 
@@ -12,7 +13,7 @@ const form = useForm({
 })
 
 function updatePassword() {
-  form.patch('/profile/password', {
+  form.patch(route('profile.password.update'), {
     preserveScroll: true,
     onSuccess: () => {
       form.reset()
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index 533e1d57..c2fe33f4 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -9,5 +9,6 @@
 </head>
 <body>
 @inertia
+@routes
 </body>
 </html>
diff --git a/routes/web.php b/routes/web.php
index fab85697..789ec189 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -92,5 +92,6 @@
     Route::post("/quizzes/{quiz}/assign", [QuizController::class, "assign"])->can("assign,quiz")->name("quizzes.assign");
     Route::post("/quizzes/{quiz}/start", [QuizController::class, "createSubmission"])->middleware(EnsureQuizIsNotAlreadyStarted::class)->can("submit,quiz")->name("quizzes.start");
     Route::get("/submissions/{quizSubmission}/", [QuizSubmissionController::class, "show"])->can("view,quizSubmission")->name("submissions.show");
+    Route::get("/submissions/{quizSubmission}/result", [QuizSubmissionController::class, "result"])->can("result,quizSubmission")->name("submissions.result");
     Route::patch("/answers/{answerRecord}/{answer}", [AnswerRecordController::class, "answer"])->can("answer,answerRecord,answer")->name("answers.answer");
 });

From 781640d9c4c302aca9ba5ec0116fe9eb0219f10f Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Wed, 4 Sep 2024 16:02:36 +0200
Subject: [PATCH 39/60] fix code style

---
 resources/js/Layouts/AdminLayout.vue                      | 2 +-
 resources/js/Layouts/UserLayout.vue                       | 2 +-
 resources/js/Pages/Auth/Verify-Email.vue                  | 2 +-
 resources/js/Pages/Guest/ForgotPassword.vue               | 4 ++--
 resources/js/Pages/User/Dashboard.vue                     | 2 +-
 resources/js/Pages/User/Edit.vue                          | 2 +-
 resources/js/Pages/User/ResetPassword.vue                 | 2 +-
 resources/js/components/Profile/PasswordUpdateSection.vue | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/js/Layouts/AdminLayout.vue b/resources/js/Layouts/AdminLayout.vue
index 66d52339..db9a0c92 100644
--- a/resources/js/Layouts/AdminLayout.vue
+++ b/resources/js/Layouts/AdminLayout.vue
@@ -3,7 +3,7 @@
 import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
 import {type PageProps} from '@/Types/PageProps'
-import { route } from "ziggy-js";
+import { route } from 'ziggy-js'
 
 const props = defineProps<PageProps>()
 
diff --git a/resources/js/Layouts/UserLayout.vue b/resources/js/Layouts/UserLayout.vue
index f823cc7a..235721c5 100644
--- a/resources/js/Layouts/UserLayout.vue
+++ b/resources/js/Layouts/UserLayout.vue
@@ -3,7 +3,7 @@
 import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
 import type {PageProps} from '@/Types/PageProps'
-import { route } from "ziggy-js";
+import { route } from 'ziggy-js'
 
 defineProps<PageProps>()
 
diff --git a/resources/js/Pages/Auth/Verify-Email.vue b/resources/js/Pages/Auth/Verify-Email.vue
index a49f8e41..8917aa8a 100644
--- a/resources/js/Pages/Auth/Verify-Email.vue
+++ b/resources/js/Pages/Auth/Verify-Email.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 
 import {useForm} from '@inertiajs/vue3'
-import { route } from "ziggy-js";
+import { route } from 'ziggy-js'
 
 const form = useForm({})
 
diff --git a/resources/js/Pages/Guest/ForgotPassword.vue b/resources/js/Pages/Guest/ForgotPassword.vue
index 87786761..060fee04 100644
--- a/resources/js/Pages/Guest/ForgotPassword.vue
+++ b/resources/js/Pages/Guest/ForgotPassword.vue
@@ -2,7 +2,7 @@
 import { useForm } from '@inertiajs/vue3'
 import CustomInput from '@/components/Common/CustomInput.vue'
 import { Head } from '@inertiajs/vue3'
-import { route } from "ziggy-js";
+import { route } from 'ziggy-js'
 
 defineProps<{
   errors: Record<string, string>
@@ -11,7 +11,7 @@ defineProps<{
 const form = useForm({ email: '' })
 
 function submit() {
-  form.post(route('password.email'));
+  form.post(route('password.email'))
 }
 </script>
 
diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 42efd86f..40772b59 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -7,7 +7,7 @@ import {computed} from 'vue'
 import dayjs from 'dayjs'
 import FormButton from '@/components/Common/FormButton.vue'
 import Divider from '@/components/Common/Divider.vue'
-import { route } from "ziggy-js";
+import { route } from 'ziggy-js'
 
 const props = defineProps<{
   submissions: QuizSubmission[]
diff --git a/resources/js/Pages/User/Edit.vue b/resources/js/Pages/User/Edit.vue
index 264a7e76..deb9f147 100644
--- a/resources/js/Pages/User/Edit.vue
+++ b/resources/js/Pages/User/Edit.vue
@@ -4,7 +4,7 @@ import { useForm } from '@inertiajs/vue3'
 import { defineProps } from 'vue'
 import { type User } from '@/Types/User'
 import { type School } from '@/Types/School'
-import { route } from "ziggy-js";
+import { route } from 'ziggy-js'
 
 const props = defineProps<{
   user: User
diff --git a/resources/js/Pages/User/ResetPassword.vue b/resources/js/Pages/User/ResetPassword.vue
index 5abb5ca5..320e02bc 100644
--- a/resources/js/Pages/User/ResetPassword.vue
+++ b/resources/js/Pages/User/ResetPassword.vue
@@ -2,7 +2,7 @@
 import { useForm } from '@inertiajs/vue3'
 import { Head } from '@inertiajs/vue3'
 import CustomInput from '@/components/Common/CustomInput.vue'
-import { route } from "ziggy-js";
+import { route } from 'ziggy-js'
 
 const props = defineProps<{
   token: string
diff --git a/resources/js/components/Profile/PasswordUpdateSection.vue b/resources/js/components/Profile/PasswordUpdateSection.vue
index 1764cec6..7bbf246e 100644
--- a/resources/js/components/Profile/PasswordUpdateSection.vue
+++ b/resources/js/components/Profile/PasswordUpdateSection.vue
@@ -2,7 +2,7 @@
 
 import CustomInput from '@/components/Common/CustomInput.vue'
 import {useForm} from '@inertiajs/vue3'
-import { route } from "ziggy-js";
+import { route } from 'ziggy-js'
 
 defineProps< { errors: Record<string, string> }>()
 

From 98bec999c7fbb735d56875db0162427b8a86b75f Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 09:53:51 +0200
Subject: [PATCH 40/60] change FormButton to LinkButton

---
 resources/js/Pages/User/Dashboard.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 40772b59..04e3337e 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -8,6 +8,7 @@ import dayjs from 'dayjs'
 import FormButton from '@/components/Common/FormButton.vue'
 import Divider from '@/components/Common/Divider.vue'
 import { route } from 'ziggy-js'
+import LinkButton from "@/components/Common/LinkButton.vue";
 
 const props = defineProps<{
   submissions: QuizSubmission[]
@@ -68,9 +69,9 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ submission.name }}</p>
         <p class="text-xs py-1">{{ dayjs(submission.closedAt).fromNow() }}</p>
       </div>
-      <FormButton class="min-w-24 text-center" small method="get" :href="route('submissions.result', submission.id)" :options="{ preserveScroll: true }">
+      <LinkButton class="min-w-24 text-center" small :href="route('submissions.result', submission.id)">
         Wyniki
-      </FormButton>
+      </LinkButton>
     </div>
   </div>
 </template>

From 4189d07cf7a2003e787185892a9bcc95bba4284b Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 09:56:29 +0200
Subject: [PATCH 41/60] fix code style

---
 resources/js/Pages/User/Dashboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 04e3337e..71a5fcfa 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -8,7 +8,7 @@ import dayjs from 'dayjs'
 import FormButton from '@/components/Common/FormButton.vue'
 import Divider from '@/components/Common/Divider.vue'
 import { route } from 'ziggy-js'
-import LinkButton from "@/components/Common/LinkButton.vue";
+import LinkButton from '@/components/Common/LinkButton.vue'
 
 const props = defineProps<{
   submissions: QuizSubmission[]

From c26d1437bb8ef5c0ff35e0a7a1463cfc2bb47944 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 10:24:56 +0200
Subject: [PATCH 42/60] add route parameter

---
 resources/js/Pages/User/Dashboard.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 71a5fcfa..0a5ac8dc 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -49,10 +49,11 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.name }}</p>
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
-      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="route('quizzes.assign', quiz.id)" :options="{ preserveScroll: true }">
+
+      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="route('quizzes.assign', quiz.id )" :options="{ preserveScroll: true }">
         Zapisz się
       </FormButton>
-      <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="route('quizzes.assign')">
+      <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="route('quizzes.assign', quiz.id)">
         Zapisano
       </FormButton>
     </div>

From 0f280ba4a6a82857afabb1b6bd5e93e110fb0154 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 10:39:07 +0200
Subject: [PATCH 43/60] fix code style

---
 app/Models/Quiz.php         | 2 +-
 app/Policies/QuizPolicy.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php
index f5c97b9b..ee90cd3f 100644
--- a/app/Models/Quiz.php
+++ b/app/Models/Quiz.php
@@ -90,7 +90,7 @@ public function isUserAssigned(User $user): bool
     {
         return $this->assignedUsers->contains($user);
     }
-    
+
     public function isRankingPublished(): Attribute
     {
         return Attribute::get(fn(): bool => $this->ranking_published_at !== null);
diff --git a/app/Policies/QuizPolicy.php b/app/Policies/QuizPolicy.php
index fbb815d9..7f19fe9d 100644
--- a/app/Policies/QuizPolicy.php
+++ b/app/Policies/QuizPolicy.php
@@ -44,7 +44,7 @@ public function assign(User $user, Quiz $quiz): bool
     {
         return $quiz->isLocked && !$quiz->isPublished && !$quiz->hasSubmissionsFrom($user);
     }
-    
+
     public function viewAdminRanking(User $user, Quiz $quiz): Response
     {
         return ($quiz->isLocked && $user->hasRole("admin|super_admin")) ? Response::allow() : Response::deny("Nie masz uprawnień do zobaczenia rankingu.");

From ebd95e73b9e75e99e6d450f1fb29cc768178e755 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 12:11:12 +0200
Subject: [PATCH 44/60] implement backend for viewing quiz result

---
 .../Controllers/QuizSubmissionController.php  | 10 ++++
 app/Http/Resources/AnswerRecordResource.php   | 43 +++++++++----
 app/Policies/QuizSubmissionPolicy.php         |  5 ++
 resources/js/Pages/User/QuizViewer.vue        |  3 +
 tests/Feature/QuizSubmissionTest.php          | 60 ++++++++++++++++++-
 5 files changed, 108 insertions(+), 13 deletions(-)
 create mode 100644 resources/js/Pages/User/QuizViewer.vue

diff --git a/app/Http/Controllers/QuizSubmissionController.php b/app/Http/Controllers/QuizSubmissionController.php
index 43b70a1b..3378cf79 100644
--- a/app/Http/Controllers/QuizSubmissionController.php
+++ b/app/Http/Controllers/QuizSubmissionController.php
@@ -17,4 +17,14 @@ public function show(QuizSubmission $quizSubmission): Response
 
         return Inertia::render("User/Quiz", ["submission" => QuizSubmissionResource::make($quizSubmission)]);
     }
+
+    public function result(QuizSubmission $quizSubmission): Response
+    {
+        $quizSubmission->load(["answerRecords.question.answers", "quiz"]);
+
+        return Inertia::render("User/QuizResult", [
+            "submission" => QuizSubmissionResource::make($quizSubmission),
+            "hasRanking" => $quizSubmission->quiz->isRankingPublished,
+        ]);
+    }
 }
diff --git a/app/Http/Resources/AnswerRecordResource.php b/app/Http/Resources/AnswerRecordResource.php
index 8134b435..720c18f2 100644
--- a/app/Http/Resources/AnswerRecordResource.php
+++ b/app/Http/Resources/AnswerRecordResource.php
@@ -4,30 +4,53 @@
 
 namespace App\Http\Resources;
 
+use App\Models\Answer;
+use App\Models\Question;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Collection;
 
 class AnswerRecordResource extends JsonResource
 {
     public function toArray(Request $request): array
     {
-        $answers = collect();
-
-        foreach ($this->question->answers as $answer) {
-            $answers->add([
-                "id" => $answer->id,
-                "text" => $answer->text,
-            ]);
-        }
-
         return [
             "id" => $this->id,
             "question" => $this->question->text,
             "createdAt" => $this->created_at,
             "updatedAt" => $this->updated_at,
             "closed" => $this->isClosed,
-            "answers" => $answers->shuffle(),
             "selected" => $this->answer_id,
+            "answers" => $this->questionAnswersToArray($this->question)->shuffle(),
+        ];
+    }
+
+    /**
+     * @return Collection<array>
+     */
+    protected function questionAnswersToArray(Question $question): Collection
+    {
+        if ($question->quiz->isRankingPublished) {
+            return $question->answers->map(fn(Answer $answer) => $this->getFullAnswer($answer))->collect();
+        }
+
+        return $question->answers->map(fn(Answer $answer) => $this->getMinimalAnswer($answer))->collect();
+    }
+
+    protected function getFullAnswer(Answer $answer): array
+    {
+        return [
+            "id" => $answer->id,
+            "text" => $answer->text,
+            "correct" => $answer->isCorrect,
+        ];
+    }
+
+    protected function getMinimalAnswer(Answer $answer): array
+    {
+        return [
+            "id" => $answer->id,
+            "text" => $answer->text,
         ];
     }
 }
diff --git a/app/Policies/QuizSubmissionPolicy.php b/app/Policies/QuizSubmissionPolicy.php
index 0fbe652d..29d48567 100644
--- a/app/Policies/QuizSubmissionPolicy.php
+++ b/app/Policies/QuizSubmissionPolicy.php
@@ -13,4 +13,9 @@ public function view(User $user, QuizSubmission $quizSubmission): bool
     {
         return $user->id === $quizSubmission->user_id;
     }
+
+    public function result(User $user, QuizSubmission $quizSubmission): bool
+    {
+        return $user->id === $quizSubmission->user_id && $quizSubmission->isClosed;
+    }
 }
diff --git a/resources/js/Pages/User/QuizViewer.vue b/resources/js/Pages/User/QuizViewer.vue
new file mode 100644
index 00000000..d6382d9a
--- /dev/null
+++ b/resources/js/Pages/User/QuizViewer.vue
@@ -0,0 +1,3 @@
+<template>
+  Quiz Result
+</template>
diff --git a/tests/Feature/QuizSubmissionTest.php b/tests/Feature/QuizSubmissionTest.php
index b0c7d3eb..47547e59 100644
--- a/tests/Feature/QuizSubmissionTest.php
+++ b/tests/Feature/QuizSubmissionTest.php
@@ -30,8 +30,13 @@ public function testUserCanViewSingleSubmission(): void
     {
         $quiz = Quiz::factory()->create();
         $questions = Question::factory()->count(2)->create(["quiz_id" => $quiz->id]);
-        Answer::factory()->count(4)->create(["question_id" => $questions[0]->id]);
-        Answer::factory()->count(4)->create(["question_id" => $questions[1]->id]);
+
+        foreach ($questions as $question) {
+            $answers = Answer::factory()->count(4)->create(["question_id" => $question->id]);
+            $question->correctAnswer()->associate($answers[2]);
+            $question->save();
+        }
+
         $submission = $quiz->createSubmission($this->user);
 
         $this->assertDatabaseCount("quizzes", 1);
@@ -48,7 +53,9 @@ public function testUserCanViewSingleSubmission(): void
                     ->where("submission.name", $quiz->name)
                     ->count("submission.answers", 2)
                     ->count("submission.answers.0.answers", 4)
-                    ->count("submission.answers.1.answers", 4),
+                    ->missing("submission.answers.0.answers.2.correct")
+                    ->count("submission.answers.1.answers", 4)
+                    ->missing("submission.answers.1.answers.2.correct"),
             );
     }
 
@@ -60,4 +67,51 @@ public function testUserCannotViewSubmissionThatIsNotHis(): void
             ->get("/submissions/{$submission->id}")
             ->assertStatus(403);
     }
+
+    public function testUserCanSeeSubmissionResult(): void
+    {
+        $quiz = Quiz::factory()->create();
+        $quiz->ranking_published_at = Carbon::now();
+        $quiz->save();
+
+        Question::factory()->count(2)->create(["quiz_id" => $quiz->id]);
+        $submission = $quiz->createSubmission($this->user);
+        $submission->closed_at = Carbon::now();
+        $submission->save();
+
+        $this->actingAs($this->user)
+            ->get("/submissions/{$submission->id}/result")
+            ->assertInertia(
+                fn(Assert $page) => $page
+                    ->component("User/QuizResult")
+                    ->where("submission.name", $quiz->name)
+                    ->count("submission.answers", 2)
+                    ->where("hasRanking", true),
+            );
+    }
+
+    public function testUserCannotSeeSubmissionResultThatNotExisted(): void
+    {
+        $this->actingAs($this->user)
+            ->get("/submissions/0/result")
+            ->assertStatus(404);
+    }
+
+    public function testUserCannotSeeSubmissionResultThatIsNotHis(): void
+    {
+        $submission = QuizSubmission::factory()->closed()->create();
+
+        $this->actingAs($this->user)
+            ->get("/submissions/{$submission->id}/result")
+            ->assertStatus(403);
+    }
+
+    public function testUserCannotSeeSubmissionResultThatIsNotClosed(): void
+    {
+        $submission = QuizSubmission::factory()->create(["user_id" => $this->user->id]);
+
+        $this->actingAs($this->user)
+            ->get("/submissions/{$submission->id}/result")
+            ->assertStatus(403);
+    }
 }

From 196a78497097bfffdc2e3cd5db048fa01450d5d9 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 12:14:48 +0200
Subject: [PATCH 45/60] fix tests

---
 routes/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index 8d924171..f95c6109 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -94,7 +94,7 @@
     });
 });
 
-Route::middleware(["auth"])->group(function (): void {
+Route::middleware(["auth", "verified"])->group(function (): void {
     Route::post("/quizzes/{quiz}/assign", [QuizController::class, "assign"])->can("assign,quiz")->name("quizzes.assign");
     Route::post("/quizzes/{quiz}/start", [QuizController::class, "createSubmission"])->middleware(EnsureQuizIsNotAlreadyStarted::class)->can("submit,quiz")->name("quizzes.start");
     Route::get("/submissions/{quizSubmission}/", [QuizSubmissionController::class, "show"])->can("view,quizSubmission")->name("submissions.show");

From 3364f2b67586e8e940567ac365e3f266e19c3378 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 12:18:51 +0200
Subject: [PATCH 46/60] import carbon

---
 tests/Feature/QuizSubmissionTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Feature/QuizSubmissionTest.php b/tests/Feature/QuizSubmissionTest.php
index 47547e59..b1e4b2d8 100644
--- a/tests/Feature/QuizSubmissionTest.php
+++ b/tests/Feature/QuizSubmissionTest.php
@@ -9,6 +9,7 @@
 use App\Models\Quiz;
 use App\Models\QuizSubmission;
 use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Inertia\Testing\AssertableInertia as Assert;
 use Tests\TestCase;

From 985ab0c678935fd998522a5f530171d60c6bbbcc Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 12:25:42 +0200
Subject: [PATCH 47/60] rename page

---
 resources/js/Pages/User/{QuizViewer.vue => QuizResult.vue} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename resources/js/Pages/User/{QuizViewer.vue => QuizResult.vue} (100%)

diff --git a/resources/js/Pages/User/QuizViewer.vue b/resources/js/Pages/User/QuizResult.vue
similarity index 100%
rename from resources/js/Pages/User/QuizViewer.vue
rename to resources/js/Pages/User/QuizResult.vue

From 07b2160ee70bc063781d09e9322d99dd861463f1 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 13:43:27 +0200
Subject: [PATCH 48/60] change default timezone

---
 config/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/app.php b/config/app.php
index 03e49b77..4f0c052e 100644
--- a/config/app.php
+++ b/config/app.php
@@ -7,7 +7,7 @@
     "env" => env("APP_ENV", "production"),
     "debug" => (bool)env("APP_DEBUG", false),
     "url" => env("APP_URL", "http://localhost"),
-    "timezone" => env("APP_TIMEZONE", "UTC"),
+    "timezone" => env("APP_TIMEZONE", "Europe/Warsaw"),
     "locale" => env("APP_LOCALE", "pl"),
     "fallback_locale" => env("APP_FALLBACK_LOCALE", "pl"),
     "faker_locale" => env("APP_FAKER_LOCALE", "en_US"),

From c76e8d6c246db316b0f539c3041a5f178400d2f0 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 14:10:20 +0200
Subject: [PATCH 49/60] fix tests

---
 tests/Feature/AdminTest.php |  5 +++--
 tests/Feature/UserTest.php  | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php
index d898260c..efd6f632 100644
--- a/tests/Feature/AdminTest.php
+++ b/tests/Feature/AdminTest.php
@@ -164,7 +164,6 @@ public function testAdminCannotEditAdmin(): void
     {
         $school = School::factory()->create();
         $admin = User::factory()->admin()->create(["school_id" => $school->id]);
-        $adminData = $admin->toArray();
 
         $this->actingAs($this->admin)
             ->from("/admin/admins/{$admin->id}/edit")
@@ -176,7 +175,9 @@ public function testAdminCannotEditAdmin(): void
             ])
             ->assertForbidden();
 
-        $this->assertDatabaseHas("users", $adminData);
+        $this->assertDatabaseMissing("users", [
+            "name" => "New Name",
+        ]);
     }
 
     public function testSuperAdminCannotEditAdminWithInvalidData(): void
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index fab5c16b..f5be41fd 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -281,8 +281,6 @@ public function testAdminAndSuperAdminCannotEditAnonymizedUser(): void
             "is_anonymized" => true,
         ]);
 
-        $anonymizeUserData = $user->toArray();
-
         $this->actingAs($this->admin)
             ->from("/admin/users/{$user->id}")
             ->patch("/admin/users/{$user->id}", [
@@ -293,7 +291,9 @@ public function testAdminAndSuperAdminCannotEditAnonymizedUser(): void
             ])
             ->assertForbidden();
 
-        $this->assertDatabaseHas("users", $anonymizeUserData);
+        $this->assertDatabaseMissing("users", [
+            "name" => "New Name",
+        ]);
 
         $this->actingAs($this->superAdmin)
             ->from("/admin/users/{$user->id}")
@@ -305,7 +305,9 @@ public function testAdminAndSuperAdminCannotEditAnonymizedUser(): void
             ])
             ->assertForbidden();
 
-        $this->assertDatabaseHas("users", $anonymizeUserData);
+        $this->assertDatabaseMissing("users", [
+            "name" => "New Name",
+        ]);
     }
 
     public function testSuperAdminCannotAnonymizeAdmin(): void

From 2a5ba297012183adea5a540fc0061e6db47f58cf Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 14:11:32 +0200
Subject: [PATCH 50/60] rename Verify-Email to VerifyEmail

---
 app/Http/Controllers/EmailVerifyController.php                | 2 +-
 resources/js/Pages/Auth/{Verify-Email.vue => VerifyEmail.vue} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename resources/js/Pages/Auth/{Verify-Email.vue => VerifyEmail.vue} (100%)

diff --git a/app/Http/Controllers/EmailVerifyController.php b/app/Http/Controllers/EmailVerifyController.php
index 5af0a49d..863460ff 100644
--- a/app/Http/Controllers/EmailVerifyController.php
+++ b/app/Http/Controllers/EmailVerifyController.php
@@ -22,7 +22,7 @@ public function __invoke(EmailVerificationRequest $request): RedirectResponse
 
     public function create(): Response
     {
-        return Inertia::render("Auth/Verify-Email");
+        return Inertia::render("Auth/VerifyEmail");
     }
 
     public function send(Request $request): RedirectResponse
diff --git a/resources/js/Pages/Auth/Verify-Email.vue b/resources/js/Pages/Auth/VerifyEmail.vue
similarity index 100%
rename from resources/js/Pages/Auth/Verify-Email.vue
rename to resources/js/Pages/Auth/VerifyEmail.vue

From 02f6de3d6c3d240149a791a7bb40259a28df6f62 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 14:26:55 +0200
Subject: [PATCH 51/60] remove ziggy

---
 resources/js/Layouts/AdminLayout.vue                     | 9 ++++-----
 resources/js/Layouts/UserLayout.vue                      | 5 ++---
 resources/js/Pages/Auth/VerifyEmail.vue                  | 5 ++---
 resources/js/Pages/Guest/ForgotPassword.vue              | 4 +---
 resources/js/Pages/User/Dashboard.vue                    | 9 ++++-----
 resources/js/Pages/User/Edit.vue                         | 4 +---
 resources/js/Pages/User/ResetPassword.vue                | 4 +---
 .../js/components/Profile/PasswordUpdateSection.vue      | 3 +--
 resources/views/app.blade.php                            | 1 -
 9 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/resources/js/Layouts/AdminLayout.vue b/resources/js/Layouts/AdminLayout.vue
index db9a0c92..c4550ae6 100644
--- a/resources/js/Layouts/AdminLayout.vue
+++ b/resources/js/Layouts/AdminLayout.vue
@@ -3,18 +3,17 @@
 import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
 import {type PageProps} from '@/Types/PageProps'
-import { route } from 'ziggy-js'
 
 const props = defineProps<PageProps>()
 
 const pages: Page[] = [
-  { title: 'Testy', href: route('admin.quizzes.index') },
-  { title: 'Szkoły', href: route('admin.schools.index') },
-  { title: 'Uczniowie', href: route('admin.users.index') },
+  { title: 'Testy', href: '/admin/quizzes' },
+  { title: 'Szkoły', href: '/admin/schools' },
+  { title: 'Uczniowie', href: '/admin/users' },
 ]
 
 if (props.user?.isSuperAdmin) {
-  pages.push({ title: 'Administratorzy', href: route('admin.admins.index')})
+  pages.push({ title: 'Administratorzy', href: '/admin/admins'})
 }
 </script>
 
diff --git a/resources/js/Layouts/UserLayout.vue b/resources/js/Layouts/UserLayout.vue
index 235721c5..eda3fd5c 100644
--- a/resources/js/Layouts/UserLayout.vue
+++ b/resources/js/Layouts/UserLayout.vue
@@ -3,13 +3,12 @@
 import type {Page} from '@/Types/Page'
 import BaseLayout from '@/Layouts/BaseLayout.vue'
 import type {PageProps} from '@/Types/PageProps'
-import { route } from 'ziggy-js'
 
 defineProps<PageProps>()
 
 const pages: Page[] = [
-  { title: 'Konkursy', href: route('dashboard') },
-  { title: 'Profil', href: route('profile') },
+  { title: 'Konkursy', href: '/dashboard' },
+  { title: 'Profil', href: '/profile' },
 ]
 </script>
 
diff --git a/resources/js/Pages/Auth/VerifyEmail.vue b/resources/js/Pages/Auth/VerifyEmail.vue
index 8917aa8a..b765a911 100644
--- a/resources/js/Pages/Auth/VerifyEmail.vue
+++ b/resources/js/Pages/Auth/VerifyEmail.vue
@@ -1,16 +1,15 @@
 <script setup lang="ts">
 
 import {useForm} from '@inertiajs/vue3'
-import { route } from 'ziggy-js'
 
 const form = useForm({})
 
 function logout() {
-  form.post( route('logout'))
+  form.post('/auth/logout')
 }
 
 function sent() {
-  form.post(route('verification.send'))
+  form.post('/email/verification-notification')
 }
 
 </script>
diff --git a/resources/js/Pages/Guest/ForgotPassword.vue b/resources/js/Pages/Guest/ForgotPassword.vue
index 060fee04..3a0ea926 100644
--- a/resources/js/Pages/Guest/ForgotPassword.vue
+++ b/resources/js/Pages/Guest/ForgotPassword.vue
@@ -2,7 +2,6 @@
 import { useForm } from '@inertiajs/vue3'
 import CustomInput from '@/components/Common/CustomInput.vue'
 import { Head } from '@inertiajs/vue3'
-import { route } from 'ziggy-js'
 
 defineProps<{
   errors: Record<string, string>
@@ -11,8 +10,7 @@ defineProps<{
 const form = useForm({ email: '' })
 
 function submit() {
-  form.post(route('password.email'))
-}
+  form.post('/auth/forgot-password')}
 </script>
 
 <template>
diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 0a5ac8dc..f89541da 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -7,7 +7,6 @@ import {computed} from 'vue'
 import dayjs from 'dayjs'
 import FormButton from '@/components/Common/FormButton.vue'
 import Divider from '@/components/Common/Divider.vue'
-import { route } from 'ziggy-js'
 import LinkButton from '@/components/Common/LinkButton.vue'
 
 const props = defineProps<{
@@ -36,7 +35,7 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.name }}</p>
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
-      <FormButton class="min-w-24 text-center" small method="post" :href="route('quizzes.start', quiz.id)" :options="{ preserveScroll: true }">
+      <FormButton class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/start`" :options="{ preserveScroll: true }">
         Weź udział
       </FormButton>
     </div>
@@ -50,10 +49,10 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
 
-      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="route('quizzes.assign', quiz.id )" :options="{ preserveScroll: true }">
+      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/assign`" :options="{ preserveScroll: true }">
         Zapisz się
       </FormButton>
-      <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="route('quizzes.assign', quiz.id)">
+      <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="`/quizzes/${quiz.id}/assign`">
         Zapisano
       </FormButton>
     </div>
@@ -70,7 +69,7 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ submission.name }}</p>
         <p class="text-xs py-1">{{ dayjs(submission.closedAt).fromNow() }}</p>
       </div>
-      <LinkButton class="min-w-24 text-center" small :href="route('submissions.result', submission.id)">
+      <LinkButton class="min-w-24 text-center" small :href="`/quizzes/${submission.id}/result`">
         Wyniki
       </LinkButton>
     </div>
diff --git a/resources/js/Pages/User/Edit.vue b/resources/js/Pages/User/Edit.vue
index deb9f147..fb8d6836 100644
--- a/resources/js/Pages/User/Edit.vue
+++ b/resources/js/Pages/User/Edit.vue
@@ -4,7 +4,6 @@ import { useForm } from '@inertiajs/vue3'
 import { defineProps } from 'vue'
 import { type User } from '@/Types/User'
 import { type School } from '@/Types/School'
-import { route } from 'ziggy-js'
 
 const props = defineProps<{
   user: User
@@ -19,8 +18,7 @@ const form = useForm({
 })
 
 function update() {
-  form.patch(route('admin.users.update', props.user.id))
-}
+  form.patch(`/admin/users/${props.user.id}`)}
 </script>
 
 <template>
diff --git a/resources/js/Pages/User/ResetPassword.vue b/resources/js/Pages/User/ResetPassword.vue
index 320e02bc..b5837675 100644
--- a/resources/js/Pages/User/ResetPassword.vue
+++ b/resources/js/Pages/User/ResetPassword.vue
@@ -2,7 +2,6 @@
 import { useForm } from '@inertiajs/vue3'
 import { Head } from '@inertiajs/vue3'
 import CustomInput from '@/components/Common/CustomInput.vue'
-import { route } from 'ziggy-js'
 
 const props = defineProps<{
   token: string
@@ -17,8 +16,7 @@ const form = useForm({
 })
 
 function submit() {
-  form.post(route('password.update'))
-}
+  form.post('/auth/password/reset')}
 </script>
 
 <template>
diff --git a/resources/js/components/Profile/PasswordUpdateSection.vue b/resources/js/components/Profile/PasswordUpdateSection.vue
index 7bbf246e..11c4a824 100644
--- a/resources/js/components/Profile/PasswordUpdateSection.vue
+++ b/resources/js/components/Profile/PasswordUpdateSection.vue
@@ -2,7 +2,6 @@
 
 import CustomInput from '@/components/Common/CustomInput.vue'
 import {useForm} from '@inertiajs/vue3'
-import { route } from 'ziggy-js'
 
 defineProps< { errors: Record<string, string> }>()
 
@@ -13,7 +12,7 @@ const form = useForm({
 })
 
 function updatePassword() {
-  form.patch(route('profile.password.update'), {
+  form.patch('/profile/password', {
     preserveScroll: true,
     onSuccess: () => {
       form.reset()
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index c2fe33f4..533e1d57 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -9,6 +9,5 @@
 </head>
 <body>
 @inertia
-@routes
 </body>
 </html>

From d11c8a635f9472f32659ffc3bf5f26dfb70e8859 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 14:57:07 +0200
Subject: [PATCH 52/60] import watch

---
 resources/js/Pages/Home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/Home.vue b/resources/js/Pages/Home.vue
index 8904559d..f853ae00 100644
--- a/resources/js/Pages/Home.vue
+++ b/resources/js/Pages/Home.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 
-import { ref, provide } from 'vue'
+import {ref, provide, watch} from 'vue'
 import Footer from '@/components/Common/Footer.vue'
 import AuthBanner from '@/components/Home/AuthBanner.vue'
 import GeneralSection from '@/components/Home/GeneralSection.vue'

From fd7b4515445802856de5097a9d3513d5b80e2415 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Thu, 5 Sep 2024 15:47:59 +0200
Subject: [PATCH 53/60] fix result route url

---
 resources/js/Pages/User/Dashboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index f89541da..23239497 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -69,7 +69,7 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ submission.name }}</p>
         <p class="text-xs py-1">{{ dayjs(submission.closedAt).fromNow() }}</p>
       </div>
-      <LinkButton class="min-w-24 text-center" small :href="`/quizzes/${submission.id}/result`">
+      <LinkButton class="min-w-24 text-center" small :href="`/submissions/${submission.id}/result`">
         Wyniki
       </LinkButton>
     </div>

From 6554ac8ae003fc3d3e35fb893fd07cb13d2bad94 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 6 Sep 2024 09:57:01 +0200
Subject: [PATCH 54/60] fix seeder

---
 database/seeders/AdminSeeder.php    |  5 -----
 database/seeders/DatabaseSeeder.php | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/database/seeders/AdminSeeder.php b/database/seeders/AdminSeeder.php
index 70016d5b..14d0b7da 100644
--- a/database/seeders/AdminSeeder.php
+++ b/database/seeders/AdminSeeder.php
@@ -55,10 +55,5 @@ public function run(): void
             ],
         );
         $user->syncRoles("user");
-
-        Quiz::factory()->count(3)->locked()->create();
-        Quiz::factory()->count(2)->locked()->create(["scheduled_at" => Carbon::now()->subMinutes(30)->timestamp]);
-        QuizSubmission::factory()->count(2)->create(["user_id" => $user->id]);
-        QuizSubmission::factory()->count(2)->closed()->create(["user_id" => $user->id]);
     }
 }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index cf956f95..40b638ca 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -5,8 +5,9 @@
 namespace Database\Seeders;
 
 use App\Models\Answer;
-use App\Models\AnswerRecord;
+use App\Models\Question;
 use App\Models\Quiz;
+use Carbon\Carbon;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
@@ -19,8 +20,16 @@ public function run(): void
             UserSeeder::class,
             UserQuizSeeder::class,
         ]);
-        Quiz::factory()->create();
-        Answer::factory()->create();
-        AnswerRecord::factory()->create();
+
+        Quiz::factory()->locked()->count(5)->create(["scheduled_at" => Carbon::now()->addMonth()]);
+
+        $quiz = Quiz::factory()->locked()->create(["name" => "Test Quiz", "scheduled_at" => Carbon::now(), "duration" => 2]);
+        $questions = Question::factory()->count(10)->create(["quiz_id" => $quiz->id]);
+
+        foreach ($questions as $question) {
+            $answers = Answer::factory()->count(4)->create(["question_id" => $question->id]);
+            $question->correct_answer_id = $answers[0]->id;
+            $question->save();
+        }
     }
 }

From 874b1e28670264d165c3a350284bf4cf727a2c83 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 6 Sep 2024 09:57:18 +0200
Subject: [PATCH 55/60] fix code style

---
 database/seeders/AdminSeeder.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/database/seeders/AdminSeeder.php b/database/seeders/AdminSeeder.php
index 14d0b7da..a25b562f 100644
--- a/database/seeders/AdminSeeder.php
+++ b/database/seeders/AdminSeeder.php
@@ -4,8 +4,6 @@
 
 namespace Database\Seeders;
 
-use App\Models\Quiz;
-use App\Models\QuizSubmission;
 use App\Models\School;
 use App\Models\User;
 use Carbon\Carbon;

From 80b37b1d6932edd78a1d38fd09fb28fa73d93e59 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 6 Sep 2024 10:38:38 +0200
Subject: [PATCH 56/60] Migrate button from useForm to router

---
 resources/js/Pages/User/Dashboard.vue         |  5 ++--
 resources/js/components/Common/FormButton.vue | 26 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 23239497..9790fd26 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -35,7 +35,7 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.name }}</p>
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
-      <FormButton class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/start`" :options="{ preserveScroll: true }">
+      <FormButton class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/start`" preserve-scroll>
         Weź udział
       </FormButton>
     </div>
@@ -49,9 +49,10 @@ const history = computed(() => props.submissions.filter(submission => submission
         <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
       </div>
 
-      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/assign`" :options="{ preserveScroll: true }">
+      <FormButton v-if="!quiz.isUserAssigned" class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/assign`" preserve-scroll>
         Zapisz się
       </FormButton>
+
       <FormButton v-else class="min-w-24 text-center" disabled small method="post" :href="`/quizzes/${quiz.id}/assign`">
         Zapisano
       </FormButton>
diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
index 78965063..de96dc30 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 
-import { useForm } from '@inertiajs/vue3'
+import { router } from '@inertiajs/vue3'
+import {ref} from 'vue'
 
-const form = useForm({})
 const props = withDefaults(defineProps<{
   small?: boolean
   disabled?: boolean
@@ -10,18 +10,32 @@ const props = withDefaults(defineProps<{
   class?: string
   href: string
   method?: 'post' | 'get' | 'put' | 'patch' | 'delete'
-  options?: any
-}>(), { method: 'get', class: '', options: {}})
+  data?: any
+  preserveState?: boolean
+  preserveScroll?: boolean
+  only?: string[]
+}>(), { method: 'get', class: '', options: undefined, data: undefined, only: undefined })
+
+const processing = ref(false)
+const emit = defineEmits(['click', 'finish'])
 
 function handleSubmit() {
-  form[props.method](props.href, props.options)
+  processing.value = true
+  emit('click')
+
+  router[props.method](props.href, props.data, {
+    onSuccess: () => { processing.value = false; emit('finish')},
+    only: props.only,
+    preserveState: props.preserveState,
+    preserveScroll: props.preserveScroll,
+  })
 }
 </script>
 
 <template>
   <form :class="props.class" @submit.prevent="handleSubmit">
     <button
-      v-if="!disabled && !form.processing"
+      v-if="!disabled && !processing"
       type="submit"
       class="font-semibold transition-colors duration-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600"
       :class="`${small ? 'rounded-md text-xs 2xs:text-sm py-2' : 'rounded-lg py-3'} ${text ? 'text-black hover:text-primary-800 px-0 py-0' : 'px-2 2xs:px-3 bg-primary text-white hover:bg-primary-600 shadow-sm'} ${props.class}`"

From 80b327f33a189333a461ba4f77b92f5d50f72dea Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 6 Sep 2024 13:03:39 +0200
Subject: [PATCH 57/60] improve isClosed function

---
 resources/js/Pages/User/Dashboard.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 9790fd26..904b279b 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -14,7 +14,10 @@ const props = defineProps<{
   quizzes: Quiz[]
 }>()
 
-const isClosed = (quiz: Quiz) => dayjs(quiz.scheduledAt).add(quiz.duration ?? 0, 'm').isBefore(Date.now())
+const isClosed = (quiz: Quiz) => (
+  dayjs(quiz.scheduledAt).add(quiz.duration ?? 0, 'm').isBefore(Date.now()) ||
+    props.submissions.find(submission => submission.quiz === quiz.id)?.closed
+)
 
 const started = computed(() => props.quizzes.filter(quiz => quiz.state == 'published' && !isClosed(quiz)))
 const scheduled = computed(() => props.quizzes.filter(quiz => quiz.state == 'locked'))

From 1ebaafa7a5f399c0af0c0ea4c9bfe0c83fa77049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Purga=C5=82?= <amonsir29@gmail.com>
Date: Fri, 6 Sep 2024 13:53:25 +0200
Subject: [PATCH 58/60] Apply suggestions from code review

Co-authored-by: Aleksandra Kozubal <104600942+AleksandraKozubal@users.noreply.github.com>
---
 app/Http/Resources/AnswerRecordResource.php | 10 +++++-----
 app/Models/Quiz.php                         |  9 +++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/Http/Resources/AnswerRecordResource.php b/app/Http/Resources/AnswerRecordResource.php
index 720c18f2..aefbbb85 100644
--- a/app/Http/Resources/AnswerRecordResource.php
+++ b/app/Http/Resources/AnswerRecordResource.php
@@ -30,11 +30,11 @@ public function toArray(Request $request): array
      */
     protected function questionAnswersToArray(Question $question): Collection
     {
-        if ($question->quiz->isRankingPublished) {
-            return $question->answers->map(fn(Answer $answer) => $this->getFullAnswer($answer))->collect();
-        }
-
-        return $question->answers->map(fn(Answer $answer) => $this->getMinimalAnswer($answer))->collect();
+    return $question->answers->map(fn(Answer $answer) =>
+        $question->quiz->isRankingPublished
+            ? $this->getFullAnswer($answer)
+            : $this->getMinimalAnswer($answer)
+    )->collect();
     }
 
     protected function getFullAnswer(Answer $answer): array
diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php
index ee90cd3f..c50338e5 100644
--- a/app/Models/Quiz.php
+++ b/app/Models/Quiz.php
@@ -77,12 +77,9 @@ public function isPublished(): Attribute
 
     public function state(): Attribute
     {
-        return Attribute::get(function (): string {
-            if ($this->isPublished) {
-                return "published";
-            }
-
-            return $this->isLocked ? "locked" : "unlocked";
+    return Attribute::get(fn(): string =>
+        $this->isPublished ? "published" : ($this->isLocked ? "locked" : "unlocked")
+    );
         });
     }
 

From 8191eb192c4631045daed6386d89a3d95c0f663d Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 6 Sep 2024 13:55:32 +0200
Subject: [PATCH 59/60] fix code style

---
 app/Http/Resources/AnswerRecordResource.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Resources/AnswerRecordResource.php b/app/Http/Resources/AnswerRecordResource.php
index aefbbb85..ac666847 100644
--- a/app/Http/Resources/AnswerRecordResource.php
+++ b/app/Http/Resources/AnswerRecordResource.php
@@ -30,11 +30,11 @@ public function toArray(Request $request): array
      */
     protected function questionAnswersToArray(Question $question): Collection
     {
-    return $question->answers->map(fn(Answer $answer) =>
-        $question->quiz->isRankingPublished
-            ? $this->getFullAnswer($answer)
-            : $this->getMinimalAnswer($answer)
-    )->collect();
+        return $question->answers->map(
+            fn(Answer $answer) => $question->quiz->isRankingPublished
+                ? $this->getFullAnswer($answer)
+                : $this->getMinimalAnswer($answer),
+        )->collect();
     }
 
     protected function getFullAnswer(Answer $answer): array

From 0a7601a548a95dd9d1797608a7a236259a935138 Mon Sep 17 00:00:00 2001
From: AmonDeShir <amonsir29@gmail.com>
Date: Fri, 6 Sep 2024 13:57:54 +0200
Subject: [PATCH 60/60] fix code style

---
 app/Models/Quiz.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php
index c50338e5..9dbb65b0 100644
--- a/app/Models/Quiz.php
+++ b/app/Models/Quiz.php
@@ -77,10 +77,9 @@ public function isPublished(): Attribute
 
     public function state(): Attribute
     {
-    return Attribute::get(fn(): string =>
-        $this->isPublished ? "published" : ($this->isLocked ? "locked" : "unlocked")
-    );
-        });
+        return Attribute::get(
+            fn(): string => $this->isPublished ? "published" : ($this->isLocked ? "locked" : "unlocked"),
+        );
     }
 
     public function isUserAssigned(User $user): bool