KevinMidboe/vinlottis
1
0
Fork 0
Code Issues 8 Pull Requests 14 Packages Projects Releases Wiki Activity

Fixed according to review comments

Browse Source
This commit is contained in:
Egil Uggerud
2020-09-10 16:48:11 +02:00
parent 9ab84fffda
commit 80f935db26
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/ui/WinnerDraw.vue
View File

@@ -15,6 +15,7 @@
<br /> <br />
<br /> <br />
</div> </div>
<div class="current-draw" v-if="drawingDone"> <div class="current-draw" v-if="drawingDone">
<h2>VINNER</h2> <h2>VINNER</h2>
<div <div
@@ -100,11 +101,7 @@ export default {
} }
this.drawing = false; this.drawing = false;
this.drawingDone = true; this.drawingDone = true;
if(this.currentName == "Amund Brandsrud"){ this.startConfetti(this.currentName);
this.startUberConfetti();
return;
}
this.startConfetti();
return; return;
} }
this.currentName = this.attendees[ this.currentName = this.attendees[
@@ -154,10 +151,13 @@ export default {
return "yellow"; return "yellow";
} }
}, },
startConfetti(){ startConfetti(currentName){
//duration is computed as x * 1000 miliseconds, in this case 7*1000 = 7000 miliseconds ==> 7 seconds.
var duration = 7 * 1000; var duration = 7 * 1000;
var animationEnd = Date.now() + duration; var animationEnd = Date.now() + duration;
var defaults = { startVelocity: 30, spread: 360, ticks: 60, zIndex: 0 }; var defaults = { startVelocity: 30, spread: 360, ticks: 60, zIndex: 0, particleCount: 10};
var uberDefaults = { startVelocity: 65, spread: 75, particleCount: 35, angle: randomInRange(55, 125)}
function randomInRange(min, max) { function randomInRange(min, max) {
return Math.random() * (max - min) + min; return Math.random() * (max - min) + min;
} }
@@ -166,29 +166,20 @@ export default {
if (timeLeft <= 0) { if (timeLeft <= 0) {
return clearInterval(interval); return clearInterval(interval);
} }
var particleCount = 50 * (timeLeft / duration); if(currentName == "Amund Brandsrud"){
confetti(Object.assign({}, defaults, { particleCount, origin: { x: randomInRange(0.1, 0.3), y: Math.random() - 0.2 } })); runCannon(uberDefaults, {x: 0 });
confetti(Object.assign({}, defaults, { particleCount, origin: { x: randomInRange(0.7, 0.9), y: Math.random() - 0.2 } })); runCannon(uberDefaults, {x: 1 });
runCannon(uberDefaults, {y: 1 });
}else{
runCannon(defaults, { x: randomInRange(0.1, 0.3), y: Math.random() - 0.2 });
runCannon(defaults, { x: randomInRange(0.7, 0.9), y: Math.random() - 0.2 });
}
}, 250); }, 250);
function runCannon(x, y){
confetti(Object.assign({}, x, {origin: y }))
}
}, },
startUberConfetti(){
var duration = 7 * 1000;
var animationEnd = Date.now() + duration;
var defaults = { startVelocity: 30, spread: 360, ticks: 60, zIndex: 0 };
function randomInRange(min, max) {
return Math.random() * (max - min) + min;
}
var interval = setInterval(function() {
var timeLeft = animationEnd - Date.now();
if (timeLeft <= 0) {
return clearInterval(interval);
}
var particleCount = 50 * (timeLeft / duration);
confetti({startVelocity: 65, angle: randomInRange(55, 125),particleCount: particleCount, angle: 60, spread: 55, origin: { x: 0 }});
confetti({startVelocity: 65, angle: randomInRange(55, 125),particleCount: particleCount, angle: 120, spread: 55, origin: { x: 1 }});
confetti({startVelocity: 65, angle: randomInRange(55, 125),spread: randomInRange(50, 70),particleCount: randomInRange(5, 15),origin: { y: 1 }});
}, 250);
}
} }
}; };