From 21a4beb88b0a8489e767e2df97689b6cd4e0f0c3 Mon Sep 17 00:00:00 2001 From: Bastian Kemmer Date: Fri, 11 Sep 2020 14:40:19 +0200 Subject: [PATCH 1/4] add options for toasted library --- package.json | 1 + pages/parken.vue | 2 +- plugins/vue-toasted.js | 6 +++++- yarn.lock | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3963397..299044a 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "js-cookie": "2.2.1", "js-sha1": "0.6.0", "ky-universal": "0.8.1", + "material-design-icons": "^3.0.1", "nuxt": "^2.12.2", "redirect-ssl": "^2.0.0", "reqlim": "0.0.0", diff --git a/pages/parken.vue b/pages/parken.vue index 4358162..6092598 100644 --- a/pages/parken.vue +++ b/pages/parken.vue @@ -210,7 +210,7 @@ map.panTo(userPos); }); }, (error) => { - switch(error.code) { + switch (error.code) { case 1: return this.$toasted.show("Bitte gib uns die Erlaubnis auf deine GPS-Daten zuzugreifen."); default: diff --git a/plugins/vue-toasted.js b/plugins/vue-toasted.js index 1331f4f..1c1b680 100644 --- a/plugins/vue-toasted.js +++ b/plugins/vue-toasted.js @@ -2,6 +2,10 @@ import Vue from "vue" import Toasted from "vue-toasted" Vue.use(Toasted, { + iconPack: "material", + theme: "toasted-primary", duration: 3000, - Icon: "warning" + icon: { + name: "warning" + } }); diff --git a/yarn.lock b/yarn.lock index d156784..54f0139 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5583,6 +5583,11 @@ marker-clusterer-plus@^2.1.4: resolved "https://registry.yarnpkg.com/marker-clusterer-plus/-/marker-clusterer-plus-2.1.4.tgz#f8eff74d599dab3b7d0e3fed5264ea0e704f5d67" integrity sha1-+O/3TVmdqzt9Dj/tUmTqDnBPXWc= +material-design-icons@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf" + integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78= + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" From adc4ba10eb0cd049e46544ad01133757ce612b96 Mon Sep 17 00:00:00 2001 From: Bastian Kemmer Date: Fri, 11 Sep 2020 14:44:06 +0200 Subject: [PATCH 2/4] use error codes --- pages/parken.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pages/parken.vue b/pages/parken.vue index 6092598..88b3323 100644 --- a/pages/parken.vue +++ b/pages/parken.vue @@ -211,8 +211,10 @@ }); }, (error) => { switch (error.code) { - case 1: + case error.PERMISSION_DENIED: return this.$toasted.show("Bitte gib uns die Erlaubnis auf deine GPS-Daten zuzugreifen."); + case error.POSITION_UNAVAILABLE: + return this.$toasted.show("Leider konnten wir deine Koordinaten nicht abrufen."); default: return this.$toasted.show(`Ein unerwarteter Fehler ist aufgetreten. (Fehlercode: ${error.code})`); } From 760cab20468ab083a5a254c9e5c917d9863f6ad4 Mon Sep 17 00:00:00 2001 From: Bastian Kemmer Date: Fri, 11 Sep 2020 14:46:35 +0200 Subject: [PATCH 3/4] material icons didnt work --- package.json | 2 +- plugins/vue-toasted.js | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d5d7518..299044a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "Nuxt.js Team", "private": true, "scripts": { - "dev": "MINIMAL=1 CSB=1 nuxt", + "dev": "MINIMAL=1 CSB=1 HOST=0.0.0.0 nuxt", "build": "nuxt build", "start": "nuxt start", "generate": "nuxt generate", diff --git a/plugins/vue-toasted.js b/plugins/vue-toasted.js index 1c1b680..7b3357f 100644 --- a/plugins/vue-toasted.js +++ b/plugins/vue-toasted.js @@ -2,10 +2,6 @@ import Vue from "vue" import Toasted from "vue-toasted" Vue.use(Toasted, { - iconPack: "material", theme: "toasted-primary", - duration: 3000, - icon: { - name: "warning" - } + duration: 3000 }); From 84ae7f078f4564da3d72e46be2904aeeaffdfd2b Mon Sep 17 00:00:00 2001 From: Bastian Kemmer Date: Fri, 11 Sep 2020 14:47:07 +0200 Subject: [PATCH 4/4] error code is unnecessary --- pages/parken.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/parken.vue b/pages/parken.vue index 88b3323..041d403 100644 --- a/pages/parken.vue +++ b/pages/parken.vue @@ -216,7 +216,7 @@ case error.POSITION_UNAVAILABLE: return this.$toasted.show("Leider konnten wir deine Koordinaten nicht abrufen."); default: - return this.$toasted.show(`Ein unerwarteter Fehler ist aufgetreten. (Fehlercode: ${error.code})`); + return this.$toasted.show(`Ein unerwarteter Fehler ist aufgetreten.`); } }); } else {