diff --git a/jstrr.css b/jstrr.css index 372563a..9b431e7 100644 --- a/jstrr.css +++ b/jstrr.css @@ -1,6 +1,6 @@ body { background-color: rgb(142, 174, 235); - background-image: url(snow.png); + background-image: url(summer3.png); background-position: center; background-repeat: no-repeat; background-size: cover; @@ -13,31 +13,6 @@ .wrapper.snow-inner{ position: relative; } -/* .snow { - background-color: #fff; - border-radius: 50%; - position: absolute; - animation: animate-snow 10s linear; -} -@keyframes animate-snow { - 0% { - opacity: 0; - top: 0; - } - - 10% { - opacity: 1; - } - - 90% { - opacity: 1; - } - - 100% { - opacity: 0; - top: 100vh; - } -} */ .pink{ background-color: #FFBCFF; } @@ -88,7 +63,7 @@ } label {margin-right: 1em;} label.disabled {color: grey;} - + div.login, div.login2, div.ranking { position: absolute; height: 100vh; width: 100vw; top: 0; left: 0; @@ -98,11 +73,15 @@ input[name="text"] {display: none;} input[name="text"]+button {min-width: 10em;} input[name="text"]:checked+button {background: yellow;} - + /*div.login, div.login2 {padding: 40% 0%;}*/ div.login{ background-color: rgb(142, 174, 235); +<<<<<<< HEAD background-image: url(snow.png); +======= + background-image: url(summer.jpg); +>>>>>>> master background-position: 10% 80%; background-repeat: no-repeat; background-size: cover; @@ -121,7 +100,7 @@ #prompt{ color: black; } - + div.login2 { opacity: 0; transition: 0.5s; border-radius: 50%; } diff --git a/jstrr.js b/jstrr.js index 582e50e..34bf123 100644 --- a/jstrr.js +++ b/jstrr.js @@ -1,6 +1,6 @@ (function (){ // var wsURL = "wss://tmp.iekei.org/jstype"; - var wsURL = "wss://" + location.host + "/koekitrr"; + var wsURL = "wss://" + location.host + "/jtserv"; var ws; // for WebSocket Object var textlist = []; var nText = nText||4; diff --git a/jtserv/jtserv.rb b/jtserv/jtserv.rb index 6be6fc0..66abec8 100755 --- a/jtserv/jtserv.rb +++ b/jtserv/jtserv.rb @@ -261,7 +261,7 @@ pass = nil # Go to next step beginner = nil # Beginner flag secret = (/secret/i =~ h["trrmode"].to_s) - time = h["finish"] - h["start"] + time = h["finish"].to_f - h["start"].to_f types = h["types"].to_i miss = h["miss"].to_i text = h["text"] @@ -533,7 +533,7 @@ end json["start"] = userinfo["start"] json["finish"] = Time.now.to_f -STDERR.printf("Start=%.2f, Finish=%.2f\n", json["start"], json["finish"]) +#STDERR.printf("Start=%.2f, Finish=%.2f\n", json["start"], json["finish"]) eval = db.evalStep(user, json) socksend.call(ws_conn, JSON.generate(eval)) userinfo.delete("typelist") diff --git a/jtserv/rmuser.sh b/jtserv/rmuser.sh new file mode 100755 index 0000000..fdef9c0 --- /dev/null +++ b/jtserv/rmuser.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +## Feeding CSV as follows: +## user +# C123456X + +DB=${1:-users.sq3} +CSV=${2:-rmusers.csv} +if [ ! -f $DB ]; then + echo "You need to create user-sqlite3 file first" >&2 + head $0 >&2; exit +fi +sqlite3 ${DB} <<-EOF + .mode csv + CREATE TEMPORARY TABLE rmuser(user); + .import $CSV rmuser + DELETE FROM rmuser WHERE user LIKE 'user'; -- rm CSV header + select * from rmuser; + select count(*) from rmuser; + PRAGMA foreign_keys=on; + SELECT count(user)||'users found' FROM users; + DELETE FROM users WHERE user IN (SELECT user FROM rmuser); + SELECT count(user)||'users remain' FROM users; +EOF diff --git a/rmuser.sh b/rmuser.sh new file mode 100644 index 0000000..fdef9c0 --- /dev/null +++ b/rmuser.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +## Feeding CSV as follows: +## user +# C123456X + +DB=${1:-users.sq3} +CSV=${2:-rmusers.csv} +if [ ! -f $DB ]; then + echo "You need to create user-sqlite3 file first" >&2 + head $0 >&2; exit +fi +sqlite3 ${DB} <<-EOF + .mode csv + CREATE TEMPORARY TABLE rmuser(user); + .import $CSV rmuser + DELETE FROM rmuser WHERE user LIKE 'user'; -- rm CSV header + select * from rmuser; + select count(*) from rmuser; + PRAGMA foreign_keys=on; + SELECT count(user)||'users found' FROM users; + DELETE FROM users WHERE user IN (SELECT user FROM rmuser); + SELECT count(user)||'users remain' FROM users; +EOF diff --git a/summer.jpg b/summer.jpg new file mode 100644 index 0000000..ea85904 --- /dev/null +++ b/summer.jpg Binary files differ diff --git a/summer3.png b/summer3.png new file mode 100644 index 0000000..309306d --- /dev/null +++ b/summer3.png Binary files differ