cami/Bachelorthesis_Code
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Wiki Activity
153 commits 1 branch 0 tags 4.7 MiB
Commit graph

153 commits

This branch
This branch
All branches
Author SHA1 Message Date
cami d6d42fac57 Merge pull request 'CSS and Refactoring' (#124) from frontend/cssRefactoring into main 
Reviewed-on: #124
 2021-07-10 21:45:16 +00:00
cami 33f5262eee CSS and Refactoring 
- added some css so that everything will become better
- refactored some things
 2021-07-10 23:44:37 +02:00
cami aefb975d26 Removed dotted line unter navbar logo when hovering (fix #33) (#118) from bugfix/linkhovering_logo into main 
Reviewed-on: #118
 2021-07-08 23:26:28 +00:00
cami 904c9ae9a5 Removed dotted line unter navbar logo when hovering (fix #33) 2021-07-09 01:25:45 +02:00
cami 85f31b17fa Merge pull request 'Added css option to hover all the links (fix #33)' (#117) from bugfix/linkhovering into main 
Reviewed-on: #117
 2021-07-08 23:20:29 +00:00
cami 55a9eabc24 Added css option to hover all the links (fix #33) 2021-07-09 01:19:47 +02:00
cami 186025f5df redirection and merge resolve (fix #113) 
Reviewed-on: #114
 2021-07-08 23:06:20 +00:00
cami 15b2697622 redirection and merge resolve (fix #113) 
This commit will add
- redirections to behaviour page

- resolving a merge conflict
 2021-07-09 01:01:17 +02:00
cami ab95b0dfd5 Merge pull request 'Add registration in the nav bar (fix #111)' (#112) from feature/register-option-navbar into main 
Reviewed-on: #112
 2021-07-06 00:42:21 +00:00
cami 04cd56e188 add register option in navbar 2021-07-06 02:41:24 +02:00
cami 47d8f501df Merge pull request 'Added text in the survey that the registration was ok (fix #106)' (#110) from survey/text into main 
Reviewed-on: #110
 2021-07-06 00:25:06 +00:00
cami 29165ef69a Added text in the survey that the registration was ok 2021-07-06 02:24:10 +02:00
cami 2ac4b987e4 Merge pull request 'Login error message is better now. (fix #108)' (#109) from login/fix-error-message into main 
Reviewed-on: #109
 2021-07-06 00:18:10 +00:00
cami c3c87273c4 Login error message is better now. (fix #108) 2021-07-06 02:17:41 +02:00
cami 9341474900 Merge pull request 'After the registration user will be logged in and redirected to survey (fix #77 and fix #74)' (#107) from feature/redirect-after-register into main 
Reviewed-on: #107
 2021-07-06 00:13:09 +00:00
cami 18f76d8cd6 After the registration user will be logged in and redirected to survey (fix #77 and fix #74) 2021-07-06 02:12:32 +02:00
cami 942c22c515 Merge pull request 'Refactor the error messages (fix #102)' (#103) from refactor/errormessage into main 
Reviewed-on: #103
 2021-07-05 16:00:35 +00:00
cami b03523cb8d Refactor the error messages (fix #102) 
All the errormessages use now the component ErrorMessage as it will be easier like this
 2021-07-05 18:00:01 +02:00
cami b6ec0948e2 Merge pull request 'Add additional feedback during the survey [fix #100]' (#101) from survey/visualfeedback into main 
Reviewed-on: #101
 2021-07-05 15:52:29 +00:00
cami 699b6fae52 Add backend validation if the survey input is correct 2021-07-05 17:51:49 +02:00
cami 1ce5b467be Removed unneccessary else statement 2021-07-05 01:32:23 +02:00
cami 0ecb73cbe7 Use const for survey validity and change smaller things 2021-07-05 01:19:26 +02:00
cami 6e9219fa7c Added frontend validation in the survey without backend 2021-07-05 01:07:50 +02:00
cami 8ca90625b7 Merge pull request 'Added login feedback in the backend [fix #98]' (#99) from login/feedback into main 
Reviewed-on: #99
 2021-07-04 22:03:23 +00:00
cami 9cd22e7d7d Added the login feedback in the frontend 2021-07-05 00:01:50 +02:00
cami 160e4d936e Added login feedback in the backend 2021-07-04 23:35:20 +02:00
cami d073c8ea2e Merge pull request 'Give feedback when someone wants to register' (#97) from register/errorText into main 
Reviewed-on: #97
 2021-07-04 21:31:58 +00:00
cami 3cbfd949e4 Give feedback when someone wants to register 2021-07-04 23:31:18 +02:00
cami 2648ffc394 Merge pull request 'Design/Buttonfontsize' (#96) from design/buttonFontsize into main 2021-07-04 19:45:45 +00:00
cami fcdb20e69f Made the font size of buttons more flexible 2021-07-04 21:40:27 +02:00
cami 23e07b1484 Merge pull request 'Format/Autoformat' (#92) from format/autoformat into main 2021-06-30 00:15:10 +00:00
cami d047e99113 Reformatted all the necessary files 2021-06-30 02:14:42 +02:00
cami 7755e63c90 Merge pull request 'Adjust design for licenses page (close #88)' (#91) from design/licenses into main 
Reviewed-on: #91
 2021-06-29 23:54:11 +00:00
cami a5a76836c5 Adjust design for licenses page (close #88) 
The design should now be more or less the same as on the other pages. There's still some work to make it more beautiful and more readable (see #90)
 2021-06-30 01:53:29 +02:00
cami 1de6862c2f Merge pull request 'Privacy site now looks the same as other sites (fix #87)' (#89) from design/privacy into main 
Reviewed-on: #89
 2021-06-29 23:38:14 +00:00
cami b7197fd6f7 Privacy site now looks the same as other sites (fix #87) 2021-06-30 01:37:47 +02:00
cami 93c098dd8e Merge pull request 'Add Feedback at the registration process (fix #78)' (#79) from feature/registerFeedback into main 
Reviewed-on: #79
 2021-06-29 23:25:27 +00:00
cami a2e1ada3af Merge branch 'main' into feature/registerFeedback (Fix #84) 
Adds some design specific things
 2021-06-30 01:24:15 +02:00
cami caad751aca Merge pull request 'Design/Inputfontsize (fix # 84)' (#85) from design/inputfontsize into main 
Reviewed-on: #85
 2021-06-29 23:22:59 +00:00
cami ec96bb4b43 Make font size a bit larger in input fields 2021-06-30 01:18:00 +02:00
cami 63c13d7e63 Survey and register/login button should be the same width (fix #84) 2021-06-30 01:12:40 +02:00
cami f2bd1b882e Rename button at registering (close #83) 
The button at the registering page was wrong. should be correct now
 2021-06-30 01:00:33 +02:00
cami f79959d531 Reformatted register so it's the same as everywhere 2021-06-30 00:58:44 +02:00
cami bf93e82d19 Removed some logging in the backend when registering 2021-06-30 00:58:18 +02:00
cami dd139c6712 Feedback color when registering 2021-06-30 00:41:58 +02:00
cami ea7be2283e Return error message if username is already taken during register 
This will return an error message if the username is already registered. The user should choose another name
 2021-06-30 00:03:34 +02:00
cami 3ab7ce0b5c Merge branch 'main' into feature/registerFeedback 2021-06-29 20:38:26 +00:00
cami 567ea0e3aa Merge pull request 'Infra/Stopscript' (#82) from infra/stopscript into main 2021-06-28 03:55:12 +00:00
cami a8c37a9d45 Stop script for local development 2021-06-28 05:54:33 +02:00
cami d7d22cb875 Formatting things in app.py 2021-06-28 04:31:52 +02:00