asco.fablab/BrainBlast
11
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Changement de la couleur orange en jaune car il n'y aura pas de buzzer orange en prod

Browse Source
This commit is contained in:
Jérémy CHOMAZ
2024-11-11 15:48:47 +01:00
parent 355d58ede7
commit c471ac978c
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/components/CardButtonScore.vue
View File

@@ -47,22 +47,22 @@
</mqtt-button> </mqtt-button>
</v-col> </v-col>
<v-col cols="4" sm="6" md="3"> <v-col cols="4" sm="6" md="3">
<mqtt-button width="120" height="60" class="btn orange card xs12 sm6 md3 " topic="/game/score" message="TEAM_ORANGE-2"> <mqtt-button width="120" height="60" class="btn yellow card xs12 sm6 md3 " topic="/game/score" message="TEAM_YELLOW-2">
<v-icon left size="40">mdi-minus-box-multiple</v-icon> <v-icon left size="40">mdi-minus-box-multiple</v-icon>
</mqtt-button> </mqtt-button>
</v-col> </v-col>
<v-col cols="12" sm="6" md="3"> <v-col cols="12" sm="6" md="3">
<mqtt-button width="120" height="60" class="btn orange card xs12 sm6 md3 " topic="/game/score" message="TEAM_ORANGE-1"> <mqtt-button width="120" height="60" class="btn yellow card xs12 sm6 md3 " topic="/game/score" message="TEAM_YELLOW-1">
<v-icon left size="40">mdi-minus-box</v-icon> <v-icon left size="40">mdi-minus-box</v-icon>
</mqtt-button> </mqtt-button>
</v-col> </v-col>
<v-col cols="4" sm="6" md="3"> <v-col cols="4" sm="6" md="3">
<mqtt-button width="120" height="60" class="btn orange card xs12 sm6 md3 " topic="/game/score" message="TEAM_ORANGE+1"> <mqtt-button width="120" height="60" class="btn yellow card xs12 sm6 md3 " topic="/game/score" message="TEAM_YELLOW+1">
<v-icon left size="40">mdi-plus-box</v-icon> <v-icon left size="40">mdi-plus-box</v-icon>
</mqtt-button> </mqtt-button>
</v-col> </v-col>
<v-col cols="12" sm="6" md="3"> <v-col cols="12" sm="6" md="3">
<mqtt-button width="120" height="60" class="btn orange card xs12 sm6 md3 " topic="/game/score" message="TEAM_ORANGE+2"> <mqtt-button width="120" height="60" class="btn yellow card xs12 sm6 md3 " topic="/game/score" message="TEAM_YELLOW+2">
<v-icon left size="40">mdi-plus-box-multiple</v-icon> <v-icon left size="40">mdi-plus-box-multiple</v-icon>
</mqtt-button> </mqtt-button>
</v-col> </v-col>

25
ui/src/components/CardControl.vue
View File

@@ -12,7 +12,22 @@
</mqtt-button> </mqtt-button>
</v-col> </v-col>
<v-col cols="12" sm="6" md="5" class="mt-4"> <v-col cols="12" sm="6" md="5" class="mt-4">
<mqtt-button width="150" height="90" class="btn red card" topic="/display/control" message="next"> <v-icon left size="60">mdi-skip-next</v-icon> </mqtt-button> </v-col> <v-col cols="12" sm="6" md="5" class="mb-4"> <mqtt-button width="150" height="90" class="btn red card" topic="/display/control" message="pause"> <v-icon left size="60">mdi-pause</v-icon> </mqtt-button> </v-col> <v-col cols="12" sm="6" md="5" class="mb-4"> <mqtt-button width="150" height="90" class="btn red card" topic="/display/control" message="play"> <v-icon left size="60">mdi-play</v-icon> </mqtt-button> </v-col> </v-row> </v-container> <mqtt-button width="150" height="90" class="btn red card" topic="/display/control" message="next">
<v-icon left size="60">mdi-skip-next</v-icon>
</mqtt-button>
</v-col>
<v-col cols="12" sm="6" md="5" class="mb-4">
<mqtt-button width="150" height="90" class="btn red card" topic="/display/control" message="pause">
<v-icon left size="60">mdi-pause</v-icon>
</mqtt-button>
</v-col>
<v-col cols="12" sm="6" md="5" class="mb-4">
<mqtt-button width="150" height="90" class="btn red card" topic="/display/control" message="play">
<v-icon left size="60">mdi-play</v-icon>
</mqtt-button>
</v-col>
</v-row>
</v-container>
</v-card> </v-card>
</template> </template>
@@ -29,6 +44,10 @@
</script> </script>
<style> <style>
.card--reduced { height: 56px; /* Réglez la hauteur réduite selon vos besoins */ width: 170px; overflow: hidden; transition: height 0.3s ease-in-out; .card--reduced {
} height: 56px; /* Réglez la hauteur réduite selon vos besoins */
width: 170px;
overflow: hidden;
transition: height 0.3s ease-in-out;
}
</style> </style>

6
ui/src/components/CardScore.vue
View File

@@ -49,7 +49,7 @@
<!-- Équipe Orange --> <!-- Équipe Orange -->
<v-col cols="6"> <v-col cols="6">
<v-row no-gutters> <v-row no-gutters>
<v-col class="scorediv-style-orange"> <v-col class="scorediv-style-yellow">
<div> <div>
<v-label class="labelRoundScore-style pt-3">Manche</v-label> <v-label class="labelRoundScore-style pt-3">Manche</v-label>
<div> <div>
@@ -138,8 +138,8 @@ const GreenRoundScore = ref(variables.GreenRoundScore);
padding: 15px; padding: 15px;
border-top-left-radius: 10%; border-top-left-radius: 10%;
} }
.scorediv-style-orange { .scorediv-style-yellow {
background-color: #d48f28 !important; background-color: #d4d100 !important;
padding: 15px; padding: 15px;
border-bottom-left-radius: 10%; border-bottom-left-radius: 10%;
} }

8
ui/src/views/GameControl.vue
View File

@@ -47,8 +47,8 @@ import CardButtonScore from '@/components/CardButtonScore.vue'
.btn.blue { .btn.blue {
background-color: #2867d4; /* Changez la couleur en fonction de votre thème */ background-color: #2867d4; /* Changez la couleur en fonction de votre thème */
} }
.btn.orange { .btn.yellow {
background-color: #d48f28; /* Changez la couleur en fonction de votre thème */ background-color: #d4d100; /* Changez la couleur en fonction de votre thème */
} }
.btn.green { .btn.green {
background-color: #28d42e; /* Changez la couleur en fonction de votre thème */ background-color: #28d42e; /* Changez la couleur en fonction de votre thème */
@@ -58,8 +58,8 @@ import CardButtonScore from '@/components/CardButtonScore.vue'
padding: 15px; padding: 15px;
border-top-left-radius: 10%; border-top-left-radius: 10%;
} }
.scorediv-style-orange { .scorediv-style-yellow {
background-color: #d48f28 !important; background-color: #d4d100!important;
padding: 15px; padding: 15px;
border-bottom-left-radius: 10%; border-bottom-left-radius: 10%;
} }