From 31a1a967295cf66cacb2cfa9eab459eec0f6fd3a Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 18 Jan 2021 20:15:40 +0200 Subject: [PATCH 1/5] Release 1.0.3 --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64f593b..10bdfe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.0.3](https://github.com/eea/volto-ims-theme/compare/1.0.2...1.0.3) + +- merge origin [`ca37c7f`](https://github.com/eea/volto-ims-theme/commit/ca37c7f8b8ee11a51286112feaabb7ec33d41756) +- footer padding and icons size fix [`b2ec7c7`](https://github.com/eea/volto-ims-theme/commit/b2ec7c7248815a0864564b647477ac8f1515a4db) + #### [1.0.2](https://github.com/eea/volto-ims-theme/compare/1.0.1...1.0.2) +> 15 January 2021 + - fix eea menu styling [`b00df36`](https://github.com/eea/volto-ims-theme/commit/b00df36abd2a038e1923931f218d09ea10c816d0) - media query fix for header and footer [`c2b19f1`](https://github.com/eea/volto-ims-theme/commit/c2b19f14b3617a5de3531c49c9d6607b81fea60d) - menu and logo style fix [`5614ae4`](https://github.com/eea/volto-ims-theme/commit/5614ae45e65396987f8d3bb6fadbd9518cdb4945) - fixed header width [`95b568d`](https://github.com/eea/volto-ims-theme/commit/95b568d7f98eddb563dd2a93ae058758f7ac7a6d) - Add link on EU flag [`ad876f0`](https://github.com/eea/volto-ims-theme/commit/ad876f09a23f23df5169a16311ec66d0d7033cbf) +- Release 1.0.2 [`8e4707d`](https://github.com/eea/volto-ims-theme/commit/8e4707de2f5eca65ff89c8bce618a4279378bf76) - header media query fix [`7e45f17`](https://github.com/eea/volto-ims-theme/commit/7e45f17cc467349abcb6422121a4e4488c888cb3) - change fontName [`cefb11e`](https://github.com/eea/volto-ims-theme/commit/cefb11e399f0cacf70f2af7a11ef433871e4c43e) diff --git a/package.json b/package.json index e69715f..f9b73f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-ims-theme", - "version": "1.0.2", + "version": "1.0.3", "description": "volto-ims-theme: Volto Theme: EEA IMS", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team", From 0d97a48b6a2ff79b8731ab86d94281a716a84871 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Tue, 26 Jan 2021 00:34:47 +0200 Subject: [PATCH 2/5] Force window.location refresh on nav and language links click --- .../theme/Navigation/Navigation.jsx | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/customizations/components/theme/Navigation/Navigation.jsx b/src/customizations/components/theme/Navigation/Navigation.jsx index a9f6dea..e484cfe 100644 --- a/src/customizations/components/theme/Navigation/Navigation.jsx +++ b/src/customizations/components/theme/Navigation/Navigation.jsx @@ -92,6 +92,7 @@ class Navigation extends Component { super(props); this.toggleMobileMenu = this.toggleMobileMenu.bind(this); this.closeMobileMenu = this.closeMobileMenu.bind(this); + this.onLinkClick = this.onLinkClick.bind(this); this.state = { isMobileMenuOpen: false, activeIndex: -1, @@ -154,6 +155,17 @@ class Navigation extends Component { this.setState({ isMobileMenuOpen: false }); } + /** + * Click an internal link + * @method onLinkClick + * @returns {undefined} + */ + onLinkClick(evt, url) { + evt.preventDefault(); + this.closeMobileMenu(); + window.location = url; + } + /** * Render method. * @method render @@ -218,7 +230,7 @@ class Navigation extends Component { ? item.url === `/${lang}` : item.url === '' } - onClick={this.closeMobileMenu} + onClick={(evt) => this.onLinkClick(evt, item.url || '/')} > {item.title} @@ -243,7 +255,10 @@ class Navigation extends Component { + this.onLinkClick(evt, `/${language.code}`) + } > {`${language.name} (${language.code})`} @@ -273,7 +288,10 @@ class Navigation extends Component { + this.onLinkClick(evt, `/${language.code}`) + } > {`${language.name} (${language.code})`} From b63e90f396d7fb6a83138c30ace61a5af9d551ef Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Tue, 26 Jan 2021 01:03:07 +0200 Subject: [PATCH 3/5] Force reload on all themes links --- .../components/theme/Footer/Footer.jsx | 59 +++++++++++++++++-- .../components/theme/Logo/Logo.jsx | 7 ++- .../theme/SearchWidget/SearchWidget.jsx | 20 ++++++- src/index.js | 1 - 4 files changed, 80 insertions(+), 7 deletions(-) diff --git a/src/customizations/components/theme/Footer/Footer.jsx b/src/customizations/components/theme/Footer/Footer.jsx index 7f8678d..94ce942 100644 --- a/src/customizations/components/theme/Footer/Footer.jsx +++ b/src/customizations/components/theme/Footer/Footer.jsx @@ -15,6 +15,11 @@ import EUflag from '../../../../../theme/site/assets/images/europe-flag.svg'; * @returns {string} Markup of the component */ class Footer extends Component { + onLinkClick(evt, url) { + evt.preventDefault(); + window.location = url; + } + render() { return ( @@ -244,18 +249,40 @@ class Footer extends Component {
- + + this.onLinkClick( + evt, + 'https://www.eea.europa.eu/contact-us', + ) + } + > + this.onLinkClick( + evt, + 'https://www.eea.europa.eu/contact-us', + ) + } > Ask your question
- + + this.onLinkClick( + evt, + 'https://www.eea.europa.eu/media/', + ) + } + > Media enquiries @@ -293,7 +320,15 @@ class Footer extends Component {

Engineered by:  - + + this.onLinkClick( + evt, + 'https://www.eea.europa.eu/help/contact-info', + ) + } + > EEA Web Team

@@ -313,6 +348,9 @@ class Footer extends Component {

+ this.onLinkClick(evt, 'https://www.eea.europa.eu/code') + } title="Code for developers" > Code for developers @@ -326,7 +364,14 @@ class Footer extends Component {

- Legal notice + + this.onLinkClick(evt, 'https://www.eea.europa.eu/legal/') + } + > + Legal notice +

@@ -343,6 +388,12 @@ class Footer extends Component {

+ this.onLinkClick( + evt, + 'https://www.eea.europa.eu/login_form', + ) + } title="Log in to CMS" > CMS login diff --git a/src/customizations/components/theme/Logo/Logo.jsx b/src/customizations/components/theme/Logo/Logo.jsx index ab3224f..5a4ccb2 100644 --- a/src/customizations/components/theme/Logo/Logo.jsx +++ b/src/customizations/components/theme/Logo/Logo.jsx @@ -32,11 +32,16 @@ const messages = defineMessages({ const Logo = () => { const lang = useSelector((state) => state.intl.locale); const intl = useIntl(); + const url = settings.isMultilingual ? `/${lang}` : '/'; return ( { + evt.preventDefault(); + window.location = url; + }} > + this.onLinkClick( + evt, + 'https://www.eea.europa.eu/help/glossary', + ) + } > A-Z Glossary diff --git a/src/index.js b/src/index.js index abe8e48..3ef62e1 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,6 @@ const applyConfig = (config) => { config.settings.allowed_cors_destinations = [ ...(config.settings.allowed_cors_destinations || []), 'www.eea.europa.eu', - 'www.eea.europa.eu/eea-custom-search.tags', ]; return config; From 71ae852c249c3e209c29a6c3a3a0fd24be4b02a7 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Tue, 26 Jan 2021 01:08:54 +0200 Subject: [PATCH 4/5] Remove undefined function call --- .../components/theme/SearchWidget/SearchWidget.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/customizations/components/theme/SearchWidget/SearchWidget.jsx b/src/customizations/components/theme/SearchWidget/SearchWidget.jsx index 91aee11..94ef83b 100644 --- a/src/customizations/components/theme/SearchWidget/SearchWidget.jsx +++ b/src/customizations/components/theme/SearchWidget/SearchWidget.jsx @@ -74,7 +74,6 @@ class SearchWidget extends Component { */ onLinkClick(evt, url) { evt.preventDefault(); - this.closeMobileMenu(); window.location = url; } From 8869ccd423d8952b7bb35d0380989ed222ea410b Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Tue, 26 Jan 2021 17:06:41 +0200 Subject: [PATCH 5/5] Release 1.1.0 --- CHANGELOG.md | 14 ++++++++++++++ package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10bdfe7..a43d9dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.1.0](https://github.com/eea/volto-ims-theme/compare/1.0.3...1.1.0) + +- erge branch 'master' into develop [`e002ceb`](https://github.com/eea/volto-ims-theme/commit/e002ceb2caf61ee349851d30a3fd0497713b4a76) +- fix after merge with develop [`4672d9a`](https://github.com/eea/volto-ims-theme/commit/4672d9a8408b4c8bc54cab14fe022733c4141c92) +- implemented design for mobile sidebar also [`d7941fc`](https://github.com/eea/volto-ims-theme/commit/d7941fce67e453a9702bc38a4bd5d45e7d0b0092) +- Force reload on all themes links [`b63e90f`](https://github.com/eea/volto-ims-theme/commit/b63e90f396d7fb6a83138c30ace61a5af9d551ef) +- Force window.location refresh on nav and language links click [`0d97a48`](https://github.com/eea/volto-ims-theme/commit/0d97a48b6a2ff79b8731ab86d94281a716a84871) +- css list items are black and adjusted size, close sidebar on login [`c061778`](https://github.com/eea/volto-ims-theme/commit/c0617782d1be1d83c1513687b9257c46370b4ea4) +- added api to suggestions request [`d5f8c85`](https://github.com/eea/volto-ims-theme/commit/d5f8c85c1390902d452946ddcd0905b06bce1a62) +- Remove undefined function call [`71ae852`](https://github.com/eea/volto-ims-theme/commit/71ae852c249c3e209c29a6c3a3a0fd24be4b02a7) + #### [1.0.3](https://github.com/eea/volto-ims-theme/compare/1.0.2...1.0.3) +> 18 January 2021 + +- Release 1.0.3 [`31a1a96`](https://github.com/eea/volto-ims-theme/commit/31a1a967295cf66cacb2cfa9eab459eec0f6fd3a) - merge origin [`ca37c7f`](https://github.com/eea/volto-ims-theme/commit/ca37c7f8b8ee11a51286112feaabb7ec33d41756) - footer padding and icons size fix [`b2ec7c7`](https://github.com/eea/volto-ims-theme/commit/b2ec7c7248815a0864564b647477ac8f1515a4db) diff --git a/package.json b/package.json index f9b73f7..0f73d80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-ims-theme", - "version": "1.0.3", + "version": "1.1.0", "description": "volto-ims-theme: Volto Theme: EEA IMS", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",