Compare commits

...

3 Commits

3 changed files with 101 additions and 19 deletions

BIN
ui/src/assets/design.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 MiB

View File

@ -18,23 +18,88 @@
<div> <div>
<v-row no-gutters justify="space-around" class="scorebox-1-pos"> <v-row no-gutters justify="space-around" class="scorebox-1-pos">
<v-row> <v-row>
<v-col class="align-start scorediv-style-red pr-1"> <v-col class="align-start scorediv-style-red pl-1">
<v-label class="labelScore-style">{{ RedScore }}</v-label> <v-col>
<div class="pr-1">
<div>
<v-label class="labelRoundScore-style">Manche</v-label>
</div>
<v-label class="labelRoundScore-style">{{ RedRoundScore }}</v-label>
</div>
<v-divider class="pr-1" color="background"/>
</v-col> </v-col>
<div class="pr-1">
<div>
<v-label class="labelTotalScore-style">Total</v-label>
</div>
<v-label class="labelTotalScore-style">{{ RedTotalScore }}</v-label>
</div>
</v-col>
<v-col class="align-start scorediv-style-blue pl-1"> <v-col class="align-start scorediv-style-blue pl-1">
<v-label class="labelScore-style">{{ BlueScore }}</v-label> <v-col>
<div class="pr-1">
<div>
<v-label class="labelRoundScore-style">Manche</v-label>
</div>
<v-label class="labelRoundScore-style">{{ BlueRoundScore }}</v-label>
</div>
<v-divider class="pr-1" color="background"/>
</v-col>
<div class="pr-1">
<div>
<v-label class="labelTotalScore-style">Total</v-label>
</div>
<v-label class="labelTotalScore-style">{{ BlueTotalScore }}</v-label>
</div>
</v-col> </v-col>
</v-row> </v-row>
</v-row> </v-row>
</div> </div>
<div> <div>
<v-row no-gutters justify="space-around" class="scorebox-2-pos mb-0"> <v-row no-gutters justify="space-around" class="scorebox-2-pos mb-0">
<v-row> <v-row>
<v-col class="align-start scorediv-style-orange pr-1"> <v-col class="scorediv-style-orange pl-1">
<v-label class="labelScore-style">{{ OrangeScore }}</v-label> <v-col>
<div class="pr-1">
<div>
<v-label class="labelRoundScore-style">Manche</v-label>
</div>
<v-label class="labelRoundScore-style">{{ OrangeRoundScore }}</v-label>
</div>
<v-divider class="pr-1" color="background"/>
</v-col> </v-col>
<div class="pr-1">
<div>
<v-label class="labelTotalScore-style">Total</v-label>
</div>
<v-label class="labelTotalScore-style">{{ OrangeTotalScore }}</v-label>
</div>
</v-col>
<v-col class="align-start scorediv-style-green pl-1"> <v-col class="align-start scorediv-style-green pl-1">
<v-label class="labelScore-style">{{ GreenScore }}</v-label> <v-col>
<div class="pr-1">
<div>
<v-label class="labelRoundScore-style">Manche</v-label>
</div>
<v-label class="labelRoundScore-style">{{ GreenRoundScore }}</v-label>
</div>
<v-divider class="pr-1" color="background"/>
</v-col>
<div class="pr-1">
<div>
<v-label class="labelTotalScore-style">Total</v-label>
</div>
<v-label class="labelTotalScore-style">{{ GreenTotalScore }}</v-label>
</div>
</v-col> </v-col>
</v-row> </v-row>
</v-row> </v-row>
@ -47,10 +112,14 @@ import { ref} from 'vue'; // Import des fonctions de Vue 3
import variables from '@/variables.js'; import variables from '@/variables.js';
// Déclaration des variables locales pour les scores // Déclaration des variables locales pour les scores
const RedScore = ref(variables.RedScore); const RedTotalScore = ref(variables.RedTotalScore);
const BlueScore = ref(variables.BlueScore); const BlueTotalScore = ref(variables.BlueTotalScore);
const OrangeScore = ref(variables.OrangeScore); const OrangeTotalScore = ref(variables.OrangeTotalScore);
const GreenScore = ref(variables.GreenScore); const GreenTotalScore = ref(variables.GreenTotalScore);
const RedRoundScore = ref(variables.RedRoundScore);
const BlueRoundScore = ref(variables.BlueRoundScore);
const OrangeRoundScore = ref(variables.OrangeRoundScore);
const GreenRoundScore = ref(variables.GreenRoundScore);
</script> </script>
@ -65,8 +134,15 @@ const GreenScore = ref(variables.GreenScore);
color: #e91e1e !important; color: #e91e1e !important;
opacity: 90% !important; opacity: 90% !important;
} }
.labelScore-style{ .labelRoundScore-style{
opacity: 100% !important; opacity: 100% !important;
font-size: 25px !important;
font-weight: 500;
}
.labelTotalScore-style{
opacity: 100% !important;
font-size: 15px !important;
font-weight: 500;
} }
.button-pos{ .button-pos{
padding-top: 10px; padding-top: 10px;
@ -75,12 +151,10 @@ const GreenScore = ref(variables.GreenScore);
.scorebox-1-pos{ .scorebox-1-pos{
padding-bottom: 15px; padding-bottom: 15px;
text-align: center; text-align: center;
margin:auto;
} }
.scorebox-2-pos{ .scorebox-2-pos{
padding-top: 9px; padding-top: 9px;
text-align: center; text-align: center;
margin:auto;
} }
.scorediv-style-red{ .scorediv-style-red{
background-color: #d42828 !important; background-color: #d42828 !important;

View File

@ -1,16 +1,24 @@
export default { export default {
// Gestion des score et des Buzzers // Gestion des score et des Buzzers
RedScore: 9999,
BlueScore: 1321, // Scores totaux
OrangeScore: 10, RedTotalScore: 11,
GreenScore: 10, BlueTotalScore: 22,
GreenTotalScore: 33,
OrangeTotalScore: 44,
// Score de la manche courante
RedRoundScore: 1,
BlueRoundScore: 2,
OrangeRoundScore: 3,
GreenRoundScore: 4,
//Etat des buzzer
BuzzerRed: false, BuzzerRed: false,
BuzzerBlue: false, BuzzerBlue: false,
BuzzerOrange: false, BuzzerOrange: false,
BuzzerGreen: false, BuzzerGreen: false,
// Ajoutez d'autres variables globales ici // Ajoutez d'autres variables globales ici
}; };