From 654b3b6dc736afc86eb849d7abcc0393d433695a Mon Sep 17 00:00:00 2001 From: GalvinGao Date: Thu, 23 Apr 2020 13:45:22 -0400 Subject: [PATCH 1/4] fix(i18n): fix i18n in pwapopup --- src/components/global/PWAPopups.vue | 6 ------ src/main.js | 3 --- 2 files changed, 9 deletions(-) diff --git a/src/components/global/PWAPopups.vue b/src/components/global/PWAPopups.vue index 7702bcbf..4dc168bd 100644 --- a/src/components/global/PWAPopups.vue +++ b/src/components/global/PWAPopups.vue @@ -11,12 +11,6 @@ "refresh": "Refresh", "success": "Website Updated!" } - }, - "en": { - "update": { - "refresh": "새로고침", - "success": "업데이트 완료!" - } } } diff --git a/src/main.js b/src/main.js index 012a4f6b..24be1c3f 100644 --- a/src/main.js +++ b/src/main.js @@ -119,9 +119,6 @@ Vue.use(VueAnalytics, { enabled: true, // enable/disable amount: 5, // amount of events fired delay: 2000 // delay in milliseconds - }, - autoTracking: { - screenview: true } }); From deeba605265c0a462591765ee1e861fc6d0a40fa Mon Sep 17 00:00:00 2001 From: casual Date: Thu, 23 Apr 2020 23:44:38 +0200 Subject: [PATCH 2/4] feat(planner): Change foreignServer option to also exclude DM event Updating foreignServer option every time new maps are released on CN looks like a quick win to give Global and JP players a feasible plan. Only English text is updated. fixes #283 --- src/utils/marshaller.js | 4 +++- src/views/Planner.vue | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/utils/marshaller.js b/src/utils/marshaller.js index 9b664716..67ce579e 100644 --- a/src/utils/marshaller.js +++ b/src/utils/marshaller.js @@ -17,7 +17,9 @@ export default { body.exp_demand = options.requireExp; body.gold_demand = options.requireLmb; if (options.foreignServer) { - body["exclude"] = ["6-1","6-10","6-11","6-12","6-14","6-15","6-16","6-2","6-3","6-4","6-5","6-8","6-9","S6-1","S6-2","S6-3","S6-4"] + body["exclude"] = ["6-1","6-10","6-11","6-12","6-14","6-15","6-16","6-2","6-3","6-4","6-5","6-8","6-9","S6-1","S6-2","S6-3","S6-4", + "DM-1","DM-2","DM-3","DM-4","DM-5","DM-6","DM-7","DM-8" + ] } return body diff --git a/src/views/Planner.vue b/src/views/Planner.vue index a5aea674..1223828e 100644 --- a/src/views/Planner.vue +++ b/src/views/Planner.vue @@ -39,7 +39,7 @@ "byProduct": "Consider by-products", "requireExp": "Large demand for EXP", "requireLmb": "Large demand for LMD", - "foreignServer": "Do not add Chapter 6 into calculation" + "foreignServer": "Do not suggest CN-only stages" }, "actions": { "import": "Import", From 1b00133d79b75bfc03be81edb23b6a8cc5686cdb Mon Sep 17 00:00:00 2001 From: GalvinGao Date: Thu, 23 Apr 2020 18:02:46 -0400 Subject: [PATCH 3/4] fix(i18n): fix i18n in planner --- src/views/About/Changelog.vue | 10 +++++++++- src/views/Planner.vue | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/About/Changelog.vue b/src/views/About/Changelog.vue index 7de50c70..978c948f 100644 --- a/src/views/About/Changelog.vue +++ b/src/views/About/Changelog.vue @@ -99,6 +99,15 @@ export default { }, { active: true, + version: "v1.1.10", + date: "2020-04-23T06:00:00Z", + changes: [ + "添加：于 Planner 内添加更多外服排除关卡 (DM-* 关卡)", + "修复：Google Analytics Screenview Tracking 问题", + "修复：网站升级提示于 en 语言时出现 ko 语言下的提示信息", + ] + }, + { version: "v1.1.9", date: "2020-04-23T06:00:00Z", changes: [ @@ -106,7 +115,6 @@ export default { ] }, { - active: true, version: "v1.1.8", date: "2020-04-23T08:00:00Z", changes: [ diff --git a/src/views/Planner.vue b/src/views/Planner.vue index 1223828e..3fac4cd2 100644 --- a/src/views/Planner.vue +++ b/src/views/Planner.vue @@ -6,7 +6,7 @@ "byProduct": "考虑合成副产物", "requireExp": "大量需求经验", "requireLmb": "大量需求龙门币", - "foreignServer": "不考虑第六章" + "foreignServer": "排除仅国服出现的关卡" }, "actions": { "import": "导入", From b99d588ef8f52a64757476938ce14a9b95ede70c Mon Sep 17 00:00:00 2001 From: GalvinGao Date: Thu, 23 Apr 2020 18:19:43 -0400 Subject: [PATCH 4/4] fix(ga): fix google analytics not recording item events --- src/mixins/hooks/Analytics.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mixins/hooks/Analytics.js b/src/mixins/hooks/Analytics.js index e64c5499..b43ec896 100644 --- a/src/mixins/hooks/Analytics.js +++ b/src/mixins/hooks/Analytics.js @@ -1,4 +1,5 @@ import config from "@/config"; +import Console from "@/utils/Console"; export default { watch: { @@ -17,9 +18,10 @@ export default { methods: { logRouteEvent (newValue) { if (newValue.name === "StatsByStage_Selected") { - // Console.log(this.$store.state.dataSource, newValue.params.stageId); + Console.info("Analytics", "fetched stage", this.$store.getters['dataSource/source'], newValue.params.stageId); this.$ga.event('result', 'fetch_' + this.$store.getters['dataSource/source'], newValue.params.stageId, 1) - } else if (newValue.name === "StatsByItem_Selected") { + } else if (newValue.name === "StatsByItem_SelectedItem") { + Console.info("Analytics", "fetched item", this.$store.getters['dataSource/source'], newValue.params.stageId); this.$ga.event('result', 'fetch_' + this.$store.getters['dataSource/source'], newValue.params.itemId, 1) } },