diff --git a/.gitignore b/.gitignore index 5d44d76e..fac45f3a 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,8 @@ lnbits/static/bundle-components.js lnbits/static/bundle.css lnbits/static/bundle.min.js.old lnbits/static/bundle.min.css.old +lnbits/static/bundle-components.min.js.old +lnbits/upgrades docker # Nix diff --git a/lnbits/core/templates/admin/index.html b/lnbits/core/templates/admin/index.html index b5183b61..d935a54d 100644 --- a/lnbits/core/templates/admin/index.html +++ b/lnbits/core/templates/admin/index.html @@ -1,60 +1,75 @@ -{% extends "base.html" %} {% from "macros.jinja" import window_vars with context -%} {% block page %} -
-
- - - - +{% if not ajax %} {% extends "base.html" %} {% endif %} {% from "macros.jinja" +import window_vars with context %} {% block scripts %} {{ window_vars(user) }} +{% endblock %} {% block page %} - - +
+
+ +
+
+
+ + + + - - - - + + - - + + + + - + + - - - - - + + + + + + + +
+
+
+
+
@@ -213,7 +228,4 @@
- -{% endblock %} {% block scripts %} {{ window_vars(user) }} - {% endblock %} diff --git a/lnbits/core/templates/audit/index.html b/lnbits/core/templates/audit/index.html index ed0e8bbc..1626ca6a 100644 --- a/lnbits/core/templates/audit/index.html +++ b/lnbits/core/templates/audit/index.html @@ -1,12 +1,39 @@ -{% extends "base.html" %} {% from "macros.jinja" import window_vars with context -%} {% block page %} +{% if not ajax %} {% extends "base.html" %} {% endif %} + +{% from "macros.jinja" import window_vars with context %} + +{% block scripts %} {{ window_vars(user) }} {% endblock %} {% block page %} +
+
+ +
+
+
+ +
+
+ + + +
+
+
+
+
+
- +
@@ -14,7 +41,7 @@
- +
@@ -22,7 +49,7 @@
- +
@@ -30,7 +57,7 @@
- +
@@ -83,11 +110,6 @@ - - - - @@ -128,7 +128,7 @@ - - - + + + - {% block page %}{% endblock %} + +
+ + +
+ + + +
+
+
+
+ + {{LNBITS_DENOMINATION}} +
+
+
+
+
+
+ + + + +
{% block page %}{% endblock %}
{% endblock %} {% block footer %} @@ -241,33 +321,43 @@ {% endfor %} {% block scripts %}{% endblock %} {% for url in INCLUDED_COMPONENTS %} diff --git a/lnbits/templates/components.vue b/lnbits/templates/components.vue index dd0cfa30..1fee4aab 100644 --- a/lnbits/templates/components.vue +++ b/lnbits/templates/components.vue @@ -1,23 +1,21 @@