diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 8339734e..dcff1def 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -30,7 +30,7 @@ TYPE=$WHAT mkdir -p ~/.zen/tmp/${MOATS}/ ################################################################################ ## REFRESH STATION & OPEN G1PalPay INTERFACE -################################################################################ +############################################################################### if [[ ${QRCODE} == "station" ]]; then # rm ~/.zen/tmp/ISTATION ## REMOVE IN PROD @@ -59,12 +59,32 @@ if [[ ${QRCODE} == "station" ]]; then exit 0 fi +################################################################################ +## MODE G1VOEU : RETURN WISHNS - image carousel links - +################################################################################ +if [[ ${QRCODE:0:2} == "G1" && ${AND} == "tw" ]]; then + APPNAME="G1Voeu" + VOEU=${QRCODE} + ASTROPATH=$(grep ${THIS} ~/.zen/game/players/*/.playerns | cut -d ':' -f 1 | rev | cut -d '/' -f 2- | rev 2>/dev/null) + ## REDIRECT TO G1VOEU IPNS ADDRESS + LINK=$(cat $ASTROPATH/voeux/${QRCODE:2}/*/.link) + echo "#>>> DISPLAY WISHNS >>>> # $VOEU : $LINK" + sed "s~_TWLINK_~${LINK}~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect + echo "url='"${LINK}"'" >> ~/.zen/tmp/${MOATS}/index.redirect + ( + cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 + rm -Rf ~/.zen/tmp/${MOATS} + ) & + exit 0 +fi + ################################################################################ ## QRCODE can be ASTRONAUTENS or G1PUB format ################################################################################ ## 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 != "" && $APPNAME == "" ]]; then + rm ~/.zen/game/players/.current ln -s $ASTROPATH ~/.zen/game/players/.current echo "LINKING $ASTROPATH to .current" @@ -78,6 +98,7 @@ if [[ $ASTROPATH != "" && $APPNAME == "" ]]; then rm -Rf ~/.zen/tmp/${MOATS} ) & exit 0 + else echo "NOT ON BOARD" diff --git a/templates/register.html b/templates/register.html index 699b0f0f..cac25a6d 100644 --- a/templates/register.html +++ b/templates/register.html @@ -50,7 +50,7 @@ header {

BOX

- +
diff --git a/tools/make_image_ipfs_index_carousel.sh b/tools/make_image_ipfs_index_carousel.sh index ddd264ee..33d7e03b 100755 --- a/tools/make_image_ipfs_index_carousel.sh +++ b/tools/make_image_ipfs_index_carousel.sh @@ -54,7 +54,7 @@ if [[ ! -d $img_dir ]]; then || echo "_REPLACE_" > ~/.zen/tmp/carousel/${pub}.insert ## Add Button for every wish : TODO - echo "" > ~/.zen/tmp/carousel/${pub}.button + echo "" > ~/.zen/tmp/carousel/${pub}.button ################## done @@ -89,8 +89,8 @@ echo " -

$myHOST :: ${#PLAYERONE[@]}

-
AINFO
+

$myHOST :: ${#PLAYERONE[@]} ::

+
@@ -143,6 +143,7 @@ if [[ $i =~ \.(JPG|jpg|PNG|png|JPEG|jpeg|GIF|gif)$ ]]; then else echo "
$ZLINK +
$BUTTON
" >> $core_file fi num=$((num+1)) diff --git a/tools/my.sh b/tools/my.sh index ab138b0f..6cd6703d 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -352,7 +352,7 @@ myHtml() { -e "s~https://ipfs.copylaradio.com~${myIPFSGW}~g" \ -e "s~_IPFSNODEID_~${IPFSNODEID}~g" \ -e "s~_HOSTNAME_~$(hostname)~g" \ - -e "s~.000.~.$(printf '%03d' "$(seq 0 17 |shuf -n 1)").~g" \ + -e "s~background.000.~background.$(printf '%03d' "$(seq 0 17 |shuf -n 1)").~g" \ ~/.zen/Astroport.ONE/templates/register.html) [ -z "$isLAN" ] \ || myHtml=$($RUN echo "$myHtml" | sed \