Commit graph

282 commits

Author SHA1 Message Date
e762032f00 Merge pull request 'frontend/refactoring' () from frontend/refactoring into main
Reviewed-on: 
2021-07-22 18:03:20 +00:00
dcd4215efa Renamed lizenzen.js to Lizenzen.js 2021-07-22 20:02:35 +02:00
52131aa3dd Refactoring..
- use STATES instead of multiple different variables
- add check if password is correct
-
2021-07-22 19:55:06 +02:00
fd205273fc Added content in license page 2021-07-22 19:01:40 +02:00
9cf2c50d01 Added study button 2021-07-22 17:10:35 +02:00
47166c6345 Merge pull request 'Check in the frontend if the username and password in the survey are correct (fix )' () from frontend/check-username-pw-survey into main
Reviewed-on: 
2021-07-22 14:55:26 +00:00
396b45df67 Add text at the end of the study 2021-07-22 16:54:24 +02:00
eaa4d8937a use property to show the value of the actual password 2021-07-22 16:53:57 +02:00
2f7d733591 Receive password and check if it's the same 2021-07-22 16:53:08 +02:00
f5e58ccb09 Merge branch 'main' into frontend/check-username-pw-survey 2021-07-22 07:31:17 +02:00
ca49c0d0f1 Merge pull request 'Added content' () from content into main
Reviewed-on: 
2021-07-22 05:30:32 +00:00
d1bc91bcb7 Added content 2021-07-22 07:29:54 +02:00
58bd327377 Update some change password things.. 2021-07-22 05:20:37 +02:00
a6346d7496 Password validation works but password is not shown in generated password thing 2021-07-22 04:44:31 +02:00
c1fce5bf4a Change api for random password 2021-07-22 03:24:31 +02:00
7a930c20b6 Permissions for requests.sh 2021-07-22 03:11:50 +02:00
130088756d Check if username is the same as in the current session 2021-07-22 03:11:28 +02:00
770e3e0285 Started implementing username and password check 2021-07-22 02:41:24 +02:00
e7407fd40b Refactoring and removing unused things 2021-07-22 02:40:58 +02:00
959912bd9b Refactored so that the studyEnd also has its own component 2021-07-22 02:40:17 +02:00
fbbdbd4332 Updated requests script 2021-07-22 02:37:04 +02:00
117e63e189 Added requests script to not enter all the things always 2021-07-22 02:26:06 +02:00
f00bc19994 Add special character and numbers inside the password 2021-07-22 00:02:57 +02:00
060f20d25c Merge pull request 'Add multiple subpages for the survey...' () from frontend/survey-multiple-sites into main
Reviewed-on: 
2021-07-21 21:41:32 +00:00
1553f92adf Added multiple situations so the survey is more complete 2021-07-21 23:41:10 +02:00
146b018ad1 Start logger when starting survey 2021-07-21 22:38:31 +02:00
65fcf8e4ab Working things 2021-07-21 22:04:23 +02:00
cf481d42e1 Refactoring.. 2021-07-21 21:53:57 +02:00
c5788a00d2 Forceupdate things 2021-07-21 21:33:16 +02:00
d162a4005d Merge pull request 'Refactored some things in the frontend' () from frontend/buttons into main
Reviewed-on: 
2021-07-21 02:34:24 +00:00
d055e693aa Refactored some things in the frontend
- use button insted of inputfield
- make use of conditional rendering
2021-07-21 04:33:52 +02:00
1751a37511 Updated and removed some npm packages 2021-07-21 04:26:23 +02:00
20da4043a8 Merge pull request 'frontend/refactoring' () from frontend/refactoring into main
Reviewed-on: 
2021-07-21 00:23:40 +00:00
01296702d3 Merge pull request 'Removed last part from password as it's too long' () from backend/change-pw into main
Reviewed-on: 
2021-07-21 00:23:11 +00:00
213dcc9197 Renaming some files. 2021-07-21 02:22:40 +02:00
966304ac3a Refactored herosection so it is more consistent with other fiels 2021-07-21 02:21:40 +02:00
a56e8ccb5c Renamed behavior to study 2021-07-21 02:21:00 +02:00
2000072a34 Removed last part from password as it's too long 2021-07-21 02:19:47 +02:00
d0d097d665 Changed nginx port as it won't work otherways :-) 2021-07-21 00:17:20 +02:00
d03a6e4985 Merge pull request 'Added url for my server' () from infra/urlfix into main
Reviewed-on: 
2021-07-20 21:55:52 +00:00
a0d8645593 Added url for my server 2021-07-20 23:51:48 +02:00
008810151f Refactored some things 2021-07-19 02:16:49 +02:00
a5b680d948 Merge pull request 'Added backend for the analytics stuff..' () from analytics/backend-deployment into main
Reviewed-on: 
2021-07-18 22:00:20 +00:00
50b8d4f82e Added backend for the analytics stuff.. 2021-07-18 23:59:04 +02:00
9808c2509c Merge pull request 'Random passwords during study (fix )' () from feature/random-password into main
Reviewed-on: 
2021-07-18 14:59:00 +00:00
c67da25cc9 Add generated password to frontend 2021-07-18 16:58:02 +02:00
5e07b3b7dd Added some more words for password generator 2021-07-17 01:45:29 +02:00
6da747d632 Add backend API to receive a random password 2021-07-17 01:45:11 +02:00
ecb06e812d Update branch with upstream changes 2021-07-17 00:53:49 +02:00
c306acc97a Remove unused things 2021-07-17 00:52:50 +02:00