diff --git a/src/components/AllWinesPage.vue b/src/components/AllWinesPage.vue index 6ef37e2..ca50da4 100644 --- a/src/components/AllWinesPage.vue +++ b/src/components/AllWinesPage.vue @@ -13,6 +13,7 @@ import { page, event } from "vue-analytics"; import Banner from "@/ui/Banner"; import Wine from "@/ui/Wine"; +import { overallWineStatistics } from "@/api"; export default { components: { @@ -25,8 +26,8 @@ export default { }; }, async mounted() { - const _wines = await fetch("/api/wines/statistics/overall"); - this.wines = (await _wines.json()).sort((a, b) => + const wines = await overallWineStatistics(); + this.wines = wines.sort((a, b) => a.rating > b.rating ? -1 : 1 ); } diff --git a/src/components/GeneratePage.vue b/src/components/GeneratePage.vue index bafa984..0c22c72 100644 --- a/src/components/GeneratePage.vue +++ b/src/components/GeneratePage.vue @@ -6,28 +6,28 @@

@@ -53,7 +53,7 @@ >
-
+
Rød: {{ red }} Blå: {{ blue }} Gul: {{ yellow }} @@ -118,7 +118,12 @@ export default { if (time == 5) { this.generating = false; this.generated = true; - if (this.numberOfBallots > 1 && new Set(this.colors).size == 1) { + if (this.numberOfBallots > 1 && + [this.redCheckbox, this.greenCheckbox, this.yellowCheckbox, this.blueCheckbox].filter(value => value == true).length == 1) { + return + } + + if (new Set(this.colors).size == 1) { alert("BINGO"); } @@ -283,10 +288,9 @@ button { input { font-size: 1.5rem; - padding: 8px; + padding: 7px; margin: 0; height: 3rem; - max-height: 3rem; border: 1px solid rgba(#333333, 0.3); } @@ -351,23 +355,6 @@ label .text { } } -button { - border: none; - background: #b7debd; - color: #333; - padding: 10px 30px; - margin: 0; - width: fit-content; - font-size: 1.3rem; - display: block; - height: calc(3rem + 18px); - display: inline-flex; - max-height: calc(3rem + 18px); - - // disable-dbl-tap-zoom - touch-action: manipulation; -} - .colors-text { display: flex; flex-direction: row;