From 9ffab4c3fd54dd922bcbcd7876c7c3fe7920f555 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 21 Mar 2023 17:05:04 +0100 Subject: [PATCH] all bugs --- API/QRCODE.sh | 12 +++++----- tools/COINScheck.sh | 4 ++-- www/Reveal/index.html | 61 +++++++++++++++++++++++++++------------------------ 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 62c83559..4cc9cb8f 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -128,8 +128,8 @@ echo ">>> ${QRCODE} g1_to_ipfs $ASTROTOIPFS" ## GET G1PUB OR CURRENT SECRET ###########################################"" MYPLAYERKEY=$(grep ${QRCODE} ~/.zen/game/players/*/secret.dunikey | cut -d ':' -f 1) -[[ ! $MYPLAYERKEY ]] && MYPLAYERKEY="$HOME/.zen/game/players/.current/secret.dunikey" -echo "SELECTED KEY : $(cat MYPLAYERKEY)" +[[ $MYPLAYERKEY == "" ]] && MYPLAYERKEY="$HOME/.zen/game/players/.current/secret.dunikey" +echo "SELECTED KEY : $(cat $MYPLAYERKEY)" echo ## PARRAIN ID EXTRACTION @@ -137,7 +137,9 @@ 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/COINScheck.sh ${CURG1} | tail -f 1) +~/.zen/Astroport.ONE/tools/COINScheck.sh ${CURG1} > ~/.zen/tmp/curcoin +cat ~/.zen/tmp/curcoin +CURCOINS=$(cat ~/.zen/tmp/curcoin | tail -n 1) echo "CURRENT PLAYER : $CURCOINS G1" ## WALLET JAMAIS SERVI @@ -164,7 +166,7 @@ else ########################################### ## GET VISITOR G1 WANNET AMOUNT : VISITORCOINS echo "COINScheck : ${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${QRCODE}" - VISITORCOINS=$(~/.zen/Astroport.ONE/tools/COINScheck.sh ${QRCODE} | tail -f 1) + VISITORCOINS=$(~/.zen/Astroport.ONE/tools/COINScheck.sh ${QRCODE} | tail -n 1) ## PALPE COMBIEN ? if [[ $VISITORCOINS == "" || $VISITORCOINS == "null" ]]; then @@ -194,7 +196,7 @@ else [[ ! -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=$(cat ~/.zen/tmp/coucou/${QRCODE}.gplus.json | jq -r '.found') [[ $GCFOUND == "false" ]] \ && 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 \ diff --git a/tools/COINScheck.sh b/tools/COINScheck.sh index d1186e60..765e4dbc 100755 --- a/tools/COINScheck.sh +++ b/tools/COINScheck.sh @@ -42,8 +42,8 @@ echo $ASTROPATH if [[ -d $ASTROPATH ]]; then COINSFILE=$ASTROPATH/ipfs/G1SSB/COINS else - mkdir -p ~/.zen/tmp/coucou/ - COINSFILE=~/.zen/tmp/coucou/${G1PUB}.COINS + mkdir -p $HOME/.zen/tmp/coucou/ + COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS fi echo "ACTUAL $COINSFILE CONTAINS" diff --git a/www/Reveal/index.html b/www/Reveal/index.html index 9aaf4994..af81f3a7 100644 --- a/www/Reveal/index.html +++ b/www/Reveal/index.html @@ -79,9 +79,9 @@

Astroport Ŋ1

- A data shaping protocol. + A data shifting protocol.
A storage network. -
A PKI application sandbox +
A PKI / DAO sandbox
Astroport.ONE

@@ -193,6 +193,7 @@

--> +
-

Add the r-fit-text class to auto-size text

-

FIT TEXT

+

Spread and Share

+

DIY

-

Fragments

-

Hit the next arrow...

-

... to step through ...

-

... a fragmented slide.

- - +

How To Play

+

Find a Wish...

+

... Fund a Recipe ...

+

Make... Report & Win !

-

Fragment Styles

-

There's different types of fragments, like:

-

grow

-

shrink

-

fade-out

+

Goals

+

There's requested Evolution :

+

Progess

+

maintain

+

control

- fade-right, - up, - down, - left + explore, + upcycle, + donate, + enhance

-

fade-in-then-out

-

fade-in-then-semi-out

-

Highlight red blue green

+

make real

+

desired reality

+

Levels : red blue green

+ + Black (default) - White - League - @@ -276,6 +276,8 @@ Solarized

+--> + -
+
-

Iframe Backgrounds

-

Since reveal.js runs on the web, you can easily embed other web content. Try interacting with the page in the background.

+

Interplanetary

+

Since Astroport runs on IPFS, anyone can run his own Station.

-

Marvelous List

+

Coucou

  • No order here
  • Or here