Commit graph

103 commits

Author SHA1 Message Date
cami ec96bb4b43 Make font size a bit larger in input fields 2021-06-30 01:18:00 +02: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 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 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
cami 215a86db58 Merge pull request 'Formatting' (#48) from formatting into main 2021-06-23 01:44:44 +00:00
cami 56eb46b668 Removed signup component as it's not needed 2021-06-23 03:43:58 +02:00
cami b22dd6f5e8 Adjusted formatting 2021-06-23 03:40:37 +02:00
cami c57492f826 Merge pull request 'Gitignore/Databases' (#47) from gitignore/databases into main 2021-06-23 01:22:22 +00:00
cami 8476f22146 Removed the database file from git as this is not needed 2021-06-23 03:22:06 +02:00
cami b9fea5455a Merge pull request 'Frontend/Css Things' (#46) from frontend/css-things into main 2021-06-23 01:17:22 +00:00
cami 04cdc9dd7e Added various css things
- Designed login and register buttons
- removed some unnecessary css things
- changed some small things in the design
2021-06-23 03:16:09 +02:00
cami f6de850772 Merge pull request 'Infra/Bugfix' (#45) from infra/bugfix into main 2021-06-23 00:00:42 +00:00
cami c4e9b80fd6 Removed the build command in start.sh
the build stage is not necessary as the containers are hot reloading during development
2021-06-23 01:59:28 +02:00
cami 809260068f Merge pull request 'Content/Ueber' (#44) from content/ueber into main
Reviewed-on: #44
2021-06-22 23:57:35 +00:00
cami 87929fe697 Added some content and fixed a small thing :-9 2021-06-23 01:56:27 +02:00
cami bd42ff0107 Merge pull request 'Make buttons all the same width and remove some css' (#43) from feature/buttons into main
This PR does the following things:

    remove some unused css code
    Make buttons the same with on the startpage (solves #24)
2021-06-22 23:40:22 +00:00
cami c072b81c60 Make buttons all the same width and remove some css
This commit does the following things:
- remove some unused css code
- Make buttons the same with on the startpage (solves #24)
2021-06-23 01:38:46 +02:00
cami f4eb7bddc9 Merge pull request 'Feature/Register' (#42) from feature/register into main 2021-06-22 23:32:23 +00:00
cami c7d4b0c262 Added very simple register backend and frontend 2021-06-23 01:26:55 +02:00
cami 5d94eafaa9 Merge pull request 'Refactor/Css' (#41) from refactor/css into main 2021-06-22 22:26:02 +00:00
cami ec95a09adc Merge branch 'loginFunciton' into refactoring/css 2021-06-23 00:23:39 +02:00
cami 620f457f62 Refactored some things and added some css styles to the javascript things 2021-06-23 00:19:17 +02:00