Commit graph

256 commits

Author SHA1 Message Date
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
8d7b5daa48 Merge pull request 'Logger works' () from feature/logger-web into main
Reviewed-on: 
2021-07-16 21:39:21 +00:00
6ee3d16f74 Logger works 2021-07-16 23:06:38 +02:00
f64406c74b Backend implementation for random passwords 2021-07-16 04:00:01 +02:00
c9e987a28f Updated some things and logger starts only once 2021-07-16 02:16:08 +02:00
0e222d3d52 Autoformatting all files 2021-07-14 21:05:16 +02:00
816689acdf Test the behaviour of the prod-containers locally 2021-07-14 17:13:03 +02:00
9aa573384b Fixing database error 2021-07-14 00:46:51 +02:00
46ce8655f3 renamed some thigns 2021-07-13 20:25:02 +02:00
b335a471cb Merge pull request 'Fix broken backend connection in prod build (fix )' () from infra/backendconnection into main
Reviewed-on: 
2021-07-13 18:06:06 +00:00
ccd53bc2a1 replaced useState from dev.react to stable 2021-07-13 20:04:56 +02:00
07e83e2f00 added working nginx configuration 2021-07-13 20:03:51 +02:00
d72367ccaa removed port mapping in backend as it's not needed 2021-07-13 20:03:20 +02:00
bab0f6bce5 Merge pull request 'added proxy_pass' () from infra/docker-compose-fix into main
Reviewed-on: 
2021-07-13 16:14:38 +00:00
ee04215382 added proxy_pass 2021-07-13 18:13:46 +02:00
9e16129aa5 Merge pull request 'Updated docker-compose file for production use' () from infra/docker-compose-fix into main
Reviewed-on: 
2021-07-12 22:39:24 +00:00
d28964dd1f added nginx back :-) 2021-07-13 00:38:46 +02:00
1b7aba4a70 Updated docker-compose file for production use 2021-07-13 00:08:36 +02:00
7e77a67aac Merge pull request 'Removed nginx to test if it works without' () from infra/bugfix into main
Reviewed-on: 
2021-07-12 21:48:10 +00:00
97b7bc3212 Removed nginx to test if it works without 2021-07-12 23:47:39 +02:00
18094fae3c Merge pull request 'Update' () from infra/bugfix into main
Reviewed-on: 
2021-07-12 21:14:16 +00:00
599f6a2e52 Update 2021-07-12 23:13:53 +02:00
ccd7dfb0e0 Merge pull request 'new npm things..' () from infra/bugfix into main
Reviewed-on: 
2021-07-12 21:10:25 +00:00
3b0288dc35 new npm things.. 2021-07-12 23:09:49 +02:00
09bbb2e2a4 Merge pull request 'bugfixing..' () from infra/bugfix into main
Reviewed-on: 
2021-07-12 20:59:56 +00:00
f4e501458e bugfixing.. 2021-07-12 22:59:34 +02:00
d9f87eb26d Merge pull request 'Removed react scripts' () from infra/bugfix into main
Reviewed-on: 
2021-07-12 20:48:36 +00:00