Fix some null-errors

This commit is contained in:
Kasper Rynning-Tønnesen
2020-03-27 16:45:56 +01:00
parent 3b91f9693e
commit 52e773bc7e
2 changed files with 19 additions and 21 deletions

View File

@@ -81,14 +81,9 @@ export default {
!this.pushAllowed || !this.pushAllowed ||
localStorage.getItem("push") == null localStorage.getItem("push") == null
); );
},
todayExists: () => {
return prelottery()
.then(wines => wines.length > 0)
.catch(() => false)
} }
}, },
mounted() { async mounted() {
this.$on("push-allowed", () => { this.$on("push-allowed", () => {
this.pushAllowed = true; this.pushAllowed = true;
}); });
@@ -96,6 +91,11 @@ export default {
return; return;
} }
this.track(); this.track();
try {
this.todayExists = (await prelottery()).length > 0;
} catch (e) {
this.todayExists = false;
}
}, },
methods: { methods: {
requestNotificationAccess() { requestNotificationAccess() {

View File

@@ -8,9 +8,7 @@
attendeesFetched && attendeesFetched &&
winnersFetched winnersFetched
" "
> >Her var det lite.. Sikker på at det er en virtuell trekning nå?</h2>
Her var det lite.. Sikker på at det er en virtuell trekning nå?
</h2>
<div class="title-info"> <div class="title-info">
<h2>Send vipps med melding "Vinlotteri" for å bli registrert til virtuelt lotteri</h2> <h2>Send vipps med melding "Vinlotteri" for å bli registrert til virtuelt lotteri</h2>
<p>Send gjerne melding om fargeønsker også</p> <p>Send gjerne melding om fargeønsker også</p>
@@ -21,15 +19,11 @@
<span class="subtext generator-link">Se her</span> <span class="subtext generator-link">Se her</span>
</router-link> </router-link>
<hr> <hr />
<h2>Live oversikt av lodd kjøp i dag</h2> <h2>Live oversikt av lodd kjøp i dag</h2>
<div class="colors"> <div class="colors">
<div <div v-for="color in Object.keys(ticketsBought)" :class="color + ' colors-box'" :key="color">
v-for="color in Object.keys(ticketsBought)"
:class="color + ' colors-box'"
:key="color"
>
<div class="colors-overlay"> <div class="colors-overlay">
<p>{{ ticketsBought[color] }} kjøpt</p> <p>{{ ticketsBought[color] }} kjøpt</p>
</div> </div>
@@ -88,8 +82,7 @@ export default {
}; };
}, },
created() { created() {
getChatHistory() getChatHistory().then(messages => (this.chatHistory = messages));
.then(messages => this.chatHistory = messages)
}, },
mounted() { mounted() {
this.track(); this.track();
@@ -150,7 +143,7 @@ export default {
todayExists: () => { todayExists: () => {
return prelottery() return prelottery()
.then(wines => wines.length > 0) .then(wines => wines.length > 0)
.catch(() => false) .catch(() => false);
} }
}, },
methods: { methods: {
@@ -176,14 +169,19 @@ export default {
let response = await attendees(); let response = await attendees();
if (response) { if (response) {
this.attendees = response; this.attendees = response;
const addValueOfListObjectByKey = (list, key) => list.map(object => object[key]).reduce((a, b) => a + b); if (this.attendees == undefined || this.attendees.length == 0) {
this.attendeesFetched = true;
return;
}
const addValueOfListObjectByKey = (list, key) =>
list.map(object => object[key]).reduce((a, b) => a + b);
this.ticketsBought = { this.ticketsBought = {
red: addValueOfListObjectByKey(response, "red"), red: addValueOfListObjectByKey(response, "red"),
blue: addValueOfListObjectByKey(response, "blue"), blue: addValueOfListObjectByKey(response, "blue"),
green: addValueOfListObjectByKey(response, "green"), green: addValueOfListObjectByKey(response, "green"),
yellow: addValueOfListObjectByKey(response, "yellow"), yellow: addValueOfListObjectByKey(response, "yellow")
} };
} }
this.attendeesFetched = true; this.attendeesFetched = true;
}, },