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

148 commits

Author SHA1 Message Date
cami
07e83e2f00 added working nginx configuration 2021-07-13 20:03:51 +02:00
cami
ee04215382 added proxy_pass
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2021-07-13 18:13:46 +02:00
cami
d28964dd1f added nginx back :-)
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2021-07-13 00:38:46 +02:00
cami
97b7bc3212 Removed nginx to test if it works without
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2021-07-12 23:47:39 +02:00
cami
599f6a2e52 Update
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2021-07-12 23:13:53 +02:00
cami
3b0288dc35 new npm things..
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2021-07-12 23:09:49 +02:00
cami
f4e501458e bugfixing..
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2021-07-12 22:59:34 +02:00
cami
3965859f0d Removed react scripts
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2021-07-12 22:47:47 +02:00
cami
5d15fbcd3d Use prod build for public things
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2021-07-12 22:38:20 +02:00
cami
fb5675eebd changed some unused things 2021-07-12 01:06:53 +02:00
cami
d1d213ac9d Added copy paste things :-) 2021-07-12 01:06:23 +02:00
cami
ca25e3bcf8 renamed to normal 2021-07-12 01:05:48 +02:00
cami
1691500883 Renamed Behavior to behaviorNormal 2021-07-12 01:04:50 +02:00
cami
8bc7076e86 Removed some console.log() 2021-07-12 00:14:47 +02:00
cami
e934ae98ec double click after registering (fix #121) 2021-07-11 02:40:27 +02:00
cami
b213f22c22 Removed some unused things.. 2021-07-11 00:40:27 +02:00
cami
4e2ef3fd4d logout will redirect to startpage (fix #126) 2021-07-11 00:35:47 +02:00
cami
00aa826971 Added Button if the user is logged in and css 
Added a button if the user is already logged in which will directly go to the study
- make buttons minimal width
 2021-07-11 00:08:11 +02:00
cami
4391cf790c Check if the user is already logged in and do not show all options (fix #122) 2021-07-11 00:04:00 +02:00
cami
dccd2fd2ae Added some things :-) 2021-07-10 23:49:17 +02:00
cami
bd96d0c7fa Merged main into current branch 2021-07-10 23:46:00 +02: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
9e3b08ea95 Merged from main branch 2021-07-09 01:46:31 +02:00
cami
904c9ae9a5 Removed dotted line unter navbar logo when hovering (fix #33) 2021-07-09 01:25:45 +02:00
cami
55a9eabc24 Added css option to hover all the links (fix #33) 2021-07-09 01:19:47 +02: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
232212a5da Merge branch 'main' into feature/logging 2021-07-06 02:43:30 +02:00
cami
04cd56e188 add register option in navbar 2021-07-06 02:41:24 +02:00
cami
de2e797bfb merged things.. 2021-07-06 02:33:10 +02:00
cami
13748b6ce5 Merge branch 'main' into feature/logging 2021-07-06 00:29:08 +00:00
cami
29165ef69a Added text in the survey that the registration was ok 2021-07-06 02:24:10 +02: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
d576ebb404 Added further things for logging user interaction 2021-07-06 00:58:26 +02:00
cami
21b97467aa Added initial start for logging the users behaviour 2021-07-05 23:10:21 +02: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
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
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
3cbfd949e4 Give feedback when someone wants to register 2021-07-04 23:31:18 +02:00
cami
fcdb20e69f Made the font size of buttons more flexible 2021-07-04 21:40:27 +02:00
cami
d047e99113 Reformatted all the necessary files 2021-06-30 02:14:42 +02: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
b7197fd6f7 Privacy site now looks the same as other sites (fix #87) 2021-06-30 01:37:47 +02: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
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
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
44e6293e43 Added some debug things to get feedback on the frontend after register 2021-06-28 04:16:46 +02:00
cami
a032ca946e Starting to add feedback in the registration (fixes #78) 2021-06-28 03:46:27 +02: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
85c3b5a227 Only allow to click submit button if validation is correct 2021-06-27 01:16:40 +02: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
3bc999b5b7 Update dependencies from react 2021-06-27 00:51:15 +02:00
cami
d48278acab Added auth to navbar to decide what should be displayed 2021-06-27 00:45:25 +02:00
cami
7d8975ed69 Merge branch 'main' into feature/umfrage 2021-06-26 22:41:41 +00: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
d8ce50a897 Formatting some things 2021-06-27 00:29:29 +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
dc905fa0e2 Updated the css things in the button.. 
looks better now :-)
 2021-06-23 04:57:40 +02: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
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
87929fe697 Added some content and fixed a small thing :-9 2021-06-23 01:56:27 +02: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
c7d4b0c262 Added very simple register backend and frontend 2021-06-23 01:26:55 +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
8e67a91dc1 Added login functionality and a redirect if not logged in 2021-06-23 00:15:43 +02:00
cami
abb2d546f7 Refactored some things 2021-06-23 00:11:04 +02:00
cami
8d4d166924 Started with the login function and it works more or less :-) 2021-06-22 03:41:14 +02:00
cami
02fc2bb4ef Started debugging backend stuff.. 2021-06-22 02:15:40 +02: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
b9771e6b1f Reformating 2021-06-21 03:45:22 +02:00
cami
ffa2c74ef5 Refactoring and removing unused things 2021-06-21 02:53:24 +02:00
cami
828da9a355 Added a custom link to the button 2021-06-21 02:11:44 +02:00
cami
67575be960 Further redesign and refactoring 2021-06-07 05:03:18 +02:00
cami
49106ea1b6 Refactored some things in the frontend 2021-06-07 04:14:00 +02:00
cami
b91084d62b Removed the button in the footer 2021-05-28 01:56:16 +02:00
cami
34724f88f3 Started with new things for personalization 2021-05-27 04:19:22 +02:00
cami
29142a9977 Refactoring because of local scripts and tabs 
In this commit I want to refactor some things.
- I don't want to use external connections so I moved all that shit to localhost
- I do not need so many spaces as it is bad for formatting
 2021-05-27 03:07:54 +02:00
cami
f8997272fe Removed all third party requests 2021-05-27 02:43:05 +02:00
cami
4f24197e30 Want to run this thing with docker-compose 2021-05-26 00:46:41 +02:00
cami
8d451a87b6 First stable application according to tutorial 2021-05-25 23:40:27 +02:00
cami
6ad07d2541 Added dev environment for docker 2021-05-11 02:03:32 +02:00
cami
efeba756a5 Added connection for backend 2021-05-07 04:02:43 +02:00
cami
18e6420500 Updated some things in the frontend 
- App zeigt nun eine Zeit an, wenn backend zur verfügung steht
- Docker-Port ist auf 3000, weil Standard
 2021-05-07 04:00:13 +02:00
cami
395b3f1e54 Added backend and moved things 2021-05-07 02:16:54 +02:00