From 53003497bb56e5cf1401bb8104eaab1541368c94 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 3 Jul 2023 03:04:45 +0200 Subject: [PATCH] G1CARD --- API/QRCODE.sh | 6 +++--- API/SALT.sh | 4 ++-- README.md | 8 ++++---- templates/register.html | 4 ++-- templates/twdefault.html | 2 +- tools/VISA.new.sh | 4 ++-- tools/VISA.print.sh | 4 ++-- tools/VOEUX.print.sh | 4 ++-- www/G1PalPay/index.html | 8 ++++---- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 0f51b37a..0093246e 100755 --- 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=____ diff --git a/API/SALT.sh b/API/SALT.sh index 963548ce..aa548ce9 100755 --- 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` diff --git a/README.md b/README.md index 2e87c5ce..08da4908 100644 --- 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) diff --git a/templates/register.html b/templates/register.html index a068a1cd..094f1db6 100644 --- a/templates/register.html +++ b/templates/register.html @@ -111,7 +111,7 @@ header { Olympe.Network
Astroport.ONE est un logiciel libre développé sous licence AGPL v3 - Une fois votre G1PASS obtenu, direction https://gchange.fr ! + Une fois votre G1CARD obtenu, direction https://gchange.fr ! @@ -216,7 +216,7 @@ function testLatency(cb) { function countdown() { if (timeLeft == -1) { clearTimeout(timerId); - document.getElementById("countdown").innerHTML = "
    
"; + document.getElementById("countdown").innerHTML = "
    
"; } else { // elem.innerHTML = timeLeft + " s"; timeLeft--; diff --git a/templates/twdefault.html b/templates/twdefault.html index 16f9f2ef..e2fdc472 100644 --- a/templates/twdefault.html +++ b/templates/twdefault.html @@ -630,7 +630,7 @@ Error message and password prompt {"title":"NoGafamNetwork.png","text":"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","type":"image/png","modified":"20220505172852060","tags":"$:/isAttachment $:/isEmbedded"}, {"created":"20230501170719605","creator":"_PSEUDO_","text":"[[Open Collective*|https://opencollective.com/]] est une boîte à outils juridiques et financiers pour les groupes de base. Il s'agit d'une plateforme de collecte de fonds, de statut juridique et de gestion financière pour votre communauté.\n\n!! 100% transparence\nCet organisme permet à nos collaborateurs de pouvoir facturer leurs services en Ğ1 sans risquer de manque d'€.\nLa transparence des comptes est TOTALE.\n\n\nLa communauté OpenCollective MonnaieLibre y conserve une cagnotte qui assure et garantie le bon développement de [[l'Internet des Gens*|https://astroport.com]] au travers du (des) [[G1Fablab]]","title":"OpenCollective","modified":"20230501190817389","modifier":"_PSEUDO_","tags":""}, {"created":"20210224201642486","creator":"_PSEUDO_","text":"\nVous êtes sur le TW (TiddlyWiki) de ''{{Astroport!!pseudo}}''\n\nIl est hébergé au travers des Stations ♥BOX du réseau in-censurable IPFS que nous appelons - LeClaude -","title":"Où suis-je?","type":"","modified":"20230501161340318","tags":"_PLAYER_","modifier":"_PSEUDO_"}, -{"created":"20230303001827164","creator":"_PSEUDO_","text":"! PROGRAMME G1PalPay\n\n* gestion d'ordres de virement entre portefeuilles Ğ1 par Email \n* virement automatique de Ğ1 lors de la copie de Tiddler\n\nAstroID est votre G1PASS\n\nVOUS DEVEZ AVOIR REÇU SON CODE (\"PASS\") PAR COURRIEL","tags":"_PLAYER_ G1Voeu","title":"PalPay","modified":"20230501160135666","modifier":"_PSEUDO_"}, +{"created":"20230303001827164","creator":"_PSEUDO_","text":"! PROGRAMME G1PalPay\n\n* gestion d'ordres de virement entre portefeuilles Ğ1 par Email \n* virement automatique de Ğ1 lors de la copie de Tiddler\n\nAstroID est votre G1CARD\n\nVOUS DEVEZ AVOIR REÇU SON CODE (\"PASS\") PAR COURRIEL","tags":"_PLAYER_ G1Voeu","title":"PalPay","modified":"20230501160135666","modifier":"_PSEUDO_"}, {"created":"20230202185900618","creator":"_PSEUDO_","text":"\u003Ciframe src={{{ [[https://ipfs.copylaradio.com/]addsuffix{!!ipfs}] }}} height=\"480\" width=\"100%\" title=\"{{!!title}}\">\u003C/iframe>","tags":"ipfs _PLAYER_ G1App dig@p2p.legal","title":"QRCODE des Membres Forgerons de la Ğ1","modified":"20230407120539940","ipfs":"/ipfs/QmZE9sMgQeAC2JkTgtEarZPkjqQoPPhYqMPiRZozXTnbet","type":"text/vnd.tiddlywiki","modifier":"_PSEUDO_"}, {"created":"20230203213813833","creator":"_PSEUDO_","text":"# À quoi ressemblerait pour vous une journée parfaite ?\nRéalitéDésirée\n\n# À quelle difficulté avez-vous été surpris de savoir particulièrement bien faire face ?\nFaireFace\n\n# À quand remonte la dernière fois que vous avez lutté de toutes vos forces contre quelque chose avant de le regretter ?\nLutteVaine","tags":"_PLAYER_ G1Citation","title":"Répondez à ces Questions ?","modified":"20230302234425495","modifier":"_PSEUDO_"}, {"created":"20230501163210882","creator":"_PSEUDO_","text":"ScuttleButt est protocole et un logiciel de messagerie chiffrée asynchrone.\n\n¯[[\\_༼\u003CO͡〰o>༽_/¯ La June s’échange sur ScuttleButt !|https://forum.monnaie-libre.fr/t/o-o-la-june-s-echange-sur-scuttlebutt/10300 ]]\n\nSes défauts majeurs:\n\n* Des synchronisations interminables entre utilisateurs\n* Le danger de voir son disque dur totalement rempli en devenant ami avec un utilisateur de longue date\n\nDésormais remplacé par TW,\n\n* AstroportONE assure un système est 100% pair à pair.\n* TW est à la fois base de données, application, et serveur applicatif\n* Chaque Tiddler est un NFT et rapporte lorsqu'il est recopié de TW en TW\n\nCopyLaRadio et MadeInZion sont les organisations qui assurent le maintien et les évolution de ce réseau ","title":"ScuttleButt","modified":"20230501165038631","modifier":"_PSEUDO_","tags":""}, diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index a36b2fe5..f19873b3 100755 --- 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}" diff --git a/tools/VISA.print.sh b/tools/VISA.print.sh index 063a4619..78c9ef17 100755 --- 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 diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh index 0eef29a6..2965a028 100755 --- 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 \ diff --git a/www/G1PalPay/index.html b/www/G1PalPay/index.html index 3227a22a..d30ab0be 100644 --- a/www/G1PalPay/index.html +++ b/www/G1PalPay/index.html @@ -121,9 +121,9 @@ a {      @@ -149,7 +149,7 @@ a { Virement Balance -

G1PASS opérateur

+

G1CARD opérateur