diff --git a/admin/static/js/app.js b/admin/static/js/app.js index 07e19729..b77219a8 100644 --- a/admin/static/js/app.js +++ b/admin/static/js/app.js @@ -743,14 +743,14 @@ angular.module("FICApp") $scope.event = Event.get({ eventId: $routeParams.eventId }); $scope.fields = ["kind", "txt", "time"]; $scope.kinds = { - "alert-secondary": "Par défaut", - "alert-primary": "Mise en valeur", - "alert-info": "Info", - "alert-warning": "Warning", - "alert-success": "Success", - "alert-danger": "Danger", - "alert-light": "Clair", - "alert-dark": "Foncé", + "secondary": "Par défaut", + "primary": "Mise en valeur", + "info": "Info", + "warning": "Warning", + "success": "Success", + "danger": "Danger", + "light": "Clair", + "dark": "Foncé", }; $scope.saveEvent = function() { diff --git a/backend/hint.go b/backend/hint.go index 2af3bf25..524deb44 100644 --- a/backend/hint.go +++ b/backend/hint.go @@ -36,7 +36,7 @@ func treatOpeningHint(pathname string, team fic.Team) { log.Println("[WRN]", err) } else if theme, err := fic.GetTheme(exercice.IdTheme); err != nil { log.Println("[WRN]", err) - } else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le %de défi %s !", team.Name, lvl, theme.Name), "alert-info"); err != nil { + } else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le %de défi %s !", team.Name, lvl, theme.Name), "info"); err != nil { log.Println("[WRN] Unable to create event:", err) } diff --git a/backend/registration.go b/backend/registration.go index d98a2eb8..36582f08 100644 --- a/backend/registration.go +++ b/backend/registration.go @@ -39,7 +39,7 @@ func treatRegistration(pathname string, team_id string) { if err := os.Remove(pathname); err != nil { log.Println("[WRN]", err) } - if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe %s qui vient de nous rejoindre !", team.Name), "alert-info"); err != nil { + if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe %s qui vient de nous rejoindre !", team.Name), "info"); err != nil { log.Println("[WRN] Unable to create event:", err) } diff --git a/backend/rename.go b/backend/rename.go index cf54de68..2dfecd1c 100644 --- a/backend/rename.go +++ b/backend/rename.go @@ -31,7 +31,7 @@ func treatRename(pathname string, team fic.Team) { if err := genTeamMyFile(team); err != nil { log.Println("my-", team.Id, ".json generation error: ", err) } - if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe %s qui vient de nous rejoindre !", team.Name), "alert-info"); err != nil { + if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe %s qui vient de nous rejoindre !", team.Name), "info"); err != nil { log.Println("[WRN] Unable to create event:", err) } if err := genEventsFile(); err != nil { diff --git a/backend/submission.go b/backend/submission.go index 0a75ffe1..53793f51 100644 --- a/backend/submission.go +++ b/backend/submission.go @@ -121,7 +121,7 @@ func treatSubmission(pathname string, team fic.Team, exercice_id string) { // Write event if lvl, err := exercice.GetLevel(); err != nil { log.Println(id, "[ERR] Unable to get exercice level:", err) - } else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s a résolu le %de défi %s !", team.Name, lvl, theme.Name), "alert-success"); err != nil { + } else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s a résolu le %de défi %s !", team.Name, lvl, theme.Name), "success"); err != nil { log.Println(id, "[WRN] Unable to create event:", err) } genTeamAll(team) @@ -132,7 +132,7 @@ func treatSubmission(pathname string, team fic.Team, exercice_id string) { if tm.Unix() == 0 { if lvl, err := exercice.GetLevel(); err != nil { log.Println(id, "[ERR] Unable to get exercice level:", err) - } else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s tente le %de défi %s !", team.Name, lvl, theme.Name), "alert-warning"); err != nil { + } else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s tente le %de défi %s !", team.Name, lvl, theme.Name), "warning"); err != nil { log.Println(id, "[WRN] Unable to create event:", err) } } diff --git a/dashboard/static/css/bootstrap.min.css b/dashboard/static/css/bootstrap.min.css index 0b20a9b5..8dd0a066 120000 --- a/dashboard/static/css/bootstrap.min.css +++ b/dashboard/static/css/bootstrap.min.css @@ -1 +1 @@ -../../../frontend/static/css/bootstrap.min.css \ No newline at end of file +../../../admin/static/css/bootstrap.min.css \ No newline at end of file diff --git a/dashboard/static/index.html b/dashboard/static/index.html index 07e81dd1..a25baf85 100644 --- a/dashboard/static/index.html +++ b/dashboard/static/index.html @@ -25,8 +25,8 @@
-
-
+
+

Bienvenue au challenge forensic !

Avant de vous installer, venez récupérer votre clef USB auprès @@ -35,7 +35,7 @@

Une fois connecté au réseau, contactez notre serveur sur : - + https://fic.srs.epita.fr/

@@ -47,13 +47,13 @@

-
{{ duration / 60 | time }} : {{ duration % 60 | time }}
-
{{ s.params.lead }}
+
{{ duration / 60 | time }} : {{ duration % 60 | time }}
+
{{ s.params.lead }}
-
-
+
+

Bienvenue au challenge forensic !

Durant ce challenge, les équipes doivent remonter des scénarii @@ -72,7 +72,7 @@

-
+

@@ -92,7 +92,7 @@
-
+

Challenge {{ themes[my.exercices[s.params.exercice].theme_id].exercices[s.params.exercice].title }} du thème {{ themes[my.exercices[s.params.exercice].theme_id].name }} @@ -111,8 +111,8 @@

- - +
+ @@ -129,7 +129,7 @@ - +
{{ th.name }}
{{ team.rank }}ere
{{ team.name }}		 @@ -154,8 +154,8 @@
-
- +
+
@@ -173,12 +173,12 @@
Place
-
+

-
+
    @@ -216,7 +216,7 @@
    - +
    @@ -271,16 +271,20 @@
    -
    +
    -
    -
    {{ e.since | since }}
    - +
    +
    + {{ e.since | since }} +
    +
    +

    +
    -
    -
    +
    +
    {{ time.hours | time }} : @@ -299,7 +303,7 @@
    -
    +
    Place
    +
    diff --git a/dashboard/static/js/dashboard.js b/dashboard/static/js/dashboard.js index d3786d15..f3c7e165 100644 --- a/dashboard/static/js/dashboard.js +++ b/dashboard/static/js/dashboard.js @@ -18,6 +18,7 @@ angular.module("FICApp", ["ngSanitize", "ngAnimate"]) $scope.events.forEach(function(event) { event.time = Date.parse(event.time); event.since = now - event.time; + event.kind = ["border-" + event.kind, "alert-" + event.kind]; }); }); } diff --git a/frontend/static/css/fic.css b/frontend/static/css/fic.css index f353b8a4..879b177d 100644 --- a/frontend/static/css/fic.css +++ b/frontend/static/css/fic.css @@ -158,7 +158,7 @@ a:hover .teamname { #eventsList { overflow:hidden; - max-height: 100vh + max-height: 90vh; } .swap-animation .alert { @@ -166,8 +166,8 @@ a:hover .teamname { } .swap-animation { margin-bottom: 0.5rem; - max-height: 25vh; - transition: max-height 1.5s linear,opacity 1.0s linear,transform 0.5s linear; + max-height: 30vh; + transition: max-height 1.0s linear,opacity 1.0s linear,transform 0.5s linear; } .swap-animation.ng-enter { transform: translateY(-25vh); @@ -274,3 +274,24 @@ blockquote { padding-right: 2em; max-width: 100%; } + +#eventsList .card { + border-left-color: rgba(0,0,0,.125) !important; + border-right-color: rgba(0,0,0,.125) !important; + border-top-color: rgba(0,0,0,.125) !important; +} + +.bg-public .card-body { + padding:1rem; + padding-bottom:0; +} + +.card-sm .card-header, .card-sm .card-footer { + padding: 0.2rem 0.75rem; +} +.card-sm .card-body { + padding: 0.4rem 0.75rem; +} +.card-sm .card-body.text-indent p { + text-indent: 0.4rem; +} diff --git a/frontend/static/views/home.html b/frontend/static/views/home.html index 3254861c..997928a9 100644 --- a/frontend/static/views/home.html +++ b/frontend/static/views/home.html @@ -17,7 +17,7 @@
    -
    +
    {{ theme.name }} #tag diff --git a/libfic/db.go b/libfic/db.go index 9beef4bc..f9b305f8 100644 --- a/libfic/db.go +++ b/libfic/db.go @@ -60,7 +60,7 @@ func DBCreate() error { CREATE TABLE IF NOT EXISTS events( id_event INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, txt VARCHAR(255) NOT NULL, - kind ENUM('alert-primary', 'alert-secondary', 'alert-success', 'alert-danger', 'alert-warning', 'alert-info', 'alert-light', 'alert-dark') NOT NULL, + kind ENUM('primary', 'secondary', 'success', 'danger', 'warning', 'info', 'light', 'dark') NOT NULL, time TIMESTAMP NOT NULL ) DEFAULT CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci; `); err != nil {
    {{ settings.start - 1800000 | date:"HH' h 'mm" }}