G1PASS G1PUB

This commit is contained in:
fred 2023-04-21 04:00:19 +02:00
parent 9346938eed
commit 26179c0ff2
2 changed files with 37 additions and 31 deletions

View File

@ -136,13 +136,13 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
if [[ $APPNAME == "pay" ]]; then
if [[ ${WHAT} != "" && ${VAL} != "" && ${CURCOINS} != "null" && ${CURCOINS} != "" && ${CURCOINS} -gt ${VAL} ]]; then
if [[ ${WHAT} != "" && ${VAL} != "" && ${CURCOINS} != "null" && ${CURCOINS} != "" && ${CURCOINS} -gt ${WHAT} ]]; then
## COMMAND A PAYMENT
if [[ $WHAT =~ ^[0-9]+$ ]]; then
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'ASTRO:Bro' -m"
${MY_PATH}/../tools/timeout.sh -t 5 \
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c "G1PASS:$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-13)" -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c "G1PASS:${MOATS}" -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
#################################### SYSTEM IS NOT DUNITER OVER POOL RESISTANT
if [ $? == 0 ]; then
@ -151,11 +151,11 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
COINSFILE="$HOME/.zen/tmp/coucou/${G1PUB}.COINS"
DESTFILE="$HOME/.zen/tmp/coucou/${VAL}.COINS"
CUR=$(cat ${COINFILE})
CUR=$(cat ${COINSFILE})
[[ ${CUR} != "" && ${CUR} != "null" ]] \
&& echo $((CUR-WHAT)) > ${COINFILE} \
|| echo ${WHAT} > ${COINFILE}
cat ${COINFILE}
&& echo $((CUR-WHAT)) > ${COINSFILE} \
|| echo ${WHAT} > ${COINSFILE}
cat ${COINSFILE}
DES=$(cat ${DESTFILE})
[[ ${DES} != "" && ${DES} != "null" ]] \
@ -163,7 +163,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|| echo ${WHAT} > ${DESTFILE}
cat ${DESTFILE}
echo "OPERATION<br>${COINSFILE} <br> ($CUR) - ${WHAT} -> ($DES) <br> ${DESTFILE} " >> ~/.zen/tmp/${MOATS}/disco
echo "<h1>OPERATION</h1> <h3>$G1PUB <br> $CUR - ${WHAT}</h3> <h3>${VAL} <br> $DES + ${WHAT} </h3><h2>OK</h2>" >> ~/.zen/tmp/${MOATS}/disco
fi
fi
@ -496,7 +496,7 @@ else
## DOES CURRENT IS RICHER THAN 100 G1
## IF GCHANGE ACCOUNT FOUND => SEND PALPE JUNE.
# SEND MESSAGE TO GCHANGE MESSAGING. SEND 1
# SEND MESSAGE TO GCHANGE MESSAGING. SEND 5
if [[ $CURCOINS -gt 100 && $PALPE != 0 ]]; then
## LE COMPTE VISITOR EST VIDE
@ -513,7 +513,10 @@ else
-m "DE LA PART DE ${CURPLAYER} : ${PALPE} JUNE."
## SEND ONE ★ (NEXT STEP GCHANGE)
my_star_level=1
[ $PALPE -ge 1 ] && my_star_level=1
[ $PALPE -lt 50 ] && my_star_level=3
[ $PALPE -ge 50 ] && my_star_level=5
echo "★ SENDING $my_star_level STAR(s) ★"
$MY_PATH/../tools/jaklis/jaklis.py -k ${MYPLAYERKEY} stars -p ${QRCODE} -n $my_star_level

View File

@ -123,14 +123,15 @@ a {
<video id="preview" style="transform: scaleX(-1);width: 240px;height: 240px;" autoplay="autoplay" class="active"></video>
<strong><div id="countdown"></div></strong>
<div id="appname">
<input type="radio" id="r0" name="appname" value="login"> Login
<input type="radio" id="r1" name="appname" value="read"> Messagerie
<input type="radio" id="r0" name="appname" value="login"> Login TW
<input type="radio" id="r1" name="appname" value="read"> (G)Messagerie
<input type="radio" id="r2" name="appname" value="history"> Historique
<input type="radio" id="r3" name="appname" value="pay"> Payer
<input type="radio" id="r3" name="appname" value="pay"> Virement
<input type="radio" id="r3" name="appname" value="balance" checked="checked"> Balance
</div>
<strong><div id="resu"></div></strong>
<p><input type="text" id="g1pub" value="DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech"/></p>
<p> <strong>Scanner QRCODE</strong> </p>
<p>1. <b>G1PUB</b> destinataire</p>
<p>2. <b>G1PASS</b> opérateur</p>
@ -182,36 +183,38 @@ a {
scanner.addListener('scan', function (content) {
alert(content);
if (content.startsWith('~~~~~')) {
// DESTINATION OF PREVIOUS SCAN
if (document.getElementById("resu").innerHTML !== '') {
var mypub = document.getElementById("resu").innerHTML.value;
} else {
// OR IF NONE Fred ;)
var mypub = "DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech"
}
// GET PASS THAT DECODE PGP
var pass = prompt("Saisir PASS:");
// GET APPNAME
var appname = document.querySelector('input[name="appname"]:checked').value;
// DEFAULT PAY
// GET PASS THAT DECODE PGP
var pass = prompt("Saisir PASS:");
// GET DESTINATION
// FROM PREVIOUS G1PUB SCAN
var g1pub = document.getElementById("g1pub").value;
// APPNAME : DATA COLLECT & ARRANGE
if ( appname == 'pay') {
var amount = prompt("Saisir MONTANT Ğ1:");
}
if ( appname == 'login') {
var amount = prompt("Saisir EMAIL:");
} else {
var amount = mypub;
alert('PAY TO ' + g1pub + ' = ' + amount);
}
if ( appname == 'pay') {
alert('PAY TO ' + mypub + ' = ' + amount);
if ( appname == 'login') {
var amount = prompt("Saisir EMAIL:");
}
var myU = 'http://astroport.localhost:1234/?qrcode=' + content +'&pass=' + pass + '&' + appname + '=' + amount + '&g1pub=' + mypub ;
if ( amount == 'undefined' || amount == '' ) {
var amount = document.getElementById("g1pub").value;
}
var myU = 'http://astroport.localhost:1234/?qrcode=' + content +'&pass=' + pass + '&' + appname + '=' + amount + '&g1pub=' + g1pub ;
console.log(myU);
homeAstroportStation(myU, 'aframe', 10000)
} else {
document.getElementById("resu").innerHTML = content;
// COPY QRCODE IN g1pub input
document.getElementById("g1pub").value = content;
// document.getElementById("resu").innerHTML = content;
var myU = 'http://astroport.localhost:1234/?qrcode=' + content;
console.log(myU);
homeAstroportStation(myU, 'aframe', 10000)