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

132 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
cami
ed8de63e80 Merge pull request 'Loginfunciton' (#39) from loginFunciton into main 2021-06-22 22:18:05 +00:00
cami
8e67a91dc1 Added login functionality and a redirect if not logged in 2021-06-23 00:15:43 +02:00
cami
27e4d10b78 Merge pull request 'Refactoring' (#38) from refactoring into main 2021-06-22 22:13:05 +00:00
cami
abb2d546f7 Refactored some things 2021-06-23 00:11:04 +02:00
cami
3f3713a43c Merge pull request 'Started with the login function and it works more or less :-)' (#37) from feature/login into main 
Reviewed-on: #37
 2021-06-22 01:46:38 +00:00
cami
8d4d166924 Started with the login function and it works more or less :-) 2021-06-22 03:41:14 +02:00
cami
8e77306c93 Merge pull request 'hotfix/backendcontainer' (#36) from hotfix/backendcontainer into main 
Reviewed-on: #36

Fixes #34
 2021-06-22 00:27:07 +00:00
cami
001db06659 Backend container works with autoreloading.. :-) 2021-06-22 02:26:23 +02:00
cami
02fc2bb4ef Started debugging backend stuff.. 2021-06-22 02:15:40 +02:00
cami
838f673107 Merge pull request 'Feature/Backendcontainer' (#35) from feature/backendContainer into main 
Reviewed-on: #35
 2021-06-21 23:01:15 +00:00
cami
921544b76f Added a working backend container 2021-06-22 00:58:08 +02:00
cami
60415ad83f Added some more things for login 🎉 2021-06-21 05:48:01 +02:00
cami
9621a12f0c Register field in frontend. still needs some design things 2021-06-21 04:55:31 +02:00
cami
514de0e4ae First working frontend for the login 2021-06-21 03:51:15 +02:00
cami
9c0b57dbf8 Merge pull request 'Formatting' (#30) from formatting into main 2021-06-21 01:48:13 +00:00
cami
b9771e6b1f Reformating 2021-06-21 03:45:22 +02:00
cami
b25d8fad3a Merge pull request 'Refactoring and removing unused things' (#29) from refactor/removeThigns into main 2021-06-21 00:55:01 +00:00
cami
ffa2c74ef5 Refactoring and removing unused things 2021-06-21 02:53:24 +02:00
cami
86f3320134 Merge pull request 'Added a custom link to the button' (#14) from feature/ButtonCustomLink into main 
Reviewed-on: #14
 2021-06-21 00:12:28 +00:00
cami
828da9a355 Added a custom link to the button 2021-06-21 02:11:44 +02:00
cami
2ed8bcb3fa Merge pull request 'refactor/frontend-design' (#13) from refactor/frontend-design into main 
Reviewed-on: #13
 2021-06-07 03:04:23 +00:00