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 545ce33c6..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.3", + "version": "2.2.5-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "es-design-system", - "version": "2.2.3", + "version": "2.2.5-alpha.0", "dependencies": { - "@energysage/es-bs-base": "^2.2.3", - "@energysage/es-vue-base": "^2.2.3", + "@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 af2474f41..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.3", + "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.3", + "@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 0bea1b400..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.3", + "version": "2.2.5-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@energysage/es-vue-base", - "version": "2.2.3", + "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 9304f7c83..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.3", + "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/es-vue-base/src/lib-components/EsFooter.vue b/es-vue-base/src/lib-components/EsFooter.vue index 2b26e3272..0450e4a78 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 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 }} +
+ + + {{ link.text }} + +
@@ -155,5 +165,24 @@ export default { return this.content.copyrightText.replace('{currentYear}', new Date().getFullYear()); }, }, + mounted() { + // 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 + // 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..cd28e3440 --- /dev/null +++ b/es-vue-base/src/lib-icons/icon-ccpa-opt-out.vue @@ -0,0 +1,61 @@ + + + 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. diff --git a/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap b/es-vue-base/tests/__snapshots__/EsFooter.spec.js.snap index b0affe448..3b708d43a 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.


-
-
+
+ - diff --git a/es-vue-base/tests/__snapshots__/icons.spec.js.snap b/es-vue-base/tests/__snapshots__/icons.spec.js.snap index f7b90d3fe..576c249ab 100644 --- a/es-vue-base/tests/__snapshots__/icons.spec.js.snap +++ b/es-vue-base/tests/__snapshots__/icons.spec.js.snap @@ -107,6 +107,17 @@ exports[`icons IconCart renders correctly 1`] = ` " `; +exports[`icons IconCcpaOptOut renders correctly 1`] = ` +" + + + + + + +" +`; + exports[`icons IconChatAdd renders correctly 1`] = ` " diff --git a/lerna.json b/lerna.json index c3822685e..0bce72340 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "es-vue-base", "es-design-system" ], - "version": "2.2.3" + "version": "2.2.5-alpha.0" }