From 4bae27c328edf488057c691b130b0e7d1387ee2f Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 28 Oct 2021 14:17:04 -0500 Subject: [PATCH 1/6] fix(test): temporary candy test --- test/common/ops/buy/purchase.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common/ops/buy/purchase.js b/test/common/ops/buy/purchase.js index f2d47c1420..6ba9b3f08b 100644 --- a/test/common/ops/buy/purchase.js +++ b/test/common/ops/buy/purchase.js @@ -13,7 +13,7 @@ import { } from '../../../helpers/common.helper'; describe('shared.ops.purchase', () => { - const SEASONAL_FOOD = 'Meat'; + const SEASONAL_FOOD = 'Candy-Base'; let user; const goldPoints = 40; const analytics = { track () {} }; From 877f16fd8821d9977f99a0a1fa060568f184630f Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 28 Oct 2021 14:39:09 -0500 Subject: [PATCH 2/6] chore(package): update caniuse-lite --- package-lock.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index fa5005c26b..f1731cef66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3340,11 +3340,6 @@ "node-releases": "^1.1.71" }, "dependencies": { - "caniuse-lite": { - "version": "1.0.30001228", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz", - "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==" - }, "colorette": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", @@ -3514,9 +3509,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001270", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001270.tgz", - "integrity": "sha512-TcIC7AyNWXhcOmv2KftOl1ShFAaHQYcB/EPL/hEyMrcS7ZX0/DvV1aoy6BzV0+16wTpoAyTMGDNAJfSqS/rz7A==" + "version": "1.0.30001272", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001272.tgz", + "integrity": "sha512-DV1j9Oot5dydyH1v28g25KoVm7l8MTxazwuiH3utWiAS6iL/9Nh//TGwqFEeqqN8nnWYQ8HHhUq+o4QPt9kvYw==" }, "caseless": { "version": "0.12.0", From 353b5a6dcb37d042ce7492fcf720c6080df03e21 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 28 Oct 2021 15:26:13 -0500 Subject: [PATCH 3/6] fix(test): underscore >.< --- test/common/ops/buy/purchase.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common/ops/buy/purchase.js b/test/common/ops/buy/purchase.js index 6ba9b3f08b..b4702ff20f 100644 --- a/test/common/ops/buy/purchase.js +++ b/test/common/ops/buy/purchase.js @@ -13,7 +13,7 @@ import { } from '../../../helpers/common.helper'; describe('shared.ops.purchase', () => { - const SEASONAL_FOOD = 'Candy-Base'; + const SEASONAL_FOOD = 'Candy_Base'; let user; const goldPoints = 40; const analytics = { track () {} }; From 0d6e34c6460a971dc0de2a577968d2bc5487572d Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 29 Oct 2021 11:08:46 -0500 Subject: [PATCH 4/6] fix(analytics): don't record task events as "click" --- website/client/src/mixins/scoreTask.js | 2 +- website/client/src/store/actions/tasks.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/client/src/mixins/scoreTask.js b/website/client/src/mixins/scoreTask.js index 510e9242a7..91cf72ea4d 100644 --- a/website/client/src/mixins/scoreTask.js +++ b/website/client/src/mixins/scoreTask.js @@ -76,7 +76,7 @@ export default { if (!tasksScoredCount || tasksScoredCount < 2) { Analytics.track({ eventName: 'task scored', - eventAction: 'click', + eventAction: 'task scored', eventCategory: 'behavior', hitType: 'event', uuid: user._id, diff --git a/website/client/src/store/actions/tasks.js b/website/client/src/store/actions/tasks.js index c7e381f2e4..863f137578 100644 --- a/website/client/src/store/actions/tasks.js +++ b/website/client/src/store/actions/tasks.js @@ -115,7 +115,7 @@ export async function create (store, createdTask) { const uuid = store.state.user.data._id; Analytics.track({ eventName: 'task created', - eventAction: 'click', + eventAction: 'task created', eventCategory: 'behavior', hitType: 'event', uuid, From e475ebf65c06f07363c242a8b651239ff357addb Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 1 Nov 2021 13:58:46 -0500 Subject: [PATCH 5/6] fix(home): remove FB signup, fix app footer outside of user context --- test/common/ops/buy/purchase.js | 2 +- .../components/auth/registerLoginReset.vue | 29 ++++--------------- website/client/src/components/static/home.vue | 10 ------- website/client/src/mixins/reportBug.js | 3 ++ 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/test/common/ops/buy/purchase.js b/test/common/ops/buy/purchase.js index b4702ff20f..a2759deac1 100644 --- a/test/common/ops/buy/purchase.js +++ b/test/common/ops/buy/purchase.js @@ -13,7 +13,7 @@ import { } from '../../../helpers/common.helper'; describe('shared.ops.purchase', () => { - const SEASONAL_FOOD = 'Candy_Base'; + const SEASONAL_FOOD = moment().isBefore('2021-11-02T20:00-04:00') ? 'Candy_Base' : 'Meat'; let user; const goldPoints = 40; const analytics = { track () {} }; diff --git a/website/client/src/components/auth/registerLoginReset.vue b/website/client/src/components/auth/registerLoginReset.vue index d15dc690cd..3ca84f7b8d 100644 --- a/website/client/src/components/auth/registerLoginReset.vue +++ b/website/client/src/components/auth/registerLoginReset.vue @@ -1,21 +1,5 @@