From 8d9e31a9fab398938cec369e89fd979f694603e3 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Tue, 4 Apr 2023 17:05:10 +0200
Subject: [PATCH] yam yami

---
 API/SALT.sh                               | 18 ++++++++++--------
 command.sh                                | 16 ++++++++--------
 templates/register.html                   |  2 +-
 tools/search_for_this_email_in_players.sh |  3 ++-
 www/G1PalPay/index.html                   | 11 +++++++++--
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/API/SALT.sh b/API/SALT.sh
index fa0247d4..a8f1bb9b 100755
--- a/API/SALT.sh
+++ b/API/SALT.sh
@@ -440,16 +440,17 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
 ##############################################
         if [[ $APPNAME == "login" ]]; then
 
-            ## REMOVE PLAYER IPNS KEY FROM STATION
+            ## INSTALL PLAYER IPNS KEY ON STATION
             PLAYER=${WHAT}
             ipfs key import ${PLAYER} -f pem-pkcs8-cleartext ~/.zen/tmp/coucou/${MOATS}.${G1PUB}.ipns.key
             ASTRONAUTENS=$(ipfs key list -l | grep $PLAYER | cut -d ' ' -f1)
 
-            WSTATION=$(cat ~/.zen/tmp/WSTATION 2>/dev/null)
+            #~ WSTATION=$(cat ~/.zen/tmp/WSTATION 2>/dev/null)
+            #~ [[ $WSTATION != "" ]] \
+            #~ && REPLACE=${myIPFS}${WSTATION} \
+            #~ || REPLACE=${myIPFS}/ipns/${ASTRONAUTENS}
 
-            [[ $WSTATION != "" ]] \
-            && REPLACE=${myIPFS}${WSTATION} \
-            || REPLACE=${myIPFS}/ipns/${ASTRONAUTENS}
+            REPLACE=${myIPFS}/ipns/${ASTRONAUTENS}
 
             ## SET COOKIE
             USALT=$(echo "$SALT" | jq -Rr @uri)
@@ -459,9 +460,10 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
             sed -i "s~_USALT_~${USALT}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect
             sed -i "s~_UPEPPER_~${UPEPPER}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect
             echo "url='"${REPLACE}"'" >> ~/.zen/tmp/coucou/${MOATS}.index.redirect
-
-            cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
-
+            (
+            cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
+            echo "BLURP " && rm ~/.zen/tmp/coucou/${MOATS}.index.redirect
+            ) &
             end=`date +%s`
             echo $APPNAME "(☉_☉ ) Execution time was "`expr $end - $start` seconds.
             exit 0
diff --git a/command.sh b/command.sh
index 259ecd71..eb2012c8 100755
--- a/command.sh
+++ b/command.sh
@@ -102,15 +102,15 @@ echo "Activation Réseau P2P Astroport !"
 
 echo
 PS3="$PLAYER choisissez : __ "
-choices=("AJOUTER VLOG" "CREER UN VOEU" "IMPRIMER QRVOEU" "IMPRIMER VISA" "SUPPRIMER PLAYER" "QUITTER")
+choices=("CREER UN VOEU" "PRINT QRVOEU" "PRINT VISA" "REMOVE PLAYER" "QUITTER")
 select fav in  "${choices[@]}"; do
     case $fav in
-    "IMPRIMER VISA")
+    "PRINT VISA")
         echo "IMPRESSION"
         ${MY_PATH}/tools/VISA.print.sh "$PLAYER"
         ;;
 
-    "SUPPRIMER PLAYER")
+    "REMOVE PLAYER")
         echo "ATTENTION ${PLAYER} DECONNEXION DE VOTRE TW !!"
         echo  "Enter to continue. Ctrl+C to stop"
         read
@@ -136,10 +136,10 @@ select fav in  "${choices[@]}"; do
         break
         ;;
 
-    "AJOUTER VLOG")
-        echo "Lancement Webcam..."
-        ${MY_PATH}/tools/vlc_webcam.sh "$PLAYER"
-        ;;
+    #~ "AJOUTER VLOG")
+        #~ echo "Lancement Webcam..."
+        #~ ${MY_PATH}/tools/vlc_webcam.sh "$PLAYER"
+        #~ ;;
 
     "CREER UN VOEU")
         echo "QRCode à coller sur les lieux ou objets portant une Gvaleur"
@@ -162,7 +162,7 @@ select fav in  "${choices[@]}"; do
     echo "================================================"
         ;;
 
-    "IMPRIMER QRVOEU")
+    "PRINT QRVOEU")
         ${MY_PATH}/tools/VOEUX.print.sh $PLAYER
         ;;
 
diff --git a/templates/register.html b/templates/register.html
index 768a690a..10b220a3 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -204,7 +204,7 @@ function testLatency(cb) {
     let cookies = document.cookie;
     console.log(cookies);
 
-    var timeLeft = 13;
+    var timeLeft = 5;
     var elem = document.getElementById("countdown");
     var timerId = setInterval(countdown, 999);
 
diff --git a/tools/search_for_this_email_in_players.sh b/tools/search_for_this_email_in_players.sh
index f3437f80..2331bfef 100755
--- a/tools/search_for_this_email_in_players.sh
+++ b/tools/search_for_this_email_in_players.sh
@@ -2,6 +2,7 @@
 ########################################################################
 # Version: 0.4
 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
+# ON LINE echo script! LAST LINE export VARIABLE values
 ########################################################################
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
@@ -39,7 +40,7 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
 
 else
 
-    echo "ASTROTW="" # ${EMAIL} NOT FOUND"
+    echo "export ASTROTW="" # ${EMAIL} NOT FOUND"
     exit 0
 
 fi
diff --git a/www/G1PalPay/index.html b/www/G1PalPay/index.html
index 41d5f7a5..b8bf7e7e 100644
--- a/www/G1PalPay/index.html
+++ b/www/G1PalPay/index.html
@@ -39,8 +39,13 @@ header {
     input {
     width: 26em;  height: 2em;
     }
+  #aframe {
+      background: white;
+      color: black;
+  }
 #yellow {
       background: black;
+      color: white;
       position: absolute;
       bottom: 2%;
       left: 2%;
@@ -105,8 +110,10 @@ a {
 <div id="demo">
     <div id="description">
         <h1><a href="http://astroport.localhost:1234">(Ğ1) <span>♥Box</span> Station</a></h1><br>
-        <h2>Oubliez la crise... N'attendez pas la Retraite !</h2>
-        <h2>Essayez la Monnaie Libre.<br>Explorez le Monde Librement.</h2>
+        <h2>N'attendez pas la Retraite !</h2>
+        <h3>Oubliez la crise... </h3>
+        <h2>Essayez la Monnaie Libre.</h2>
+        <h3>Explorez le Monde Autrement. </h3>
     </div>
 </div>
     <div id="showoff">