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

Fix for countdown

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2020-01-24 15:51:05 +01:00
parent 5301e70a86
commit ca0a91e81f
3 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ui/Banner.vue
View File

@@ -4,8 +4,8 @@
<img src="/public/assets/images/knowit.svg" />
<div class="clock">
<h2 cv-if="distance > 0">
<span v-if="days > 0">{{ pad(days) }}</span>
<span>{{ pad(hours) }}</span
<span v-if="days > 0">{{ pad(days) }}</span
>: <span>{{ pad(hours) }}</span
>: <span>{{ pad(minutes) }}</span
>:
<span>{{ pad(seconds) }}</span>
@@ -58,9 +58,11 @@ export default {
initialize: function() {
let d = new Date();
let dayOfLottery = 5;
let nextDayOfLottery = new Date(
d.setDate(d.getDate() + ((5 + 7 - d.getDay()) % 7))
);
let dayDifference = (dayOfLottery + 7 - d.getDay()) % 7;
if (dayDifference == 0) {
dayDifference = 7;
}
let nextDayOfLottery = new Date(d.setDate(d.getDate() + dayDifference));
nextDayOfLottery = new Date(nextDayOfLottery.setHours(15));
nextDayOfLottery = new Date(nextDayOfLottery.setMinutes(0));
nextDayOfLottery = new Date(nextDayOfLottery.setSeconds(0));
@@ -130,5 +132,8 @@ export default {
color: #333333;
display: flex;
font-family: Arial;
h2 {
display: flex;
}
}
</style>

12
src/ui/Countdown.vue
View File

@@ -2,8 +2,8 @@
<div>
<div class="clock" v-if="enabled">
<h2 cv-if="distance > 0">
<span v-if="days > 0">{{ days }} dager,&nbsp;</span>
<span>{{ pad(hours) }}</span
<span v-if="days > 0">{{ pad(days) }}</span
>: <span>{{ pad(hours) }}</span
>: <span>{{ pad(minutes) }}</span
>:
<span>{{ pad(seconds) }}</span>
@@ -71,9 +71,11 @@ export default {
initialize: function() {
let d = new Date();
let dayOfLottery = 5;
let nextDayOfLottery = new Date(
d.setDate(d.getDate() + ((5 + 7 - d.getDay()) % 7))
);
let dayDifference = (dayOfLottery + 7 - d.getDay()) % 7;
if (dayDifference == 0) {
dayDifference = 7;
}
let nextDayOfLottery = new Date(d.setDate(d.getDate() + dayDifference));
nextDayOfLottery = new Date(nextDayOfLottery.setHours(15));
nextDayOfLottery = new Date(nextDayOfLottery.setMinutes(0));
nextDayOfLottery = new Date(nextDayOfLottery.setSeconds(0));

16
src/ui/Vipps.vue
View File

@@ -5,7 +5,7 @@
kr.
<span class="big-money">{{ amount * 10 }},- (10,- pr. lodd)</span>
</span>
<img src="/public/assets/images/vipps-qr.png" class="qr-logo" />
<img :src="qrLink" class="qr-logo" />
<span class="phone-number">977 40 427</span>
<span class="name">Kasper Rynning-Tønnesen</span>
<span class="mark-with">Merk med: Vinlodd/🍾</span>
@@ -17,12 +17,22 @@ export default {
props: {
amount: Number
},
data() {
return {
qrLink:
"https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl=https://qr.vipps.no/28/2/01/031/4797740427?v=1&m=Vinlotteri🍾&a=" +
100 * this.amount
};
},
methods: {
openVipps: () => {
window.location.assign('https://qr.vipps.no/28/2/01/031/4797740427?v=1&m=Vinlotteri🍾&a=' + 100 * this.amount)
window.location.assign(
"https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl=https://qr.vipps.no/28/2/01/031/4797740427?v=1&m=Vinlotteri🍾&a=" +
100 * this.amount
);
}
}
}
};
</script>
<style lang="scss" scoped>