9c0b57dbf8
Merge pull request 'Formatting' ( #30 ) from formatting into main
2021-06-21 01:48:13 +00:00
b9771e6b1f
Reformating
2021-06-21 03:45:22 +02:00
b25d8fad3a
Merge pull request 'Refactoring and removing unused things' ( #29 ) from refactor/removeThigns into main
2021-06-21 00:55:01 +00:00
ffa2c74ef5
Refactoring and removing unused things
2021-06-21 02:53:24 +02:00
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
828da9a355
Added a custom link to the button
2021-06-21 02:11:44 +02:00
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
67575be960
Further redesign and refactoring
2021-06-07 05:03:18 +02:00
49106ea1b6
Refactored some things in the frontend
2021-06-07 04:14:00 +02:00
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
b91084d62b
Removed the button in the footer
2021-05-28 01:56:16 +02:00
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
34724f88f3
Started with new things for personalization
2021-05-27 04:19:22 +02:00
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
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
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
f8997272fe
Removed all third party requests
2021-05-27 02:43:05 +02:00
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
9386e5bb3d
Changed the docker-compose files so that everything works
2021-05-27 00:31:38 +02:00
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
1d8cf9fcb3
Working for docker-compose prod
2021-05-26 01:24:17 +02:00
d0c30b2113
Removed volumes as it didn't work before
2021-05-26 01:02:06 +02:00
5f42b54a8a
Want to run this thing with docker-compose
2021-05-26 00:47:11 +02:00
4f24197e30
Want to run this thing with docker-compose
2021-05-26 00:46:41 +02:00
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
8d451a87b6
First stable application according to tutorial
2021-05-25 23:40:27 +02:00
f5e4be85c4
Merge pull request 'Starting with docker implementation for python. Does not work at the moment' ( #3 ) from feature/flaskdocker into main
...
Reviewed-on: #3
2021-05-11 00:05:27 +00:00
d312f122cb
Working integration with frontend and backend
2021-05-11 02:04:42 +02:00
6ad07d2541
Added dev environment for docker
2021-05-11 02:03:32 +02:00
ea6497d7e3
Merge pull request 'Added a start script to run docker containers' ( #4 ) from feature/startscript into main
...
Reviewed-on: #4
2021-05-07 02:13:54 +00:00
2ec7358a16
Added a start script to run docker containers
2021-05-07 04:13:15 +02:00
b3601652f1
Starting with docker implementation for python. Does not work at the moment
2021-05-07 04:04:38 +02:00
d613c355ca
Merge pull request 'backend/initial' ( #2 ) from backend/initial into main
...
Reviewed-on: #2
2021-05-07 02:03:39 +00:00
efeba756a5
Added connection for backend
2021-05-07 04:02:43 +02:00
dca5bbda5c
Working backend without container
2021-05-07 04:02:18 +02:00
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
8fd0e44422
Started with flask and added a /time endpoint
2021-05-07 02:24:50 +02:00
395b3f1e54
Added backend and moved things
2021-05-07 02:16:54 +02:00
fad61c4d93
Initial Commit
2021-05-05 03:08:58 +02:00
