From e1a1bedbca4daa9bceaa37ffd865345986ff95e7 Mon Sep 17 00:00:00 2001 From: Tepohe Date: Tue, 29 Oct 2024 19:52:07 +0100 Subject: [PATCH] Second squashed commit adding pr/62 commit 92a0b1e404b93ff3d590377e68e0a498539b8cff Author: Tepohe Date: Tue Oct 29 19:49:54 2024 +0100 Updated Membership schema commit b5dde204357240486b8acda2175a5476110ef446 Merge: 1b1e2db 34c3184 Author: Eric Svebakk <47322476+EricSvebakk@users.noreply.github.com> Date: Tue Oct 29 19:25:05 2024 +0100 Merge pull request #62 from yrjarv/membership-comment Fix prisma request for membership creation commit 34c3184fd2ad756bb1e3a02df2c347b325bc35f9 Author: Yrjar V Date: Mon Sep 30 09:04:48 2024 +0200 Fix prisma request for membership creation commit 1b1e2db9d97c8266e548516b003e49f9bb096681 Merge: cbe876a 6beb84d Author: Eric Svebakk <47322476+EricSvebakk@users.noreply.github.com> Date: Tue Oct 29 18:26:04 2024 +0100 Merge pull request #81 from Sebbben/betterUsabilityForCustomTableComponent Better usability for custom table component commit 6beb84d91953a7b080ec7c67d0e265d89c6bea08 Author: Sebbben Date: Fri Oct 25 10:40:23 2024 +0200 Implementet default filter parameters for customtable component commit cbe876a9553c82fc07d740edb5db998a1b0773a4 Merge: 8b529ef ac17a6e Author: Eric Svebakk <47322476+EricSvebakk@users.noreply.github.com> Date: Mon Oct 28 16:24:24 2024 +0100 Merge pull request #82 from Sebbben/moveBoardPage Move board page commit ac17a6e51d1159e50b2c21280f92243ec7de5c63 Author: Sebbben Date: Fri Oct 25 10:54:13 2024 +0200 moved pages/main/board/* to (pages)/(main)/board commit 8b529ef70214c7d3d66054181557f0594577a201 Author: Tepohe Date: Thu Oct 17 16:20:05 2024 +0200 Updated incorrect url-path commit 73999a883f499fe8ccf66bc8293f37a4d8f43fc4 Merge: f0bacbb 1861431 Author: Eric Svebakk Date: Thu Oct 17 16:11:36 2024 +0200 git push origin developmentMerge branch 'Sebbben-featureBetterRegisterFeedback' into development Handled merge-conflict for pr/64 commit 1861431483ec52ea0647b6cb912c27f54a7d767e Merge: f0bacbb cd922ac Author: Tepohe Date: Thu Oct 17 16:08:02 2024 +0200 Handled merge-conflict commit f0bacbbc3673170802017986d8216aba779c2f60 Merge: d26bd3f d198b94 Author: Eric Svebakk <47322476+EricSvebakk@users.noreply.github.com> Date: Thu Oct 17 15:46:05 2024 +0200 Merge pull request #75 from Borgarsy/feature-halloween-theme Temporary Halloween theme commit cd922ac9be0d937de54bcfd3a71cea81cab9c070 Author: Sebbben Date: Fri Oct 11 10:20:45 2024 +0200 made it so that pressing enter on signin and register page submits the forms commit 56dc5709ad033cc676d336540e5655d38e5a0095 Author: Sebbben Date: Fri Oct 11 10:16:44 2024 +0200 removed duplicate login button on successfull registration commit d26bd3fa6f650a486f19b18daffc2c7778b62529 Merge: 0f096c0 c019c46 Author: Eric Svebakk <47322476+EricSvebakk@users.noreply.github.com> Date: Thu Oct 10 16:54:40 2024 +0200 Merge pull request #67 from Sebbben/fixNoResultMembershipSearch Fix no result membership search commit c019c466036d5168b50a953036050c7a0ae62021 Author: Sebbben Date: Sat Oct 5 16:20:01 2024 +0200 Made tables turn to first page when the table content changes with a search commit 0f096c0f9a8d629f66f073f6fd612cd3e1715b44 Merge: a1ce2ec 4dfd6f8 Author: Tepohe Date: Thu Oct 10 14:42:19 2024 +0200 Merge branch 'main' into development commit d198b9492b623e7959c640f04dc8a7199c84da0c Author: Borgar Date: Tue Oct 8 15:01:29 2024 +0200 adds halloween theme. commit a1ce2ec14eb8bafd7a5d9e5a9ce939a97c734f11 Merge: 4f7d813 f06a472 Author: Tepohe Date: Tue Oct 8 13:53:44 2024 +0200 Merge branch 'pr/53' into development commit f06a472fb08cbcc9989a93f1f8ad6497f666eb46 Author: Sebbben Date: Mon Oct 7 16:47:03 2024 +0200 Fixed wrong path for nav bar home from pointing to /home to pointing to / commit a715facad10659dd7d7edc1ec45e6d6260fbd477 Author: Sebbben Date: Tue Oct 1 17:24:53 2024 +0200 added snackbar to singin page commit 6322071f60e41dc381c232f99c301017ba138342 Merge: 131cc76 ea38e61 Author: Sebbben Date: Tue Oct 1 17:08:07 2024 +0200 Merged features from featureBetterRegisterFeedback into changes made by pvk05's fixRegisterUserResponse commit 131cc76ce624229a1a2dc3d8c449367f6832fae2 Merge: 221a968 eb8b2f2 Author: Philip Knudsen <113419351+pvk05@users.noreply.github.com> Date: Tue Oct 1 16:32:52 2024 +0200 Merge branch 'cybernetisk:main' into fixRegisterUserResponse commit 221a968a368d5074d5d28f0610909321fb848da3 Author: pvk05 Date: Sat Sep 28 00:57:24 2024 +0200 moved register response to a snackbar for better visual feedback commit ea38e61f1bad4be9fc25b3f35d34acad48ddfa4e Author: Sebbben Date: Fri Sep 27 23:41:22 2024 +0200 added loading indicator to singin page as well commit 8a3d2de7c6304b6fa23dd3654866e056b0a95fdd Author: pvk05 Date: Fri Sep 27 23:14:48 2024 +0200 checks if email includes "@" before registering user commit 3f547cfd5af113371057a12bf598cde6a62850b7 Author: pvk05 Date: Fri Sep 27 22:44:11 2024 +0200 fixed response from sendMail function to send correct feedback when failing commit 0b33808f1dc512ba7bc27872ba1d69502eab7960 Author: Sebbben Date: Thu Sep 26 17:07:50 2024 +0200 visual queue when registering user commit 0d154f5ef967dd55f6453abf93dead2504e34a47 Author: Sebbben Date: Thu Sep 26 14:40:51 2024 +0200 Renamed some directories to take advantage of nexts routing for more usable url paths Co-Authored-By: Yrjar V --- app/(pages)/(main)/volunteering/membership/page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(pages)/(main)/volunteering/membership/page.js b/app/(pages)/(main)/volunteering/membership/page.js index 345954f..65c9e78 100644 --- a/app/(pages)/(main)/volunteering/membership/page.js +++ b/app/(pages)/(main)/volunteering/membership/page.js @@ -116,7 +116,7 @@ function MembershipPage() { data: { name: newMemberName, email: "", - comments: newMemberComment, + comment: newMemberComment, seller_id: session.data.user.id, semester_id: session.data.semester.id, },