diff --git a/token-validator/htdocs/dashboard.html b/token-validator/htdocs/dashboard.html index 554e0fa..b249df5 100644 --- a/token-validator/htdocs/dashboard.html +++ b/token-validator/htdocs/dashboard.html @@ -32,7 +32,7 @@ - +
@@ -46,17 +46,10 @@ Unreachable -
- - T1 - T2 - T3 - T4 - T5 - B1 - B2 +
+ + - SSH
diff --git a/token-validator/htdocs/js/adlin-dashboard.js b/token-validator/htdocs/js/adlin-dashboard.js index 3585f56..1165360 100644 --- a/token-validator/htdocs/js/adlin-dashboard.js +++ b/token-validator/htdocs/js/adlin-dashboard.js @@ -1,3 +1,22 @@ +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 ICMP", label: "B1"}, + 7: { title: "Bonus disk", label: "B2"}, + 8: { title: "Uploaded SSH key", label: "SSH"}, + }, + { + 100: { title: "HTTP", label: "HTTP"}, + 101: { title: "HTTPS", label: "HTTPS"}, + 102: { title: "DNS", label: "DNS"}, + }, +]; + + angular.module("AdLinApp", ["ngResource", "ngSanitize"]) .factory("Student", function($resource) { return $resource("/api/students/:studentId", { studentId: '@id' }, { @@ -19,9 +38,6 @@ angular.module("AdLinApp") } $interval(refreshStd, 1600000); }) - .controller("ChallengesController", function($scope, Challenge) { - $scope.chids = Challenge.query(); - }) .controller("PingController", function($scope, $interval, $http) { $scope.PING = false; var refreshPing = function() { @@ -43,6 +59,7 @@ angular.module("AdLinApp") $interval(refreshSSH, 15500); }) .controller("ProgressionController", function($scope, $interval, $http) { + $scope.tuto_progress = tuto_progress; $scope.mychallenges = {}; var refreshChal = function() { $http.get("/api/students/" + $scope.student.id + "/progress").then(function(response) {