diff --git a/.gitignore b/.gitignore index 5e55b1a..ed4e28e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Byte-compiled / optimized / DLL files __pycache__/ +*.pyc # C extensions *.so @@ -53,6 +54,7 @@ target/ # PyCharm .idea/ +.vscode/ # ConfigFile app/config.py diff --git a/README.md b/README.md index 2455575..15b44b5 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,13 @@ Haldis is your friendly neighbourhood servant. He exists so lazy fucks like you Start an order and let people add items with a simple mouse-click! No more calculating prices and making lists! Be lazier today! + +Local hosting steps +=================== +0. This is a Python 3 project so make sure to use python 3 and pip3 everywhere +1. Run `pip install -r requirements.txt` +2. Copy `config.example.py` to `config.py` and find out some valid values for `ZEUS_KEY` and `ZEUS_SECRET` (try asking an admin) +3. Copy the python files from `database/` to `app/` (yes, it's sad, I know) +4. Run `python database.py` in `app/` (if you want to fill the DB with sample data be sure to answer `Y` to `Do you still want to add something?`) +5. Run `rm -f add_admins.py* add_oceans_garden.py* add_simpizza.py* create_database.py*` in `app/` +6. Run `python haldis.py runserver` diff --git a/app/database/create_database.py b/app/database/create_database.py index e8d238f..5c3033e 100644 --- a/app/database/create_database.py +++ b/app/database/create_database.py @@ -25,7 +25,7 @@ def add_all(): def recreate_from_scratch(): - confirmation = "Are you very very sure? (Will delete previous entry's!) (y/N) " + confirmation = "Are you very very sure? (Will delete previous entries!) (y/N) " check = "I acknowledge any repercussions!" if input(confirmation) in yes and input("Type: '{}' ".format(check)) == check: print("Resetting the database!") diff --git a/app/templates/order.html b/app/templates/order.html index 974a0c2..fe4db94 100644 --- a/app/templates/order.html +++ b/app/templates/order.html @@ -78,7 +78,7 @@