Skip to content

Commit

Permalink
Asso 21 10 24 (#132)
Browse files Browse the repository at this point in the history
* Changed 1st announcement

* Changed 1st announcement

* Made a halloween themed IUT logo
  • Loading branch information
Xabi08YT authored Oct 21, 2024
1 parent ca70a01 commit 097fa1e
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 5 deletions.
2 changes: 1 addition & 1 deletion components/DateHourHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="header">
<p>{{ currentDate }}</p>
<p>{{ currentTime }}</p>
<img style="width: 150px; margin-left: 150px;" src="/assets/logo_iut.svg" />
<img style="width: 150px; margin-left: 150px;" src="/assets/logo_iut_halloween.png" />
</div>
</template>

Expand Down
2 changes: 1 addition & 1 deletion components/TransitionOverlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
return {
active: false,
duration: 3000,
logoIut: "/assets/logo_iut.png",
logoIut: "/assets/logo_iut_halloween.png",
logoGP: "/assets/gitpoule.png",
currentLogo: null
};
Expand Down
Binary file added public/assets/asso/asso.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/asso/assoCrepes.png
Binary file not shown.
Binary file added public/assets/asso/qrcodeBarathon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/logo_iut_halloween.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 13 additions & 2 deletions views/Announcement.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
<div class="view-container" v-show="isActive">
<h1 class="view-title">Annonce de l'Assopeña</h1>
<div class="announcment">
<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" />
<h2>Toute la nuit du 31 octobre, c'est le Barathon d'Halloween ! <br/> 1500 personnes sont attendues, alors ramenez vos amis ! Scannez le QR code pour vous inscrire.</h2>
<div id="AssoImg">
<img src="@/public/assets/asso/asso.jpg" />
<img src="@/public/assets/asso/qrcodeBarathon.png" />
</div>
</div>
</div>
</template>
Expand All @@ -15,9 +18,17 @@ export default{
};
</script>
<style>
#AssoImg {
display: flex;
flex-direction: row;
justify-content: center;
}
#AssoImg > img {
max-height: 425px;
max-width: 325px;
margin: 10px;
}
.announcment {
Expand Down
5 changes: 4 additions & 1 deletion views/NextPlannings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ async function processPlannings(cls) {
}
let refresh = async () => {
edt.info_but1 = [];
edt.info_but2 = [];
edt.info_but3 = [];
setCurrentHourRange();
let classes = await getCourses();
await processPlannings(classes);
Expand All @@ -172,7 +175,7 @@ onMounted(async () => {
setCurrentHourRange();
let classes = await getCourses()
await processPlannings(classes)
refreshInterval = setInterval(refresh(), delay);
refreshInterval = setInterval(await refresh, delay);
})
onUnmounted(() => clearInterval(refreshInterval));
Expand Down

0 comments on commit 097fa1e

Please sign in to comment.