From 11b988ba19a0f9365c5a96a5930b92d48166bd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Fri, 22 Jan 2021 12:17:04 +0100 Subject: [PATCH 1/6] Added salgsbetingelser page. --- src/components/Salgsbetingelser.vue | 207 ++++++++++++++++++++++++++++ src/router.js | 6 + 2 files changed, 213 insertions(+) create mode 100644 src/components/Salgsbetingelser.vue diff --git a/src/components/Salgsbetingelser.vue b/src/components/Salgsbetingelser.vue new file mode 100644 index 0000000..fd2d8de --- /dev/null +++ b/src/components/Salgsbetingelser.vue @@ -0,0 +1,207 @@ + + + \ No newline at end of file diff --git a/src/router.js b/src/router.js index deea0ba..f5f544c 100644 --- a/src/router.js +++ b/src/router.js @@ -13,6 +13,7 @@ import LotteryPage from "@/components/LotteryPage"; import HistoryPage from "@/components/HistoryPage"; import HighscorePage from "@/components/HighscorePage"; import PersonalHighscorePage from "@/components/PersonalHighscorePage"; +import Salgsbetingelser from "@/components/Salgsbetingelser"; import RequestWine from "@/components/RequestWine"; import AllRequestedWines from "@/components/AllRequestedWines"; @@ -90,6 +91,11 @@ const routes = [ path: "/requested-wines", name: "Etterspurte vin", component: AllRequestedWines + }, + { + path: "/salgsbetingelser", + name: "Salgsbetingelser", + component: Salgsbetingelser } ]; From 3ed0ce7dac1d4d0193b41235430931106945034e Mon Sep 17 00:00:00 2001 From: Adrian Thompson Date: Fri, 22 Jan 2021 12:24:14 +0100 Subject: [PATCH 2/6] add grid --- src/components/TodaysPage.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/TodaysPage.vue b/src/components/TodaysPage.vue index 4cca96b..cce4bc1 100644 --- a/src/components/TodaysPage.vue +++ b/src/components/TodaysPage.vue @@ -43,10 +43,10 @@ h1 { } .wines-container { - display: flex; - flex-wrap: wrap; - justify-content: space-evenly; - margin: 0 2rem; + display: grid; + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + grid-gap: 2rem; + gap: 2rem; @media (min-width: 1500px) { max-width: 1500px; From bfa13892d54cd10cd6ff31d8c55fe0dd66078007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Fri, 22 Jan 2021 12:33:13 +0100 Subject: [PATCH 3/6] Renamed salgsbetingelser to SalgsbetingelserPage. --- .../components/{Salgsbetingelser.vue => SalgsbetingelserPage.vue} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename frontend/components/{Salgsbetingelser.vue => SalgsbetingelserPage.vue} (100%) diff --git a/frontend/components/Salgsbetingelser.vue b/frontend/components/SalgsbetingelserPage.vue similarity index 100% rename from frontend/components/Salgsbetingelser.vue rename to frontend/components/SalgsbetingelserPage.vue From 8d320e73c068fc99f4807fdf1bf1108ce9324dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Fri, 22 Jan 2021 12:33:23 +0100 Subject: [PATCH 4/6] Router gets salgsbetingelser. --- frontend/router.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frontend/router.js b/frontend/router.js index beaa308..a9d6231 100644 --- a/frontend/router.js +++ b/frontend/router.js @@ -20,6 +20,9 @@ const HistoryPage = () => import( const WinnerPage = () => import( /* webpackChunkName: "sub-pages" */ "@/components/WinnerPage"); +const SalgsbetingelserPage = () => import( + /* webpackChunkName: "sub-pages" */ + "@/components/SalgsbetingelserPage"); const LoginPage = () => import( /* webpackChunkName: "user" */ @@ -118,6 +121,11 @@ const routes = [ path: "/requested-wines", name: "Etterspurte vin", component: AllRequestedWines + }, + { + path: "/salgsbetingelser", + name: "Salgsbetingelser", + component: SalgsbetingelserPage } ]; From 872f1f5fa3beea31e323ea3ffd62781c24e7fb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Fri, 22 Jan 2021 12:40:18 +0100 Subject: [PATCH 5/6] Nicer styling of salgsbetingelser. --- frontend/components/SalgsbetingelserPage.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/components/SalgsbetingelserPage.vue b/frontend/components/SalgsbetingelserPage.vue index fd2d8de..9597b72 100644 --- a/frontend/components/SalgsbetingelserPage.vue +++ b/frontend/components/SalgsbetingelserPage.vue @@ -199,9 +199,9 @@ .container { margin: 3rem; + display: flex; + flex-direction: column; + justify-self: center; + width: 80%; } - -a { - -} - \ No newline at end of file + From 93854bc13158ec62682b9b6b5bfadd8b2bcdc8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Fri, 22 Jan 2021 12:40:36 +0100 Subject: [PATCH 6/6] Updated text. --- frontend/components/SalgsbetingelserPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/components/SalgsbetingelserPage.vue b/frontend/components/SalgsbetingelserPage.vue index 9597b72..222e275 100644 --- a/frontend/components/SalgsbetingelserPage.vue +++ b/frontend/components/SalgsbetingelserPage.vue @@ -25,7 +25,7 @@

2. Partene

-

Selger er KEVIN MIDBØE, Schleppegrells gate 18, questions@vinlottis.no/kevin.midboe@gmail.com, 926432478, og betegnes i det følgende som selger/selgeren.

+

Selger er Kevin Midbøe, Schleppegrells gate 18, questions@vinlottis.no/kevin.midboe@gmail.com, 926432478, og betegnes i det følgende som selger/selgeren.

Kjøper er den forbrukeren som foretar bestillingen, og betegnes i det følgende som kjøper/kjøperen.