From 0e74534cde4539ae0c007f241f20af5ab2ee9797 Mon Sep 17 00:00:00 2001
From: KevinMidboe <kevin.midboe@gmail.com>
Date: Sun, 11 Oct 2020 14:00:42 +0200
Subject: [PATCH 1/3] Removed unnecessary mongo connection string.

---
 api/lottery.js       | 5 -----
 api/retrieve.js      | 4 ----
 api/subscriptions.js | 5 -----
 api/update.js        | 4 ----
 4 files changed, 18 deletions(-)

diff --git a/api/lottery.js b/api/lottery.js
index 17d8e29..2a0145f 100644
--- a/api/lottery.js
+++ b/api/lottery.js
@@ -1,10 +1,5 @@
 const path = require('path');
 
-const mongoose = require('mongoose');
-mongoose.connect('mongodb://localhost:27017/vinlottis', {
-  useNewUrlParser: true
-})
-
 const Highscore = require(path.join(__dirname + '/../schemas/Highscore'));
 const Wine = require(path.join(__dirname + '/../schemas/Wine'));
 
diff --git a/api/retrieve.js b/api/retrieve.js
index 92bb2a6..d377c60 100644
--- a/api/retrieve.js
+++ b/api/retrieve.js
@@ -1,8 +1,4 @@
 const path = require("path");
-const mongoose = require("mongoose");
-mongoose.connect("mongodb://localhost:27017/vinlottis", {
-  useNewUrlParser: true
-});
 
 const Purchase = require(path.join(__dirname + "/../schemas/Purchase"));
 const Wine = require(path.join(__dirname + "/../schemas/Wine"));
diff --git a/api/subscriptions.js b/api/subscriptions.js
index 574280c..1d61a08 100644
--- a/api/subscriptions.js
+++ b/api/subscriptions.js
@@ -2,13 +2,8 @@ const express = require("express");
 const path = require("path");
 const router = express.Router();
 const webpush = require("web-push"); //requiring the web-push module
-const mongoose = require("mongoose");
 const schedule = require("node-schedule");
 
-mongoose.connect("mongodb://localhost:27017/vinlottis", {
-  useNewUrlParser: true
-});
-
 const mustBeAuthenticated = require(path.join(
   __dirname + "/../middleware/mustBeAuthenticated"
 ));
diff --git a/api/update.js b/api/update.js
index 59642dc..c3fa4d1 100644
--- a/api/update.js
+++ b/api/update.js
@@ -1,9 +1,5 @@
 const express = require("express");
 const path = require("path");
-const mongoose = require("mongoose");
-mongoose.connect("mongodb://localhost:27017/vinlottis", {
-  useNewUrlParser: true
-});
 
 const sub = require(path.join(__dirname + "/../api/subscriptions"));
 

From f2989d2534c13fa87f23391763907453de0dd5d6 Mon Sep 17 00:00:00 2001
From: KevinMidboe <kevin.midboe@gmail.com>
Date: Sun, 11 Oct 2020 18:14:43 +0200
Subject: [PATCH 2/3] Use api.js funcs over manual fetch.

---
 src/components/TodaysPage.vue | 4 ++--
 src/components/WinnerPage.vue | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/TodaysPage.vue b/src/components/TodaysPage.vue
index 0dfdf12..de81fc1 100644
--- a/src/components/TodaysPage.vue
+++ b/src/components/TodaysPage.vue
@@ -11,6 +11,7 @@
 
 <script>
 import { page, event } from "vue-analytics";
+import { prelottery } from "@/api";
 import Banner from "@/ui/Banner";
 import Wine from "@/ui/Wine";
 
@@ -25,8 +26,7 @@ export default {
     };
   },
   async mounted() {
-    const _wines = await fetch("/api/wines/prelottery");
-    this.wines = await _wines.json();
+    prelottery().then(wines => this.wines = wines);
   }
 };
 </script>
diff --git a/src/components/WinnerPage.vue b/src/components/WinnerPage.vue
index 434f9d7..c60472c 100644
--- a/src/components/WinnerPage.vue
+++ b/src/components/WinnerPage.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { getAmIWinner, postWineChosen } from "@/api";
+import { getAmIWinner, postWineChosen, prelottery } from "@/api";
 import Wine from "@/ui/Wine";
 export default {
   components: { Wine },
@@ -60,8 +60,7 @@ export default {
     }
     this.turn = true;
     this.name = winnerObject.name;
-    const _wines = await fetch("/api/wines/prelottery");
-    this.wines = await _wines.json();
+    this.wines = await prelottery();
   },
   methods: {
     chosenWine: async function(name) {

From 21904f4bb6399bf2da9f0cb71b452e17fe16f60a Mon Sep 17 00:00:00 2001
From: KevinMidboe <kevin.midboe@gmail.com>
Date: Sun, 11 Oct 2020 18:16:03 +0200
Subject: [PATCH 3/3] More global styling properties.

---
 src/styles/global.scss        | 59 +++++++++++++++++++++++++++++++++--
 src/styles/media-queries.scss |  3 +-
 src/styles/positioning.scss   | 23 ++++++++++++++
 src/styles/variables.scss     |  2 +-
 4 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/src/styles/global.scss b/src/styles/global.scss
index d4bbfce..e4e6f07 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -129,6 +129,15 @@ textarea {
   // disable-dbl-tap-zoom
   touch-action: manipulation;
 
+  &.auto-height {
+    height: auto;
+  }
+
+  &.danger {
+    background-color: $red;
+    color: white;
+  }
+
   &::after {
     content: "";
     position: absolute;
@@ -172,7 +181,14 @@ textarea {
   font-weight: bold;
   border-bottom: 1px solid $link-color;
   font-size: 1rem;
-  margin-left: 15px;
+  cursor: pointer;
+
+  text-decoration: none;
+  color: $matte-text-color;
+
+  &:focus, &:hover {
+    border-color: $link-color;
+  }
 }
 
 
@@ -180,8 +196,35 @@ textarea {
   &-md {
     margin-top: 3rem;
   }
+  &-sm {
+    margin-top: 1rem;
+  }
+  &-0 {
+    margin-top: 0;
+  }
+}
+.margin-left {
+  &-md {
+    margin-left: 3rem;
+  }
+  &-sm {
+    margin-left: 1rem;
+  }
+  &-0 {
+    margin-left: 0;
+  }
+}
+.margin-right {
+  &-md {
+    margin-right: 3rem;
+  }
+  &-sm {
+    margin-right: 1rem;
+  }
+  &-0 {
+    margin-right: 0;
+  }
 }
-
 .margin-bottom {
   &-md {
     margin-bottom: 3rem;
@@ -224,3 +267,15 @@ textarea {
     background-color: $light-red;
   }
 }
+
+.desktop-only {
+  @include mobile {
+    display: none;
+  }
+}
+
+.mobile-only {
+  @include desktop {
+    display: none;
+  }
+}
\ No newline at end of file
diff --git a/src/styles/media-queries.scss b/src/styles/media-queries.scss
index 2c41be8..8108453 100644
--- a/src/styles/media-queries.scss
+++ b/src/styles/media-queries.scss
@@ -1,6 +1,6 @@
 $mobile-width: 768px;
 $tablet-max: 1200px;
-$desktop-max: 1704;
+$desktop-max: 2004px;
 
 
 @mixin mobile {
@@ -15,7 +15,6 @@ $desktop-max: 1704;
   }
 }
 
-
 @mixin desktop {
   @media (min-width: #{$tablet-max + 1px}) {
     @content;
diff --git a/src/styles/positioning.scss b/src/styles/positioning.scss
index db9abcb..15e36e4 100644
--- a/src/styles/positioning.scss
+++ b/src/styles/positioning.scss
@@ -16,8 +16,31 @@
   &.justify-center {
     justify-content: center;
   }
+  &.justify-space-between {
+    justify-content: space-between;
+  }
+  &.justify-end {
+    justify-content: flex-end;
+  }
+  &.justify-start {
+    justify-content: flex-start;
+  }
 
   &.align-center {
     align-items: center;
   }
+}
+
+.inline-block {
+  display: inline-block;
+}
+
+.float {
+  &-left {
+    float: left;
+  }
+
+  &-right {
+    float: right;
+  }
 }
\ No newline at end of file
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 9886163..7529b3e 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -1,4 +1,4 @@
-$primary: #dbeede;
+$primary: #b7debd;
 
 $light-green: #c8f9df;
 $green: #0be881;