From 4e23744f60814e4e73af1ec1878b13ae29ef6acc Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Thu, 18 Feb 2021 04:13:23 +0100 Subject: [PATCH] token-validator: last fixes --- libadlin/ssh.go | 2 +- token-validator/htdocs/dashboard.html | 5 +++-- token-validator/htdocs/js/adlin-dashboard.js | 21 ++++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libadlin/ssh.go b/libadlin/ssh.go index 1d83fe8..9e8f1be 100644 --- a/libadlin/ssh.go +++ b/libadlin/ssh.go @@ -105,7 +105,7 @@ func (s Student) NewKey(key string) (k StudentKey, err error) { } else if kid, err := res.LastInsertId(); err != nil { return StudentKey{}, err } else { - s.UnlockNewChallenge(9, "") + s.UnlockNewChallenge(11, "") return StudentKey{kid, s.Id, key, time.Now()}, nil } } diff --git a/token-validator/htdocs/dashboard.html b/token-validator/htdocs/dashboard.html index 4689e0c..8815e14 100644 --- a/token-validator/htdocs/dashboard.html +++ b/token-validator/htdocs/dashboard.html @@ -24,10 +24,10 @@ height: calc(100vh / 5 - 0.3vh); margin-left: 0.2%; margin-bottom: 0.2vh; - width: calc(100vw / 12 - 0.22vw); + width: calc(100vw / 13 - 0.22vw); } .student-title { - width: calc(2 * (100vw / 12 - 0.22vw) + 0.2vw); + width: calc(2 * (100vw / 13 - 0.22vw) + 0.2vw); font-size: 15px; } .student h5 { @@ -48,6 +48,7 @@ max-width: 122px; } .badge { + font-size: 59%; padding: .15em .35em; } diff --git a/token-validator/htdocs/js/adlin-dashboard.js b/token-validator/htdocs/js/adlin-dashboard.js index 74e8976..baee842 100644 --- a/token-validator/htdocs/js/adlin-dashboard.js +++ b/token-validator/htdocs/js/adlin-dashboard.js @@ -1,15 +1,16 @@ var tuto_progress = [ { - 1: { title: "Is alive?", label: "t1"}, - 2: { title: "DMZ reached", label: "t2"}, - 3: { title: "HTTPS on + time", label: "t3"}, - 4: { title: "DNS ok", label: "t4"}, - 5: { title: "On Internet", label: "t5"}, - 6: { title: "Bonus cachΓ©", label: "b0"}, - 7: { title: "Bonus ICMP", label: "b1"}, - 8: { title: "Bonus disk", label: "b2"}, - 9: { title: "Bonus email", label: "b3"}, - 10: { title: "Uploaded SSH key", label: "ssh"}, + 1: { title: "Is alive?", label: "πŸ‘‹"}, + 2: { title: "DMZ reached", label: "πŸ“š"}, + 3: { title: "HTTPS on + time", label: "⏲"}, + 4: { title: "DNS ok", label: "🍰"}, + 5: { title: "On Internet", label: "🌎"}, + 6: { title: "Bonus cachΓ©", label: "b"}, + 7: { title: "Bonus ICMP", label: "πŸ“"}, + 8: { title: "Bonus disk", label: "πŸ’½"}, + 9: { title: "Bonus email", label: "πŸ“§"}, + 10: { title: "Wg tunnel", label: "πŸš‡"}, + 11: { title: "Uploaded SSH key", label: "πŸ’Š"}, }, { 100: { title: "HTTP", label: "HTTP"},