Commit graph

121 commits

Author SHA1 Message Date
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
cami 44e6293e43 Added some debug things to get feedback on the frontend after register 2021-06-28 04:16:46 +02:00
cami 19db7f18a5 Merge branch 'main' into feature/registerFeedback 2021-06-28 03:54:10 +02:00
cami 95a2730af8 Merge pull request 'Remove unused endpoint in the backend' (#81) from cleanup/removeEndpoint into main
Reviewed-on: #81
2021-06-28 01:52:59 +00:00
cami 2ae7cb129d Remove unused endpoint in the backend (fix #80) 2021-06-28 03:50:55 +02:00
cami a032ca946e Starting to add feedback in the registration (fixes #78) 2021-06-28 03:46:27 +02:00
cami 10766dc601 Merge pull request 'Write survey data to backend (solves #70)' (#72) from feature/WriteSurveyToDatabase into main
Reviewed-on: #72
2021-06-28 00:22:12 +00:00
cami 2aae4e2b1b Write survey data to backend (solves #70)
In this commit the survey data will be written into the database for the corresponding user. The usercheck works with the authtoken which is sent in the header
2021-06-28 02:19:51 +02:00
cami e320ab4c27 Merge pull request 'Add login / logout to navbar' (#69) from feature/loginLogoutNavbar into main
Reviewed-on: #69
2021-06-26 23:51:33 +00:00
cami cf3e0b8043 Add login / logout to navbar
This commit will add a login or logout button in the navbar so that the user can decide what the person wants to do . (solves #68)
2021-06-27 01:50:45 +02:00
cami 431b3454bd Merge pull request 'Only allow to click submit button if validation is correct' (#67) from bug/SurveySubmit into main
Reviewed-on: #67
2021-06-26 23:26:16 +00:00
cami 85c3b5a227 Only allow to click submit button if validation is correct 2021-06-27 01:16:40 +02:00
cami 0971880c5f Merge pull request 'Bug/Formwidth' (#65) from bug/formWidth into main
Reviewed-on: #65
2021-06-26 23:00:38 +00:00
cami 73b30a776f Design things in the input field
This commit will do some design things
- Solves #61
- makes the app more consistent
2021-06-27 00:58:47 +02:00
cami 42fd1bfb3b Merge pull request 'Update/Deps' (#64) from update/deps into main
Reviewed-on: #64
2021-06-26 22:56:57 +00:00
cami 3bc999b5b7 Update dependencies from react 2021-06-27 00:51:15 +02:00
cami 5a1b060338 Merge pull request 'Feature/Navbarloggedin' (#63) from feature/navbarLoggedIn into main 2021-06-26 22:45:45 +00:00
cami d48278acab Added auth to navbar to decide what should be displayed 2021-06-27 00:45:25 +02:00
cami 36d782dfd1 Merge pull request 'Feature für die Umfrage' (#58) from feature/umfrage into main
Reviewed-on: #58
2021-06-26 22:41:59 +00:00
cami 7d8975ed69 Merge branch 'main' into feature/umfrage 2021-06-26 22:41:41 +00:00
cami 364de2124f Merge branch 'feature/umfrage' of git.sp-codes.de:cami/Bachelorthesis_Code into feature/umfrage 2021-06-27 00:41:27 +02:00
cami f4e460123f backend will only receive the request (see #62)
This commit will solve the issue #62 so that not every click in the form will trigger a request to the backend
2021-06-27 00:41:17 +02:00
cami e0ffe1a79b Added survey to web application with the backend working 2021-06-27 00:39:28 +02:00
cami 80121c9b90 Merge pull request 'Refactor/Formattingandstuff' (#60) from refactor/formattingAndStuff into main 2021-06-26 22:31:13 +00:00
cami d8ce50a897 Formatting some things 2021-06-27 00:29:29 +02:00
cami c23f7bd333 Merge branch 'main' into feature/umfrage 2021-06-25 01:04:41 +00:00
cami 73a0c2bdd4 Merge pull request 'Infra/Update Dockerfiles' (#59) from infra/update-dockerfiles into main 2021-06-25 01:03:23 +00:00
cami 520252bbee Added backend to prod docker environment 2021-06-25 03:02:44 +02:00
cami 8424cb346f Added some more questions and fixed some css 2021-06-24 02:53:42 +02:00
cami 32b8186fc7 Added frontend for survey 2021-06-24 02:01:17 +02:00
cami 80cb99cb36 started for survey feature 2021-06-23 05:12:01 +02:00
cami 8035172102 Merge pull request 'Design/Css Button' (#49) from design/css-button into main 2021-06-23 02:58:40 +00:00
cami dc905fa0e2 Updated the css things in the button..
looks better now :-)
2021-06-23 04:57:40 +02:00