Merge branch 'master' into StreamerCopilot

lnbits/core/templates/core/index.html

@@ -94,7 +94,7 @@
             <a href="https://github.com/ElementsProject/lightning">
               <q-img
                 contain
-                :src="($q.dark.isActive) ? '/static/images/cln.png' : '/static/images/lnd.png'"
+                :src="($q.dark.isActive) ? '/static/images/cln.png' : '/static/images/clnl.png'"
               ></q-img>
             </a>
           </div>
@@ -113,7 +113,7 @@
             <a href="https://opennode.com">
               <q-img
                 contain
-                :src="($q.dark.isActive) ? '/static/images/opennode.png' : '/static/images/opennode.png'"
+                :src="($q.dark.isActive) ? '/static/images/opennode.png' : '/static/images/opennodel.png'"
               ></q-img>
             </a>
           </div>
@@ -121,7 +121,7 @@
             <a href="https://lnpay.co/">
               <q-img
                 contain
-                :src="($q.dark.isActive) ? '/static/images/lnpay.png' : '/static/images/lnpay.png'"
+                :src="($q.dark.isActive) ? '/static/images/lnpay.png' : '/static/images/lnpayl.png'"
               ></q-img>
             </a>
           </div>
@@ -132,7 +132,7 @@
             <a href="https://github.com/shesek/spark-wallet">
               <q-img
                 contain
-                :src="($q.dark.isActive) ? '/static/images/spark.png' : '/static/images/spark.png'"
+                :src="($q.dark.isActive) ? '/static/images/spark.png' : '/static/images/sparkl.png'"
               ></q-img>
             </a>
           </div>
@@ -140,7 +140,7 @@
             <a href="https://t.me/lntxbot">
               <q-img
                 contain
-                :src="($q.dark.isActive) ? '/static/images/lntxbot.png' : '/static/images/lntxbot.png'"
+                :src="($q.dark.isActive) ? '/static/images/lntxbot.png' : '/static/images/lntxbotl.png'"
               ></q-img>
             </a>
           </div>
@@ -150,7 +150,7 @@
             <a href="https://github.com/rootzoll/raspiblitz">
               <q-img
                 contain
-                :src="($q.dark.isActive) ? '/static/images/blitz.png' : '/static/images/blitz.png'"
+                :src="($q.dark.isActive) ? '/static/images/blitz.png' : '/static/images/blitzl.png'"
               ></q-img>
             </a>
           </div>
@@ -158,7 +158,7 @@
             <a href="https://getumbrel.com/">
               <q-img
                 contain
-                :src="($q.dark.isActive) ? '/static/images/umbrel.png' : '/static/images/umbrel.png'"
+                :src="($q.dark.isActive) ? '/static/images/umbrel.png' : '/static/images/umbrell.png'"
               ></q-img>
             </a>
           </div>

lnbits/extensions/captcha/static/js/captcha.js

@@ -2,7 +2,7 @@ var ciframeLoaded = !1,
   captchaStyleAdded = !1
 
 function ccreateIframeElement(t = {}) {
-  const e = document.createElement('iframe')
+   const e = document.createElement('iframe')
   // e.style.marginLeft = "25px",
   ;(e.style.border = 'none'),
     (e.style.width = '100%'),
@@ -12,13 +12,17 @@ function ccreateIframeElement(t = {}) {
   t.dest, t.amount, t.currency, t.label, t.opReturn
   var captchaid = document
     .getElementById('captchascript')
-    .getAttribute('data-captchaid')
+    .getAttribute('data-captchaid');
-  return (e.src = './captcha/' + captchaid), e
+  var lnbhostsrc = document
+    .getElementById('captchascript')
+    .getAttribute('src');
+  var lnbhost = lnbhostsrc.split("/captcha/static/js/captcha.js")[0];
+  return (e.src = lnbhost + '/captcha/' + captchaid), e
 }
 document.addEventListener('DOMContentLoaded', function () {
-  if (captchaStyleAdded) console.log('Captcha stuff already added!')
+  if (captchaStyleAdded) console.log('Captcha already added!')
   else {
-    console.log('Adding captcha stuff'), (captchaStyleAdded = !0)
+    console.log('Adding captcha'), (captchaStyleAdded = !0)
     var t = document.createElement('style')
     t.innerHTML =
       "\t/*Button*/\t\t.button-captcha-filled\t\t\t{\t\t\tdisplay: flex;\t\t\talign-items: center;\t\t\tjustify-content: center;\t\t\twidth: 120px;\t\t\tmin-width: 30px;\t\t\theight: 40px;\t\t\tline-height: 2.5;\t\t\ttext-align: center;\t\t\tcursor: pointer;\t\t\t/* Rectangle 2: */\t\t\tbackground: #FF7979;\t\t\tbox-shadow: 0 2px 4px 0 rgba(0,0,0,0.20);\t\t\tborder-radius: 20px;\t\t\t/* Sign up: */\t\t\tfont-family: 'Avenir-Heavy', Futura, Helvetica, Arial;\t\t\tfont-size: 16px;\t\t\tcolor: #FFFFFF;\t\t}\t\t.button-captcha-filled:hover\t\t{\t\t\tbackground:#FFFFFF;\t\t\tcolor: #FF7979;\t\t\tbox-shadow: 0 0 4px 0 rgba(0,0,0,0.20);\t\t}\t\t.button-captcha-filled:active\t\t{\t\t\tbackground:#FFFFFF;\t\t\tcolor: #FF7979;\t\t\t/*Move it down a little bit*/\t\t\tposition: relative;\t\t\ttop: 1px;\t\t}\t\t.button-captcha-filled-dark\t\t\t{\t\t\tdisplay: flex;\t\t\talign-items: center;\t\t\tjustify-content: center;\t\t\twidth: 120px;\t\t\tmin-width: 30px;\t\t\theight: 40px;\t\t\tline-height: 2.5;\t\t\ttext-align: center;\t\t\tcursor: pointer;\t\t\t/* Rectangle 2: */\t\t\tbackground: #161C38;\t\t\tbox-shadow: 0 0px 4px 0 rgba(0,0,0,0.20);\t\t\tborder-radius: 20px;\t\t\t/* Sign up: */\t\t\tfont-family: 'Avenir-Heavy', Futura, Helvetica, Arial;\t\t\tfont-size: 16px;\t\t\tcolor: #FFFFFF;\t\t}\t\t.button-captcha-filled-dark:hover\t\t{\t\t\tbackground:#FFFFFF;\t\t\tcolor: #161C38;\t\t\tbox-shadow: 0 0px 4px 0 rgba(0,0,0,0.20);\t\t}\t\t.button-captcha-filled-dark:active\t\t{\t\t\tbackground:#FFFFFF;\t\t\tcolor: #161C38;\t\t\t/*Move it down a little bit*/\t\t\tposition: relative;\t\t\ttop: 1px;\t\t}\t\t.modal-captcha-container {\t\t    position: fixed;\t\t    z-index: 1000;\t\t    text-align: left;/*Si no añado esto, a veces hereda el text-align:center del body, y entonces el popup queda movido a la derecha, por center + margin left que aplico*/\t\t    left: 0;\t\t    top: 0;\t\t    width: 100%;\t\t    height: 100%;\t\t    background-color: rgba(0, 0, 0, 0.5);\t\t    opacity: 0;\t\t    visibility: hidden;\t\t    transform: scale(1.1);\t\t    transition: visibility 0s linear 0.25s, opacity 0.25s 0s, transform 0.25s;\t\t}\t\t.modal-captcha-content {\t\t    position: absolute;\t\t    top: 50%;\t\t    left: 50%;\t\t    transform: translate(-50%, -50%);\t\t    background-color: white;\t\t    width: 100%;\t\t    height: 100%;\t\t    border-radius: 0.5rem;\t\t    /*Rounded shadowed borders*/\t\t\tbox-shadow: 2px 2px 4px 0 rgba(0,0,0,0.15);\t\t\tborder-radius: 5px;\t\t}\t\t.close-button-captcha {\t\t    float: right;\t\t    width: 1.5rem;\t\t    line-height: 1.5rem;\t\t    text-align: center;\t\t    cursor: pointer;\t\t    margin-right:20px;\t\t    margin-top:10px;\t\t    border-radius: 0.25rem;\t\t    background-color: lightgray;\t\t}\t\t.close-button-captcha:hover {\t\t    background-color: darkgray;\t\t}\t\t.show-modal-captcha {\t\t    opacity: 1;\t\t    visibility: visible;\t\t    transform: scale(1.0);\t\t    transition: visibility 0s linear 0s, opacity 0.25s 0s, transform 0.25s;\t\t}\t\t/* Mobile */\t\t@media screen and (min-device-width: 160px) and ( max-width: 1077px ) /*No tendria ni por que poner un min-device, porq abarca todo lo humano...*/\t\t{\t\t}"