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

Merge branch 'master' of github.com:KevinMidboe/vinlottis into enhancement/vinlottispage-css-fixes

Browse Source
This commit is contained in:
Adrian Thompson
2020-09-17 11:52:00 +02:00
parent 2c9821d753 48e43edcf4
commit 0f24afd07c
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ui/RequestedWineCard.vue
View File

@@ -74,7 +74,6 @@ export default {
box-shadow: 0px 0px 10px 1px rgba(0, 0, 0, 0.65); box-shadow: 0px 0px 10px 1px rgba(0, 0, 0, 0.65);
text-align: center; text-align: center;
display: grid; display: grid;
grid: auto-flow min-content / 2fr 1fr;
grid-template-areas: "top top" grid-template-areas: "top top"
"middle-left middle-right-top" "middle-left middle-right-top"
"middle-left middle-right-bot" "middle-left middle-right-bot"

22
src/ui/WinnerDraw.vue
View File

@@ -155,8 +155,8 @@ export default {
//duration is computed as x * 1000 miliseconds, in this case 7*1000 = 7000 miliseconds ==> 7 seconds. //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, particleCount: 10}; var defaults = { startVelocity: 50, spread: 160, ticks: 50, zIndex: 0, particleCount: 20};
var uberDefaults = { startVelocity: 65, spread: 75, particleCount: 35, angle: randomInRange(55, 125)} var uberDefaults = { startVelocity: 65, spread: 75, zIndex: 0, particleCount: 35}
function randomInRange(min, max) { function randomInRange(min, max) {
return Math.random() * (max - min) + min; return Math.random() * (max - min) + min;
@@ -167,17 +167,21 @@ export default {
return clearInterval(interval); return clearInterval(interval);
} }
if(currentName == "Amund Brandsrud"){ if(currentName == "Amund Brandsrud"){
runCannon(uberDefaults, {x: 0 }); runCannon(uberDefaults, {x: 1, y: 1 }, {angle: 135});
runCannon(uberDefaults, {x: 1 }); runCannon(uberDefaults, {x: 0, y: 1 }, {angle: 45});
runCannon(uberDefaults, {y: 1 }); runCannon(uberDefaults, {y: 1 }, {angle: 90});
runCannon(uberDefaults, {x: 0 }, {angle: 45});
runCannon(uberDefaults, {x: 1 }, {angle: 135});
}else{ }else{
runCannon(defaults, { x: randomInRange(0.1, 0.3), y: Math.random() - 0.2 }); runCannon(defaults, {x: 0 }, {angle: 45});
runCannon(defaults, { x: randomInRange(0.7, 0.9), y: Math.random() - 0.2 }); runCannon(defaults, {x: 1 }, {angle: 135});
runCannon(defaults, {y: 1 }, {angle: 90});
} }
}, 250); }, 250);
function runCannon(confettiDefaultValues, originPoint){ function runCannon(confettiDefaultValues, originPoint, launchAngle){
confetti(Object.assign({}, confettiDefaultValues, {origin: originPoint })) confetti(Object.assign({}, confettiDefaultValues, {origin: originPoint }, launchAngle))
} }
}, },
} }