Config-file

This commit is contained in:
Kasper Rynning-Tønnesen
2020-01-30 15:08:22 +01:00
parent b1a207bb96
commit 8b3e3d60a5
6 changed files with 69 additions and 16 deletions

8
config/env/lottery.config.example.js vendored Normal file
View File

@@ -0,0 +1,8 @@
module.exports = {
name: "NAME",
phone: "PHONE NUMBER",
price: 10,
message: "VINLOTTERI",
date: 5,
hours: 15
};

8
config/env/lottery.config.js vendored Normal file
View File

@@ -0,0 +1,8 @@
module.exports = {
name: "Kasper Rynning-Tønnesen",
phone: "977 40 427",
price: 10,
message: "Vinlotteri 🍾",
date: 5,
hours: 15
};

View File

@@ -1,5 +1,7 @@
"use strict"; "use strict";
const env = require("./env/lottery.config.js");
const webpack = require("webpack");
const VueLoaderPlugin = require("vue-loader/lib/plugin"); const VueLoaderPlugin = require("vue-loader/lib/plugin");
const MiniCSSExtractPlugin = require("mini-css-extract-plugin"); const MiniCSSExtractPlugin = require("mini-css-extract-plugin");
const HtmlPlugin = require("html-webpack-plugin"); const HtmlPlugin = require("html-webpack-plugin");
@@ -68,7 +70,17 @@ const webpackConfig = function(isDev) {
} }
] ]
}, },
plugins: [new VueLoaderPlugin()] plugins: [
new VueLoaderPlugin(),
new webpack.DefinePlugin({
__NAME__: JSON.stringify(env.name),
__PHONE__: JSON.stringify(env.phone),
__PRICE__: env.price,
__MESSAGE__: JSON.stringify(env.message),
__DATE__: env.date,
__HOURS__: env.hours
})
]
}; };
}; };

View File

@@ -1,7 +1,7 @@
<template> <template>
<router-link to="/" class="link"> <router-link to="/" class="link">
<div class="top-banner"> <div class="top-banner">
<img src="/public/assets/images/knowit.svg" alt="knowit logo"/> <img src="/public/assets/images/knowit.svg" alt="knowit logo" />
<div class="clock"> <div class="clock">
<h2 cv-if="distance > 0"> <h2 cv-if="distance > 0">
<span v-if="days > 0">{{ pad(days) }}</span <span v-if="days > 0">{{ pad(days) }}</span
@@ -57,13 +57,13 @@ export default {
}, },
initialize: function() { initialize: function() {
let d = new Date(); let d = new Date();
let dayOfLottery = 5; let dayOfLottery = __DATE__;
let dayDifference = (dayOfLottery + 7 - d.getDay()) % 7; let dayDifference = (dayOfLottery + 7 - d.getDay()) % 7;
if (dayDifference == 0) { if (dayDifference == 0) {
dayDifference = 7; dayDifference = 7;
} }
let nextDayOfLottery = new Date(d.setDate(d.getDate() + dayDifference)); let nextDayOfLottery = new Date(d.setDate(d.getDate() + dayDifference));
nextDayOfLottery = new Date(nextDayOfLottery.setHours(15)); nextDayOfLottery = new Date(nextDayOfLottery.setHours(__HOURS__));
nextDayOfLottery = new Date(nextDayOfLottery.setMinutes(0)); nextDayOfLottery = new Date(nextDayOfLottery.setMinutes(0));
nextDayOfLottery = new Date(nextDayOfLottery.setSeconds(0)); nextDayOfLottery = new Date(nextDayOfLottery.setSeconds(0));
this.nextLottery = nextDayOfLottery; this.nextLottery = nextDayOfLottery;

View File

@@ -70,13 +70,13 @@ export default {
}, },
initialize: function() { initialize: function() {
let d = new Date(); let d = new Date();
let dayOfLottery = 5; let dayOfLottery = __DATE__;
let dayDifference = (dayOfLottery + 7 - d.getDay()) % 7; let dayDifference = (dayOfLottery + 7 - d.getDay()) % 7;
if (dayDifference == 0) { if (dayDifference == 0) {
dayDifference = 7; dayDifference = 7;
} }
let nextDayOfLottery = new Date(d.setDate(d.getDate() + dayDifference)); let nextDayOfLottery = new Date(d.setDate(d.getDate() + dayDifference));
nextDayOfLottery = new Date(nextDayOfLottery.setHours(15)); nextDayOfLottery = new Date(nextDayOfLottery.setHours(__HOURS__));
nextDayOfLottery = new Date(nextDayOfLottery.setMinutes(0)); nextDayOfLottery = new Date(nextDayOfLottery.setMinutes(0));
nextDayOfLottery = new Date(nextDayOfLottery.setSeconds(0)); nextDayOfLottery = new Date(nextDayOfLottery.setSeconds(0));
this.nextLottery = nextDayOfLottery; this.nextLottery = nextDayOfLottery;

View File

@@ -1,7 +1,15 @@
<template> <template>
<div> <div>
<div class="vipps-container" :class="isMobile ? 'clickable': null" @click="openVipps"> <div
<img src="/public/assets/images/vipps-logo.svg" class="vipps-logo" alt="vipps logo" /> class="vipps-container"
:class="isMobile ? 'clickable' : null"
@click="openVipps"
>
<img
src="/public/assets/images/vipps-logo.svg"
class="vipps-logo"
alt="vipps logo"
/>
<span v-if="amount * 10 > 10"> <span v-if="amount * 10 > 10">
kr. kr.
<span class="big-money">{{ amount * 10 }},-</span> <span class="big-money">{{ amount * 10 }},-</span>
@@ -12,11 +20,15 @@
<span class="big-money">{{ amount * 10 }},-</span> <span class="big-money">{{ amount * 10 }},-</span>
pr. lodd pr. lodd
</span> </span>
<ing src="/public/assets/images/vipps-qr.png" class="qr-logo" v-if="qrFailed" /> <ing
src="/public/assets/images/vipps-qr.png"
class="qr-logo"
v-if="qrFailed"
/>
<canvas v-if="!qrFailed" ref="canvas" class="qr-logo"></canvas> <canvas v-if="!qrFailed" ref="canvas" class="qr-logo"></canvas>
<span class="phone-number">977 40 427</span> <span class="phone-number">{{ phone }}</span>
<span class="name">Kasper Rynning-Tønnesen</span> <span class="name">{{ name }}</span>
<span class="mark-with">Merk med: Vinlodd/🍾</span> <span class="mark-with">Merk med: {{ message }}</span>
</div> </div>
<p class="click-to-open-text" v-if="isMobile"> <p class="click-to-open-text" v-if="isMobile">
<i>Du kan også klikke QR-koden for å åpne i Vipps</i> <i>Du kan også klikke QR-koden for å åpne i Vipps</i>
@@ -37,7 +49,10 @@ export default {
data() { data() {
return { return {
qrImage: null, qrImage: null,
qrFailed: false qrFailed: false,
phone: __PHONE__,
name: __NAME__,
message: __MESSAGE__
}; };
}, },
watch: { watch: {
@@ -53,17 +68,27 @@ export default {
return this.isMobileFunction(); return this.isMobileFunction();
}, },
price: function() { price: function() {
return this.amount * 1000; return this.amount * (__PRICE * 100);
}, },
vippsUrlBasedOnUserAgent: function() { vippsUrlBasedOnUserAgent: function() {
console.log(this.phone, __PHONE__);
if (navigator.userAgent.includes("iPhone")) { if (navigator.userAgent.includes("iPhone")) {
return ( return (
"https://qr.vipps.no/28/2/01/031/4797740427?v=1&m=Vinlotteri%20🍾&a=" + "https://qr.vipps.no/28/2/01/031/47" +
this.phone +
"?v=1&m=" +
this.message +
"&a=" +
this.price this.price
); );
} }
return "https://qr.vipps.no/28/2/01/031/4797740427?v=1&m=Vinlotteri%20🍾"; return (
"https://qr.vipps.no/28/2/01/031/47" +
this.phone +
"?v=1&m=" +
this.message
);
} }
}, },
methods: { methods: {