From 7950572377c097f3df90a15062d93ed74d1caf92 Mon Sep 17 00:00:00 2001 From: Nilesh Date: Wed, 8 Dec 2021 16:22:02 +0530 Subject: [PATCH 1/6] Update theme.config --- theme/theme.config | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/theme/theme.config b/theme/theme.config index 55fa009..09fa113 100644 --- a/theme/theme.config +++ b/theme/theme.config @@ -81,4 +81,8 @@ @import (multiple) "~semantic-ui-less/theme.less"; @fontPath : "~volto-themes/@{theme}/assets/fonts"; -/* End Config */ \ No newline at end of file +.loadAddonOverrides() { + @import (optional) "@{siteFolder}/@{addon}/@{addontype}s/@{addonelement}.overrides"; +} + +/* End Config */ From 8339cc26ded18ccfd6e24a3c1ce0ee8b334b8f50 Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Wed, 8 Dec 2021 17:20:55 +0530 Subject: [PATCH 2/6] add missing routes --- src/localconfig.js | 53 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/src/localconfig.js b/src/localconfig.js index 926d596..2a74a0f 100644 --- a/src/localconfig.js +++ b/src/localconfig.js @@ -1,5 +1,5 @@ import { defineMessages } from 'react-intl'; - +import loadable from '@loadable/component'; import TokenWidget from '@plone/volto/components/manage/Widgets/TokenWidget'; import CountryView from '@eeacms/volto-forests-theme/components/theme/CountryView/CountryView'; @@ -19,6 +19,11 @@ import NavigationBlockEdit from '@eeacms/volto-forests-theme/components/manage/B import NavigationBlockView from '@eeacms/volto-forests-theme/components/manage/Blocks/NavigationBlock/View'; import RedirectView from '@eeacms/volto-forests-theme/components/theme/View/RedirectView'; +import SiteMap from '@eeacms/volto-forests-theme/components/theme/SiteMap/SiteMap'; +import Header from '@eeacms/volto-forests-theme/components/theme/CatalogueViews/AppHeader.jsx'; +import Footer from '@eeacms/volto-forests-theme/components/theme/CatalogueViews/AppFooter.jsx'; +import Head from '@eeacms/volto-forests-theme/components/theme/CatalogueViews/AppHead.jsx'; + import { uniqBy } from 'lodash'; import './slate-inlineStyles.less'; @@ -80,6 +85,31 @@ export function applyConfig(config) { // ...['navigation', '&expand.navigation.depth=3'], }; + const addonRoutes = [ + { + path: '/header', + component: Header, + exact: true, + }, + { + path: '/footer', + component: Footer, + exact: true, + }, + { + path: '/head', + component: Head, + exact: true, + }, + { + path: '/sitemap', + component: SiteMap, + exact: true, + }, + ]; + + config.addonRoutes = addonRoutes; + config.views = { ...config.views, layoutViews: { @@ -157,28 +187,31 @@ export function applyConfig(config) { { title: 'Forest Default', colorscale: [ - '#005c30', - '#168130', - '#6fb22c', - '#bed492', + '#215511', + '#77BB12', + '#CBEE66', '#ffffff', - '#ecf0c5', + '#F4F4F1', '#000000', ], }, { title: 'Forest Active', colorscale: [ - '#b94d1f ', - '#d9d9d9', - '#b92e48', - '#005e7d', + '#CA4300 ', + '#E0E1E2', + '#E30166', + '#074F7C', '#000000', '#ffffff', ], }, ]; + config.settings.loadables.rechartsLib = loadable.lib( + () => import('recharts'), + { ssr: false }, + ); // border-tile config.settings.pluggableStyles = [ ...(config.settings.pluggableStyles || []), From 791c6b064d5b827ddb32e8d237c7c2a54b90e592 Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Wed, 8 Dec 2021 17:23:37 +0530 Subject: [PATCH 3/6] revert configs --- src/localconfig.js | 53 +++++++++------------------------------------- 1 file changed, 10 insertions(+), 43 deletions(-) diff --git a/src/localconfig.js b/src/localconfig.js index 2a74a0f..926d596 100644 --- a/src/localconfig.js +++ b/src/localconfig.js @@ -1,5 +1,5 @@ import { defineMessages } from 'react-intl'; -import loadable from '@loadable/component'; + import TokenWidget from '@plone/volto/components/manage/Widgets/TokenWidget'; import CountryView from '@eeacms/volto-forests-theme/components/theme/CountryView/CountryView'; @@ -19,11 +19,6 @@ import NavigationBlockEdit from '@eeacms/volto-forests-theme/components/manage/B import NavigationBlockView from '@eeacms/volto-forests-theme/components/manage/Blocks/NavigationBlock/View'; import RedirectView from '@eeacms/volto-forests-theme/components/theme/View/RedirectView'; -import SiteMap from '@eeacms/volto-forests-theme/components/theme/SiteMap/SiteMap'; -import Header from '@eeacms/volto-forests-theme/components/theme/CatalogueViews/AppHeader.jsx'; -import Footer from '@eeacms/volto-forests-theme/components/theme/CatalogueViews/AppFooter.jsx'; -import Head from '@eeacms/volto-forests-theme/components/theme/CatalogueViews/AppHead.jsx'; - import { uniqBy } from 'lodash'; import './slate-inlineStyles.less'; @@ -85,31 +80,6 @@ export function applyConfig(config) { // ...['navigation', '&expand.navigation.depth=3'], }; - const addonRoutes = [ - { - path: '/header', - component: Header, - exact: true, - }, - { - path: '/footer', - component: Footer, - exact: true, - }, - { - path: '/head', - component: Head, - exact: true, - }, - { - path: '/sitemap', - component: SiteMap, - exact: true, - }, - ]; - - config.addonRoutes = addonRoutes; - config.views = { ...config.views, layoutViews: { @@ -187,31 +157,28 @@ export function applyConfig(config) { { title: 'Forest Default', colorscale: [ - '#215511', - '#77BB12', - '#CBEE66', + '#005c30', + '#168130', + '#6fb22c', + '#bed492', '#ffffff', - '#F4F4F1', + '#ecf0c5', '#000000', ], }, { title: 'Forest Active', colorscale: [ - '#CA4300 ', - '#E0E1E2', - '#E30166', - '#074F7C', + '#b94d1f ', + '#d9d9d9', + '#b92e48', + '#005e7d', '#000000', '#ffffff', ], }, ]; - config.settings.loadables.rechartsLib = loadable.lib( - () => import('recharts'), - { ssr: false }, - ); // border-tile config.settings.pluggableStyles = [ ...(config.settings.pluggableStyles || []), From 15d88961cd24995424bce95e895fa7c781609fea Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Wed, 8 Dec 2021 19:55:10 +0530 Subject: [PATCH 4/6] fix Header missing prop in AppHeader.jsx ( catalogue) --- .../theme/CatalogueViews/AppHeader.jsx | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/components/theme/CatalogueViews/AppHeader.jsx b/src/components/theme/CatalogueViews/AppHeader.jsx index fac83d3..7e3179f 100644 --- a/src/components/theme/CatalogueViews/AppHeader.jsx +++ b/src/components/theme/CatalogueViews/AppHeader.jsx @@ -102,8 +102,41 @@ class App extends Component { render() { const path = getBaseUrl(this.props.pathname); const action = getView(this.props.pathname); + const leadImageCaption = + this.props.content?.lead_image_caption && + this.props.content.lead_image_caption !== null + ? this.props.content.lead_image_caption + : ''; + + const bigLeading = + this.props.content?.big_leading_image && + this.props.content.big_leading_image !== null + ? this.props.content.big_leading_image + : false; + + const inheritLeadingData = + this.props.content?.inherit_leading_data && + this.props.content.inherit_leading_data !== null + ? this.props.content.inherit_leading_data + : false; + + const leadNavigation = + this.props.content?.lead_navigation && + this.props.content.lead_navigation !== null + ? this.props.content.lead_navigation + : false; + const headerImage = this.props.content?.image?.download || this.props.defaultHeaderImage; + + const extraHeaderData = { + bigLeading, + inheritLeadingData, + parentData: this.props.content?.parent, + leadNavigation, + leadImageCaption, + }; + return ( @@ -111,6 +144,7 @@ class App extends Component { folderHeader={this.props.folderHeader} actualPathName={this.props.pathname} pathname={path} + extraData={extraHeaderData} defaultHeaderImage={headerImage} navigationItems={this.props.navigation} frontpage_slides={this.props.frontpage_slides} @@ -192,7 +226,7 @@ export default compose( folderHeader: state.folder_header.items, defaultHeaderImage: state.default_header_image.items?.[0], // content: state.content.data, - content: state.prefetch?.[props.location.pathname] || state.content.data, + content: state.content.data, frontpage_slides: state.frontpage_slides.items, navigation: state.navigation.items, pathname: state.router.location.pathname, //props.location.pathname, From 4fbc04b36fb607681c40d2ededd5d489060d792e Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Wed, 8 Dec 2021 20:00:17 +0530 Subject: [PATCH 5/6] remove unused prop --- src/components/theme/CatalogueViews/AppHeader.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/theme/CatalogueViews/AppHeader.jsx b/src/components/theme/CatalogueViews/AppHeader.jsx index 7e3179f..7ce8a55 100644 --- a/src/components/theme/CatalogueViews/AppHeader.jsx +++ b/src/components/theme/CatalogueViews/AppHeader.jsx @@ -141,7 +141,6 @@ class App extends Component {
({ - folderHeader: state.folder_header.items, defaultHeaderImage: state.default_header_image.items?.[0], // content: state.content.data, content: state.content.data, From 1d27b00f173fabc108c43dfc893a00cd69790545 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Wed, 8 Dec 2021 14:42:00 +0000 Subject: [PATCH 6/6] Automated release 0.1.26 --- CHANGELOG.md | 12 +++++++++++- package.json | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4de3c89..4720486 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,19 @@ 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). +#### [0.1.26](https://github.com/eea/volto-forests-theme/compare/0.1.25...0.1.26) + +- remove unused prop [`4fbc04b`](https://github.com/eea/volto-forests-theme/commit/4fbc04b36fb607681c40d2ededd5d489060d792e) +- fix Header missing prop in AppHeader.jsx ( catalogue) [`15d8896`](https://github.com/eea/volto-forests-theme/commit/15d88961cd24995424bce95e895fa7c781609fea) +- revert configs [`791c6b0`](https://github.com/eea/volto-forests-theme/commit/791c6b064d5b827ddb32e8d237c7c2a54b90e592) +- add missing routes [`8339cc2`](https://github.com/eea/volto-forests-theme/commit/8339cc26ded18ccfd6e24a3c1ce0ee8b334b8f50) +- Update theme.config [`7950572`](https://github.com/eea/volto-forests-theme/commit/7950572377c097f3df90a15062d93ed74d1caf92) + #### [0.1.25](https://github.com/eea/volto-forests-theme/compare/0.1.24...0.1.25) -- Update index.js [`2067fe3`](https://github.com/eea/volto-forests-theme/commit/2067fe33518e23513a329ea48f4cc15713008419) +> 7 December 2021 + +- Update index.js [`#34`](https://github.com/eea/volto-forests-theme/pull/34) #### [0.1.24](https://github.com/eea/volto-forests-theme/compare/0.1.23...0.1.24) diff --git a/package.json b/package.json index 826334c..68e2003 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-forests-theme", - "version": "0.1.25", + "version": "0.1.26", "description": "@eeacms/volto-forests-theme: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",