Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix voucher response #89

Draft
wants to merge 26 commits into
base: development
Choose a base branch
from
Draft

Fix voucher response #89

wants to merge 26 commits into from

Conversation

pvk05
Copy link
Member

@pvk05 pvk05 commented Oct 31, 2024 •
edited
Loading

Fixes issue #78 and #39
Added a better feedback component to voucherLogInput and workLogInput. I used the same alert component as the login and signup pages.
I also found and fixed an issue where I could use more vouchers than I have, because it checks if you want to use more than you have earned and not more than you currently have.

yrjarv and others added 25 commits September 20, 2024 11:12
@yrjarv
Replace "Profile" with first section of user name
1948d7a 
Related to cybernetisk#42
We risk issues when name is long or if the user has multiple first names ("Per Ole Hansen" will be shown as "Per" and not "Per Ole")
@yrjarv
Allow width of LoginButton to be automatic
9cfb39e 
Remove hard width limit for the LoginButton text, allow the Grid containing LoginButton to shrink to the appropriate size for the length of the text inside LoginButton
@yrjarv
Enable shortening of first name in profile button
3ac806f
@EricSvebakk
Added force-graph logic
9056baf
@yrjarv
Reduce max first name length in profile button to 15
4e18084
@yrjarv
Reload page when user info is updated
216dbd2 
Awaits prismaRequest, then reloads the entire page. This 1) confirms to the user that something happened, and 2) updates AppBar to ensure the first name is always correct.
I could not get router.refresh() to work, so window.location.reload() is the best replacement I could find.
@yrjarv
Replace hyphens in first name with non-breaking hyphen
0b9a317
@EricSvebakk
Merge pull request cybernetisk#44 from yrjarv/main
cee4b41 
First name instead of 'Profile' in right corner of header
@yrjarv
Manually replaces "About CYB" with "About" on mobile
99e5190
@EricSvebakk
Audited mui version
2c516d4
@EricSvebakk
Update development.yml
15dc90b
@EricSvebakk
Merge branch 'feature-recruitment-graph' into development
0972970
@EricSvebakk
Merge branch 'development'
eb8b2f2
@EricSvebakk
Merge pull request cybernetisk#58 from yrjarv/shorter-about-mobile
4f7d813 
Manually replaces "About CYB" with "About" on mobile
@EricSvebakk
Merge branch 'development'
4dfd6f8
@EricSvebakk @Sebbben
Squashed commit adding pr/53
bcbc8d1 
commit 0f096c0
Merge: a1ce2ec 4dfd6f8
Author: Tepohe <[email protected]>
Date:   Thu Oct 10 14:42:19 2024 +0200

    Merge branch 'main' into development

commit a1ce2ec
Merge: 4f7d813 f06a472
Author: Tepohe <[email protected]>
Date:   Tue Oct 8 13:53:44 2024 +0200

    Merge branch 'pr/53' into development

commit f06a472
Author: Sebbben <[email protected]>
Date:   Mon Oct 7 16:47:03 2024 +0200

    Fixed wrong path for nav bar home from pointing to /home to pointing to /

commit 0d154f5
Author: Sebbben <[email protected]>
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: Sebbben <[email protected]>
@EricSvebakk @Sebbben
Squashed commit adding pr/67:
420e092 
commit d26bd3f
Merge: 0f096c0 c019c46
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 10 16:54:40 2024 +0200

    Merge pull request cybernetisk#67 from Sebbben/fixNoResultMembershipSearch

    Fix no result membership search

commit c019c46
Author: Sebbben <[email protected]>
Date:   Sat Oct 5 16:20:01 2024 +0200

    Made tables turn to first page when the table content changes with a search

commit 0f096c0
Merge: a1ce2ec 4dfd6f8
Author: Tepohe <[email protected]>
Date:   Thu Oct 10 14:42:19 2024 +0200

    Merge branch 'main' into development

commit a1ce2ec
Merge: 4f7d813 f06a472
Author: Tepohe <[email protected]>
Date:   Tue Oct 8 13:53:44 2024 +0200

    Merge branch 'pr/53' into development

commit f06a472
Author: Sebbben <[email protected]>
Date:   Mon Oct 7 16:47:03 2024 +0200

    Fixed wrong path for nav bar home from pointing to /home to pointing to /

commit 0d154f5
Author: Sebbben <[email protected]>
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: Sebbben <[email protected]>
@EricSvebakk @Borgarsy
Squashed commit adding pr/75
3a2cabc 
commit f0bacbb
Merge: d26bd3f d198b94
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 17 15:46:05 2024 +0200

    Merge pull request cybernetisk#75 from Borgarsy/feature-halloween-theme

    Temporary Halloween theme

commit d26bd3f
Merge: 0f096c0 c019c46
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 10 16:54:40 2024 +0200

    Merge pull request cybernetisk#67 from Sebbben/fixNoResultMembershipSearch

    Fix no result membership search

commit c019c46
Author: Sebbben <[email protected]>
Date:   Sat Oct 5 16:20:01 2024 +0200

    Made tables turn to first page when the table content changes with a search

commit 0f096c0
Merge: a1ce2ec 4dfd6f8
Author: Tepohe <[email protected]>
Date:   Thu Oct 10 14:42:19 2024 +0200

    Merge branch 'main' into development

commit d198b94
Author: Borgar <[email protected]>
Date:   Tue Oct 8 15:01:29 2024 +0200

    adds halloween theme.

commit a1ce2ec
Merge: 4f7d813 f06a472
Author: Tepohe <[email protected]>
Date:   Tue Oct 8 13:53:44 2024 +0200

    Merge branch 'pr/53' into development

commit f06a472
Author: Sebbben <[email protected]>
Date:   Mon Oct 7 16:47:03 2024 +0200

    Fixed wrong path for nav bar home from pointing to /home to pointing to /

commit 0d154f5
Author: Sebbben <[email protected]>
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: Borgarsy <[email protected]>
@EricSvebakk @pvk05 @Sebbben
Squashed commit adding pr/64
ebe4c43 
commit 8b529ef
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:20:05 2024 +0200

    Updated incorrect url-path

commit 73999a8
Merge: f0bacbb 1861431
Author: Eric Svebakk <[email protected]>
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 1861431
Merge: f0bacbb cd922ac
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:08:02 2024 +0200

    Handled merge-conflict

commit f0bacbb
Merge: d26bd3f d198b94
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 17 15:46:05 2024 +0200

    Merge pull request cybernetisk#75 from Borgarsy/feature-halloween-theme

    Temporary Halloween theme

commit cd922ac
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:20:45 2024 +0200

    made it so that pressing enter on signin and register page submits the forms

commit 56dc570
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:16:44 2024 +0200

    removed duplicate login button on successfull registration

commit d26bd3f
Merge: 0f096c0 c019c46
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 10 16:54:40 2024 +0200

    Merge pull request cybernetisk#67 from Sebbben/fixNoResultMembershipSearch

    Fix no result membership search

commit c019c46
Author: Sebbben <[email protected]>
Date:   Sat Oct 5 16:20:01 2024 +0200

    Made tables turn to first page when the table content changes with a search

commit 0f096c0
Merge: a1ce2ec 4dfd6f8
Author: Tepohe <[email protected]>
Date:   Thu Oct 10 14:42:19 2024 +0200

    Merge branch 'main' into development

commit d198b94
Author: Borgar <[email protected]>
Date:   Tue Oct 8 15:01:29 2024 +0200

    adds halloween theme.

commit a1ce2ec
Merge: 4f7d813 f06a472
Author: Tepohe <[email protected]>
Date:   Tue Oct 8 13:53:44 2024 +0200

    Merge branch 'pr/53' into development

commit f06a472
Author: Sebbben <[email protected]>
Date:   Mon Oct 7 16:47:03 2024 +0200

    Fixed wrong path for nav bar home from pointing to /home to pointing to /

commit a715fac
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:24:53 2024 +0200

    added snackbar to singin page

commit 6322071
Merge: 131cc76 ea38e61
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:08:07 2024 +0200

    Merged features from featureBetterRegisterFeedback into changes made by pvk05's fixRegisterUserResponse

commit 131cc76
Merge: 221a968 eb8b2f2
Author: Philip Knudsen <[email protected]>
Date:   Tue Oct 1 16:32:52 2024 +0200

    Merge branch 'cybernetisk:main' into fixRegisterUserResponse

commit 221a968
Author: pvk05 <[email protected]>
Date:   Sat Sep 28 00:57:24 2024 +0200

    moved register response to a snackbar for better visual feedback

commit ea38e61
Author: Sebbben <[email protected]>
Date:   Fri Sep 27 23:41:22 2024 +0200

    added loading indicator to singin page as well

commit 8a3d2de
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 23:14:48 2024 +0200

    checks if email includes "@" before registering user

commit 3f547cf
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 22:44:11 2024 +0200

    fixed response from sendMail function to send correct feedback when failing

commit 0b33808
Author: Sebbben <[email protected]>
Date:   Thu Sep 26 17:07:50 2024 +0200

    visual queue when registering user

commit 0d154f5
Author: Sebbben <[email protected]>
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: Philip Knudsen <[email protected]>
Co-Authored-By: Sebbben <[email protected]>
@EricSvebakk @Sebbben
Squashed commit adding pr/82
184fe7d 
commit cbe876a
Merge: 8b529ef ac17a6e
Author: Eric Svebakk <[email protected]>
Date:   Mon Oct 28 16:24:24 2024 +0100

    Merge pull request cybernetisk#82 from Sebbben/moveBoardPage

    Move board page

commit ac17a6e
Author: Sebbben <[email protected]>
Date:   Fri Oct 25 10:54:13 2024 +0200

    moved pages/main/board/* to (pages)/(main)/board

commit 8b529ef
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:20:05 2024 +0200

    Updated incorrect url-path

commit 73999a8
Merge: f0bacbb 1861431
Author: Eric Svebakk <[email protected]>
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 1861431
Merge: f0bacbb cd922ac
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:08:02 2024 +0200

    Handled merge-conflict

commit f0bacbb
Merge: d26bd3f d198b94
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 17 15:46:05 2024 +0200

    Merge pull request cybernetisk#75 from Borgarsy/feature-halloween-theme

    Temporary Halloween theme

commit cd922ac
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:20:45 2024 +0200

    made it so that pressing enter on signin and register page submits the forms

commit 56dc570
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:16:44 2024 +0200

    removed duplicate login button on successfull registration

commit d26bd3f
Merge: 0f096c0 c019c46
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 10 16:54:40 2024 +0200

    Merge pull request cybernetisk#67 from Sebbben/fixNoResultMembershipSearch

    Fix no result membership search

commit c019c46
Author: Sebbben <[email protected]>
Date:   Sat Oct 5 16:20:01 2024 +0200

    Made tables turn to first page when the table content changes with a search

commit 0f096c0
Merge: a1ce2ec 4dfd6f8
Author: Tepohe <[email protected]>
Date:   Thu Oct 10 14:42:19 2024 +0200

    Merge branch 'main' into development

commit d198b94
Author: Borgar <[email protected]>
Date:   Tue Oct 8 15:01:29 2024 +0200

    adds halloween theme.

commit a1ce2ec
Merge: 4f7d813 f06a472
Author: Tepohe <[email protected]>
Date:   Tue Oct 8 13:53:44 2024 +0200

    Merge branch 'pr/53' into development

commit f06a472
Author: Sebbben <[email protected]>
Date:   Mon Oct 7 16:47:03 2024 +0200

    Fixed wrong path for nav bar home from pointing to /home to pointing to /

commit a715fac
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:24:53 2024 +0200

    added snackbar to singin page

commit 6322071
Merge: 131cc76 ea38e61
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:08:07 2024 +0200

    Merged features from featureBetterRegisterFeedback into changes made by pvk05's fixRegisterUserResponse

commit 131cc76
Merge: 221a968 eb8b2f2
Author: Philip Knudsen <[email protected]>
Date:   Tue Oct 1 16:32:52 2024 +0200

    Merge branch 'cybernetisk:main' into fixRegisterUserResponse

commit 221a968
Author: pvk05 <[email protected]>
Date:   Sat Sep 28 00:57:24 2024 +0200

    moved register response to a snackbar for better visual feedback

commit ea38e61
Author: Sebbben <[email protected]>
Date:   Fri Sep 27 23:41:22 2024 +0200

    added loading indicator to singin page as well

commit 8a3d2de
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 23:14:48 2024 +0200

    checks if email includes "@" before registering user

commit 3f547cf
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 22:44:11 2024 +0200

    fixed response from sendMail function to send correct feedback when failing

commit 0b33808
Author: Sebbben <[email protected]>
Date:   Thu Sep 26 17:07:50 2024 +0200

    visual queue when registering user

commit 0d154f5
Author: Sebbben <[email protected]>
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: Sebbben <[email protected]>
@EricSvebakk @Sebbben
Squashed commit adding pr/81
005b413 
commit 1b1e2db
Merge: cbe876a 6beb84d
Author: Eric Svebakk <[email protected]>
Date:   Tue Oct 29 18:26:04 2024 +0100

    Merge pull request cybernetisk#81 from Sebbben/betterUsabilityForCustomTableComponent

    Better usability for custom table component

commit 6beb84d
Author: Sebbben <[email protected]>
Date:   Fri Oct 25 10:40:23 2024 +0200

    Implementet default filter parameters for customtable component

commit cbe876a
Merge: 8b529ef ac17a6e
Author: Eric Svebakk <[email protected]>
Date:   Mon Oct 28 16:24:24 2024 +0100

    Merge pull request cybernetisk#82 from Sebbben/moveBoardPage

    Move board page

commit ac17a6e
Author: Sebbben <[email protected]>
Date:   Fri Oct 25 10:54:13 2024 +0200

    moved pages/main/board/* to (pages)/(main)/board

commit 8b529ef
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:20:05 2024 +0200

    Updated incorrect url-path

commit 73999a8
Merge: f0bacbb 1861431
Author: Eric Svebakk <[email protected]>
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 1861431
Merge: f0bacbb cd922ac
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:08:02 2024 +0200

    Handled merge-conflict

commit f0bacbb
Merge: d26bd3f d198b94
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 17 15:46:05 2024 +0200

    Merge pull request cybernetisk#75 from Borgarsy/feature-halloween-theme

    Temporary Halloween theme

commit cd922ac
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:20:45 2024 +0200

    made it so that pressing enter on signin and register page submits the forms

commit 56dc570
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:16:44 2024 +0200

    removed duplicate login button on successfull registration

commit d26bd3f
Merge: 0f096c0 c019c46
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 10 16:54:40 2024 +0200

    Merge pull request cybernetisk#67 from Sebbben/fixNoResultMembershipSearch

    Fix no result membership search

commit c019c46
Author: Sebbben <[email protected]>
Date:   Sat Oct 5 16:20:01 2024 +0200

    Made tables turn to first page when the table content changes with a search

commit 0f096c0
Merge: a1ce2ec 4dfd6f8
Author: Tepohe <[email protected]>
Date:   Thu Oct 10 14:42:19 2024 +0200

    Merge branch 'main' into development

commit d198b94
Author: Borgar <[email protected]>
Date:   Tue Oct 8 15:01:29 2024 +0200

    adds halloween theme.

commit a1ce2ec
Merge: 4f7d813 f06a472
Author: Tepohe <[email protected]>
Date:   Tue Oct 8 13:53:44 2024 +0200

    Merge branch 'pr/53' into development

commit f06a472
Author: Sebbben <[email protected]>
Date:   Mon Oct 7 16:47:03 2024 +0200

    Fixed wrong path for nav bar home from pointing to /home to pointing to /

commit a715fac
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:24:53 2024 +0200

    added snackbar to singin page

commit 6322071
Merge: 131cc76 ea38e61
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:08:07 2024 +0200

    Merged features from featureBetterRegisterFeedback into changes made by pvk05's fixRegisterUserResponse

commit 131cc76
Merge: 221a968 eb8b2f2
Author: Philip Knudsen <[email protected]>
Date:   Tue Oct 1 16:32:52 2024 +0200

    Merge branch 'cybernetisk:main' into fixRegisterUserResponse

commit 221a968
Author: pvk05 <[email protected]>
Date:   Sat Sep 28 00:57:24 2024 +0200

    moved register response to a snackbar for better visual feedback

commit ea38e61
Author: Sebbben <[email protected]>
Date:   Fri Sep 27 23:41:22 2024 +0200

    added loading indicator to singin page as well

commit 8a3d2de
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 23:14:48 2024 +0200

    checks if email includes "@" before registering user

commit 3f547cf
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 22:44:11 2024 +0200

    fixed response from sendMail function to send correct feedback when failing

commit 0b33808
Author: Sebbben <[email protected]>
Date:   Thu Sep 26 17:07:50 2024 +0200

    visual queue when registering user

commit 0d154f5
Author: Sebbben <[email protected]>
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: Sebbben <[email protected]>
@EricSvebakk @yrjarv
Squashed commit adding pr/62
e9a6562 
commit b5dde20
Merge: 1b1e2db 34c3184
Author: Eric Svebakk <[email protected]>
Date:   Tue Oct 29 19:25:05 2024 +0100

    Merge pull request cybernetisk#62 from yrjarv/membership-comment

    Fix prisma request for membership creation

commit 34c3184
Author: Yrjar V <[email protected]>
Date:   Mon Sep 30 09:04:48 2024 +0200

    Fix prisma request for membership creation

commit 1b1e2db
Merge: cbe876a 6beb84d
Author: Eric Svebakk <[email protected]>
Date:   Tue Oct 29 18:26:04 2024 +0100

    Merge pull request cybernetisk#81 from Sebbben/betterUsabilityForCustomTableComponent

    Better usability for custom table component

commit 6beb84d
Author: Sebbben <[email protected]>
Date:   Fri Oct 25 10:40:23 2024 +0200

    Implementet default filter parameters for customtable component

commit cbe876a
Merge: 8b529ef ac17a6e
Author: Eric Svebakk <[email protected]>
Date:   Mon Oct 28 16:24:24 2024 +0100

    Merge pull request cybernetisk#82 from Sebbben/moveBoardPage

    Move board page

commit ac17a6e
Author: Sebbben <[email protected]>
Date:   Fri Oct 25 10:54:13 2024 +0200

    moved pages/main/board/* to (pages)/(main)/board

commit 8b529ef
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:20:05 2024 +0200

    Updated incorrect url-path

commit 73999a8
Merge: f0bacbb 1861431
Author: Eric Svebakk <[email protected]>
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 1861431
Merge: f0bacbb cd922ac
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:08:02 2024 +0200

    Handled merge-conflict

commit f0bacbb
Merge: d26bd3f d198b94
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 17 15:46:05 2024 +0200

    Merge pull request cybernetisk#75 from Borgarsy/feature-halloween-theme

    Temporary Halloween theme

commit cd922ac
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:20:45 2024 +0200

    made it so that pressing enter on signin and register page submits the forms

commit 56dc570
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:16:44 2024 +0200

    removed duplicate login button on successfull registration

commit d26bd3f
Merge: 0f096c0 c019c46
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 10 16:54:40 2024 +0200

    Merge pull request cybernetisk#67 from Sebbben/fixNoResultMembershipSearch

    Fix no result membership search

commit c019c46
Author: Sebbben <[email protected]>
Date:   Sat Oct 5 16:20:01 2024 +0200

    Made tables turn to first page when the table content changes with a search

commit 0f096c0
Merge: a1ce2ec 4dfd6f8
Author: Tepohe <[email protected]>
Date:   Thu Oct 10 14:42:19 2024 +0200

    Merge branch 'main' into development

commit d198b94
Author: Borgar <[email protected]>
Date:   Tue Oct 8 15:01:29 2024 +0200

    adds halloween theme.

commit a1ce2ec
Merge: 4f7d813 f06a472
Author: Tepohe <[email protected]>
Date:   Tue Oct 8 13:53:44 2024 +0200

    Merge branch 'pr/53' into development

commit f06a472
Author: Sebbben <[email protected]>
Date:   Mon Oct 7 16:47:03 2024 +0200

    Fixed wrong path for nav bar home from pointing to /home to pointing to /

commit a715fac
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:24:53 2024 +0200

    added snackbar to singin page

commit 6322071
Merge: 131cc76 ea38e61
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:08:07 2024 +0200

    Merged features from featureBetterRegisterFeedback into changes made by pvk05's fixRegisterUserResponse

commit 131cc76
Merge: 221a968 eb8b2f2
Author: Philip Knudsen <[email protected]>
Date:   Tue Oct 1 16:32:52 2024 +0200

    Merge branch 'cybernetisk:main' into fixRegisterUserResponse

commit 221a968
Author: pvk05 <[email protected]>
Date:   Sat Sep 28 00:57:24 2024 +0200

    moved register response to a snackbar for better visual feedback

commit ea38e61
Author: Sebbben <[email protected]>
Date:   Fri Sep 27 23:41:22 2024 +0200

    added loading indicator to singin page as well

commit 8a3d2de
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 23:14:48 2024 +0200

    checks if email includes "@" before registering user

commit 3f547cf
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 22:44:11 2024 +0200

    fixed response from sendMail function to send correct feedback when failing

commit 0b33808
Author: Sebbben <[email protected]>
Date:   Thu Sep 26 17:07:50 2024 +0200

    visual queue when registering user

commit 0d154f5
Author: Sebbben <[email protected]>
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 <[email protected]>
@EricSvebakk
Revert "Squashed commit adding pr/62"
12dfee7 
This reverts commit e9a6562.
@EricSvebakk @yrjarv
Second squashed commit adding pr/62
2ac2123 
commit 92a0b1e
Author: Tepohe <[email protected]>
Date:   Tue Oct 29 19:49:54 2024 +0100

    Updated Membership schema

commit b5dde20
Merge: 1b1e2db 34c3184
Author: Eric Svebakk <[email protected]>
Date:   Tue Oct 29 19:25:05 2024 +0100

    Merge pull request cybernetisk#62 from yrjarv/membership-comment

    Fix prisma request for membership creation

commit 34c3184
Author: Yrjar V <[email protected]>
Date:   Mon Sep 30 09:04:48 2024 +0200

    Fix prisma request for membership creation

commit 1b1e2db
Merge: cbe876a 6beb84d
Author: Eric Svebakk <[email protected]>
Date:   Tue Oct 29 18:26:04 2024 +0100

    Merge pull request cybernetisk#81 from Sebbben/betterUsabilityForCustomTableComponent

    Better usability for custom table component

commit 6beb84d
Author: Sebbben <[email protected]>
Date:   Fri Oct 25 10:40:23 2024 +0200

    Implementet default filter parameters for customtable component

commit cbe876a
Merge: 8b529ef ac17a6e
Author: Eric Svebakk <[email protected]>
Date:   Mon Oct 28 16:24:24 2024 +0100

    Merge pull request cybernetisk#82 from Sebbben/moveBoardPage

    Move board page

commit ac17a6e
Author: Sebbben <[email protected]>
Date:   Fri Oct 25 10:54:13 2024 +0200

    moved pages/main/board/* to (pages)/(main)/board

commit 8b529ef
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:20:05 2024 +0200

    Updated incorrect url-path

commit 73999a8
Merge: f0bacbb 1861431
Author: Eric Svebakk <[email protected]>
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 1861431
Merge: f0bacbb cd922ac
Author: Tepohe <[email protected]>
Date:   Thu Oct 17 16:08:02 2024 +0200

    Handled merge-conflict

commit f0bacbb
Merge: d26bd3f d198b94
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 17 15:46:05 2024 +0200

    Merge pull request cybernetisk#75 from Borgarsy/feature-halloween-theme

    Temporary Halloween theme

commit cd922ac
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:20:45 2024 +0200

    made it so that pressing enter on signin and register page submits the forms

commit 56dc570
Author: Sebbben <[email protected]>
Date:   Fri Oct 11 10:16:44 2024 +0200

    removed duplicate login button on successfull registration

commit d26bd3f
Merge: 0f096c0 c019c46
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 10 16:54:40 2024 +0200

    Merge pull request cybernetisk#67 from Sebbben/fixNoResultMembershipSearch

    Fix no result membership search

commit c019c46
Author: Sebbben <[email protected]>
Date:   Sat Oct 5 16:20:01 2024 +0200

    Made tables turn to first page when the table content changes with a search

commit 0f096c0
Merge: a1ce2ec 4dfd6f8
Author: Tepohe <[email protected]>
Date:   Thu Oct 10 14:42:19 2024 +0200

    Merge branch 'main' into development

commit d198b94
Author: Borgar <[email protected]>
Date:   Tue Oct 8 15:01:29 2024 +0200

    adds halloween theme.

commit a1ce2ec
Merge: 4f7d813 f06a472
Author: Tepohe <[email protected]>
Date:   Tue Oct 8 13:53:44 2024 +0200

    Merge branch 'pr/53' into development

commit f06a472
Author: Sebbben <[email protected]>
Date:   Mon Oct 7 16:47:03 2024 +0200

    Fixed wrong path for nav bar home from pointing to /home to pointing to /

commit a715fac
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:24:53 2024 +0200

    added snackbar to singin page

commit 6322071
Merge: 131cc76 ea38e61
Author: Sebbben <[email protected]>
Date:   Tue Oct 1 17:08:07 2024 +0200

    Merged features from featureBetterRegisterFeedback into changes made by pvk05's fixRegisterUserResponse

commit 131cc76
Merge: 221a968 eb8b2f2
Author: Philip Knudsen <[email protected]>
Date:   Tue Oct 1 16:32:52 2024 +0200

    Merge branch 'cybernetisk:main' into fixRegisterUserResponse

commit 221a968
Author: pvk05 <[email protected]>
Date:   Sat Sep 28 00:57:24 2024 +0200

    moved register response to a snackbar for better visual feedback

commit ea38e61
Author: Sebbben <[email protected]>
Date:   Fri Sep 27 23:41:22 2024 +0200

    added loading indicator to singin page as well

commit 8a3d2de
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 23:14:48 2024 +0200

    checks if email includes "@" before registering user

commit 3f547cf
Author: pvk05 <[email protected]>
Date:   Fri Sep 27 22:44:11 2024 +0200

    fixed response from sendMail function to send correct feedback when failing

commit 0b33808
Author: Sebbben <[email protected]>
Date:   Thu Sep 26 17:07:50 2024 +0200

    visual queue when registering user

commit 0d154f5
Author: Sebbben <[email protected]>
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 <[email protected]>
@pvk05
added snackbaralert to voucherLog and workLog input
5d1ea92
@pvk05 pvk05 self-assigned this Oct 31, 2024
@pvk05 pvk05 requested a review from EricSvebakk October 31, 2024 15:10
@pvk05 pvk05 marked this pull request as draft November 12, 2024 10:22
@pvk05 pvk05 linked an issue Nov 12, 2024 that may be closed by this pull request
Better visual feedback on the voucher page #78
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EricSvebakk EricSvebakk Awaiting requested review from EricSvebakk

Assignees

@pvk05 pvk05

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Better visual feedback on the voucher page
3 participants
@pvk05 @yrjarv @EricSvebakk