diff --git a/API/QRCODE.sh b/API/QRCODE.sh
index a2164ea9..95be8938 100755
--- a/API/QRCODE.sh
+++ b/API/QRCODE.sh
@@ -54,7 +54,10 @@ fi
###############################################################################
if [[ ${QRCODE} == "station" ]]; then
- rm ~/.zen/tmp/ISTATION ## REMOVE IN PROD
+ # Keep 2nd try of the day
+ [[ ! -s ~/.zen/tmp/_ISTATION ]] \
+ && mv ~/.zen/tmp/ISTATION ~/.zen/tmp/_ISTATION \
+ || cp ~/.zen/tmp/_ISTATION ~/.zen/tmp/ISTATION
if [[ ! -s ~/.zen/tmp/ISTATION ]]; then
## GENERATE PLAYER G1 TO ZEN ACCOUNTING
@@ -92,16 +95,17 @@ fi
if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
echo ${QRCODE}
PASS=$(urldecode $THIS)
- echo "## THIS IS A PGP ENCRYPTED QRCODE LOOK - PASS $PASS - $APPNAME"
+ echo "## THIS IS A PGP ENCRYPTED QRCODE LOOK - PASS ${PASS} - $APPNAME"
+
+ if [[ ${PASS} != "" ]]; then
+ echo "WHAT=${WHAT} VAL=${VAL}"
- if [[ $PASS != "" ]]; then
- echo ${WHAT} ${VAL}
## Recreate GPG aes file
urldecode ${QRCODE} | tr '_' '+' | tr '-' '\n' | tr '~' '-' > ~/.zen/tmp/${MOATS}/disco.aes
sed -i '$ d' ~/.zen/tmp/${MOATS}/disco.aes
# Decoding
- echo "cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "$PASS" --batch"
- cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "$PASS" --batch > ~/.zen/tmp/${MOATS}/decoded
+ echo "cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "${PASS}" --batch"
+ cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "${PASS}" --batch > ~/.zen/tmp/${MOATS}/decoded
# cat ~/.zen/tmp/${MOATS}/disco
## FORMAT IS "/?salt=${USALT}&pepper=${UPEPPER}"
@@ -173,10 +177,23 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
if [[ $APPNAME == "history" || $APPNAME == "read" ]]; then
- ## history & read
+ ## history & read ## CANNOT USE jaklis CLI formated output (JSON output)
+ echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}/disco
+ sed -i "s~text/html~application/json~g" ~/.zen/tmp/${MOATS}/disco
# cp ~/.zen/tmp/${MOATS}/secret.key ~/.zen/tmp/
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/secret.key $APPNAME -j"
- ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key $APPNAME -j > ~/.zen/tmp/${MOATS}/disco
+ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key $APPNAME -j >> ~/.zen/tmp/${MOATS}/disco
+
+ fi
+
+ if [[ $APPNAME == "balance" ]]; then
+
+ ## history & read
+ # cp ~/.zen/tmp/${MOATS}/secret.key ~/.zen/tmp/
+ qrencode -s 6 -o "${HOME}/.zen/tmp/${MOATS}/disco.qr.png" "$G1PUB"
+ QRURL=${myIPFS}/ipfs/$(ipfs add -q ~/.zen/tmp/${MOATS}/disco.qr.png)
+ ONVADIRE="
~ ${CURCOINS} Ğ1
${G1PUB}
"
+ echo "${ONVADIRE}" >> ~/.zen/tmp/${MOATS}/disco
fi
@@ -206,7 +223,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
else
- echo "
$PASS : MAUVAIS PASS
" >> ~/.zen/tmp/${MOATS}/disco
+ echo "
${PASS} : MAUVAIS PASS
" >> ~/.zen/tmp/${MOATS}/disco
echo "
" >> ~/.zen/tmp/${MOATS}/disco
fi
diff --git a/tools/VISA.print.sh b/tools/VISA.print.sh
index a508f15c..b7da8955 100755
--- a/tools/VISA.print.sh
+++ b/tools/VISA.print.sh
@@ -27,82 +27,65 @@ PASS=$(cat ~/.zen/game/players/${PLAYER}/.pass)
source ~/.zen/game/players/${PLAYER}/secret.june
[[ $SALT == "" ]] && echo "BAD ACCOUNT. PLEASE BACKUP. MOVE. RESTORE." && exit 1
-LP=$(ls /dev/usb/lp* 2>/dev/null)
+LP=$(ls /dev/usb/lp* | head -n 1 2>/dev/null)
-PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
+[[ ${PASS} == "" ]] && PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
# USE G1BILLET GENERATOR
[[ -s ~/.zen/G1BILLET/MAKE_G1BILLET.sh ]] \
-&& echo ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "$PASS" "xbian" "$ASTRONAUTENS" "$PLAYER" \
-&& ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "$PASS" "xbian" "$ASTRONAUTENS" "$PLAYER"
+&& echo ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "xbian" "$ASTRONAUTENS" "$PLAYER" \
+&& ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "xbian" "$ASTRONAUTENS" "$PLAYER" \
+|| ( echo "MISSING G1BILLET ENGINE - ERROR - " && exit 1 )
s=$(${MY_PATH}/diceware.sh 1 | xargs)
p=$(${MY_PATH}/diceware.sh 1 | xargs)
BILLETNAME=$(echo "$SALT" | sed 's/ /_/g')
-mv ~/.zen/G1BILLET/tmp/g1billet/$PASS/$BILLETNAME.BILLET.jpg ~/.zen/tmp/$PASS.jpg
+## GET IMAGE FROM G1BILLET tmp
+mv ~/.zen/G1BILLET/tmp/g1billet/${PASS}/$BILLETNAME.BILLET.jpg ~/.zen/tmp/${PASS}.jpg
-[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/$PASS.jpg
+[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${PASS}.jpg
- #~ USALT=$(echo "$SALT" | jq -Rr @uri)
- #~ UPEPPER=$(echo "$PEPPER" | jq -Rr @uri)
- #~ echo "/?${s}=${USALT}&${p}=${UPEPPER}" > ~/.zen/tmp/topgp
- #~ cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$PASS" -o ~/.zen/tmp/gpg.${PASS}.asc
+#~ [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.TW.png
- #~ DISCO="$(cat ~/.zen/tmp/gpg.${PASS}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )"
- #~ echo "$DISCO"
- #~ ## Add logo to QRCode
- #~ cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/fond.png
- #~ ## MAKE amzqr WITH astro:// LINK
- #~ amzqr -d ~/.zen/tmp \
- #~ -l H \
- #~ -p ~/.zen/tmp/fond.png \
- #~ "$DISCO"
+#~ [[ $LP ]] \
+#~ && brother_ql_create --model QL-700 --label-size 62 ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.TW.png > ~/.zen/tmp/bill.bin 2>/dev/null \
+#~ && sudo brother_ql_print ~/.zen/tmp/bill.bin $LP
+#~ #############
- #~ ## ADD PLAYER EMAIL
- convert -gravity SouthEast -pointsize 12 -fill black -draw "text 5,3 \"$EMAIL\"" ~/.zen/G1BILLET/tmp/fond_qrcode.png ~/.zen/tmp/${PASS}.G1PASS.png
+convert ~/.zen/game/players/${PLAYER}/QRG1avatar.png -resize 300 ~/.zen/tmp/QR.png
+convert ${MY_PATH}/../images/astroport.jpg -resize 260 ~/.zen/tmp/astroport.jpg
-[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${PASS}.G1PASS.png
-## PRINT STICKER
-[[ $LP ]] \
-&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${PASS}.G1PASS.png > ~/.zen/tmp/bill.bin 2>/dev/null \
-&& sudo brother_ql_print ~/.zen/tmp/bill.bin $LP
-#############
-
-convert ~/.zen/game/players/${PLAYER}/QRG1avatar.png -resize 320 ~/.zen/tmp/QR.png
-convert ${MY_PATH}/../images/astroport.jpg -resize 220 ~/.zen/tmp/ASTROPORT.png
-
-composite -compose Over -gravity NorthEast -geometry +0+0 ~/.zen/tmp/ASTROPORT.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/astroport.png
-composite -compose Over -gravity NorthWest -geometry +0+0 ~/.zen/tmp/QR.png ~/.zen/tmp/astroport.png ~/.zen/tmp/one.png
+composite -compose Over -gravity NorthEast -geometry +42+72 ~/.zen/tmp/astroport.jpg ${MY_PATH}/../images/Brother_600x300.png ~/.zen/tmp/one.png
+composite -compose Over -gravity NorthWest -geometry +0+12 ~/.zen/tmp/QR.png ~/.zen/tmp/one.png ~/.zen/tmp/astroport.png
# composite -compose Over -gravity NorthWest -geometry +280+280 ~/.zen/game/players/${PLAYER}/QRsec.png ~/.zen/tmp/one.png ~/.zen/tmp/image.png
-convert -gravity NorthWest -pointsize 25 -fill black -draw "text 10,300 \"$PLAYER\"" ~/.zen/tmp/one.png ~/.zen/tmp/image.png
+convert -gravity NorthEast -pointsize 15 -fill black -draw "text 42,32 \"$PLAYER\"" ~/.zen/tmp/astroport.png ~/.zen/tmp/image.png
convert -gravity NorthWest -pointsize 15 -fill black -draw "text 20,2 \"$G1PUB\"" ~/.zen/tmp/image.png ~/.zen/tmp/pseudo.png
-convert -gravity NorthWest -pointsize 20 -fill black -draw "text 400,260 \"$PASS\"" ~/.zen/tmp/pseudo.png ~/.zen/tmp/pass.png
-convert -gravity NorthWest -pointsize 15 -fill black -draw "text 300,200 \"$SALT\"" ~/.zen/tmp/pass.png ~/.zen/tmp/salt.png
-convert -gravity NorthWest -pointsize 15 -fill black -draw "text 300,220 \"$PEPPER\"" ~/.zen/tmp/salt.png ~/.zen/tmp/done.jpg
+convert -gravity SouthEast -pointsize 30 -fill black -draw "text 100, 72 \"${PASS}\"" ~/.zen/tmp/pseudo.png ~/.zen/tmp/pass.png
+convert -gravity SouthEast -pointsize 12 -fill black -draw "text 10,25 \"$SALT\"" ~/.zen/tmp/pass.png ~/.zen/tmp/salt.png
+convert -gravity SouthEast -pointsize 12 -fill black -draw "text 10,10 \"$PEPPER\"" ~/.zen/tmp/salt.png ~/.zen/tmp/visa.${PASS}.jpg
-[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/done.jpg
+[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/visa.${PASS}.jpg
+## PRINT VISA
[[ $LP ]] \
-&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/done.jpg > ~/.zen/tmp/toprint.bin 2>/dev/null \
+&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/visa.${PASS}.jpg > ~/.zen/tmp/toprint.bin 2>/dev/null \
&& sudo brother_ql_print ~/.zen/tmp/toprint.bin $LP
-################################################################
-### PRINT PLAYER TW myIP link
+## PRINT PGP G1PASS
+convert ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.G1PASS.png -resize 400 ~/.zen/tmp/ASTROPORT.png
+convert -gravity NorthWest -pointsize 15 -fill black -draw "text 20,2 \"$G1PUB\"" ~/.zen/tmp/ASTROPORT.png ~/.zen/tmp/one.png
-#~ playerns=$(ipfs key list -l | grep -w $PLAYER | cut -d ' ' -f1)
-#~ qrencode -s 12 -o "$HOME/.zen/tmp/QR.ASTRO.png" "$myIPFSGW/ipns/$playerns"
-#~ convert $HOME/.zen/tmp/QR.ASTRO.png -resize 600 ~/.zen/tmp/playerns.png
-## GET FROM G1BILLET CACHE FACTORY
-[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/G1BILLET/tmp/${PASS}/300.png
+composite -compose Over -gravity Center -geometry +0+0 ~/.zen/tmp/one.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/${PASS}.png
+
+
+[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${PASS}.png
[[ $LP ]] \
-&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/G1BILLET/tmp/${PASS}/300.png > ~/.zen/tmp/toprint.bin 2>/dev/null \
+&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${PASS}.png > ~/.zen/tmp/toprint.bin 2>/dev/null \
&& sudo brother_ql_print ~/.zen/tmp/toprint.bin $LP
-################################################################
-
## TODO BETTER CACHE CLEANING
#~ rm -Rf ~/.zen/G1BILLET/tmp/${PASS}
#~ rm ~/.zen/G1BILLET/tmp/${PASS}*
diff --git a/www/G1PalPay/index.html b/www/G1PalPay/index.html
index 1b6d4029..7b5c6bfb 100644
--- a/www/G1PalPay/index.html
+++ b/www/G1PalPay/index.html
@@ -126,7 +126,8 @@ a {
Login
Messagerie
Historique
- Payer
+ Payer
+ Balance
@@ -181,6 +182,13 @@ a {
scanner.addListener('scan', function (content) {
alert(content);
if (content.startsWith('~~~~~')) {
+ // DESTINATION OF PREVIOUS SCAN
+ if (document.getElementById("resu").innerHTML !== '') {
+ var mypub = document.getElementById("resu").innerHTML.value;
+ } else {
+ // OR IF NONE Fred ;)
+ var mypub = "DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech"
+ }
// GET PASS THAT DECODE PGP
var pass = prompt("Saisir PASS:");
// GET APPNAME
@@ -191,13 +199,12 @@ a {
}
if ( appname == 'login') {
var amount = prompt("Saisir EMAIL:");
- }
- // DESTINATION WAS PREVIOUS SCAN
- if (document.getElementById("resu").innerHTML !== '') {
- var mypub = document.getElementById("resu").innerHTML.value;
} else {
- // OR IF NONE Fred ;)
- var mypub = "DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech"
+ var amount = mypub;
+ }
+
+ if ( appname == 'pay') {
+ alert('PAY TO ' + mypub + ' = ' + amount);
}
var myU = 'http://astroport.localhost:1234/?qrcode=' + content +'&pass=' + pass + '&' + appname + '=' + amount + '&g1pub=' + mypub ;
console.log(myU);