From 7a12c929aa0ce64e082b0773353cd27aac3e6719 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Mon, 16 Mar 2020 19:53:09 +0100 Subject: [PATCH] Moved generator to a component RaffleGenerator. Moved generator and added to virtuallottertyregistrationpage Removed logic for generating random colors in backend. --- api/virtualLottery.js | 31 +- src/components/GeneratePage.vue | 390 +--------------- .../VirtualLotteryRegistrationPage.vue | 29 +- src/ui/RaffleGenerator.vue | 421 ++++++++++++++++++ 4 files changed, 442 insertions(+), 429 deletions(-) create mode 100644 src/ui/RaffleGenerator.vue diff --git a/api/virtualLottery.js b/api/virtualLottery.js index 2090bd6..65ca63e 100644 --- a/api/virtualLottery.js +++ b/api/virtualLottery.js @@ -160,35 +160,8 @@ router.route("/attendees/secure").get(mustBeAuthenticated, async (req, res) => { router.route("/attendee").post(mustBeAuthenticated, async (req, res) => { const attendee = req.body; - let red = 0; - let blue = 0; - let green = 0; - let yellow = 0; - if (attendee.randomColors) { - let color; - for (let i = 0; i < attendee.ballots; i++) { - color = Math.floor(Math.random() * 4); - switch (color) { - case 0: - red += 1; - break; - case 1: - blue += 1; - break; - case 2: - green += 1; - break; - case 3: - yellow += 1; - break; - } - } - } else { - red = attendee.red; - blue = attendee.blue; - yellow = attendee.yellow; - green = attendee.green; - } + const { red, blue, yellow, green } = attendee; + let newAttendee = new Attendee({ name: attendee.name, red, diff --git a/src/components/GeneratePage.vue b/src/components/GeneratePage.vue index 8b4b3c6..a77e780 100644 --- a/src/components/GeneratePage.vue +++ b/src/components/GeneratePage.vue @@ -4,61 +4,8 @@

Velg hvilke farger du vil ha, fyll inn antall lodd og klikk 'generer'

-
- - - - -
-
- - -
-
-
-
- -
- Rød: {{ red }} - Blå: {{ blue }} - Gul: {{ yellow }} - Grønn: {{ green }} -
+ @@ -67,39 +14,22 @@ + +