diff --git a/.gitignore b/.gitignore index db4561e..8e88017 100644 --- a/.gitignore +++ b/.gitignore @@ -32,8 +32,7 @@ var/ pip-log.txt pip-delete-this-directory.txt -# Unit test / coverage reports -htmlcov/ +# Unit test / coverage reportshtmlcov/ .tox/ .coverage .cache @@ -52,3 +51,11 @@ docs/_build/ # PyBuilder target/ + +# PyCharm +.idea/ + +# ConfigFile +app/config.py + + diff --git a/app/templates/login.html b/app/templates/login.html index 940493e..a70fb3d 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -1,24 +1,24 @@ {% extends "layout.html" %} {% block content %} -
-
-

Login with Zeus-Account

-
-

-

-

- -

-

-
-
+
+ - -
+
+

Forgot your password? Click here to reset it.

+
+
{% endblock %} \ No newline at end of file diff --git a/db/muhscheme b/db/muhscheme index d5be7c2..e4358ee 100644 --- a/db/muhscheme +++ b/db/muhscheme @@ -1,14 +1,18 @@ ORDERS ======= -OrderID | Courier | Locatie | Starttijdstip | Eindtijstip | Comment +OrderID | User | LocatieID | Starttijdstip | Eindtijstip | Comment Item ===== -ItemID | OrderID | User | Food +ItemID | OrderID | User | FoodID Locaties ====== -LocatieID | Naam | Adres | Telefoonnummer +LocatieID | Naam | Adres | Coordinaten(2.0) | Website + +LocatieMetaData +=============== +LocatieID | Key | Value Food =====