admin: New route to reset settings to sane default values

admin/api/settings.go

@@ -16,6 +16,9 @@ func init() {
 	router.GET("/api/settings-ro.json", apiHandler(getROSettings))
 	router.GET("/api/settings.json", apiHandler(getSettings))
 	router.PUT("/api/settings.json", apiHandler(saveSettings))
+	router.DELETE("/api/settings.json", apiHandler(func(_ httprouter.Params, _ []byte) (interface{}, error) {
+		return true, ResetSettings()
+	}))
 
 	router.POST("/api/reset", apiHandler(reset))
 }
@@ -61,6 +64,29 @@ func ApplySettings(config settings.FICSettings) {
 	fic.SubmissionUniqueness = config.SubmissionUniqueness
 }
 
+func ResetSettings() error {
+	return settings.SaveSettings(path.Join(settings.SettingsDir, settings.SettingsFile), settings.FICSettings{
+		Title:                  "Challenge FIC",
+		Authors:                "Laboratoire SRS, ÉPITA",
+		FirstBlood:             fic.FirstBlood,
+		SubmissionCostBase:     fic.SubmissionCostBase,
+		ExerciceCurCoefficient: 1,
+		HintCurCoefficient:     1,
+		WChoiceCurCoefficient:  1,
+		AllowRegistration:      false,
+		CanJoinTeam:            false,
+		DenyTeamCreation:       false,
+		DenyNameChange:         false,
+		AcceptNewIssue:         true,
+		EnableResolutionRoute:  false,
+		PartialValidation:      true,
+		UnlockedChallengeDepth: 0,
+		SubmissionUniqueness:   false,
+		DisplayAllFlags:        false,
+		EventKindness:          false,
+	})
+}
+
 func reset(_ httprouter.Params, body []byte) (interface{}, error) {
 	var m map[string]string
 	if err := json.Unmarshal(body, &m); err != nil {
@@ -75,6 +101,8 @@ func reset(_ httprouter.Params, body []byte) (interface{}, error) {
 		return true, fic.ResetExercices()
 	} else if t == "game" {
 		return true, fic.ResetGame()
+	} else if t == "settings" {
+		return true, ResetSettings()
 	} else {
 		return nil, errors.New("Unknown reset type")
 	}

admin/main.go

@@ -168,26 +168,7 @@ func main() {
 
 	// Initialize settings and load them
 	if !settings.ExistsSettings(path.Join(settings.SettingsDir, settings.SettingsFile)) {
-		if err = settings.SaveSettings(path.Join(settings.SettingsDir, settings.SettingsFile), settings.FICSettings{
+		if err = api.ResetSettings(); err != nil {
-			Title:                  "Challenge FIC",
-			Authors:                "Laboratoire SRS, ÉPITA",
-			FirstBlood:             fic.FirstBlood,
-			SubmissionCostBase:     fic.SubmissionCostBase,
-			ExerciceCurCoefficient: 1,
-			HintCurCoefficient:     1,
-			WChoiceCurCoefficient:  1,
-			AllowRegistration:      false,
-			CanJoinTeam:            false,
-			DenyTeamCreation:       false,
-			DenyNameChange:         false,
-			AcceptNewIssue:         true,
-			EnableResolutionRoute:  false,
-			PartialValidation:      true,
-			UnlockedChallengeDepth: 0,
-			SubmissionUniqueness:   false,
-			DisplayAllFlags:        false,
-			EventKindness:          false,
-		}); err != nil {
 			log.Fatal("Unable to initialize settings.json:", err)
 		}
 	} else {

admin/static/js/app.js

@@ -578,6 +578,7 @@ angular.module("FICApp")
 	}
         $scope.reset = function(type) {
 	    var txts = {
+	        "settings": "En validant, vous remettrez les paramètres de cette page à leur valeur initiale, y compris la date de début du challenge.",
 	        "challenges": "En validant, vous retirerez toutes les données statiques des challenges.",
 	        "teams": "En validant, vous supprimerez l'ensemble des équipes enregistreées.",
 	        "game": "En validant, vous supprimerez toutes les tentatives, les validations, ... faites par les équipes.",

admin/static/views/settings.html

@@ -242,15 +242,10 @@
 
   </div>
 
-  <div class="col-4">
+  <div class="col-4 d-flex flex-column">
-    <div class="card mt-3">
+    <button ng-click="reset('settings');" class="btn btn-secondary mt-2 mb-1" type="button"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Revenir aux paramètres par défaut</button>
-      <button ng-click="reset('challenges')" class="btn btn-secondary" type="button"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Effacer les challenges et les thèmes</button>
+    <button ng-click="reset('challenges')" class="btn btn-secondary mt-2 mb-1" type="button"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Effacer les challenges et les thèmes</button>
-    </div>
+    <button ng-click="reset('teams');" class="btn btn-secondary mt-1 mb-1" type="button"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Effacer les équipes</button>
-    <div class="card mt-3">
+    <button ng-click="reset('game');" class="btn btn-secondary mt-1 mb-2" type="button"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Effacer la partie (tentatives, indices, ...)</button>
-      <button ng-click="reset('teams');" class="btn btn-secondary" type="button"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Effacer les équipes</button>
-    </div>
-    <div class="card mt-3">
-      <button ng-click="reset('game');" class="btn btn-secondary" type="button"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Effacer la partie (tentatives, indices, ...)</button>
-    </div>
   </div>
 </div>