Merge pull request #721 from MatthewCroughan/matthewcroughan/nixify

Add Nix and Poetry to the project

lnbits/__main__.py

@@ -4,7 +4,7 @@ import uvloop
 from loguru import logger
 from starlette.requests import Request
 
-from .commands import bundle_vendored, migrate_databases, transpile_scss
+from .commands import migrate_databases
 from .settings import (
     DEBUG,
     HOST,
@@ -19,8 +19,6 @@ from .settings import (
 uvloop.install()
 
 asyncio.create_task(migrate_databases())
-transpile_scss()
-bundle_vendored()
 
 from .app import create_app
 

lnbits/app.py

@@ -46,9 +46,9 @@ def create_app(config_object="lnbits.settings") -> FastAPI:
     configure_logger()
 
     app = FastAPI()
-    app.mount("/static", StaticFiles(directory="lnbits/static"), name="static")
+    app.mount("/static", StaticFiles(packages=[("lnbits", "static")]), name="static")
     app.mount(
-        "/core/static", StaticFiles(directory="lnbits/core/static"), name="core_static"
+        "/core/static", StaticFiles(packages=[("lnbits.core", "static")]), name="core_static"
     )
 
     origins = ["*"]

lnbits/extensions/bleskomat/__init__.py

@@ -9,7 +9,7 @@ db = Database("ext_bleskomat")
 bleskomat_static_files = [
     {
         "path": "/bleskomat/static",
-        "app": StaticFiles(directory="lnbits/extensions/bleskomat/static"),
+        "app": StaticFiles(packages=[("lnbits", "extensions/bleskomat/static")]),
         "name": "bleskomat_static",
     }
 ]

lnbits/extensions/copilot/__init__.py

@@ -12,7 +12,7 @@ db = Database("ext_copilot")
 copilot_static_files = [
     {
         "path": "/copilot/static",
-        "app": StaticFiles(directory="lnbits/extensions/copilot/static"),
+        "app": StaticFiles(packages=[("lnbits", "extensions/copilot/static")]),
         "name": "copilot_static",
     }
 ]

lnbits/extensions/discordbot/__init__.py

@@ -9,7 +9,7 @@ db = Database("ext_discordbot")
 discordbot_static_files = [
     {
         "path": "/discordbot/static",
-        "app": StaticFiles(directory="lnbits/extensions/discordbot/static"),
+        "app": StaticFiles(packages=[("lnbits", "extensions/discordbot/static")]),
         "name": "discordbot_static",
     }
 ]

lnbits/extensions/jukebox/__init__.py

@@ -12,7 +12,7 @@ db = Database("ext_jukebox")
 jukebox_static_files = [
     {
         "path": "/jukebox/static",
-        "app": StaticFiles(directory="lnbits/extensions/jukebox/static"),
+        "app": StaticFiles(packages=[("lnbits", "extensions/jukebox/static")]),
         "name": "jukebox_static",
     }
 ]

lnbits/extensions/livestream/__init__.py

@@ -12,7 +12,7 @@ db = Database("ext_livestream")
 livestream_static_files = [
     {
         "path": "/livestream/static",
-        "app": StaticFiles(directory="lnbits/extensions/livestream/static"),
+        "app": StaticFiles(packages=[("lnbits", "extensions/livestream/static")]),
         "name": "livestream_static",
     }
 ]

lnbits/extensions/lnurlp/__init__.py

@@ -12,7 +12,7 @@ db = Database("ext_lnurlp")
 lnurlp_static_files = [
     {
         "path": "/lnurlp/static",
-        "app": StaticFiles(directory="lnbits/extensions/lnurlp/static"),
+        "app": StaticFiles(packages=[("lnbits", "extensions/lnurlp/static")]),
         "name": "lnurlp_static",
     }
 ]

lnbits/extensions/offlineshop/__init__.py

@@ -9,7 +9,7 @@ db = Database("ext_offlineshop")
 offlineshop_static_files = [
     {
         "path": "/offlineshop/static",
-        "app": StaticFiles(directory="lnbits/extensions/offlineshop/static"),
+        "app": StaticFiles(packages=[("lnbits", "extensions/offlineshop/static")]),
         "name": "offlineshop_static",
     }
 ]
@@ -21,6 +21,7 @@ def offlineshop_renderer():
     return template_renderer(["lnbits/extensions/offlineshop/templates"])
 
 
+
 from .lnurl import *  # noqa
 from .views import *  # noqa
 from .views_api import *  # noqa

lnbits/extensions/splitpayments/__init__.py

@@ -12,7 +12,7 @@ db = Database("ext_splitpayments")
 splitpayments_static_files = [
     {
         "path": "/splitpayments/static",
-        "app": StaticFiles(directory="lnbits/extensions/splitpayments/static"),
+        "app": StaticFiles(packages=[("lnbits", "extensions/splitpayments/static")]),
         "name": "splitpayments_static",
     }
 ]

lnbits/extensions/withdraw/__init__.py

@@ -9,7 +9,7 @@ db = Database("ext_withdraw")
 withdraw_static_files = [
     {
         "path": "/withdraw/static",
-        "app": StaticFiles(directory="lnbits/extensions/withdraw/static"),
+        "app": StaticFiles(packages=[("lnbits", "extensions/withdraw/static")]),
         "name": "withdraw_static",
     }
 ]

lnbits/server.py

@@ -0,0 +1,17 @@
+import uvicorn
+
+import click
+
+@click.command()
+@click.option('--port', default="5000", help='Port to run LNBits on')
+@click.option('--host', default="127.0.0.1", help='Host to run LNBits on')
+def main(port, host):
+    """Launched with `poetry run lnbits` at root level"""
+    uvicorn.run("lnbits.__main__:app", port=port, host=host)
+
+if __name__ == '__main__':
+    main()
+
+#def main():
+#    """Launched with `poetry run start` at root level"""
+#    uvicorn.run("lnbits.__main__:app")