From fafb778c9dca4d6be88d7a40974d0cd476446a0d Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 31 May 2022 19:11:28 +0200
Subject: [PATCH] ui: Use logos from challenge.info

---
 frontend/ui/src/components/Header.svelte      |  7 +++++-
 .../ui/src/components/HeaderPartners.svelte   | 24 +++++--------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/frontend/ui/src/components/Header.svelte b/frontend/ui/src/components/Header.svelte
index 2807df59..081bc70f 100644
--- a/frontend/ui/src/components/Header.svelte
+++ b/frontend/ui/src/components/Header.svelte
@@ -17,6 +17,7 @@
      Row,
  } from 'sveltestrap';
 
+ import { challengeInfo } from '../stores/challengeinfo.js';
  import { my } from '../stores/my.js';
  import { teams } from '../stores/teams.js';
  import { settings, time } from '../stores/settings.js';
@@ -42,7 +43,11 @@
     </div>
     <Container class="d-flex justify-content-between p-1" style="max-height: inherit">
         <a href="." style="max-width: 50%">
-            <img src="img/fic.png" alt="Forum International de la Cybersécurité" class="h-100"><img src="img/ec2.png" alt="European Cyber Cup" class="h-100 d-none d-md-inline ms-2">
+            {#if $challengeInfo && $challengeInfo.main_logo}
+                {#each $challengeInfo.main_logo as logo, i}
+                    <img src={logo} alt={'Logo principal #' + i} class={'h-100' + (i > 0?' d-none d-md-inline ms-2':'')}>
+                {/each}
+            {/if}
         </a>
         <HeaderPartners />
     </Container>
diff --git a/frontend/ui/src/components/HeaderPartners.svelte b/frontend/ui/src/components/HeaderPartners.svelte
index 681ef862..b1c6749f 100644
--- a/frontend/ui/src/components/HeaderPartners.svelte
+++ b/frontend/ui/src/components/HeaderPartners.svelte
@@ -4,28 +4,15 @@
      CarouselItem,
  } from 'sveltestrap';
 
- let partners = [
-     {
-         img: 'img/epita.png',
-         alt: 'Epita',
-         href: 'https://www.epita.fr/',
-     },
-     {
-         img: 'img/srs.png',
-         alt: 'Laboratoire SRS Épita',
-         href: 'https://srs.epita.fr/',
-     },
-     {
-         img: 'img/comcyber.png',
-         alt: 'Réserves de cyberdéfense',
-     },
- ];
+ import { challengeInfo } from '../stores/challengeinfo.js';
+
  let activePartner = 0;
 </script>
 
-<Carousel items={partners} bind:activeIndex={activePartner} ride="carousel" pause="hover" interval={25000}>
+{#if $challengeInfo && $challengeInfo.partners}
+<Carousel items={$challengeInfo.partners} bind:activeIndex={activePartner} ride="carousel" pause="hover" interval={25000}>
     <div class="carousel-inner h-100">
-        {#each partners as partner, index}
+        {#each $challengeInfo.partners as partner, index}
             <CarouselItem bind:activeIndex={activePartner} itemIndex={index} class="h-100 text-end">
                 {#if partner.href}
                     <a href="{partner.href}" target="_blank" class="h-100">
@@ -38,3 +25,4 @@
         {/each}
     </div>
 </Carousel>
+{/if}