From 9fe66c563b0f55ac7ba65814d3a4c4dd139a6f42 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Thu, 19 May 2022 21:15:25 +0200 Subject: [PATCH] admin/ui: Split settings page into sync and settings pages --- admin/index.go | 6 +- admin/static.go | 5 +- admin/static/js/app.js | 69 ++++---- admin/static/views/exercice-list.html | 26 ++- admin/static/views/settings.html | 222 +++++++++++--------------- admin/static/views/sync.html | 47 ++++++ 6 files changed, 211 insertions(+), 164 deletions(-) create mode 100644 admin/static/views/sync.html diff --git a/admin/index.go b/admin/index.go index 6f9ab5c3..74b36661 100644 --- a/admin/index.go +++ b/admin/index.go @@ -80,7 +80,6 @@ const indextpl = `
  • PKI
  • Thèmes
  • Exercices
    • -
  • Fichiers
  • Public
  • Événements
  • @@ -88,6 +87,11 @@ const indextpl = ` {{ "{{ myClaims }}" }} {{ "{{ newClaims }}" }}
    • +
  • + + Synchronisation + +
  • Paramètres diff --git a/admin/static.go b/admin/static.go index 8a0f837f..bdf5e0a6 100644 --- a/admin/static.go +++ b/admin/static.go @@ -68,7 +68,10 @@ func declareStaticRoutes(router *gin.RouterGroup, cfg *settings.Settings, baseUR router.GET("/pki/*_", func(c *gin.Context) { serveIndex(c) }) - router.GET("/settings/*_", func(c *gin.Context) { + router.GET("/settings", func(c *gin.Context) { + serveIndex(c) + }) + router.GET("/sync", func(c *gin.Context) { serveIndex(c) }) router.GET("/teams/*_", func(c *gin.Context) { diff --git a/admin/static/js/app.js b/admin/static/js/app.js index f1f0f610..3dce0387 100644 --- a/admin/static/js/app.js +++ b/admin/static/js/app.js @@ -13,6 +13,10 @@ angular.module("FICApp", ["ngRoute", "ngResource", "ngSanitize"]) controller: "ExerciceController", templateUrl: "views/exercice.html" }) + .when("/sync", { + controller: "SyncController", + templateUrl: "views/sync.html" + }) .when("/settings", { controller: "SettingsController", templateUrl: "views/settings.html" @@ -499,7 +503,7 @@ angular.module("FICApp") $scope.monitor = Monitor.get(); }) - .controller("SettingsController", function($scope, $rootScope, Settings, SettingsChallenge, ROSettings, $location, $http, $interval) { + .controller("SettingsController", function($scope, $rootScope, Settings, SettingsChallenge, $location, $http, $interval) { $scope.displayDangerousActions = false; $scope.config = Settings.get(); $scope.config.$promise.then(function(response) { @@ -509,7 +513,6 @@ angular.module("FICApp") $rootScope.settings.generation = new Date(response.generation); $rootScope.settings.activateTime = new Date(response.activateTime); }) - $scope.configro = ROSettings.get(); $scope.challenge = SettingsChallenge.get(); $scope.duration = 360; @@ -520,34 +523,6 @@ angular.module("FICApp") $scope.config.unlockedChallengeDepth = -1; }; - var needRefreshSyncReportWhenReady = false; - var refreshSyncReport = function() { - needRefreshSyncReportWhenReady = false; - $http.get("full_import_report.json").then(function(response) { - $scope.syncReport = response.data; - }) - }; - refreshSyncReport() - - var progressInterval = $interval(function() { - $http.get("api/sync/deep").then(function(response) { - if (response.data.progress && response.data.progress != 255) - needRefreshSyncReportWhenReady = true; - else if (needRefreshSyncReportWhenReady) - refreshSyncReport(); - if (response.data && response.data.progress) - $scope.syncProgress = Math.floor(response.data.progress * 100 / 255) + " %"; - else - $scope.syncProgress = response.data; - }, function(response) { - if (response.data && response.data.errmsg) - $scope.syncProgress = response.data.errmsg; - else - $scope.syncProgress = response.data; - }) - }, 1500); - $scope.$on('$destroy', function () { $interval.cancel(progressInterval); }); - $scope.saveChallengeInfo = function() { this.challenge.$update(function(response) { $scope.addToast('success', 'Infos du challenge mises à jour avec succès !'); @@ -621,6 +596,40 @@ angular.module("FICApp") } }); }; + }) + + .controller("SyncController", function($scope, $rootScope, ROSettings, $location, $http, $interval) { + $scope.displayDangerousActions = false; + $scope.configro = ROSettings.get(); + + var needRefreshSyncReportWhenReady = false; + var refreshSyncReport = function() { + needRefreshSyncReportWhenReady = false; + $http.get("full_import_report.json").then(function(response) { + $scope.syncReport = response.data; + }) + }; + refreshSyncReport() + + var progressInterval = $interval(function() { + $http.get("api/sync/deep").then(function(response) { + if (response.data.progress && response.data.progress != 255) + needRefreshSyncReportWhenReady = true; + else if (needRefreshSyncReportWhenReady) + refreshSyncReport(); + if (response.data && response.data.progress) + $scope.syncProgress = Math.floor(response.data.progress * 100 / 255) + " %"; + else + $scope.syncProgress = response.data; + }, function(response) { + if (response.data && response.data.errmsg) + $scope.syncProgress = response.data.errmsg; + else + $scope.syncProgress = response.data; + }) + }, 1500); + $scope.$on('$destroy', function () { $interval.cancel(progressInterval); }); + $scope.deepSyncInProgress = false; $scope.deepSync = function(theme) { if (theme) { diff --git a/admin/static/views/exercice-list.html b/admin/static/views/exercice-list.html index 1ef934dc..998f8e21 100644 --- a/admin/static/views/exercice-list.html +++ b/admin/static/views/exercice-list.html @@ -1,7 +1,13 @@ -

    Exercices - - -
    +
    +

    Exercices

    +
    + + Voir les fichiers + +
    @@ -12,8 +18,16 @@ Flags
    -     -

    + + +
    diff --git a/admin/static/views/settings.html b/admin/static/views/settings.html index d402c3d2..7512d4b3 100644 --- a/admin/static/views/settings.html +++ b/admin/static/views/settings.html @@ -1,13 +1,13 @@ -
    -
    +
    +
    - +

    Paramètres

    -
    +
    @@ -99,82 +99,9 @@ Il restera : {{ timeRemaining - activateTimeCountDown | timer }}
    -
    - -
    -
    - -
    -
    - - -

    Infos challenge

    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -

    Options

    -
    -
    +
    -
    -
    -
    -
    - Synchronisation et suppressions de masse +
    +
    + + +

    Infos challenge

    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    -
    -
    - +
    +
    +
    + +
    +
    +

    Changements anticipés

    -
    -
    -
    -
    -
    -
    -
    Synchronisation
    -
    -
    ID
    -
    {{ configro['sync-id'] }}
    -
    +
    +
    +
    + Synchronisation et suppressions de masse +
    +
    +
    +
    + +
    +
    +
    -
    - {{ syncProgress }} -
    -
    - Dernier import : {{ syncReport._date[1] }} -
    -
    - -
    - - -
    - -
    -
    - - Voir le rapport +
    +
    + Paramètres de synchronisation + + + +
    - -
    - - - - -
    diff --git a/admin/static/views/sync.html b/admin/static/views/sync.html new file mode 100644 index 00000000..32723c5c --- /dev/null +++ b/admin/static/views/sync.html @@ -0,0 +1,47 @@ +
    +
    +

    + Synchronisation +

    +
    +
    +
    + +
    +
    +
    + +
    +
    +
    +
    Synchronisation
    +
    +
    ID
    +
    {{ configro['sync-id'] }}
    +
    + +
    + {{ syncProgress }} +
    +
    + Dernier import : {{ syncReport._date[1] }} +
    +
    + +
    + + +
    + +
    +
    + + Voir le rapport +
    +
    +