diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 48129a52..3a98668b 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -63,13 +63,13 @@ fi ################################################################################ ## ACCOUNT IPNS FORMAT : CHANGE .current ASTROPATH=$(grep $QRCODE ~/.zen/game/players/*/.playerns | cut -d ':' -f 1 | rev | cut -d '/' -f 2- | rev 2>/dev/null) -if [[ $ASTROPATH != "" ]]; then +if [[ $ASTROPATH != "" && $APPNAME == "" ]]; then rm ~/.zen/game/players/.current ln -s $ASTROPATH ~/.zen/game/players/.current echo "LINKING $ASTROPATH to .current" #### SELECT PARRAIN "G1PalPé" - echo "#>>>>>>>>>>>> # SEND TO G1BILLETS" + echo "#>>>>>>>>>>>> # REDIRECT TO CREATE G1BILLETS" sed "s~_TWLINK_~${myG1BILLET}?montant=0\&style=jeu~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect echo "url='"${myG1BILLET}"?montant=0\&style=jeu'" >> ~/.zen/tmp/${MOATS}/index.redirect ( @@ -109,15 +109,15 @@ echo CURPLAYER=$(cat ~/.zen/game/players/.current/.player) CURG1=$(cat ~/.zen/game/players/.current/.g1pub) echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${CURG1}" -CURCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 20 ${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${CURG1} | cut -d '.' -f 1) +CURCOINS=$(~/.zen/Astroport.ONE/tools/COINScheck.sh ${CURG1} | tail -f 1) echo "CURRENT PLAYER : $CURCOINS G1" -## FAUCHE +## WALLET JAMAIS SERVI ########################################### if [[ $CURCOINS == "null" ]]; then echo "NULL" - sed "s~_TWLINK_~$(cat ~/.zen/ISTATION)~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect - echo "url='"${myIPFSGW}$(cat ~/.zen/ISTATION)"'" >> ~/.zen/tmp/${MOATS}/index.redirect + sed "s~_TWLINK_~$(cat ~/.zen/WSTATION)~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect + echo "url='"${myIPFSGW}$(cat ~/.zen/WSTATION)"'" >> ~/.zen/tmp/${MOATS}/index.redirect ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 ) & @@ -135,7 +135,7 @@ else ########################################### ## GET VISITOR G1 WANNET AMOUNT : VISITORCOINS echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${QRCODE}" - VISITORCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 20 ${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${QRCODE} | cut -d '.' -f 1) + VISITORCOINS=$(~/.zen/Astroport.ONE/tools/COINScheck.sh ${QRCODE} | tail -f 1) ## PALPE COMBIEN ? if [[ $VISITORCOINS == "" || $VISITORCOINS == "null" ]]; then @@ -148,43 +148,51 @@ else echo "VISITEUR POSSEDE ${VISITORCOINS} G1" ## GET G1 WALLET HISTORY - $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/${MOATS}/g1history.json + [[ ! -s ~/.zen/tmp/coucou/${QRCODE}.g1history.json ]] \ + && ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/coucou/${QRCODE}.g1history.json & ## SCAN CCHANGE + - ~/.zen/Astroport.ONE/tools/timeout.sh -t 10 curl -s ${myDATA}/user/profile/${QRCODE} > ~/.zen/tmp/${MOATS}/gchange.json - GFOUND=$(cat ~/.zen/tmp/${MOATS}/gchange.json | jq -r '.found') + [[ ! -s ~/.zen/tmp/coucou/${QRCODE}.gchange.json ]] \ + && ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${QRCODE} > ~/.zen/tmp/coucou/${QRCODE}.gchange.json & + + GFOUND=$(cat ~/.zen/tmp/coucou/${QRCODE}.gchange.json | jq -r '.found') [[ $GFOUND == "false" ]] \ && echo "AUCUN GCHANGE" \ && sed "s~_TWLINK_~${myGCHANGE}~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect \ && echo "url='"${myGCHANGE}"'" >> ~/.zen/tmp/${MOATS}/index.redirect \ && ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1) & - ## CHECK IF RELATED TO CESIUM - CPUB=$(cat ~/.zen/tmp/${MOATS}/gchange.json | jq -r '._source.pubkey' 2>/dev/null) - ## SCAN GPUB CESIUM + - ~/.zen/Astroport.ONE/tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${QRCODE} > ~/.zen/tmp/${MOATS}/gplus.json 2>/dev/null - GCFOUND=$(cat ~/.zen/tmp/${MOATS}/gplus.json | jq -r '.found') + [[ ! -s ~/.zen/tmp/coucou/${QRCODE}.gplus.json ]] \ + && ~/.zen/Astroport.ONE/tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${QRCODE} > ~/.zen/tmp/coucou/${QRCODE}.gplus.json 2>/dev/null & + + GCFOUND=$(cat ~~/.zen/tmp/coucou/${QRCODE}.gplus.json | jq -r '.found') [[ $GCFOUND == "false" ]] \ - && echo "AUCUN GCPLUS" \ + && echo "AUCUN GCPLUS : PAS DE CESIUM POUR CLEF GCHANGE" \ && sed "s~_TWLINK_~https://demo.cesium.app/#/app/wot/$QRCODE/~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect \ && echo "url='"${myASTRONEF}"'" >> ~/.zen/tmp/${MOATS}/index.redirect \ && ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1) & - ##### MEMBER ?? - if [[ $CPUB && $CPUB != 'null' ]]; then + ## CHECK IF GCHANGE IS LINKED TO "A DECLARED CESIUM" + CPUB=$(cat ~/.zen/tmp/coucou/${QRCODE}.gchange.json | jq -r '._source.pubkey' 2>/dev/null) + ## SCAN GPUB CESIUM + + + ##### DO WE HAVE A MEMBER LINKED ?? + if [[ $CPUB && $CPUB != 'null' && $CPUB != $QRCODE ]]; then ## SCAN CPUB CESIUM + - ~/.zen/Astroport.ONE/tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${CPUB} > ~/.zen/tmp/${MOATS}/cplus.json 2>/dev/null - CCFOUND=$(cat ~/.zen/tmp/${MOATS}/cplus.json | jq -r '.found') + [[ ! -s ~/.zen/tmp/coucou/${QRCODE}.cplus.json ]] \ + && ~/.zen/Astroport.ONE/tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${CPUB} > ~/.zen/tmp/coucou/${QRCODE}.cplus.json 2>/dev/null & + + CCFOUND=$(cat ~/.zen/tmp/coucou/${QRCODE}.cplus.json | jq -r '.found') [[ $CCFOUND == "false" ]] \ - && echo "AUCUN CCPLUS" \ + && echo "AUCUN CCPLUS : MEMBRE LIE" \ && sed "s~_TWLINK_~https://monnaie-libre.fr~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect \ && ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1) & ## MESSAGE LINKED CESIUM WALLET - $MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k $MYPLAYERKEY send -d "${QRCODE}" -t "FORGERON" \ - -m "ASTROPORT. G1. FORGERON." + $MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k $MYPLAYERKEY send -d "${CPUB}" -t "COUCOU" \ + -m "VOUS AVEZ ${VISITORCOINS} G1 SUR VOTRE COMPTE ${QRCODE}" else diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index 93bb8417..230a4625 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -28,12 +28,16 @@ for PLAYER in ${PLAYERONE[@]}; do MOATS=$(date -u +"%Y%m%d%H%M%S%4N") [[ ! $(echo "$PLAYER" | grep '@') ]] && continue + mkdir -p ~/.zen/tmp/${MOATS} echo "##################################################################" echo ">>>>> PLAYER : $PLAYER >>>>>>>>>>>>> REFRESHING TW STATION" echo "##################################################################" + PSEUDO=$(cat ~/.zen/game/players/$PLAYER/.pseudo 2>/dev/null) + G1PUB=$(cat ~/.zen/game/players/$PLAYER/.g1pub 2>/dev/null) + ASTRONS=$(cat ~/.zen/game/players/$PLAYER/.playerns 2>/dev/null) # Get PLAYER wallet amount - COINS=$($MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey balance) + COINS=$($MY_PATH/../tools/COINScheck.sh $G1PUB | tail -n 1) echo "+++ WALLET BALANCE _ $COINS (G1) _" #~ ## IF WALLET IS EMPTY : WHAT TODO ? echo "##################################################################" @@ -41,9 +45,6 @@ for PLAYER in ${PLAYERONE[@]}; do echo "################### REFRESH ASTRONAUTE TW ###########################" echo "##################################################################" - PSEUDO=$(cat ~/.zen/game/players/$PLAYER/.pseudo 2>/dev/null) - G1PUB=$(cat ~/.zen/game/players/$PLAYER/.g1pub 2>/dev/null) - ASTRONS=$(cat ~/.zen/game/players/$PLAYER/.playerns 2>/dev/null) ## REFRESH ASTRONAUTE TW ASTRONAUTENS=$(ipfs key list -l | grep -w $PLAYER | cut -d ' ' -f1) diff --git a/ASTROBOT/VOEUX.refresh.sh b/ASTROBOT/VOEUX.refresh.sh index 17f6a467..f927abe6 100755 --- a/ASTROBOT/VOEUX.refresh.sh +++ b/ASTROBOT/VOEUX.refresh.sh @@ -65,7 +65,7 @@ do sed -i "s~G1Voeu~voeu~g" $INDEX continue else - VCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 20 ${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${VOEUKEY}) + VCOINS=$($MY_PATH/../tools/COINScheck.sh $VOEUKEY | tail -n 1) [[ $VCOINS == "" || $VCOINS == "null" ]] \ && echo "ERROR G1WALLET" \ || echo "WISH G1WALLET = $VCOINS G1" diff --git a/ajouter_media.sh b/ajouter_media.sh index 857b96b4..81444fa9 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -89,12 +89,8 @@ if [ $URL ]; then fi ### -# 20H12 WALLET SYNCHO - #~ ( ## SUB PROCESS - #~ # Get PLAYER wallet amount - #~ COINS=$($MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey balance | cut -d '.' -f 1) - #~ [[ $COINS == "" || $COINS == "null" ]] && espeak "Missing coins. Free Run." || espeak "You have $COINS Coins" - #~ ) & + +COINS=$($MY_PATH/COINScheck.sh $G1PUB | tail -n 1) ### # GET SCREEN DIMENSIONS @@ -163,7 +159,7 @@ YOU=$(myIpfsApi) [[ ! $URL ]] && xdg-open "http://ipfs.localhost:8080/ipns/$ASTRONAUTENS" ######################################################################## -espeak "Ready !" +espeak "$COINS JUNE Ready !" ######################################################################## ######################################################################## diff --git a/templates/register.html b/templates/register.html index 3fd5213b..7d364998 100644 --- a/templates/register.html +++ b/templates/register.html @@ -37,7 +37,7 @@ header { width: 18%; visibility: hidden; } -#login {visibility: hidden; left: 10%;} +#login {visibility: hidden; right: 10%;} diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh index e97c0bf5..5ffd47cd 100755 --- a/tools/Connect_PLAYER_To_Gchange.sh +++ b/tools/Connect_PLAYER_To_Gchange.sh @@ -143,13 +143,8 @@ $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "ht ######################################################################## # Get PLAYER wallet amount :: ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS - COINS=$(${MY_PATH}/timeout.sh -t 20 $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey balance | cut -d '.' -f 1) - [[ $COINS == "" || $COINS == "null" ]] && COINS=0 + COINS=$($MY_PATH/COINScheck.sh $G1PUB | tail -n 1) echo "+++ YOU have $COINS Ğ1 Coins +++" - OLDCOINS=$(cat ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS 2>/dev/null) - [[ $OLDCOINS != $COINS && ! $COINS -lt 0 ]] \ - && ( cp ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS.$MOATS 2>/dev/null; \ - echo $COINS > ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS ) ######################################################################## ######################################################################## diff --git a/tools/make_image_ipfs_index_carousel.sh b/tools/make_image_ipfs_index_carousel.sh index 38a75372..70a4fb2d 100755 --- a/tools/make_image_ipfs_index_carousel.sh +++ b/tools/make_image_ipfs_index_carousel.sh @@ -21,7 +21,7 @@ if [[ ! -d $img_dir ]]; then # Get PLAYER wallet amount :: ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS echo $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey balance - COINS=$(${MY_PATH}/timeout.sh -t 3 $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey balance | cut -d '.' -f 1) + COINS=$($MY_PATH/COINScheck.sh $pub | tail -n 1) echo "+++ ${PLAYER} have $COINS Ğ1 Coins +++" ## USE G1BARRE SERVICE AS 1ST IMAGE diff --git a/www/G1PalPay/index.html b/www/G1PalPay/index.html index b231d673..90d3fb03 100644 --- a/www/G1PalPay/index.html +++ b/www/G1PalPay/index.html @@ -101,12 +101,13 @@ a {

(Ğ1) ♥Box Station

-

Oubliez la crise... N'attendez plus la Retraite ?

-

Passez à la Monnaie Libre. Refaites le monde d'égale à égal.

+

Oubliez la crise... N'attendez pas la Retraite !

+

Essayez la Monnaie Libre. Découvrez le monde d'égale à égal.

+

Scannez QRCode

@@ -121,17 +122,27 @@ a { async function fetchAstroport(myURL) { try { - let one = await fetch(myURL); // Gets a promise - var doc = await one.text(); - var regex = /url='([^']+)/i; // Get response PORT - var redirectURL = doc.match(regex)[1] + let one = await fetch(myURL); // Gets a promise + var doc = await one.text(); + var regex = /url='([^']+)/i; // Get response PORT + var redirectURL = doc.match(regex)[1] - console.log(redirectURL) + console.log(redirectURL) - setTimeout(function() { + // start countdown + var timeLeft = 20; + var elem = document.getElementById("countdown"); + var timerId = setInterval(countdown, 1000); + function countdown() { + if (timeLeft == -1) { + clearTimeout(timerId); window.open( redirectURL, "AstroTab"); - }, 15123); + } else { + elem.innerHTML = timeLeft + " s"; + timeLeft--; + } + } } catch (err) { console.log('Fetch error:' + err); // Error handling @@ -141,13 +152,10 @@ a { let scanner = new Instascan.Scanner({ video: document.getElementById('preview') }); scanner.addListener('scan', function (content) { - alert(content); - // - var myU = 'http://astroport.localhost:1234/?qrcode=' + content; - // fetchAstroport(myU); - homeAstroportStation(myU, 'aframe', 15123) - // BORIS STUFF COMES HERE - + alert(content); + var myU = 'http://astroport.localhost:1234/?qrcode=' + content; + fetchAstroport(myU) + // homeAstroportStation(myU, 'aframe', 15123) }); Instascan.Camera.getCameras().then(function (cameras) { @@ -169,7 +177,7 @@ a { }); - +
Menu