G1CARD

2023-07-03 03:04:45 +02:00 · 2023-07-03 03:04:45 +02:00 · 53003497bb
parent 8d8e15e1a4
commit 53003497bb
9 changed files with 22 additions and 22 deletions
--- a/API/QRCODE.sh
+++ b/API/QRCODE.sh
@ -147,9 +147,9 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
                    ## COMMAND A PAYMENT
                        if [[ $WHAT =~ ^[0-9]+$ ]]; then

-                            echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'G1PASS:${MOATS}' -m"
+                            echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'G1CARD:${MOATS}' -m"
                            ${MY_PATH}/../tools/timeout.sh -t 5 \
-                            ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c "G1PASS:${MOATS}" -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
+                            ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c "G1CARD:${MOATS}" -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco

                            #################################### SYSTEM IS NOT DUNITER OVER POOL RESISTANT
                            if [ $? == 0 ]; then
@ -765,7 +765,7 @@ else

 fi

-## USE PLAYER API OR MOVE TO G1PASS PGP QRCODE
+## USE PLAYER API OR MOVE TO G1CARD PGP QRCODE
 ###################################################################################################
 # API TWO : ?qrcode=G1PUB&url=____&type=____

--- a/API/SALT.sh
+++ b/API/SALT.sh
@ -169,14 +169,14 @@ Content-Type: text/html; charset=UTF-8

                    ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL

-                    echo "Le code de votre G1PASS est ${PASS}, scannez-le sur La♥Box Ğ1Station (demo : https://astroport.copylaradio.com)" > ~/.zen/tmp/${MOATS}/intro.txt
+                    echo "Le code de votre G1CARD est ${PASS}, scannez-le sur La♥Box Ğ1Station (demo : https://astroport.copylaradio.com)" > ~/.zen/tmp/${MOATS}/intro.txt

                    ## EXECUTE LAST LINE
                    $(cat ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt | tail -n 1)
                    echo "export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$PLAYER ASTROFEED=$FEEDNS PASS=$PASS"

                    BILLETNAME=$(echo "$SALT" | sed 's/ /_/g')
-                    mpack -a -s "La♥Box : G1PASS :+: TW :+: " -d ~/.zen/tmp/${MOATS}/intro.txt \
+                    mpack -a -s "La♥Box : G1CARD :+: TW :+: " -d ~/.zen/tmp/${MOATS}/intro.txt \
                        ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.BILLET.jpg ${PLAYER}

                    end=`date +%s`
--- a/README.md
+++ b/README.md
@ -287,7 +287,7 @@ GET /?player=${PLAYER}&youtube=URLENCODED

 ### QRCODE (API SandBox)
 ```http
-GET /?qrcode=${G1PUB} | ${ASTRONAUTENS} | ${PGP_G1PASS_STRING}
+GET /?qrcode=${G1PUB} | ${ASTRONAUTENS} | ${PGP_G1CARD_STRING}
 ```
 | Parameter | Type     | Description                       |
 | :-------- | :------- | :-------------------------------- |
@ -297,7 +297,7 @@ GET /?qrcode=${G1PUB} | ${ASTRONAUTENS} | ${PGP_G1PASS_STRING}

 ### CODE BEHAVIOUR. monitor && rewards || fork signal

-* Is IPNS key & PLAYER is local ? Redirect to [make a G1PASS (security level 6)](http://g1billet.localhost:33101/?montant=0&style=xbian&dice=6)
+* Is IPNS key & PLAYER is local ? Redirect to [make a G1CARD (security level 6)](http://g1billet.localhost:33101/?montant=0&style=xbian&dice=6)

 * Is G1*? Redirect to G1WishApp / Export Tagged Tiddlers json from TW

@ -308,13 +308,13 @@ redirect to
 [http://astroport.localhost:1234/?qrcode=G1G1Serie&tw=k51qzi5uqu5dgobi9ozzzvdftqfd3hd7a1488nzymky1edz8j779jov7sbemc0&json](https://astroport.copylaradio.com/?qrcode=G1G1Serie&tw=k51qzi5uqu5dgobi9ozzzvdftqfd3hd7a1488nzymky1edz8j779jov7sbemc0&json)
 redirect to pure "tag=" result  json

-* Is G1PUB ... (FROM NEW G1PASS or empty G1BILLET)
+* Is G1PUB ... (FROM NEW G1CARD or empty G1BILLET)

    * If balance is "null" : Send 1 G1 (G1BILLET)
    * if GChange+ account exists : send 10 G1
    * if Cesium+ account exists : send 50 G1

-* Is G1PASS
+* Is G1CARD
    * decode with PASS and make operation (same functions as SALT API are available)


--- a/templates/register.html
+++ b/templates/register.html
@ -111,7 +111,7 @@ header {
                <a href="https://olympe.network">Olympe.Network</a><br>
                Astroport.ONE est un logiciel libre développé sous licence AGPL v3
        </center>
-            <a target="gchange" href="https://gchange.fr">Une fois votre G1PASS obtenu, direction https://gchange.fr !</a>
+            <a target="gchange" href="https://gchange.fr">Une fois votre G1CARD obtenu, direction https://gchange.fr !</a>
        </h1>
    </div>
 </article>
@ -216,7 +216,7 @@ function testLatency(cb) {
    function countdown() {
        if (timeLeft == -1) {
            clearTimeout(timerId);
-            document.getElementById("countdown").innerHTML = "<form method='get' action='http://g1billet.localhost:33101' target='aframe'><input type='hidden' name='montant' value='0' ><label for='type'>Type :</label><select name='type'><option value=''>G1BILLET+ ( x 6 )</option><option value='jeu' selected>G1PASS</option><option value='xastro'>G1PASS+TW</option><option value='@astroport'>G1PASS+@</option></select><input type='hidden' name='dice' value='4' >&nbsp;&nbsp;&nbsp;&nbsp;<button type='submit'>Lancer Fabrication</button></form>";
+            document.getElementById("countdown").innerHTML = "<form method='get' action='http://g1billet.localhost:33101' target='aframe'><input type='hidden' name='montant' value='0' ><label for='type'>Type :</label><select name='type'><option value=''>G1BILLET+ ( x 6 )</option><option value='jeu'>G1CARD</option><option value='xastro' selected>G1CARD+TW</option><option value='@astroport'>G1CARD+@</option></select><input type='hidden' name='dice' value='4' >&nbsp;&nbsp;&nbsp;&nbsp;<button type='submit'>Lancer Fabrication</button></form>";
        } else {
            // elem.innerHTML = timeLeft + " s";
            timeLeft--;
--- a/templates/twdefault.html
+++ b/templates/twdefault.html
--- a/tools/VISA.new.sh
+++ b/tools/VISA.new.sh
@ -271,7 +271,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
        sed -i "s~_MEDIAKEY_~${PLAYER}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
        sed -i "s~k2k4r8kxfnknsdf7tpyc46ks2jb3s9uvd3lqtcv9xlq9rsoem7jajd75~${ASTRONAUTENS}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html

-        ## AstroID G1PASS Update
+        ## AstroID G1CARD Update
        [[ ! $AstroID ]] && AstroID="/ipfs/bafybeifbebc3ewnzrzbm44arddedbralegnxklhua5d5ymzaqtf2kaub7i"
        sed -i "s~${AstroID}~${ASTROQR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html

@ -478,7 +478,7 @@ echo "$(${MY_PATH}/face.sh cool)"
 echo " 'Astronaute'  $PSEUDO"
 echo
 echo "G1Visa : ${myIPFS}${IASTRO}"
-echo "G1PASS ($PASS) : ${myIPFS}${ASTROQR}"
+echo "G1CARD ($PASS) : ${myIPFS}${ASTROQR}"
 echo "G1TW : ${myIPFS}/ipns/${ASTRONAUTENS}"
 echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
 echo "${PLAYER}"
--- a/tools/VISA.print.sh
+++ b/tools/VISA.print.sh
@ -97,8 +97,8 @@ convert -gravity SouthEast -pointsize 13 -fill black -draw "text 10,10 \"$PEPPER
 && 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 PGP G1PASS
-convert ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.G1PASS.png  -resize 400 ~/.zen/tmp/ASTROPORT.png
+## PRINT PGP G1CARD
+convert ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.G1CARD.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

 composite -compose Over -gravity Center -geometry +0+0 ~/.zen/tmp/one.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/${PASS}.png
--- a/tools/VOEUX.print.sh
+++ b/tools/VOEUX.print.sh
@ -29,7 +29,7 @@ PPASS=$(cat ~/.zen/game/players/.current/.pass 2>/dev/null)
 ############################################################ G1Voeu.sh use
 ############################################################ PRINT G1Milgram (once a month)
    if [[ ${G1PUB} != "" && ${VoeuName} != "" && ${MOATS} != "" ]]; then
-        echo "MAKE G1PASS+@"
+        echo "MAKE G1CARD+@"
        mkdir -p ~/.zen/tmp/${MOATS}
        #################################################################
        ## MAKING SPECIAL amrzqr => G1Milgram TICKET = G1Missive
@ -83,7 +83,7 @@ PPASS=$(cat ~/.zen/game/players/.current/.pass 2>/dev/null)

        cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/${MOATS}/result.png

-        ## MAKE amzqr WITH @@@@@ PGP G1PASS FORMAT (%40)
+        ## MAKE amzqr WITH @@@@@ PGP G1CARD FORMAT (%40)
        amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.asc  | tr '-' '@' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )" \
                    -d "$HOME/.zen/tmp/${MOATS}" \
                    -l H \
--- a/www/G1PalPay/index.html
+++ b/www/G1PalPay/index.html
@ -121,9 +121,9 @@ a {
            <input type='hidden' name='montant' value='0' >
            <label for='type'>Type :</label><select name='type'>
                <option value=''>G1BILLET+ ( x 6 )</option>
-                <option value='jeu' selected>G1PASS</option>
-                <option value='xastro'>G1PASS+TW</option>
-                <option value='@astroport'>G1PASS+@</option>
+                <option value='jeu' selected>G1CARD</option>
+                <option value='xastro'>G1CARD+TW</option>
+                <option value='@astroport'>G1CARD+@</option>
                </select><input type='hidden' name='dice' value='6' >&nbsp;&nbsp;&nbsp;&nbsp;
            <button type='submit'>Lancer Fabrication</button>
        </form>
@ -149,7 +149,7 @@ a {
                  <input type="radio" id="r3" name="appname" value="pay"> Virement
                  <input type="radio" id="r3" name="appname" value="balance" checked="checked"> Balance
                </div>
-                <p><b>G1PASS</b>  opérateur</p>
+                <p><b>G1CARD</b>  opérateur</p>

                <strong><div id="resu"></div></strong>