From 5689a70a1989c5ae9ead7f8e3d7663328450b746 Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Tue, 14 Jan 2025 13:28:05 -0500 Subject: [PATCH 01/16] feat: add privacy choices link and icon to footer --- es-vue-base/src/lib-components/EsFooter.vue | 37 ++++++- .../src/lib-icons/icon-ccpa-opt-out.vue | 102 ++++++++++++++++++ es-vue-base/src/lib-icons/index.js | 1 + es-vue-base/src/lib-utils/footer-content.js | 1 + 4 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue diff --git a/es-vue-base/src/lib-components/EsFooter.vue b/es-vue-base/src/lib-components/EsFooter.vue index 2b26e3272..877f11383 100644 --- a/es-vue-base/src/lib-components/EsFooter.vue +++ b/es-vue-base/src/lib-components/EsFooter.vue @@ -85,16 +85,26 @@
-
+
+ class="col col-6 col-lg-auto"> + class="text-reset font-weight-normal font-size-75 font-size-md-50 font-weight-md-normal mt-25 mb-50 pr-lg-300"> {{ link.text }} +
+ + + {{ link.text }} + +
@@ -155,5 +165,26 @@ export default { return this.content.copyrightText.replace('{currentYear}', new Date().getFullYear()); }, }, + mounted() { + // TODO: update with GTM tag in prod once we've gone live + // See https://tagmanager.google.com/#/container/accounts/2920232696/containers/8806152/workspaces/126/tags + // for GTM script that triggers this event. + window.addEventListener('OneTrustLoadedCb', () => { + window.OneTrust.OnConsentChanged(() => { + // OneTrust modal should modify cookie values, a hard-refresh will + // trigger re-loading GTM with updated cookie values, which in turn + // will only fire tags aligned with new preferences + window.location.reload(); + return false; + }); + document.querySelectorAll('.toggle-info-display').forEach((elem) => { + // Function closure to ensure event only fires on one elem + elem.addEventListener('click', (e) => { + e.stopImmediatePropagation(); + window.OneTrust.ToggleInfoDisplay(); + }); + }); + }); + }, }; diff --git a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue new file mode 100644 index 000000000..15f720fca --- /dev/null +++ b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/es-vue-base/src/lib-icons/index.js b/es-vue-base/src/lib-icons/index.js index f82953120..fd66bd93b 100644 --- a/es-vue-base/src/lib-icons/index.js +++ b/es-vue-base/src/lib-icons/index.js @@ -85,6 +85,7 @@ export { default as IconUpload } from './icon-upload.vue'; export { default as IconVideoPlay } from './icon-video-play.vue'; export { default as IconBank } from './icon-bank.vue'; export { default as IconCreditCard } from './icon-credit-card.vue'; +export { default as IconCcpaOptOut } from './icon-ccpa-opt-out.vue'; // marketing icons export { default as IconBattery } from './icon-battery.vue'; diff --git a/es-vue-base/src/lib-utils/footer-content.js b/es-vue-base/src/lib-utils/footer-content.js index 9c35e42eb..65b68e5d8 100644 --- a/es-vue-base/src/lib-utils/footer-content.js +++ b/es-vue-base/src/lib-utils/footer-content.js @@ -74,6 +74,7 @@ export default ( { text: 'Privacy policy', url: `${ES_DOMAIN}/privacy-policy/` }, { text: 'Mobile terms of use', url: `${ES_DOMAIN}/mobile-terms-of-use/` }, { text: 'Non-discrimination policy', url: `${ES_DOMAIN}/nondiscrimination/` }, + { text: 'Your privacy choices' }, ], copyrightText: '© Copyright 2009-{currentYear} EnergySage, Inc. All rights reserved.', trademarkText: `ENERGYSAGE is a registered trademark and the EnergySage logo is a trademark of EnergySage, Inc. From 69266b50f8aaf6ca946499dab176a3770a9aa381 Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Tue, 14 Jan 2025 13:42:50 -0500 Subject: [PATCH 02/16] chore: clean up styles --- .../src/lib-icons/icon-ccpa-opt-out.vue | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue index 15f720fca..eb0fbbbe3 100644 --- a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue +++ b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue @@ -83,20 +83,16 @@ export default { From 0cb513aff35061ee10d1c3ed9b4cc41e55835db8 Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Tue, 14 Jan 2025 14:00:28 -0500 Subject: [PATCH 03/16] chore: update tests --- .../tests/__snapshots__/EsFooter.spec.js.snap | 20 +++++++++----- .../tests/__snapshots__/icons.spec.js.snap | 27 +++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap b/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap index b0affe448..6a381e2d4 100644 --- a/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap +++ b/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap @@ -153,22 +153,30 @@ exports[`EsFooter 1`] = ` Other trademarks are the property of either EnergySage, Inc. or our licensors and are used with permission.

- © Copyright 2009-2024 EnergySage, Inc. All rights reserved. + © Copyright 2009-2025 EnergySage, Inc. All rights reserved.

-
-
+
+
Terms of use
-
+
Privacy policy
-
+
Mobile terms of use
-
+
Non-discrimination policy
+
+
+ + + Your privacy choices + +
+
diff --git a/es-vue-base/tests/__snapshots__/icons.spec.js.snap b/es-vue-base/tests/__snapshots__/icons.spec.js.snap index f7b90d3fe..fbb6e1f7b 100644 --- a/es-vue-base/tests/__snapshots__/icons.spec.js.snap +++ b/es-vue-base/tests/__snapshots__/icons.spec.js.snap @@ -107,6 +107,33 @@ exports[`icons IconCart renders correctly 1`] = ` " `; +exports[`icons IconCcpaOptOut renders correctly 1`] = ` +" + + + + + + + + + + + + + + + + + + +" +`; + exports[`icons IconChatAdd renders correctly 1`] = ` " From a33e09cffd73a7ad311a4139c6384fdd5cff888b Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Thu, 16 Jan 2025 13:05:05 -0500 Subject: [PATCH 04/16] fix: use aria-label --- es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue index eb0fbbbe3..54b437ff3 100644 --- a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue +++ b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue @@ -5,7 +5,7 @@ height: height, width: width, }" - aria-labelledby="California Consumer Privacy Act (CCPA) Opt-Out Icon" + aria-label="California Consumer Privacy Act (CCPA) Opt-Out Icon" role="img" version="1.1" xmlns="http://www.w3.org/2000/svg" From 6198421dc17ed8d69920467450e21b63587c6c91 Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Thu, 16 Jan 2025 13:14:09 -0500 Subject: [PATCH 05/16] chore: update tests --- es-vue-base/tests/__snapshots__/icons.spec.js.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-vue-base/tests/__snapshots__/icons.spec.js.snap b/es-vue-base/tests/__snapshots__/icons.spec.js.snap index fbb6e1f7b..2df489351 100644 --- a/es-vue-base/tests/__snapshots__/icons.spec.js.snap +++ b/es-vue-base/tests/__snapshots__/icons.spec.js.snap @@ -108,7 +108,7 @@ exports[`icons IconCart renders correctly 1`] = ` `; exports[`icons IconCcpaOptOut renders correctly 1`] = ` -" +" From af956dae2b80247d36a39520f164a57281fbe0e8 Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Thu, 16 Jan 2025 13:28:24 -0500 Subject: [PATCH 06/16] refactor: clean up svg --- .../src/lib-icons/icon-ccpa-opt-out.vue | 87 +++++-------------- 1 file changed, 24 insertions(+), 63 deletions(-) diff --git a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue index 54b437ff3..5837d9306 100644 --- a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue +++ b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue @@ -1,59 +1,35 @@ @@ -81,18 +57,3 @@ export default { }, }; - - From 9a8ab232045789632676762be22c004ad93423e9 Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Thu, 16 Jan 2025 13:30:23 -0500 Subject: [PATCH 07/16] fix: add accessibility props back in --- es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue index 5837d9306..48e1b9682 100644 --- a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue +++ b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue @@ -7,6 +7,8 @@ height: height, width: width, }" + aria-label="California Consumer Privacy Act (CCPA) Opt-Out Icon" + role="img" x="0" y="0" version="1.1" From 3661449b1ffd87069f5b2480e14ed7d7395a2dcb Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Thu, 16 Jan 2025 13:42:38 -0500 Subject: [PATCH 08/16] fix: update width to 30px --- es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue index 48e1b9682..cd28e3440 100644 --- a/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue +++ b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue @@ -45,7 +45,7 @@ export default { */ width: { type: String, - default: '29px', + default: '30px', required: false, }, /** From 78f07317034a6ccb4bf60de919e1b63f5a4171ad Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Thu, 16 Jan 2025 13:43:55 -0500 Subject: [PATCH 09/16] chore: update tests --- .../tests/__snapshots__/icons.spec.js.snap | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/es-vue-base/tests/__snapshots__/icons.spec.js.snap b/es-vue-base/tests/__snapshots__/icons.spec.js.snap index 2df489351..576c249ab 100644 --- a/es-vue-base/tests/__snapshots__/icons.spec.js.snap +++ b/es-vue-base/tests/__snapshots__/icons.spec.js.snap @@ -108,28 +108,12 @@ exports[`icons IconCart renders correctly 1`] = ` `; exports[`icons IconCcpaOptOut renders correctly 1`] = ` -" - - - - - - - - - - - - - - - - - +" + + + + + " `; From 9222576387376164a6b5c0216c56b4939863237d Mon Sep 17 00:00:00 2001 From: Tommy Date: Thu, 16 Jan 2025 14:15:08 -0500 Subject: [PATCH 10/16] v2.2.4-alpha.0 --- es-design-system/package-lock.json | 6 +++--- es-design-system/package.json | 4 ++-- es-vue-base/package-lock.json | 4 ++-- es-vue-base/package.json | 2 +- lerna.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es-design-system/package-lock.json b/es-design-system/package-lock.json index 545ce33c6..70c9fa26d 100644 --- a/es-design-system/package-lock.json +++ b/es-design-system/package-lock.json @@ -1,15 +1,15 @@ { "name": "es-design-system", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "es-design-system", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "dependencies": { "@energysage/es-bs-base": "^2.2.3", - "@energysage/es-vue-base": "^2.2.3", + "@energysage/es-vue-base": "^2.2.4-alpha.0", "@nuxtjs/axios": "^5.13.6", "@nuxtjs/i18n": "^7.3.1", "bootstrap-vue": "^2.23.1", diff --git a/es-design-system/package.json b/es-design-system/package.json index af2474f41..91c7dc75d 100644 --- a/es-design-system/package.json +++ b/es-design-system/package.json @@ -1,6 +1,6 @@ { "name": "es-design-system", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "private": true, "scripts": { "dev": "nuxt", @@ -18,7 +18,7 @@ "prettier": "eslint-config-energysage/prettier", "dependencies": { "@energysage/es-bs-base": "^2.2.3", - "@energysage/es-vue-base": "^2.2.3", + "@energysage/es-vue-base": "^2.2.4-alpha.0", "@nuxtjs/axios": "^5.13.6", "@nuxtjs/i18n": "^7.3.1", "bootstrap-vue": "^2.23.1", diff --git a/es-vue-base/package-lock.json b/es-vue-base/package-lock.json index 0bea1b400..0537d4c15 100644 --- a/es-vue-base/package-lock.json +++ b/es-vue-base/package-lock.json @@ -1,12 +1,12 @@ { "name": "@energysage/es-vue-base", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@energysage/es-vue-base", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "license": "MIT", "dependencies": { "path": "^0.12.7", diff --git a/es-vue-base/package.json b/es-vue-base/package.json index 9304f7c83..02e612ff7 100644 --- a/es-vue-base/package.json +++ b/es-vue-base/package.json @@ -1,6 +1,6 @@ { "name": "@energysage/es-vue-base", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "private": false, "description": "", "scripts": { diff --git a/lerna.json b/lerna.json index c3822685e..7988074d5 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "es-vue-base", "es-design-system" ], - "version": "2.2.3" + "version": "2.2.4-alpha.0" } From 214b726b82ac26d01082d4c17a9dd29c4fe4b791 Mon Sep 17 00:00:00 2001 From: Tommy Date: Thu, 16 Jan 2025 14:17:27 -0500 Subject: [PATCH 11/16] Revert "v2.2.4-alpha.0" This reverts commit 9222576387376164a6b5c0216c56b4939863237d. --- es-design-system/package-lock.json | 6 +++--- es-design-system/package.json | 4 ++-- es-vue-base/package-lock.json | 4 ++-- es-vue-base/package.json | 2 +- lerna.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es-design-system/package-lock.json b/es-design-system/package-lock.json index 70c9fa26d..545ce33c6 100644 --- a/es-design-system/package-lock.json +++ b/es-design-system/package-lock.json @@ -1,15 +1,15 @@ { "name": "es-design-system", - "version": "2.2.4-alpha.0", + "version": "2.2.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "es-design-system", - "version": "2.2.4-alpha.0", + "version": "2.2.3", "dependencies": { "@energysage/es-bs-base": "^2.2.3", - "@energysage/es-vue-base": "^2.2.4-alpha.0", + "@energysage/es-vue-base": "^2.2.3", "@nuxtjs/axios": "^5.13.6", "@nuxtjs/i18n": "^7.3.1", "bootstrap-vue": "^2.23.1", diff --git a/es-design-system/package.json b/es-design-system/package.json index 91c7dc75d..af2474f41 100644 --- a/es-design-system/package.json +++ b/es-design-system/package.json @@ -1,6 +1,6 @@ { "name": "es-design-system", - "version": "2.2.4-alpha.0", + "version": "2.2.3", "private": true, "scripts": { "dev": "nuxt", @@ -18,7 +18,7 @@ "prettier": "eslint-config-energysage/prettier", "dependencies": { "@energysage/es-bs-base": "^2.2.3", - "@energysage/es-vue-base": "^2.2.4-alpha.0", + "@energysage/es-vue-base": "^2.2.3", "@nuxtjs/axios": "^5.13.6", "@nuxtjs/i18n": "^7.3.1", "bootstrap-vue": "^2.23.1", diff --git a/es-vue-base/package-lock.json b/es-vue-base/package-lock.json index 0537d4c15..0bea1b400 100644 --- a/es-vue-base/package-lock.json +++ b/es-vue-base/package-lock.json @@ -1,12 +1,12 @@ { "name": "@energysage/es-vue-base", - "version": "2.2.4-alpha.0", + "version": "2.2.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@energysage/es-vue-base", - "version": "2.2.4-alpha.0", + "version": "2.2.3", "license": "MIT", "dependencies": { "path": "^0.12.7", diff --git a/es-vue-base/package.json b/es-vue-base/package.json index 02e612ff7..9304f7c83 100644 --- a/es-vue-base/package.json +++ b/es-vue-base/package.json @@ -1,6 +1,6 @@ { "name": "@energysage/es-vue-base", - "version": "2.2.4-alpha.0", + "version": "2.2.3", "private": false, "description": "", "scripts": { diff --git a/lerna.json b/lerna.json index 7988074d5..c3822685e 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "es-vue-base", "es-design-system" ], - "version": "2.2.4-alpha.0" + "version": "2.2.3" } From e2ded7a1559b509acbd264097f6f3db43da397e9 Mon Sep 17 00:00:00 2001 From: Tommy Date: Thu, 16 Jan 2025 14:18:20 -0500 Subject: [PATCH 12/16] v2.2.4-alpha.0 --- es-design-system/package-lock.json | 6 +++--- es-design-system/package.json | 4 ++-- es-vue-base/package-lock.json | 4 ++-- es-vue-base/package.json | 2 +- lerna.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es-design-system/package-lock.json b/es-design-system/package-lock.json index 545ce33c6..70c9fa26d 100644 --- a/es-design-system/package-lock.json +++ b/es-design-system/package-lock.json @@ -1,15 +1,15 @@ { "name": "es-design-system", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "es-design-system", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "dependencies": { "@energysage/es-bs-base": "^2.2.3", - "@energysage/es-vue-base": "^2.2.3", + "@energysage/es-vue-base": "^2.2.4-alpha.0", "@nuxtjs/axios": "^5.13.6", "@nuxtjs/i18n": "^7.3.1", "bootstrap-vue": "^2.23.1", diff --git a/es-design-system/package.json b/es-design-system/package.json index af2474f41..91c7dc75d 100644 --- a/es-design-system/package.json +++ b/es-design-system/package.json @@ -1,6 +1,6 @@ { "name": "es-design-system", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "private": true, "scripts": { "dev": "nuxt", @@ -18,7 +18,7 @@ "prettier": "eslint-config-energysage/prettier", "dependencies": { "@energysage/es-bs-base": "^2.2.3", - "@energysage/es-vue-base": "^2.2.3", + "@energysage/es-vue-base": "^2.2.4-alpha.0", "@nuxtjs/axios": "^5.13.6", "@nuxtjs/i18n": "^7.3.1", "bootstrap-vue": "^2.23.1", diff --git a/es-vue-base/package-lock.json b/es-vue-base/package-lock.json index 0bea1b400..0537d4c15 100644 --- a/es-vue-base/package-lock.json +++ b/es-vue-base/package-lock.json @@ -1,12 +1,12 @@ { "name": "@energysage/es-vue-base", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@energysage/es-vue-base", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "license": "MIT", "dependencies": { "path": "^0.12.7", diff --git a/es-vue-base/package.json b/es-vue-base/package.json index 9304f7c83..02e612ff7 100644 --- a/es-vue-base/package.json +++ b/es-vue-base/package.json @@ -1,6 +1,6 @@ { "name": "@energysage/es-vue-base", - "version": "2.2.3", + "version": "2.2.4-alpha.0", "private": false, "description": "", "scripts": { diff --git a/lerna.json b/lerna.json index c3822685e..7988074d5 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "es-vue-base", "es-design-system" ], - "version": "2.2.3" + "version": "2.2.4-alpha.0" } From 116540a4875eb000838e0026b6775f693c490bb0 Mon Sep 17 00:00:00 2001 From: Tommy Date: Thu, 16 Jan 2025 14:20:53 -0500 Subject: [PATCH 13/16] v2.2.5-alpha.0 --- es-bs-base/package-lock.json | 4 ++-- es-bs-base/package.json | 2 +- es-design-system/package-lock.json | 8 ++++---- es-design-system/package.json | 6 +++--- es-vue-base/package-lock.json | 6 +++--- es-vue-base/package.json | 4 ++-- lerna.json | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/es-bs-base/package-lock.json b/es-bs-base/package-lock.json index b0e7876fd..5da01c574 100644 --- a/es-bs-base/package-lock.json +++ b/es-bs-base/package-lock.json @@ -1,12 +1,12 @@ { "name": "@energysage/es-bs-base", - "version": "2.2.3", + "version": "2.2.5-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@energysage/es-bs-base", - "version": "2.2.3", + "version": "2.2.5-alpha.0", "license": "MIT", "devDependencies": { "@babel/cli": "^7.17.6", diff --git a/es-bs-base/package.json b/es-bs-base/package.json index 83a7e36fd..6643e13b5 100644 --- a/es-bs-base/package.json +++ b/es-bs-base/package.json @@ -1,7 +1,7 @@ { "name": "@energysage/es-bs-base", "description": "Base CSS for EnergySage design system based on Bootstrap", - "version": "2.2.3", + "version": "2.2.5-alpha.0", "config": { "version_short": "0.1" }, diff --git a/es-design-system/package-lock.json b/es-design-system/package-lock.json index 70c9fa26d..54178cb6b 100644 --- a/es-design-system/package-lock.json +++ b/es-design-system/package-lock.json @@ -1,15 +1,15 @@ { "name": "es-design-system", - "version": "2.2.4-alpha.0", + "version": "2.2.5-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "es-design-system", - "version": "2.2.4-alpha.0", + "version": "2.2.5-alpha.0", "dependencies": { - "@energysage/es-bs-base": "^2.2.3", - "@energysage/es-vue-base": "^2.2.4-alpha.0", + "@energysage/es-bs-base": "^2.2.5-alpha.0", + "@energysage/es-vue-base": "^2.2.5-alpha.0", "@nuxtjs/axios": "^5.13.6", "@nuxtjs/i18n": "^7.3.1", "bootstrap-vue": "^2.23.1", diff --git a/es-design-system/package.json b/es-design-system/package.json index 91c7dc75d..7c6d18f70 100644 --- a/es-design-system/package.json +++ b/es-design-system/package.json @@ -1,6 +1,6 @@ { "name": "es-design-system", - "version": "2.2.4-alpha.0", + "version": "2.2.5-alpha.0", "private": true, "scripts": { "dev": "nuxt", @@ -17,8 +17,8 @@ }, "prettier": "eslint-config-energysage/prettier", "dependencies": { - "@energysage/es-bs-base": "^2.2.3", - "@energysage/es-vue-base": "^2.2.4-alpha.0", + "@energysage/es-bs-base": "^2.2.5-alpha.0", + "@energysage/es-vue-base": "^2.2.5-alpha.0", "@nuxtjs/axios": "^5.13.6", "@nuxtjs/i18n": "^7.3.1", "bootstrap-vue": "^2.23.1", diff --git a/es-vue-base/package-lock.json b/es-vue-base/package-lock.json index 0537d4c15..a7a7233cb 100644 --- a/es-vue-base/package-lock.json +++ b/es-vue-base/package-lock.json @@ -1,12 +1,12 @@ { "name": "@energysage/es-vue-base", - "version": "2.2.4-alpha.0", + "version": "2.2.5-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@energysage/es-vue-base", - "version": "2.2.4-alpha.0", + "version": "2.2.5-alpha.0", "license": "MIT", "dependencies": { "path": "^0.12.7", @@ -16,7 +16,7 @@ "@babel/core": "^7.20.12", "@babel/eslint-parser": "^7.19.1", "@babel/preset-env": "^7.20.2", - "@energysage/es-bs-base": "^2.2.3", + "@energysage/es-bs-base": "^2.2.5-alpha.0", "@rollup/plugin-babel": "^6.0.0", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-image": "^3.0.0", diff --git a/es-vue-base/package.json b/es-vue-base/package.json index 02e612ff7..65afbb219 100644 --- a/es-vue-base/package.json +++ b/es-vue-base/package.json @@ -1,6 +1,6 @@ { "name": "@energysage/es-vue-base", - "version": "2.2.4-alpha.0", + "version": "2.2.5-alpha.0", "private": false, "description": "", "scripts": { @@ -30,7 +30,7 @@ "@babel/core": "^7.20.12", "@babel/eslint-parser": "^7.19.1", "@babel/preset-env": "^7.20.2", - "@energysage/es-bs-base": "^2.2.3", + "@energysage/es-bs-base": "^2.2.5-alpha.0", "@rollup/plugin-babel": "^6.0.0", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-image": "^3.0.0", diff --git a/lerna.json b/lerna.json index 7988074d5..0bce72340 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "es-vue-base", "es-design-system" ], - "version": "2.2.4-alpha.0" + "version": "2.2.5-alpha.0" } From 01f3215a6186d16662cfb52e5ae1bdb0c0d9762a Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Fri, 17 Jan 2025 12:45:49 -0500 Subject: [PATCH 14/16] fix: move margin and padding --- es-vue-base/src/lib-components/EsFooter.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es-vue-base/src/lib-components/EsFooter.vue b/es-vue-base/src/lib-components/EsFooter.vue index 877f11383..2993c7311 100644 --- a/es-vue-base/src/lib-components/EsFooter.vue +++ b/es-vue-base/src/lib-components/EsFooter.vue @@ -89,11 +89,11 @@
+ class="col col-6 col-lg-auto mt-25 mb-50 pr-lg-300"> + class="text-reset font-weight-normal font-size-75 font-size-md-50 font-weight-md-normal"> {{ link.text }}
From 43b4a708a02764115e9d595cbae5b98199fb4f3b Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Fri, 17 Jan 2025 12:52:11 -0500 Subject: [PATCH 15/16] chore: update tests --- es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap b/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap index 6a381e2d4..3b708d43a 100644 --- a/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap +++ b/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap @@ -157,19 +157,19 @@ exports[`EsFooter 1`] = `

-
+
Terms of use
-
+
Privacy policy
-
+
Mobile terms of use
-
+
Non-discrimination policy
-
+
From da742ae8da44d802ce100f88905aa9c9bbac71e9 Mon Sep 17 00:00:00 2001 From: Hannah Roth Date: Fri, 17 Jan 2025 15:54:09 -0500 Subject: [PATCH 16/16] docs: replace TODO with Confluence doc --- es-vue-base/src/lib-components/EsFooter.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/es-vue-base/src/lib-components/EsFooter.vue b/es-vue-base/src/lib-components/EsFooter.vue index 2993c7311..0450e4a78 100644 --- a/es-vue-base/src/lib-components/EsFooter.vue +++ b/es-vue-base/src/lib-components/EsFooter.vue @@ -166,9 +166,7 @@ export default { }, }, mounted() { - // TODO: update with GTM tag in prod once we've gone live - // See https://tagmanager.google.com/#/container/accounts/2920232696/containers/8806152/workspaces/126/tags - // for GTM script that triggers this event. + // https://energysage.atlassian.net/wiki/spaces/FG/pages/1427865649/One-trust+Consent+Initialization+and+GTM window.addEventListener('OneTrustLoadedCb', () => { window.OneTrust.OnConsentChanged(() => { // OneTrust modal should modify cookie values, a hard-refresh will