From 53728003787096f772d84129359df3da51aeb967 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 12 Nov 2019 19:40:56 +0000 Subject: [PATCH] --- ayanova/src/App.vue | 5 +++++ ayanova/src/api/gzdialog.js | 15 +++++++++++++-- ayanova/src/api/initialize.js | 3 ++- ayanova/src/api/locale.js | 1 + ayanova/src/components/gznotify.vue | 14 +++++++++----- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue index 47d40835..f5d963fe 100644 --- a/ayanova/src/App.vue +++ b/ayanova/src/App.vue @@ -156,6 +156,11 @@ export default { mounted() { this.$root.$gzconfirm = this.$refs.gzconfirm.open; this.$root.$gznotify = this.$refs.gznotify.addNotification; + + //weird bastardization thing + //basically I want to access $gz in vue components where I can't access Window + //this smells bad but it works + this.$root.$gz = window.$gz; //redirect to login if not authenticated if (!this.$store.state.authenticated) { diff --git a/ayanova/src/api/gzdialog.js b/ayanova/src/api/gzdialog.js index 04da6f51..7daa63c6 100644 --- a/ayanova/src/api/gzdialog.js +++ b/ayanova/src/api/gzdialog.js @@ -18,19 +18,30 @@ export default { /////////// //ERROR window.$gz.eventBus.$on("notify-error", function handleNotifyWarn(msg) { + window.$gz.store.commit("logItem", "notify-error: " + msg); vm.$root.$gznotify({ message: msg, type: "error", timeout: 5000 }); }); /////////// //WARNING window.$gz.eventBus.$on("notify-warning", function handleNotifyWarn(msg) { + window.$gz.store.commit("logItem", "notify-warning: " + msg); vm.$root.$gznotify({ message: msg, type: "warning", timeout: 4000 }); }); /////////// //INFO - window.$gz.eventBus.$on("notify-info", function handleNotifyWarn(msg) { - vm.$root.$gznotify({ message: msg, type: "info", timeout: 3000 }); + window.$gz.eventBus.$on("notify-info", function handleNotifyWarn( + msg, + helpUrl + ) { + window.$gz.store.commit("logItem", "notify-info: " + msg); + vm.$root.$gznotify({ + message: msg, + type: "info", + timeout: 3000, + helpUrl: helpUrl + }); }); /////////// diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index b3c3451f..4e10098f 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -151,7 +151,8 @@ export default function initialize() { "Time zone offset for your account is set to " + res.data.timeZoneOffset + " which doesn't match the local timezone offset of " + - localOffset + localOffset, + window.$gz.store.state.helpUrl + "intro/#searching" ); } diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js index 9e715c24..9c6a799b 100644 --- a/ayanova/src/api/locale.js +++ b/ayanova/src/api/locale.js @@ -56,6 +56,7 @@ export default { "Operations", "HelpAboutAyaNova", "MenuHelp", + "More", "Logout", //form required options "Active", diff --git a/ayanova/src/components/gznotify.vue b/ayanova/src/components/gznotify.vue index b6e0bbf0..c55c0d5f 100644 --- a/ayanova/src/components/gznotify.vue +++ b/ayanova/src/components/gznotify.vue @@ -3,14 +3,14 @@ {{ currentNotification.message }} - + + {{ this.$root.$gz.locale.get("More") }} +