Merge branch 'master' of git.rezo-rm.fr:BDEMetz/bde-liste

This commit is contained in:
johan 2023-01-08 19:14:36 +01:00
commit 6e384b472b
2 changed files with 6 additions and 6 deletions

View file

@ -18,7 +18,7 @@ let PrankData = JSON.parse(fs.readFileSync(prankPath));
let ActivityData = JSON.parse(fs.readFileSync(activityPath));
let TreasureData = JSON.parse(fs.readFileSync(treasurePath));
let GoldenUsers = JSON.parse(fs.readFileSync(goldenUsersPath));
let AdminUsersUid = ["asyncnomi", "johan", "enthalpine", "fas", "arina", "billy", "remi", "pierre", "matmaz", "mariusdrgc", "agathe", "jsansa"];
let AdminUsersUid = ["asyncnomi", "johan", "enthalpine", "fleur", "arina", "billy", "remi", "pierre", "matmaz", "mariusdrgc", "agathe", "jsansa"];
let UsersToken = {};
let TokenDurationSecond = 3600;
let MaxAmountCrepe = 10;

View file

@ -31,8 +31,8 @@ function show_page(id, historyPush) {
$("#login-button").click(function (e) {
var data = JSON.stringify({
user: $("#login").val(),
password: $("#password").val()
user: $("#login").val().trim(),
password: $("#password").val().trim()
});
$("#password").val('');
$.ajax({
@ -80,8 +80,8 @@ $("#login-button").click(function (e) {
$("#register-button").click(function (e) {
var data = JSON.stringify({
user: $("#register-user").val(),
password: $("#register-password").val()
user: $("#register-user").val().trim(),
password: $("#register-password").val().trim()
});
if( $("#register-password-confirm").val() != $("#register-password").val()) {
t = new TypeIt('#error-message-register', {
@ -221,7 +221,7 @@ function get_admin(type) {
</span>
</span>
`)
} else if(prankData[entry].state == "done") {
} else if(prankData[entry].state == "Done") {
doneCnt++;
}
break;