From 36aac6bb74e4b711b7c411ea95e052b7ac137759 Mon Sep 17 00:00:00 2001 From: fred Date: Sat, 2 Sep 2023 03:50:54 +0200 Subject: [PATCH] salt pepper = lat lon --- API/UPLANET.sh | 13 +++++++------ templates/register.html | 14 +++++++------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/API/UPLANET.sh b/API/UPLANET.sh index bb7514f4..e864c5fb 100755 --- a/API/UPLANET.sh +++ b/API/UPLANET.sh @@ -6,7 +6,7 @@ ################################################################################ ## API: UPLANET ## Dedicated to OSM2IPFS & UPlanet Client App -# ?uplanet=EMAIL&LAT=LON +# ?uplanet=EMAIL&salt=LAT&pepper=LON ## https://git.p2p.legal/qo-op/OSM2IPFS ################################################################################ MY_PATH="`dirname \"$0\"`" # relative @@ -44,9 +44,9 @@ mkdir -p ~/.zen/tmp/${MOATS}/ ## DIRECT VISA.print.sh PLAYER=${THAT} -[[ ${PLAYER} == "lat" ]] && PLAYER="@" +[[ ${PLAYER} == "salt" ]] && PLAYER="@" -[[ ${AND} == "lat" ]] && SALT=${THIS} || SALT=${AND} +[[ ${AND} == "salt" ]] && SALT=${THIS} || SALT=${AND} [[ ${SALT} == "0" ]] && SALT="0.00" input_number=${SALT} @@ -56,7 +56,7 @@ else LAT=${input_number} fi -[[ ${APPNAME} == "lon" ]] && PEPPER=${WHAT} || PEPPER=${APPNAME} +[[ ${APPNAME} == "pepper" ]] && PEPPER=${WHAT} || PEPPER=${APPNAME} [[ ${PEPPER} == "0" ]] && PEPPER="0.00" input_number=${PEPPER} @@ -118,10 +118,11 @@ UMAPGEN="https://ipfs.copylaradio.com/ipfs/QmSaFpSM6ps2pBqYxxLjKJfuigpEo98GNCPdK echo ${UMAPGEN} ## TODO find a better crawling method (pb tiles are not fully loaded before screenshot) -echo "chromium --headless --disable-gpu --screenshot=/tmp/Umap_${SALT}_${PEPPER}.jpg --window-size=1200x1200 ${UMAPGEN}" -chromium --headless --disable-gpu --screenshot=${HOME}/.zen/tmp/${MOATS}/Umap_${SALT}_${PEPPER}.jpg --window-size=1200x1200 ${UMAPGEN} +echo "chromium --headless --disable-gpu --screenshot=/tmp/Umap_${SALT}_${PEPPER}.jpg --window-size=1200x1200 \"${UMAPGEN}\"" +chromium --headless --disable-gpu --screenshot=/tmp/Umap_${SALT}_${PEPPER}.jpg --window-size=1200x1200 ${UMAPGEN} ## COPYING FILES FROM ABROAD +cp /tmp/Umap_${SALT}_${PEPPER}.jpg ~/.zen/tmp/${MOATS}/ cp ~/.zen/tmp/${PASS}##/G1*.jpg ~/.zen/tmp/${MOATS}/ cp -f ~/.zen/tmp/${PASS}##/${PASS}.jpg ~/.zen/tmp/${MOATS}/G1Card.${PASS}.jpg ls ~/.zen/tmp/${MOATS}/ diff --git a/templates/register.html b/templates/register.html index 74cfe0f4..704208c8 100644 --- a/templates/register.html +++ b/templates/register.html @@ -73,8 +73,8 @@ header { Email :

- -

>>> (◕‿‿◕) <<<

+ +

>>> (◕‿‿◕) <<<

@@ -95,7 +95,7 @@ header {      - + @@ -107,13 +107,13 @@ header { // Extract latitude and longitude from URL parameters document.addEventListener('DOMContentLoaded', function() { const urlParams = new URLSearchParams(window.location.search); - const lat = urlParams.get('lat'); - const lon = urlParams.get('lon'); + const salt = urlParams.get('salt'); + const pepper = urlParams.get('pepper'); const uplanet = urlParams.get('uplanet'); // Set latitude and longitude values to hidden inputs - const latElement = document.querySelector('input[name="lat"]'); - const lonElement = document.querySelector('input[name="lon"]'); + const latElement = document.querySelector('input[name="salt"]'); + const lonElement = document.querySelector('input[name="pepper"]'); const uplanetElement = document.querySelector('input[name="uplanet"]'); if (latElement && lonElement) {