Annonces Asso

app.vue

@@ -53,6 +53,10 @@
       v-if="Object.keys(views).includes('announcement')"
       :isActive="currentView == 'announcement'"
     />
+    <Announcement2
+      v-if="Object.keys(views).includes('announcement')"
+      :isActive="currentView == 'announcement2'"
+    />
     <TeacherAnnouncement
       v-if="Object.keys(views).includes('tannouncement')"
       :isActive="currentView == 'tannouncement'"
@@ -81,6 +85,7 @@ import MaintainerProposal from "./views/MaintainerProposal.vue";
 
 import "./stylesheets/reset.css";
 import Announcement from "./views/Announcement.vue";
+import Announcement2 from "./views/Announcement2.vue";
 import TeacherAnnouncement from "./views/TeacherAnnouncement.vue";
 import WelcomeAmericans from "./views/WelcomeMessage.vue";
 import Lundi from "./views/Lundi.vue";
@@ -160,7 +165,11 @@ export default {
         },
         announcement: {
           time: () => DEVELOPEMENT_MODE ? 10000 : 1000 * 15,
-          allowed: () => false && !this.isEndOfDay(),
+          allowed: () => true && !this.isEndOfDay(),
+        },
+        announcement2: {
+          time: () => DEVELOPEMENT_MODE ? 10000 : 1000 * 15,
+          allowed: () => true && !this.isEndOfDay(),
         },
         tannouncement: {
           time: () => DEVELOPEMENT_MODE ? 10000 : 1000 * 15,
@@ -282,6 +291,7 @@ export default {
     Discord,
     MaintainerProposal,
     Announcement,
+    Announcement2,
     TeacherAnnouncement,
     WelcomeAmericans,
   },

views/Announcement.vue

@@ -2,7 +2,8 @@
     <div class="view-container" v-show="isActive">
         <h1 class="view-title">Annonce de l'Assopeña</h1>
         <div class="announcment">
-            <img src="@/public/assets/Warning.png" id="AssoImg" />
+          <h2>Pour bien commencer la dernière semaine, le lundi 21/10/2024, le BDE vends des crêpes 0.5€ l'unité ! <br/> Une offre spéciale thé + 1 crêpe est disponible à 0.80€ !</h2>
+          <img src="@/public/assets/asso/assoCrepes.png" id="AssoImg" />
         </div>
     </div>
 </template>
@@ -15,8 +16,8 @@ export default{
 </script>
 <style>
 #AssoImg {
-    height: 625px;
-    width: 425px;
+    max-height: 425px;
+    max-width: 325px;
 }
 
 .announcment {
@@ -25,6 +26,12 @@ export default{
   box-shadow: 0px 1px 15px rgba(0, 0, 0, 0.25);
   padding: 25px;
   display: flex;
-  flex-direction: row;
+  flex-direction: column !important;
+  align-items: center;
+}
+
+h2 {
+  font-family: Fredoka, sans-serif;
+  font-size: 35px;
 }
 </style>

views/Announcement2.vue

@@ -0,0 +1,23 @@
+<template>
+    <div class="view-container" v-show="isActive">
+        <h1 class="view-title">Annonce de l'Assopeña</h1>
+        <div class="announcment">
+            <h2>Intéressé(e) par un tournois Super Smash Bros ? Scan-moi !</h2>
+            <img src="@/public/assets/asso/smash.png" id="AssoImg2"/>
+        </div>
+    </div>
+</template>
+<script>
+export default{
+  props: {
+    isActive: Boolean,
+  }
+};
+</script>
+<style>
+#AssoImg2 {
+    height: 525px;
+    width: 525px;
+    margin-top: 25px;
+}
+</style>