diff --git a/publicDirs/public/favicon.ico b/publicDirs/public/favicon.ico index fa7241a..dc09ab1 100755 Binary files a/publicDirs/public/favicon.ico and b/publicDirs/public/favicon.ico differ diff --git a/scripts/serverStats.sh b/scripts/serverStats.sh deleted file mode 100755 index 8e5893c..0000000 --- a/scripts/serverStats.sh +++ /dev/null @@ -1,195 +0,0 @@ -#!/bin/bash - -if [ "$#" -ne "1" ]; then - echo not enough params! please specify server root directory! - exit 1 -fi - -export TERM=xterm-256color - -# COLORS -NC='' -# GRAY='' -R='' -G='' -# YELLOW='' -B='' -P='' -C='' -sep="${P}----------------------------------------------------------------------------------------------------------------------------<=$NC" - -pcolumns() { - mlength=35 - NUM=0 - l=$(echo $"$1" | wc -l) - sizeof2=$(echo $"$2" | wc -l) - sizeof3=$(echo $"$3" | wc -l) - - if [ "$l" -lt "$sizeof2" ]; then - l=$(echo $"$2" | wc -l) - fi - if [ "$l" -lt "$sizeof3" ]; then - l=$(echo $"$3" | wc -l) - fi - - for i in $(eval echo {0..$l}); do - line=$(echo -ne $"$1" | cut -d$'\n' -f $(($NUM + 1))) - sliced="${line:0:$mlength}" - last="${line: -3}" - size=${#sliced} - diff=$(($mlength - $size)) - - if [ "$sliced" == "null" ]; then - echo -en "\t" - else - echo -en "\t$sliced" - fi - if [ "$diff" -gt "0" ]; then - diff=$((diff + 2)) - for j in $(eval echo {0..$diff}); do - echo -n " " - done - else - echo -en "$last" - fi - - sr=$(echo -ne $"$2" | cut -d$'\n' -f $(($NUM + 1))) - r=$"${sr:0:$mlength}" - last="${r: -3}" - size=${#r} - diff=$(($mlength - $size)) - if [ "$r" == "null" ]; then - echo -ne '' - else - echo -ne "$r" - fi - - if [ "$diff" -gt "0" ]; then - diff=$((diff + 2)) - for j in $(eval echo {0..$diff}); do - echo -n " " - done - else - echo -en "$last" - fi - - tr=$(echo -ne $"$3" | cut -d$'\n' -f $(($NUM + 1))) - r=$"${tr:0:$mlength}" - - if [ "$r" == "null" ]; then - echo '' - else - echo "$r" - fi - - NUM=$((NUM + 1)) - done -} - -function jsonStats() { - dateind=$(date '+%Y-%m-%d') - a=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort) - ac=$(cat "$1" | jq ".[\"$dateind\"] | length") - a="\t${ac}\n${a}" - - dateind=$(date -d '-1 day' '+%Y-%m-%d') - b=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort) - bc=$(cat "$1" | jq ".[\"$dateind\"] | length") - b="\t${bc}\n${b}" - - dateind=$(date -d '-2 day' '+%Y-%m-%d') - c=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort) - cc=$(cat "$1" | jq ".[\"$dateind\"] | length") - c="\t${cc}\n${c}" - - pcolumns $"$c" $"$b" $"$a" | sed -E \ - -e "s,/getVeteranPw,${C}&${NC},g" \ - -e "s,/getveteranpw,${C}&${NC},g" \ - -e "s,/pwRequest,${C}&${NC},g" \ - -e "s,/getpw,${C}&${NC},g" \ - -e "s,/avaiblePWS,${C}&${NC},g" \ - -e "s,/pwRequest,${C}&${NC},g" \ - -e "s,/login,${C}&${NC},g" \ - -e "s,/logout,${C}&${NC},g" \ - -e "s,/manual,${G}&${NC},g" \ - -e "s,/todos,${G}&${NC},g" \ - -e "s,/allQuestions,${G}&${NC},g" \ - -e "s,/subjectBrowser,${G}&${NC},g" \ - -e "s,/repos,${G}&${NC},g" \ - -e "s,/contribute,${G}&${NC},g" \ - -e "s,/reops,${G}&${NC},g" \ - -e "s,/feedback,${G}&${NC},g" \ - -e "s,/addQuestion,${G}&${NC},g" \ - -e "s,/dataCount,${G}&${NC},g" \ - -e "s,/menuClick,${G}&${NC},g" \ - -e "s,/ranklist,${G}&${NC},g" \ - -e "s,/uploaddata,${G}&${NC},g" \ - -e "s,/legacy,${G}&${NC},g" \ - -e "s,/donate,${P}&${NC},g" \ - -e "s,/tiszai,${P}&${NC},g" \ - -e "s,/install,${P}&${NC},g" \ - -e "s,/irc,${P}&${NC},g" \ - -e "s,/postfeedback,${P}&${NC},g" \ - -e "s,/voteTodo,${P}&${NC},g" \ - -e "s,/registerscript,${P}&${NC},g" \ - -e "s,/quickvote,${P}&${NC},g" \ - -e "s,/servergit,${P}&${NC},g" \ - -e "s,/scriptgit,${P}&${NC},g" \ - -e "s,/classesgit,${P}&${NC},g" \ - -e "s,/lred,${R}&${NC},g" \ - -e "s,/thanks,${R}&${NC},g" \ - -e "s,/isAdding,${B}&${NC},g" \ - -e "s,/allqr,${B}&${NC},g" \ - -e "s,/ask,${B}&${NC},g" -} - -function jsonStatsLength() { - dateind=$(date '+%Y-%m-%d') - ac=$(cat "$1" | jq ".[\"$dateind\"] | length") - a="\t${ac}\n" - - dateind=$(date -d '-1 day' '+%Y-%m-%d') - bc=$(cat "$1" | jq ".[\"$dateind\"] | length") - b="\t${bc}\n" - - dateind=$(date -d '-2 day' '+%Y-%m-%d') - cc=$(cat "$1" | jq ".[\"$dateind\"] | length") - c="\t${cc}\n" - - pcolumns $"$c" $"$b" $"$a" -} - -echo -e "${G}Site requests before / yesterday / today:$NC" -jsonStats "${1}/stats/vstats" - -echo -e "$sep" -echo -e "${G}User ID test solving count before / yesterday / today:$NC" -jsonStatsLength "${1}/stats/idvstats" - -echo -e "$sep" -echo -e "${G}User ID requests before / yesterday / today:$NC" -jsonStatsLength "${1}/stats/uvstats" - -echo -e "$sep" -echo -e "${G}User/data count day before / day before / yesterday + new ones yesterday:$NC" -s=$(cat "${1}/stats/dailyDataCount" | tail -n 1 | jq '.subjectCount') -q=$(cat "${1}/stats/dailyDataCount" | tail -n 1 | jq '.questionCount') -u=$(cat "${1}/stats/dailyDataCount" | tail -n 1 | jq '.userCount') - -st=$(cat "${1}/stats/dailyDataCount" | tail -n 2 | head -n 1 | jq '.subjectCount') -qt=$(cat "${1}/stats/dailyDataCount" | tail -n 2 | head -n 1 | jq '.questionCount') -ut=$(cat "${1}/stats/dailyDataCount" | tail -n 2 | head -n 1 | jq '.userCount') - -sy=$(cat "${1}/stats/dailyDataCount" | tail -n 3 | head -n 1 | jq '.subjectCount') -qy=$(cat "${1}/stats/dailyDataCount" | tail -n 3 | head -n 1 | jq '.questionCount') -uy=$(cat "${1}/stats/dailyDataCount" | tail -n 3 | head -n 1 | jq '.userCount') - -sd=$((s - st)) -qd=$((q - qt)) -ud=$((u - ut)) - -echo -e "Users:\t\t${G}${uy}${NC}\t\t\t\t\t${G}${ut}${NC}\t\t\t\t\t${G}${u}${NC}\t+${B}${ud}${NC}" -echo -e "Subjects:\t${G}${sy}${NC}\t\t\t\t\t${G}${st}${NC}\t\t\t\t\t${G}${s}${NC}\t+${B}${sd}${NC}" -echo -e "Questions:\t${G}${qy}${NC}\t\t\t\t\t${G}${qt}${NC}\t\t\t\t\t${G}${q}${NC}\t+${B}${qd}${NC}" - -echo -e "$sep" diff --git a/src/modules.json b/src/modules.json index df25d58..479ca8f 100644 --- a/src/modules.json +++ b/src/modules.json @@ -19,8 +19,7 @@ "nextdir": "nextStatic/qminingPagePublic", "name": "qmining", "urls": [ - "qmining.frylabs.net", - "localhost" + "qmining.frylabs.net" ], "isNextJs": true }, @@ -31,7 +30,8 @@ ], "name": "api", "urls": [ - "api.frylabs.net" + "api.frylabs.net", + "localhost" ] }, "main": { diff --git a/src/sharedViews/404.ejs b/src/sharedViews/404.ejs index 64be699..4126305 100755 --- a/src/sharedViews/404.ejs +++ b/src/sharedViews/404.ejs @@ -18,7 +18,7 @@

404

- +
diff --git a/src/sharedViews/login.ejs b/src/sharedViews/login.ejs index bb413bc..b9aed1b 100644 --- a/src/sharedViews/login.ejs +++ b/src/sharedViews/login.ejs @@ -165,7 +165,7 @@ function ShowFeedback () { const form = document.getElementById('form').style.display = "none"; const feedback = document.getElementById('feedback').style.display = "block"; - document.getElementById('text').innerText = 'Jelszót meglévő felhasználóktól lehet kérni!' + document.getElementById('text').innerText = 'Jelszót meglévő felhasználóktól lehet kérni! (nem itt)' } function HandleResp (resp) { const button = document.getElementById('sendButton') diff --git a/submodules/moodle-test-userscript b/submodules/moodle-test-userscript index 969c251..73c1cb7 160000 --- a/submodules/moodle-test-userscript +++ b/submodules/moodle-test-userscript @@ -1 +1 @@ -Subproject commit 969c2516c3bc8d454ebf6bffb621c79c968da334 +Subproject commit 73c1cb76f096b728d156d8d50b06c80b99049cac diff --git a/submodules/qmining-data-editor b/submodules/qmining-data-editor index 33e8b3a..a19c39c 160000 --- a/submodules/qmining-data-editor +++ b/submodules/qmining-data-editor @@ -1 +1 @@ -Subproject commit 33e8b3a49e7ddbf5c52721c51e655dc28b6ff877 +Subproject commit a19c39c651bfbc57eb0ef2bb3371c58e1ea82cb0 diff --git a/submodules/qmining-page b/submodules/qmining-page index 8e0c03b..599ef00 160000 --- a/submodules/qmining-page +++ b/submodules/qmining-page @@ -1 +1 @@ -Subproject commit 8e0c03ba360f79c6dbbab30b7f0166fce3174529 +Subproject commit 599ef00635c15d500dfcc1a9c226212000e74707