what a peaceful night
This commit is contained in:
parent
0d27f4d88b
commit
1618fa2924
|
@ -414,7 +414,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
|
||||||
##############################################
|
##############################################
|
||||||
if [[ $APPNAME == "getipns" ]]; then
|
if [[ $APPNAME == "getipns" ]]; then
|
||||||
( echo "$HTTPCORS
|
( echo "$HTTPCORS
|
||||||
url=${ASTRONAUTENS}"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getipns : ${ASTRONAUTENS}" ) &
|
url='"${ASTRONAUTENS}"'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getipns : ${ASTRONAUTENS}" ) &
|
||||||
end=`date +%s`
|
end=`date +%s`
|
||||||
echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds.
|
echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds.
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -425,7 +425,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
|
||||||
##############################################
|
##############################################
|
||||||
if [[ $APPNAME == "getg1pub" ]]; then
|
if [[ $APPNAME == "getg1pub" ]]; then
|
||||||
( echo "$HTTPCORS
|
( echo "$HTTPCORS
|
||||||
url=${G1PUB}"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getg1pub : ${G1PUB}" ) &
|
url='"${G1PUB}"'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getg1pub : ${G1PUB}" ) &
|
||||||
end=`date +%s`
|
end=`date +%s`
|
||||||
echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds.
|
echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds.
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -184,8 +184,12 @@ if [[ ! ${TIDDLER} ]]; then
|
||||||
PLAYLIST=$(yt-dlp $BROWSER --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g')
|
PLAYLIST=$(yt-dlp $BROWSER --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g')
|
||||||
EXTRATAG="$CHANNEL $PLAYLIST"
|
EXTRATAG="$CHANNEL $PLAYLIST"
|
||||||
## PREPARE VIDEO HTML5 CODE
|
## PREPARE VIDEO HTML5 CODE
|
||||||
TEXT="<video controls width=100% poster='/ipfs/"${ANIMH}"'><source src='/ipfs/"${ILINK}"' type='"${MIME}"'></video>
|
TEXT="<video controls width=100% poster='/ipfs/"${ANIMH}"'>
|
||||||
<br>{{!!filesize}} - {{!!duration}} sec. - vtratio(dur) = {{!!vtratio}} ({{!!dur}})<br>
|
<source src='/ipfs/"${ILINK}"' type='"${MIME}"'>
|
||||||
|
</video>
|
||||||
|
<br>
|
||||||
|
{{!!filesize}} - {{!!duration}} sec. - vtratio(dur) = {{!!vtratio}} ({{!!dur}})
|
||||||
|
<br>
|
||||||
<h1><a href='"${ZYURL}"'>"${TITLE}"</a></h1>"
|
<h1><a href='"${ZYURL}"'>"${TITLE}"</a></h1>"
|
||||||
|
|
||||||
end=`date +%s`
|
end=`date +%s`
|
||||||
|
|
|
@ -40,19 +40,19 @@ MOATS="$4"
|
||||||
mkdir -p ~/.zen/tmp/$MOATS
|
mkdir -p ~/.zen/tmp/$MOATS
|
||||||
|
|
||||||
#####################################################
|
#####################################################
|
||||||
# CREATION DU TW G1VOEU
|
# CREATION DE LA CLEF DERIVEE "G1VOEU"
|
||||||
#####################################################
|
#####################################################
|
||||||
source ~/.zen/game/players/$PLAYER/secret.june ## CLEF DERIVEE ET MEMORISABLE
|
source ~/.zen/game/players/$PLAYER/secret.june ## LE PEPPER DU PLAYER DEVIENT LE SALT DU G1VOEU
|
||||||
[[ $PEPPER ]] && echo "Using PLAYER PEPPER AS WISH SALT" && SALT=$PEPPER ##
|
[[ $PEPPER ]] && echo "Using PLAYER PEPPER AS WISH SALT" && SALT=$PEPPER ##
|
||||||
[[ ! $SALT ]] && SALT=$(${MY_PATH}/../tools/diceware.sh 3 | xargs)
|
[[ ! $SALT ]] && SALT=$(${MY_PATH}/../tools/diceware.sh 3 | xargs)
|
||||||
echo "$SALT"
|
echo "$SALT"
|
||||||
|
|
||||||
echo "## TITRE DU G1VOEU ? CapitalGluedWords please"
|
echo "## TITRE DU G1VOEU ? CapitalGluedWords please"
|
||||||
[[ ! $TITRE ]] && read TITRE
|
[[ ! $TITRE ]] && read TITRE
|
||||||
PEPPER=$(echo "$TITRE" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords
|
PEPPER=$(echo "$TITRE" | sed -r 's/\<./\U&/g' | sed 's/ //g') # PEPPER EST LE TITRE DU VOEU : CapitalGluedWords
|
||||||
echo "$PEPPER" && [[ ! $PEPPER ]] && echo "EMPTY PEPPER - ERROR" && exit 1
|
echo "$PEPPER" && [[ ! $PEPPER ]] && echo "EMPTY PEPPER - ERROR" && exit 1
|
||||||
|
|
||||||
echo "## keygen CLEF DE VOEUX from PLAYER : pepper + G1WishName derivation"
|
echo "## keygen PLAYER DERIVATE WISH KEY"
|
||||||
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/qrtw.dunikey "$SALT" "$PEPPER"
|
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/qrtw.dunikey "$SALT" "$PEPPER"
|
||||||
WISHKEY=$(cat ~/.zen/tmp/qrtw.dunikey | grep "pub:" | cut -d ' ' -f 2)
|
WISHKEY=$(cat ~/.zen/tmp/qrtw.dunikey | grep "pub:" | cut -d ' ' -f 2)
|
||||||
echo "WISHKEY (G1PUB) = $WISHKEY"
|
echo "WISHKEY (G1PUB) = $WISHKEY"
|
||||||
|
@ -71,10 +71,10 @@ mkdir -p ~/.zen/tmp/$MOATS
|
||||||
echo $ENCODING
|
echo $ENCODING
|
||||||
|
|
||||||
## TEST IPFS
|
## TEST IPFS
|
||||||
ipfs --timeout=30s cat /ipns/$VOEUNS > ~/.zen/tmp/$VOEUNS.json
|
#~ ipfs --timeout=30s cat /ipns/$VOEUNS > ~/.zen/tmp/$VOEUNS.json
|
||||||
[[ -s ~/.zen/tmp/$VOEUNS.json ]] \
|
#~ [[ -s ~/.zen/tmp/$VOEUNS.json ]] \
|
||||||
&& echo "HEY !!! UN CHANNEL EXISTE DEJA POUR CE VOEU ! ~/.zen/tmp/$VOEUNS.json - EXIT -" \
|
#~ && echo "HEY !!! UN CHANNEL EXISTE DEJA POUR CE VOEU ! ~/.zen/tmp/$VOEUNS.json - EXIT -" \
|
||||||
&& exit 1
|
#~ && exit 1
|
||||||
|
|
||||||
echo "# UPGRADING WORLD WHISHKEY DATABASE"
|
echo "# UPGRADING WORLD WHISHKEY DATABASE"
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ composite -compose Over -gravity NorthWest -geometry +350+10 ~/.zen/tmp/ASTROLOG
|
||||||
composite -compose Over -gravity NorthWest -geometry +0+0 ~/.zen/tmp/QRWISHLINK.png ~/.zen/tmp/astroport.png ~/.zen/tmp/one.png
|
composite -compose Over -gravity NorthWest -geometry +0+0 ~/.zen/tmp/QRWISHLINK.png ~/.zen/tmp/astroport.png ~/.zen/tmp/one.png
|
||||||
convert -gravity northwest -pointsize 20 -fill black -draw "text 320,250 \"$PLAYER\"" ~/.zen/tmp/one.png ~/.zen/tmp/hop.png
|
convert -gravity northwest -pointsize 20 -fill black -draw "text 320,250 \"$PLAYER\"" ~/.zen/tmp/one.png ~/.zen/tmp/hop.png
|
||||||
convert -gravity northwest -pointsize 30 -fill black -draw "text 20,320 \"$PEPPER\"" ~/.zen/tmp/hop.png ~/.zen/tmp/pseudo.png
|
convert -gravity northwest -pointsize 30 -fill black -draw "text 20,320 \"$PEPPER\"" ~/.zen/tmp/hop.png ~/.zen/tmp/pseudo.png
|
||||||
convert -gravity northwest -pointsize 30 -fill black -draw "text 320,300 \"$SALT\"" ~/.zen/tmp/pseudo.png ~/.zen/tmp/salt.png
|
convert -gravity northwest -pointsize 30 -fill black -draw "text 320,300 \"*****\"" ~/.zen/tmp/pseudo.png ~/.zen/tmp/salt.png
|
||||||
convert -gravity northwest -pointsize 33 -fill black -draw "text 320,350 \"$PEPPER\"" ~/.zen/tmp/salt.png ~/.zen/tmp/player.png
|
convert -gravity northwest -pointsize 33 -fill black -draw "text 320,350 \"$PEPPER\"" ~/.zen/tmp/salt.png ~/.zen/tmp/player.png
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 45 KiB |
Binary file not shown.
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 17 KiB |
|
@ -154,11 +154,11 @@ Take possession of your TW. Make freedom of expression uncensurable, unstoppable
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
const el = document.getElementById('yellow');
|
const el = document.getElementById('yellow');
|
||||||
const log = document.getElementById('login');
|
// const log = document.getElementById('login');
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
el.style.visibility = 'visible';
|
el.style.visibility = 'visible';
|
||||||
log.style.visibility = 'visible';
|
// log.style.visibility = 'visible';
|
||||||
}, 23456); // 👈️ delay in milliseconds
|
}, 23456); // 👈️ delay in milliseconds
|
||||||
|
|
||||||
var arrTimes = [];
|
var arrTimes = [];
|
||||||
|
@ -207,7 +207,7 @@ function testLatency(cb) {
|
||||||
function countdown() {
|
function countdown() {
|
||||||
if (timeLeft == -1) {
|
if (timeLeft == -1) {
|
||||||
clearTimeout(timerId);
|
clearTimeout(timerId);
|
||||||
document.getElementById("countdown").innerHTML = "Remplacez les '0' par les identifiants de votre G1BILLET. Validez";
|
document.getElementById("countdown").innerHTML = "Remplacez les '0' par les identifiants de votre G1BILLET.";
|
||||||
} else {
|
} else {
|
||||||
// elem.innerHTML = timeLeft + " s";
|
// elem.innerHTML = timeLeft + " s";
|
||||||
timeLeft--;
|
timeLeft--;
|
||||||
|
|
|
@ -46,13 +46,16 @@ if [[ ! -d $img_dir ]]; then
|
||||||
-pointsize 14 -fill white -draw 'text 40, 200 "'"$(date)"'"' \
|
-pointsize 14 -fill white -draw 'text 40, 200 "'"$(date)"'"' \
|
||||||
"${HOME}/.zen/tmp/one.png" "${HOME}/.zen/tmp/carousel/${pub}.png" \
|
"${HOME}/.zen/tmp/one.png" "${HOME}/.zen/tmp/carousel/${pub}.png" \
|
||||||
&& rm ${HOME}/.zen/tmp/carousel/${pub}.one.png
|
&& rm ${HOME}/.zen/tmp/carousel/${pub}.one.png
|
||||||
|
##################
|
||||||
## PREPARE LOOP LINK LINE
|
## PREPARE LOOP LINK LINE
|
||||||
ASTRONAUTENS=$(cat ~/.zen/game/players/${PLAYER}/.playerns)
|
ASTRONAUTENS=$(cat ~/.zen/game/players/${PLAYER}/.playerns)
|
||||||
[[ $COINS -gt 0 ]] \
|
[[ $COINS -gt 0 ]] \
|
||||||
&& echo "<a href=\"javascript:homeAstroportStation('"$myASTROPORT"/?qrcode="$ASTRONAUTENS"', 'tab', '2500')\" title=\"$PLAYER ($COINS G1)\">_REPLACE_</a>" > ~/.zen/tmp/carousel/${pub}.insert \
|
&& echo "<a href=\"javascript:homeAstroportStation('"$myASTROPORT"/?qrcode="$ASTRONAUTENS"', 'tab', '3000')\" title=\"$PLAYER ($COINS G1) CHARGEUR DE G1BILLET \">_REPLACE_</a>" > ~/.zen/tmp/carousel/${pub}.insert \
|
||||||
|| echo "_REPLACE_" > ~/.zen/tmp/carousel/${pub}.insert
|
|| echo "_REPLACE_" > ~/.zen/tmp/carousel/${pub}.insert
|
||||||
|
|
||||||
|
## Add Button for every wish : TODO
|
||||||
|
echo "<button onclick=\"homeAstroportStation('$myASTROPORT/?qrcode=G1CopierYoutube&tw=$ASTRONAUTENS', '', 7654)\">G1CopierYoutube</button>" > ~/.zen/tmp/carousel/${pub}.button
|
||||||
|
##################
|
||||||
|
|
||||||
done
|
done
|
||||||
img_dir="$HOME/.zen/tmp/carousel"
|
img_dir="$HOME/.zen/tmp/carousel"
|
||||||
|
@ -86,8 +89,8 @@ echo "<link rel=\"stylesheet\" href=\"/ipfs/QmX9QyopkTw9TdeC6yZpFzutfjNFWP36nzfP
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<h3 id=\"countdown\"> $myHOST :: ${#PLAYERONE[@]}</h3>
|
<h3> $myHOST :: ${#PLAYERONE[@]} <div id=\"countdown\"></div></h3>
|
||||||
|
<div id=ainfo>AINFO</div>
|
||||||
<div class=\"container\">
|
<div class=\"container\">
|
||||||
|
|
||||||
<div id=\"myCarousel\" class=\"carousel slide\" data-ride=\"carousel\">
|
<div id=\"myCarousel\" class=\"carousel slide\" data-ride=\"carousel\">
|
||||||
|
@ -125,14 +128,17 @@ if [[ $i =~ \.(JPG|jpg|PNG|png|JPEG|jpeg|GIF|gif)$ ]]; then
|
||||||
|
|
||||||
MORE="${i%.png}.insert"
|
MORE="${i%.png}.insert"
|
||||||
echo "$MORE"
|
echo "$MORE"
|
||||||
|
BUTTON="${i%.png}.button"
|
||||||
|
echo "$BUTTON"
|
||||||
|
|
||||||
LINK="<img src=\"/ipfs/$ilink\" alt=\"$img_alt\" width=\"$img_width\" height=\"$img_height\">"
|
LINK="<img src=\"/ipfs/$ilink\" alt=\"$img_alt\" width=\"$img_width\" height=\"$img_height\">"
|
||||||
[[ -s $MORE ]] && ZLINK=$(cat $MORE | sed "s~_REPLACE_~$LINK~g") || ZLINK="$LINK"
|
[[ -s $MORE ]] && ZLINK=$(cat $MORE | sed "s~_REPLACE_~$LINK~g") || ZLINK="$LINK"
|
||||||
|
# echo $ZLINK
|
||||||
echo $ZLINK
|
|
||||||
|
|
||||||
if [ $num -eq 1 ]; then
|
if [ $num -eq 1 ]; then
|
||||||
echo " <div class=\"carousel-item active\">
|
echo " <div class=\"carousel-item active\">
|
||||||
$ZLINK
|
$ZLINK
|
||||||
|
<br>$BUTTON
|
||||||
</div>" >> $core_file
|
</div>" >> $core_file
|
||||||
else
|
else
|
||||||
echo " <div class=\"carousel-item\">
|
echo " <div class=\"carousel-item\">
|
||||||
|
|
|
@ -41,6 +41,9 @@ async function homeAstroportStation(myURL, option = '', duration = 3000) {
|
||||||
case "page":
|
case "page":
|
||||||
window.location.replace(redirectURL);
|
window.location.replace(redirectURL);
|
||||||
break;
|
break;
|
||||||
|
case "parent":
|
||||||
|
window.parent.location.replace(redirectURL);
|
||||||
|
break;
|
||||||
case "aframe":
|
case "aframe":
|
||||||
document.getElementById("aframe").src = redirectURL;
|
document.getElementById("aframe").src = redirectURL;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -91,6 +91,14 @@
|
||||||
margin-top: -12.5px;
|
margin-top: -12.5px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
#yellow {
|
||||||
|
background: black;
|
||||||
|
position: absolute;
|
||||||
|
bottom: 2%;
|
||||||
|
left: 2%;
|
||||||
|
width: 60%;
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
@ -151,7 +159,7 @@
|
||||||
// Générer le HTML
|
// Générer le HTML
|
||||||
pageGifs.forEach((gif, i) => {
|
pageGifs.forEach((gif, i) => {
|
||||||
output += `
|
output += `
|
||||||
<a target="astroplay" href="_LIBRA_${pageUrls[i]}">
|
<a target="astroplay" href="javascript:document.getElementById('aframe').src = _LIBRA_${pageUrls[i]}">
|
||||||
<img src="_LIBRA_${gif}" title="${pageDurees[i]} - ${pageTitles[i]}" />
|
<img src="_LIBRA_${gif}" title="${pageDurees[i]} - ${pageTitles[i]}" />
|
||||||
</a>
|
</a>
|
||||||
`;
|
`;
|
||||||
|
@ -199,13 +207,25 @@ Plus vous vérifiez votre identité, plus vous aurez d'opportunités de voter et
|
||||||
|
|
||||||
<p><a href="https://ipfs.copylaradio.com/ipns/_ASTRONAUTENS_">TW♥BOX "_PLAYER_"</a></p>
|
<p><a href="https://ipfs.copylaradio.com/ipns/_ASTRONAUTENS_">TW♥BOX "_PLAYER_"</a></p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<br>
|
||||||
|
<br> 👍 IPFS DATA STORAGE 👍 </p>
|
||||||
|
<p>Powered by <a href="https://github.com/papiche/Astroport.ONE">Astroport.ONE</a></p>
|
||||||
|
<p>/ <a href="https://opencollective.com/monnaie-libre/projects/stiits">LaSTI</a> / <a href="https://opencollective.com/monnaie-libre/projects/coeurbox">La♥BOX</a> /
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="choose_example">
|
<div class="choose_example">
|
||||||
Choose example: <select id="example">
|
Choose example: <select id="example">
|
||||||
<option value="simple">Simple earth</option>
|
<option value="simple">Simple earth</option>
|
||||||
<option value="simple_tilted">Simple tilted earth</option>
|
<option value="simple_tilted">Simple tilted earth</option>
|
||||||
<option value="simple_mars">Simple mars</option>
|
<option value="simple_mars">Simple mars</option>
|
||||||
<option value="locations">Earth with locations</option>
|
<option value="locations" selected>Earth with locations</option>
|
||||||
<option value="flights" selected>Earth with locations and flights</option>
|
<option value="flights">Earth with locations and flights</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="code">
|
<div class="code">
|
||||||
|
@ -214,17 +234,12 @@ Plus vous vérifiez votre identité, plus vous aurez d'opportunités de voter et
|
||||||
<textarea id="example_code" onclick="this.focus();this.select();"></textarea>
|
<textarea id="example_code" onclick="this.focus();this.select();"></textarea>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<br>
|
|
||||||
<br> 👍 IPFS DATA STORAGE 👍 </p>
|
|
||||||
<p>Powered by <a href="https://github.com/papiche/Astroport.ONE">Astroport.ONE</a></p>
|
|
||||||
<p>/ <a href="https://opencollective.com/monnaie-libre/projects/stiits">LaSTI</a> / <a href="https://opencollective.com/monnaie-libre/projects/coeurbox">La♥BOX</a> /
|
|
||||||
|
|
||||||
|
<div id="yellow" >
|
||||||
|
<iframe id="aframe" src="_STATION_" width="100%" height="280px"></iframe>
|
||||||
|
</div>
|
||||||
|
<script>
|
||||||
|
const el = document.getElementById('yellow');
|
||||||
|
el.style.visibility = 'visible';
|
||||||
|
</script>
|
||||||
</body></html>
|
</body></html>
|
||||||
|
|
|
@ -60,6 +60,7 @@ examples['locations'] = function() {
|
||||||
link: 'https://oasis.astroport.com#europe'
|
link: 'https://oasis.astroport.com#europe'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
$('#sphere').earth3d({
|
$('#sphere').earth3d({
|
||||||
locationsElement: $('#locations'),
|
locationsElement: $('#locations'),
|
||||||
dragElement: $('#locations'), // where do we catch the mouse drag
|
dragElement: $('#locations'), // where do we catch the mouse drag
|
||||||
|
|
Loading…
Reference in New Issue