From c0914a2393542207afd4c1c98d3f911a8bc211c2 Mon Sep 17 00:00:00 2001 From: fred Date: Sat, 25 Nov 2023 17:43:57 +0100 Subject: [PATCH] ${EARTHCID} is latest UPlanet interface --- RUNTIME/UPLANET.refresh.sh | 12 ++++++------ RUNTIME/VISA.new.sh | 7 +++++-- templates/register.html | 4 ++-- tools/mailjet.sh | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index 895e3e5e..183e281a 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -157,8 +157,8 @@ echo "" mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON} echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}/index.html - SECTORMAPGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/map_render.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}" - SECTORSATGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/sat_render.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}" + SECTORMAPGEN="${EARTHCID}/map_render.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}" + SECTORSATGEN="${EARTHCID}/sat_render.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Map.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Sat.html @@ -181,8 +181,8 @@ echo "" mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON} echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}/index.html - REGIONMAPGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/map_render.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" - REGIONSATGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/sat_render.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" + REGIONMAPGEN="${EARTHCID}/map_render.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" + REGIONSATGEN="${EARTHCID}/sat_render.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}.REGION.Map.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}.REGION.Sat.html @@ -205,8 +205,8 @@ echo "" ################################## ## OSM2IPFS ### UMAP = 0.01° Planet Slice - UMAPGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Umap.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}" - USATGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Usat.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}" + UMAPGEN="${EARTHCID}/Umap.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}" + USATGEN="${EARTHCID}/Usat.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/Umap.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/Usat.html diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index 9b6b7696..507ff5c6 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -217,8 +217,11 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" ## Add logo to QRCode cp ${MY_PATH}/../images/astrologo_nb.png ~/.zen/tmp/${MOATS}/fond.png - ## MAKE amzqr WITH astro:// ---- PGP LINK - amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" \ + ## ASTROID ~~~~~ || &&&&& + ASTROIDQR="$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" + [[ ${PSEUDO} == "UPlanet" ]] && ASTROIDQR="$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '-' '&' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" + ## MAKE amzqr ASTROID PGP QRCODE + amzqr "${ASTROIDQR}" \ -d ~/.zen/tmp/${MOATS} \ -l H \ -p ~/.zen/tmp/${MOATS}/fond.png 1>/dev/null diff --git a/templates/register.html b/templates/register.html index c8fbe1fb..dd3de7f3 100644 --- a/templates/register.html +++ b/templates/register.html @@ -196,9 +196,9 @@ document.addEventListener('DOMContentLoaded', function() { var latMAP = (parseFloat(latElement.value) - 0.05).toFixed(2); // Subtract 0.05 from latElement var lonMAP = (parseFloat(lonElement.value) - 0.05).toFixed(2); // Subtract 0.05 from lonElement - const satURL = `http://127.0.0.1:8080/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/sat_render.html?southWestLat=${latMAP}&southWestLon=${lonMAP}°=0.1`; + const satURL = `https://ipfs.copylaradio.com/ipns/copylaradio.com/sat_render.html?southWestLat=${latMAP}&southWestLon=${lonMAP}°=0.1`; document.getElementById("satLink").href = satURL; - const mapURL = `http://127.0.0.1:8080/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/map_render.html?southWestLat=${latMAP}&southWestLon=${lonMAP}°=0.1`; + const mapURL = `https://ipfs.copylaradio.com/ipns/copylaradio.com/map_render.html?southWestLat=${latMAP}&southWestLon=${lonMAP}°=0.1`; document.getElementById("mapLink").href = mapURL; document.getElementById("LAT").innerHTML = latElement.value ; diff --git a/tools/mailjet.sh b/tools/mailjet.sh index f0f38337..4b003467 100755 --- a/tools/mailjet.sh +++ b/tools/mailjet.sh @@ -33,7 +33,7 @@ echo " echo "From: support@g1sms.fr To: EMAIL -Bcc: support@qo-op.com +Bcc: fred@g1sms.fr Subject: SUBJECT MESSAGE " > ~/.zen/tmp/email.txt