This commit is contained in:
2021-02-18 21:42:03 +01:00
parent cded690fba
commit eaf57115e8

View File

@@ -1,8 +1,6 @@
<template> <template>
<main class="main-container"> <main class="main-container">
<section class="top-container"> <section class="top-container">
<div class="want-to-win"> <div class="want-to-win">
<h1> <h1>
Vil du også vinne? Vil du også vinne?
@@ -18,8 +16,8 @@
</div> </div>
<router-link to="/lottery" class="participate-button"> <router-link to="/lottery" class="participate-button">
<i class="icon icon--arrow-right"></i> <i class="icon icon--arrow-right"></i>
<p>Trykk her for å delta</p> <p>Trykk her for å delta</p>
</router-link> </router-link>
<router-link to="/generate" class="see-details-link"> <router-link to="/generate" class="see-details-link">
@@ -38,17 +36,16 @@
<i class="icon icon--bottle"></i> <i class="icon icon--bottle"></i>
<i class="icon icon--bottle"></i> <i class="icon icon--bottle"></i>
</div> </div>
</section> </section>
<section class="content-container"> <section class="content-container">
<div class="scroll-info"> <div class="scroll-info">
<i class ="icon icon--arrow-long-right"></i> <i class="icon icon--arrow-long-right"></i>
<p>Scroll for å se vinnere og annen gøy statistikk</p> <p>Scroll for å se vinnere og annen gøy statistikk</p>
</div> </div>
<Highscore class="highscore"/> <Highscore class="highscore" />
<TotalBought class="total-bought" /> <TotalBought class="total-bought" />
<section class="chart-container"> <section class="chart-container">
@@ -56,12 +53,10 @@
<WinGraph class="win" /> <WinGraph class="win" />
</section> </section>
<Wines class="wines-container" /> <Wines class="wine-container" />
</section> </section>
<Countdown :hardEnable="hardStart" @countdown="changeEnabled" /> <Countdown :hardEnable="hardStart" @countdown="changeEnabled" />
</main> </main>
</template> </template>
@@ -96,11 +91,7 @@ export default {
if (!("PushManager" in window)) { if (!("PushManager" in window)) {
return false; return false;
} }
return ( return Notification.permission !== "granted" || !this.pushAllowed || localStorage.getItem("push") == null;
Notification.permission !== "granted" ||
!this.pushAllowed ||
localStorage.getItem("push") == null
);
} }
}, },
async mounted() { async mounted() {
@@ -120,7 +111,7 @@ export default {
this.hardStart = way; this.hardStart = way;
}, },
track() { track() {
window.ga('send', 'pageview', '/'); window.ga("send", "pageview", "/");
}, },
startCountdown() { startCountdown() {
this.hardStart = true; this.hardStart = true;
@@ -145,7 +136,7 @@ export default {
align-items: center; align-items: center;
justify-items: start; justify-items: start;
@include mobile{ @include mobile {
padding-bottom: 2em; padding-bottom: 2em;
height: 15em; height: 15em;
grid-template-rows: repeat(7, 1fr); grid-template-rows: repeat(7, 1fr);
@@ -156,13 +147,13 @@ export default {
grid-column: 2 / -1; grid-column: 2 / -1;
display: flex; display: flex;
h1{ h1 {
font-size: 2em; font-size: 2em;
font-weight: 400; font-weight: 400;
} }
@include tablet { @include tablet {
h1{ h1 {
font-size: 3em; font-size: 3em;
} }
grid-row: 2 / 4; grid-row: 2 / 4;
@@ -170,7 +161,7 @@ export default {
} }
} }
.notification-request-button{ .notification-request-button {
cursor: pointer; cursor: pointer;
} }
@@ -229,7 +220,7 @@ export default {
.icons-container { .icons-container {
grid-column: 1 / -1; grid-column: 1 / -1;
grid-row: 7 / -1; grid-row: 7 / -1;
@include mobile{ @include mobile {
margin-top: 2em; margin-top: 2em;
display: none; display: none;
} }
@@ -239,7 +230,7 @@ export default {
grid-column: 7 / -1; grid-column: 7 / -1;
} }
@include desktop{ @include desktop {
grid-row: 4 / -3; grid-row: 4 / -3;
grid-column: 7 / 11; grid-column: 7 / 11;
} }
@@ -257,30 +248,27 @@ export default {
i { i {
font-size: 5em; font-size: 5em;
&.icon--heart-sparks{ &.icon--heart-sparks {
grid-column: 2 / 4; grid-column: 2 / 4;
grid-row: 2 / 4; grid-row: 2 / 4;
align-self: center; align-self: center;
justify-self: center; justify-self: center;
} }
&.icon--face-1{ &.icon--face-1 {
grid-column: 4 / 7; grid-column: 4 / 7;
grid-row: 2 / 4; grid-row: 2 / 4;
justify-self: center; justify-self: center;
} }
&.icon--face-3{ &.icon--face-3 {
grid-column: 7 / 10; grid-column: 7 / 10;
grid-row: 1 / 4; grid-row: 1 / 4;
align-self: center; align-self: center;
} }
&.icon--ballon{ &.icon--ballon {
grid-column: 9 / 11; grid-column: 9 / 11;
grid-row: 3 / 5; grid-row: 3 / 5;
} }
&.icon--bottle{ &.icon--bottle {
grid-row: 4 / -1; grid-row: 4 / -1;
&:nth-of-type(5) { &:nth-of-type(5) {
@@ -297,14 +285,13 @@ export default {
&:nth-of-type(8) { &:nth-of-type(8) {
grid-column: 7 / 8; grid-column: 7 / 8;
} }
&:nth-of-type(9){ &:nth-of-type(9) {
grid-column: 8 / 9; grid-column: 8 / 9;
align-self: center; align-self: center;
} }
} }
} }
} }
} }
h1 { h1 {
@@ -312,12 +299,12 @@ h1 {
font-family: "knowit"; font-family: "knowit";
} }
.to-lottery{ .to-lottery {
color: #333; color: #333;
text-decoration: none; text-decoration: none;
display: block; display: block;
text-align: center; text-align: center;
margin-bottom: 0; margin-bottom: 0;
} }
.content-container { .content-container {
@@ -326,10 +313,10 @@ h1 {
row-gap: 5em; row-gap: 5em;
.scroll-info { .scroll-info {
display: flex; display: flex;
align-items: center; align-items: center;
column-gap: 10px; column-gap: 10px;
grid-column: 2 / -2; grid-column: 2 / -2;
} }
.chart-container { .chart-container {
@@ -346,8 +333,8 @@ h1 {
grid-column: 2 / -2; grid-column: 2 / -2;
} }
.wines-container { .wine-container {
grid-column: 2 / -2; grid-column: 3 / -3;
} }
.icon--arrow-long-right { .icon--arrow-long-right {
@@ -356,8 +343,7 @@ h1 {
} }
@include tablet { @include tablet {
.scroll-info {
.scroll-info{
grid-column: 3 / -3; grid-column: 3 / -3;
} }