Merge branch 'master' of github.com:KevinMidboe/vinlottis

This commit is contained in:
Kasper Rynning-Tønnesen
2020-01-24 09:51:42 +01:00
17 changed files with 7598 additions and 1770 deletions

2662
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -21,7 +21,6 @@
"express": "^4.17.1",
"express-session": "^1.17.0",
"extract-text-webpack-plugin": "^3.0.2",
"favicon-emoji": "^2.3.0",
"moment": "^2.24.0",
"mongoose": "^5.8.7",
"node-fetch": "^2.6.0",
@@ -58,7 +57,7 @@
"vue-loader": "~15.6",
"vue-style-loader": "~4.1",
"vue-template-compiler": "~2.6",
"webpack": "~4.29",
"webpack": "~4.41.5",
"webpack-bundle-analyzer": "^3.6.0",
"webpack-cli": "~3.2",
"webpack-dev-server": "~3.1",

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
</browserconfig>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -0,0 +1,34 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="160.000000pt" height="160.000000pt" viewBox="0 0 160.000000 160.000000"
preserveAspectRatio="xMidYMid meet">
<metadata>
Created by potrace 1.11, written by Peter Selinger 2001-2013
</metadata>
<g transform="translate(0.000000,160.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M486 1574 c-25 -24 -21 -47 7 -39 31 10 41 21 34 39 -8 20 -21 20
-41 0z"/>
<path d="M199 1467 c-46 -35 -129 -131 -129 -149 0 -6 20 -30 44 -55 36 -36
49 -43 69 -38 28 7 70 -11 65 -27 -2 -6 -12 -12 -23 -14 -29 -4 -47 -45 -25
-59 17 -10 11 -25 -9 -25 -19 0 -61 -43 -61 -62 0 -5 10 -12 23 -17 25 -10 68
8 89 37 8 12 23 18 38 16 14 -1 30 -3 37 -3 7 -1 35 -21 62 -45 27 -24 55 -46
63 -48 10 -4 9 -9 -4 -25 -16 -17 -16 -21 -2 -41 8 -12 22 -22 31 -22 9 0 13
-3 10 -7 -11 -10 14 -33 37 -33 25 0 126 -98 150 -146 8 -18 32 -81 52 -140
60 -182 101 -250 213 -353 202 -188 207 -191 294 -170 107 25 251 148 307 263
36 73 42 103 26 140 -6 15 -72 87 -145 161 -156 156 -198 182 -397 246 -71 22
-147 51 -169 64 -50 30 -139 120 -131 133 3 6 -5 19 -19 30 -14 11 -25 25 -25
31 0 16 -48 25 -63 12 -10 -8 -18 -1 -35 32 -12 23 -30 56 -41 72 -35 58 -52
125 -53 212 -1 34 -6 54 -14 57 -21 8 -36 -31 -32 -79 2 -30 0 -41 -8 -34 -15
12 -34 -10 -34 -39 l0 -23 -30 21 c-28 20 -29 23 -16 48 13 24 11 28 -27 69
-22 24 -48 43 -58 43 -10 0 -37 -15 -60 -33z m271 -281 c0 -20 0 -20 -21 1
-15 14 -19 27 -15 40 7 17 8 17 22 -1 8 -11 14 -29 14 -40z m-105 -66 c3 -5
-3 -10 -14 -10 -12 0 -21 5 -21 10 0 6 6 10 14 10 8 0 18 -4 21 -10z"/>
<path d="M15 1115 c-17 -12 -18 -16 -6 -24 17 -11 63 7 58 23 -6 17 -31 18
-52 1z"/>
<path d="M281 854 c-21 -27 -19 -49 6 -58 24 -10 43 13 43 50 0 42 -20 45 -49
8z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@@ -0,0 +1,15 @@
{
"author": "Kasper Rynning-Tønnesen og Kevin Midbøe",
"name": "Vinlotteri Knowit",
"short_name": "Vinlottis",
"icons": [
{
"src": "/android-chrome-144x144.png",
"sizes": "144x144",
"type": "image/png"
}
],
"theme_color": "#daeedd",
"background_color": "#daeedd",
"display": "standalone"
}

View File

@@ -94,6 +94,10 @@ export default {
methods: {
generateColors: function(event, time) {
if (time == 5) {
if (this.numberOfBallots > 1 && new Set(this.colors).size == 1) {
alert('BINGO')
}
if (window.location.hostname == "localhost") {
return;
}

View File

@@ -116,7 +116,6 @@ export default {
}
.outer {
height: 100vh;
width: 100vw;
display: flex;
align-items: center;

View File

@@ -3,11 +3,13 @@
<head>
<title>Vinlottis</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link
rel="icon"
href="/public/assets/images/favicon.ico"
type="image/x-icon"
/>
<link rel="apple-touch-icon" sizes="152x152" href="/public/assets/images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/public/assets/images/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/public/assets/images/favicon-16x16.png">
<link rel="manifest" href="/public/assets/images/site.webmanifest">
<link rel="mask-icon" href="/public/assets/images/safari-pinned-tab.svg" color="#23101f">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
</head>
<body>
<div id="app"></div>

View File

@@ -86,7 +86,7 @@ export default {
maintainAspectRatio: false,
title: {
display: true,
text: "Antall vinn",
text: "Antall kjøpt",
fontSize: 20,
},
legend: {
@@ -134,10 +134,12 @@ export default {
.chart {
height: 40vh;
max-height: 364px;
@include mobile {
position: relative;
width: 90vw !important;
max-height: unset;
height: 50vh;
margin-bottom: 2rem;
}

View File

@@ -109,10 +109,12 @@ export default {
.chart {
height: 40vh;
max-height: 364px;
@include mobile {
position: relative;
width: 90vw !important;
max-height: unset;
height: 50vh;
margin-bottom: 2rem;
}

6622
yarn.lock Normal file

File diff suppressed because it is too large Load Diff