chore: move core/templates into templates/, remove unused and deprecate macro (#3804)

lnbits/core/templates/index.html

@@ -1,3 +0,0 @@
-{% 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

@@ -1,3 +0,0 @@
-{% 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,
-        "index.html",
+        "base.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, "index.html", {"public": True})
+    return template_renderer().TemplateResponse(request, "base.html", {"public": True})
 
 
 @generic_router.get("/uuidv4/{hex_value}")

lnbits/helpers.py

@@ -55,7 +55,6 @@ 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/templates/base.html

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

lnbits/templates/error.html

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

lnbits/templates/macros.jinja

@@ -1,9 +1,5 @@
 {% macro window_vars(user) -%}
-  <script>
-  //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>
+  // deprecated dont use window_vars anymore
 </script>
 {%- endmacro %}