diff --git a/admin/api/settings.go b/admin/api/settings.go index 0ce7528b..ddfe67d0 100644 --- a/admin/api/settings.go +++ b/admin/api/settings.go @@ -25,7 +25,7 @@ func getSettings(_ httprouter.Params, body []byte) (interface{}, error) { if settings.ExistsSettings(path.Join(TeamsDir, settings.SettingsFile)) { return settings.ReadSettings(path.Join(TeamsDir, settings.SettingsFile)) } else { - return settings.FICSettings{time.Unix(0,0), time.Unix(0,0), time.Unix(0,0), fic.FirstBlood, fic.SubmissionCostBase, false, false, false, true, true}, nil + return settings.FICSettings{"Challenge FIC", "Laboratoire SRS, ÉPITA", time.Unix(0,0), time.Unix(0,0), time.Unix(0,0), fic.FirstBlood, fic.SubmissionCostBase, false, false, false, true, true}, nil } } diff --git a/admin/static/views/settings.html b/admin/static/views/settings.html index 16e1d3b1..4c54921d 100644 --- a/admin/static/views/settings.html +++ b/admin/static/views/settings.html @@ -4,6 +4,20 @@ +
+ +
+ +
+
+ +
+ +
+ +
+
+
diff --git a/frontend/static/index.html b/frontend/static/index.html index f0af118e..c4c4bd54 100644 --- a/frontend/static/index.html +++ b/frontend/static/index.html @@ -90,7 +90,7 @@
diff --git a/frontend/static/js/public.js b/frontend/static/js/public.js index d1d7702a..e2fb1df3 100644 --- a/frontend/static/js/public.js +++ b/frontend/static/js/public.js @@ -129,6 +129,9 @@ angular.module("FICApp") $http.get("/stats.json").success(function(stats) { $scope.stats = stats; }); + $http.get("/settings.json").success(function(settings) { + $scope.settings = settings; + }); $http.get("/themes.json").then(function(response) { if ($scope.lastthemeetag == response.headers().etag) return; diff --git a/frontend/static/public.html b/frontend/static/public.html index f9c98501..8833201d 100644 --- a/frontend/static/public.html +++ b/frontend/static/public.html @@ -48,7 +48,7 @@
-

Le challenge forensic 2017 est sur le point de commencer !

+

Le {{ settings.title }} est sur le point de commencer !

{{ startIn }}
Go, go, go !
diff --git a/settings/settings.go b/settings/settings.go index d327663c..44f793dd 100644 --- a/settings/settings.go +++ b/settings/settings.go @@ -13,6 +13,9 @@ import ( const SettingsFile = "settings.json" type FICSettings struct { + Title string `json:"title"` + Authors string `json:"authors"` + Start time.Time `json:"start"` End time.Time `json:"end"` Generation time.Time `json:"generation"`