From 6abaf515aecc34ba7adb3b7dd5acd43d47764a15 Mon Sep 17 00:00:00 2001
From: Daniel Weschke <daniel.weschke@directbox.de>
Date: Thu, 21 Dec 2023 13:26:55 +0100
Subject: [PATCH] fix config

---
 controldeck.py | 12 ++++--------
 justpy.env     |  3 ---
 2 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 justpy.env

diff --git a/controldeck.py b/controldeck.py
index 20b599b..07f8488 100755
--- a/controldeck.py
+++ b/controldeck.py
@@ -31,16 +31,12 @@ CACHE_DIR = path.join(path.expanduser('~'), '.cache', APP_NAME.lower())
 STATIC_DIR = path.join(CACHE_DIR, 'static')
 
 # justpy config overwrite
-# NEEDS to be done before loading justpy
+# NEEDS to be done BEFORE loading justpy but AFTER jpcore.justpy_config.JpConfig
+# jpcore.justpy_config.JpConfig loads defaults into jpcore.jpconfig
+# justpy creates app mounts
+from jpcore.justpy_config import JpConfig
 import jpcore.jpconfig
 jpcore.jpconfig.STATIC_DIRECTORY = STATIC_DIR
-# justpy/justpy.py
-# import jpcore.jpconfig as jpconfig
-# app = JustpyApp(middleware=middleware, debug=jpconfig.DEBUG)
-# app.mount(jpconfig.STATIC_ROUTE, StaticFiles(directory=jpconfig.STATIC_DIRECTORY), name=jpconfig.STATIC_NAME)
-# app.mount(
-#     "/templates", StaticFiles(directory=current_dir + "/templates"), name="templates"
-# )
 
 from justpy import (
   app,
diff --git a/justpy.env b/justpy.env
deleted file mode 100644
index 4543732..0000000
--- a/justpy.env
+++ /dev/null
@@ -1,3 +0,0 @@
-STATIC_DIRECTORY = ./static
-NO_INTERNET = True
-VERBOSE = False
\ No newline at end of file