dashboard: Take information from challenge.json

This commit is contained in:
nemunaire 2022-05-31 18:42:41 +02:00
parent c0260da035
commit cd03b99f9b
2 changed files with 19 additions and 11 deletions

View File

@ -533,16 +533,18 @@
<div style="position: fixed; bottom: 0; right: 0; width: 33vw; height: 110px; {{ display.hideCountdown && !display.customCountdown.show?'box-shadow: white 0px -10px 15px 0px;':'' }}" class="bg-dark" ng-if="!display.hideCarousel">
<div class="carousel slide" id="carousel-logos" data-ride="carousel" data-interval="10500" style="height: inherit">
<div class="carousel-inner" style="height: inherit">
<div class="carousel-item">
<div class="carousel-caption" style="display: table; width: 100%">
<a href="https://www.epita.fr/" class="align-middle text-center" style="display: table-cell; width: 38%"><img src="img/epita.png" alt="Epita" style="height:100px"></a>
<a href="https://www.sii.fr/" class="align-middle text-center" style="display: table-cell; width: 32%"><img src="img/sii.png" alt="SII" style="height:100px"></a>
<a href="https://www.epita.fr/" class="align-middle text-center" style="display: table-cell; width: 30%"><img src="img/comcyber.png" alt="Réserves de cyberdéfense" style="height:100px"></a>
</div>
<div class="carousel-item" style="height: inherit">
<div class="carousel-caption d-flex justify-content-between p-1" style="height: inherit">
<div class="align-self-center text-center" ng-repeat="partner in challenge.partners">
<a ng-href="{{ partner.href }}" style="max-height: 100%">
<img src="{{ partner.img }}" alt="{{ partner.alt }}" style="max-width:100%; max-height: 100%">
</a>
</div>
</div>
</div>
<div class="carousel-item">
<div class="carousel-caption" style="padding: 15px; display: table;">
<h2 class="align-middle" style="display: table-cell;">Bienvenue au challenge forensic&nbsp;!</h2>
<h2 class="align-middle" style="display: table-cell;">Bienvenue au {{ challenge.title }}&nbsp;!</h2>
</div>
</div>
<div class="carousel-item">
@ -574,11 +576,9 @@
</div>
<div class="carousel-item">
<div class="carousel-caption" style="padding: 5px; display: table">
<p class="text-bold align-middle" style="font-size: 111%; display: table-cell; width: 70%">
Avec le parrainage du commandement de la cyberdéfense
</p>
<p class="text-bold align-middle" style="font-size: 111%; display: table-cell; width: 70%" ng-bind="challenge.subtitle"></p>
<div class="align-middle" style="display: table-cell; width: 30%">
<img src="img/comcyber.png" alt="Réserves de cyberdéfense" style="max-width:100%; max-height: 80px">
<img src="img/dnred.png" alt="DRNED" style="max-width:100%; max-height: 80px">
</div>
</div>
</div>

View File

@ -102,6 +102,14 @@ angular.module("FICApp", ["ngSanitize", "ngAnimate"])
refreshSettings();
var refreshSettingsInterval = $interval(refreshSettings, 4200);
var refreshChallengeInfo = function() {
$http.get("../challenge.json").then(function(response) {
$rootScope.challenge = response.data;
});
}
refreshChallengeInfo();
var refreshChallengeInfoInterval = $interval(refreshChallengeInfo, 900000);
$rootScope.refresh = function() {
$http.get("../my.json").then(function(response) {