From cdba41aa524ebdc2b8e0dcc6fae7614b33fdbee6 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 26 Mar 2023 19:53:57 +0200 Subject: [PATCH] information flows better like that --- API/QRCODE.sh | 1 + ASTROBOT/VOEUX.refresh.sh | 1 + www/G1PalPay/index.html | 8 ++++---- www/PasseportTerre/index.html | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 33dc07bb..1d813ba1 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -45,6 +45,7 @@ if [[ ${QRCODE} == "station" ]]; then ## SHOW G1PALPAY FRONT (IFRAME) sed "s~_STATION_~${myIPFS}${ISTATION}/~g" $MY_PATH/../www/G1PalPay/index.html > ~/.zen/tmp/${MOATS}/index.htm sed -i "s~http://127.0.0.1:8080~${myIPFS}~g" ~/.zen/tmp/${MOATS}/index.htm + sed -i "s~http://astroport.localhost:1234~${myASTROPORT}~g" ~/.zen/tmp/${MOATS}/index.htm WSTATION="/ipfs/$(ipfs add -q ~/.zen/tmp/${MOATS}/index.htm)" echo $WSTATION > ~/.zen/tmp/WSTATION diff --git a/ASTROBOT/VOEUX.refresh.sh b/ASTROBOT/VOEUX.refresh.sh index 85ed828f..7c276fc4 100755 --- a/ASTROBOT/VOEUX.refresh.sh +++ b/ASTROBOT/VOEUX.refresh.sh @@ -192,6 +192,7 @@ do | sed -e "s~_LIBRA_~$(myIpfsGw)~g" \ -e "s~_G1VOEU_~${WISHNAME}~g" \ -e "s~_PLAYER_~${PLAYER}~g" \ + -e "s~_G1PUB_~${G1PUB}~g" \ -e "s~_VOEUNS_~${VOEUNS}~g" \ -e "s~QmYdWBx32dP14XcbXF7hhtDq7Uu6jFmDaRnuL5t7ARPYkW/index_fichiers/world.js~${IAMAP}/world.js~g" \ -e "s~_ASTRONAUTENS_~${ASTRONAUTENS}~g" \ diff --git a/www/G1PalPay/index.html b/www/G1PalPay/index.html index 8e8b417c..913f49d4 100644 --- a/www/G1PalPay/index.html +++ b/www/G1PalPay/index.html @@ -114,7 +114,7 @@ a {
-
+

Scannez QRCode

G1BILLET

et "portefeuille" Cesium

@@ -168,10 +168,10 @@ a { //print the decrypted url console.log(decrypted.data); var amount = prompt("Saisir MONTANT Ğ1:"); - var myU = 'http://astroport.localhost:1234' + decrypted.data +'&pay=' + amount + '&g1pub=' + document.getElementById("scan").innerHTML.value ; - document.getElementById("scan").innerHTML = decrypted.data; + var myU = 'http://astroport.localhost:1234' + decrypted.data +'&pay=' + amount + '&g1pub=' + document.getElementById("resu").innerHTML.value ; + document.getElementById("resu").innerHTML = decrypted.data; } else { - document.getElementById("scan").innerHTML = content; + document.getElementById("resu").innerHTML = content; var myU = 'http://astroport.localhost:1234/?qrcode=' + content; } diff --git a/www/PasseportTerre/index.html b/www/PasseportTerre/index.html index ebd8d636..d2807438 100644 --- a/www/PasseportTerre/index.html +++ b/www/PasseportTerre/index.html @@ -201,6 +201,7 @@

+
_G1PUB_

TODO: + display video with overlay link to grab Tid into my TW.