Commit graph

63 commits

Author SHA1 Message Date
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
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 c72e2bd2e9 Merge pull request 'Removed the button in the footer' (#12) from frontend/removebutton into main
Reviewed-on: #12
2021-05-27 23:57:42 +00:00
cami b91084d62b Removed the button in the footer 2021-05-28 01:56:16 +02:00
cami 166f642b53 Merge pull request 'Started with new things for personalization' (#10) from frontend/farbenetc into main
Reviewed-on: #10
2021-05-27 02:22:37 +00:00
cami 34724f88f3 Started with new things for personalization 2021-05-27 04:19:22 +02:00
cami 9f7c8c18b4 Merge pull request 'Refactoring because of local scripts and tabs' (#9) from refactor/code_externalthings into main
Reviewed-on: #9
2021-05-27 01:08:41 +00: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 80f9586d36 Merge pull request 'Removed all third party requests' (#8) from general/remove-thirdparty into main
Reviewed-on: #8
2021-05-27 00:44:10 +00:00
cami f8997272fe Removed all third party requests 2021-05-27 02:43:05 +02:00
cami c23ba06f98 Merge pull request 'Changed the docker-compose files so that everything works' (#7) from docker/compose-fix into main
Reviewed-on: #7
2021-05-26 22:34:33 +00:00
cami 9386e5bb3d Changed the docker-compose files so that everything works 2021-05-27 00:31:38 +02:00
cami e5d95083f6 Merge pull request 'docker-compose/frontend' (#6) from docker-compose/frontend into main
Reviewed-on: #6
2021-05-25 23:24:48 +00:00
cami 1d8cf9fcb3 Working for docker-compose prod 2021-05-26 01:24:17 +02:00
cami d0c30b2113 Removed volumes as it didn't work before 2021-05-26 01:02:06 +02:00
cami 5f42b54a8a Want to run this thing with docker-compose 2021-05-26 00:47:11 +02:00
cami 4f24197e30 Want to run this thing with docker-compose 2021-05-26 00:46:41 +02:00
cami 429fc02202 Merge pull request 'First stable application according to tutorial' (#5) from frontend/header into main
Reviewed-on: #5
2021-05-25 22:04:30 +00:00
cami 8d451a87b6 First stable application according to tutorial 2021-05-25 23:40:27 +02:00