chore: just a change

.github/workflows/bundle.yml

@@ -1,29 +0,0 @@
-name: bundle
-on:
-  workflow_call:
-
-jobs:
-  bundle:
-    permissions:
-      contents: write
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-      - uses: lnbits/lnbits/.github/actions/prepare@dev
-        with:
-          python-version: "3.10"
-          node-version: "24.x"
-          npm: true
-      - run: make bundle
-      - name: Commit and push bundle changes
-        run: |
-          git config user.name "alan"
-          git config user.email "alan@lnbits.com"
-          git add lnbits/static
-          if git diff --cached --quiet; then
-            exit 0
-          fi
-          git commit -m "chore: make bundle [skip ci]"
-          git push

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
 
 
 jobs:
+
   lint:
     uses: ./.github/workflows/lint.yml
 
@@ -97,7 +98,3 @@ jobs:
     uses: ./.github/workflows/jmeter.yml
     with:
       python-version: ${{ matrix.python-version }}
-
-  bundle:
-    needs: [ lint, test-api, test-wallets, test-unit, migration, openapi, regtest, jmeter ]
-    uses: ./.github/workflows/bundle.yml

.github/workflows/lint.yml

@@ -25,11 +25,18 @@ jobs:
       make: pyright
       npm: true
 
+
   prettier:
     uses: ./.github/workflows/make.yml
     with:
       make: checkprettier
       npm: true
 
+  bundle:
+    uses: ./.github/workflows/make.yml
+    with:
+      make: checkbundle
+      npm: true
+
   poetry:
     uses: ./.github/workflows/poetry.yml

lnbits/core/templates/index.html

@@ -0,0 +1,3 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block scripts %} {{ window_vars(user) }} {% endblock %} {% block page %}{%
+endblock %}

lnbits/core/templates/index_public.html

@@ -0,0 +1,3 @@
+{% extends "public.html" %} {% from "macros.jinja" import window_vars with
+context %} {% block scripts %} {{ window_vars() }} {% endblock %} {% block page
+%} {% endblock %}

lnbits/core/views/generic.py

@@ -200,7 +200,7 @@ async def index(
 ) -> HTMLResponse:
     return template_renderer().TemplateResponse(
         request,
-        "base.html",
+        "index.html",
         {
             "user": user.json(),
         },
@@ -211,7 +211,7 @@ async def index(
 @generic_router.get("/node/public")
 @generic_router.get("/first_install", dependencies=[Depends(check_first_install)])
 async def index_public(request: Request) -> HTMLResponse:
-    return template_renderer().TemplateResponse(request, "base.html", {"public": True})
+    return template_renderer().TemplateResponse(request, "index.html", {"public": True})
 
 
 @generic_router.get("/uuidv4/{hex_value}")

lnbits/helpers.py

@@ -55,6 +55,7 @@ def static_url_for(static: str, path: str) -> str:
 def template_renderer(additional_folders: list | None = None) -> Jinja2Templates:
     folders = [
         "lnbits/templates",
+        "lnbits/core/templates",
         settings.extension_builder_working_dir_path.as_posix(),
     ]
 

lnbits/static/js/pages/account.js

@@ -10,10 +10,6 @@ window.PageAccount = {
           name: 'bitcoin',
           color: 'deep-orange'
         },
-        {
-          name: 'classic',
-          color: 'purple'
-        },
         {
           name: 'mint',
           color: 'green'

lnbits/templates/base.html

@@ -90,9 +90,6 @@
       {% if not public %}
       window.g.isPublicPage = false
       {% endif %}
-      window.app = Vue.createApp({
-        el: '#vue',
-      })
     </script>
     {% endif %}
     <!-- scripts from extensions -->

lnbits/templates/error.html

@@ -1,4 +1,6 @@
-{% extends "base.html" %} {% block page_container %}
+{% extends "public.html" %} {% from "macros.jinja" import window_vars with
+context %} {% block scripts %} {{ window_vars() }} {% endblock %} {% block
+page_container %}
 <lnbits-error
   code="{{ status_code | safe }}"
   message="{{ message | safe }}"

lnbits/templates/macros.jinja

@@ -1,5 +1,9 @@
 {% macro window_vars(user) -%}
-<script>
+  <script>
-  // deprecated dont use window_vars anymore
+  //Needed for Vue to create the app on first load (although called on every page, its only loaded once)
+  window.app = Vue.createApp({
+    el: '#vue',
+    mixins: [window.windowMixin]
+  })
 </script>
 {%- endmacro %}

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lnbits"
-version = "1.5.2"
+version = "1.5.2-rc3"
 requires-python = ">=3.10,<3.13"
 description = "LNbits, free and open-source Lightning wallet and accounts system."
 authors = [{ name = "Alan Bits", email = "alan@lnbits.com" }]

tests/conftest.py

@@ -62,6 +62,7 @@ def run_before_and_after_tests(settings: Settings):
 
 
 # use session scope to run once before and once after all tests
+# random change
 @pytest.fixture(scope="session")
 async def app(settings: Settings):
     app = create_app()

uv.lock

@@ -1263,7 +1263,7 @@ wheels = [
 
 [[package]]
 name = "lnbits"
-version = "1.5.2"
+version = "1.5.2rc3"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },