From 8ba9c1733d27686f8532bfb26acc4cd860188089 Mon Sep 17 00:00:00 2001 From: th3root Date: Fri, 10 Mar 2023 21:31:28 -0500 Subject: [PATCH] Updated some requirements, began npm handling. --- Pipfile | 1 + Pipfile.lock | 15 ++++++++++++++- config.json | 19 ------------------- pyShelf.py | 1 + 4 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 config.json diff --git a/Pipfile b/Pipfile index 5b8e5e2..4c0e96e 100644 --- a/Pipfile +++ b/Pipfile @@ -23,6 +23,7 @@ pudb = "*" jinja2 = "*" libsass = "*" nodejs-bin = "*" +npm = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 73ddc29..8efb516 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "5d56999438cbda3534d93e0836165fa7d44a8c0e0987034158c059e7b3a96907" + "sha256": "ef07730e6f0a8a9ffcf031f104ac9ef771a4810cc749bb1339e966d7daaa9c08" }, "pipfile-spec": 6, "requires": { @@ -608,6 +608,19 @@ "index": "pypi", "version": "==18.4.0a4" }, + "npm": { + "hashes": [ + "sha256:84aefc83a3486d034c4c14f8bcd4b746b95b529289b0d042c268f6201c3034e9" + ], + "index": "pypi", + "version": "==0.1.1" + }, + "optional-django": { + "hashes": [ + "sha256:77d6b9fb74bda30583e1af4683a39e0af725cea6003252bba75838f4939326c5" + ], + "version": "==0.1.0" + }, "orjson": { "hashes": [ "sha256:010e2970ec9e826c332819e0da4b14b29b19641da0f1a6af4cec91629ef9b988", diff --git a/config.json b/config.json deleted file mode 100644 index 909d012..0000000 --- a/config.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "TITLE": "pyShelf E-Book Server", - "VERSION": "0.7.0", - "BOOKPATH": "/books", - "DB_HOST": "localhost", - "DB_PORT": "5432", - "DATABASE": "pyshelf", - "USER": "pyshelf", - "PASSWORD": "pyshelf", - "BOOKSHELF": "data/shelf.json", - "ALLOWED_HOSTS": [ - "localhost", - "127.0.0.1", - "[::1]", - "0.0.0.0" - ], - "SECRET": "$(*6fvi@enzau@vir1ft%gz7sar%*okxhc0h$s7pud4ijnkj5t", - "BUILD_MODE": "development" -} diff --git a/pyShelf.py b/pyShelf.py index ddaecb8..34bb602 100755 --- a/pyShelf.py +++ b/pyShelf.py @@ -8,6 +8,7 @@ from src.backend.lib.config import Config from src.backend.pyShelf_MakeCollections import MakeCollections from src.backend.pyShelf_ScanLibrary import execute_scan from src.frontend.lib.FastAPIServer import FastAPIServer +from src.frontend.lib.objects import FastAPIServer # import websockets