@eeacms/volto-eea-website-theme 0.6.4 → 0.6.7

package/CHANGELOG.md

@@ -4,8 +4,33 @@ 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.6.7](https://github.com/eea/volto-eea-website-theme/compare/0.6.6...0.6.7)
+
+- change(footer): updated managed by grid sizes from footer.stories #37 [`63b86be`](https://github.com/eea/volto-eea-website-theme/commit/63b86becdf5a501b133e3b4ff05b1ab0e6281f12)
+- change(footer): updated managed by grid sizes as se [`6be36fa`](https://github.com/eea/volto-eea-website-theme/commit/6be36fa6e8d8a2762fce65b71bb0e0c795a050a2)
+
+#### [0.6.6](https://github.com/eea/volto-eea-website-theme/compare/0.6.5...0.6.6)
+
+> 8 June 2022
+
+- condition config of accordion only if found to avoid error [`#36`](https://github.com/eea/volto-eea-website-theme/pull/36)
+- Add customization for volto-tabs-block [`#35`](https://github.com/eea/volto-eea-website-theme/pull/35)
+- change(footer): update footer implementation [`#34`](https://github.com/eea/volto-eea-website-theme/pull/34)
+- change(footer): update footer implementation to use subfooter section #33 [`e4cb3c0`](https://github.com/eea/volto-eea-website-theme/commit/e4cb3c042414ba5811924b40c532738da978fdbd)
+- change(footer): update footer implementation to use latest changes to the subfooter component [`efa23fe`](https://github.com/eea/volto-eea-website-theme/commit/efa23fecee0786c3d9a254c8115b3f28a8be5302)
+
+#### [0.6.5](https://github.com/eea/volto-eea-website-theme/compare/0.6.4...0.6.5)
+
+> 3 June 2022
+
+- fix(tags): Replace customizations of volto-widgets-view with config r… [`#32`](https://github.com/eea/volto-eea-website-theme/pull/32)
+- fix(tags): Replace customizations of volto-widgets-view with config registry [`8f8c6fc`](https://github.com/eea/volto-eea-website-theme/commit/8f8c6fcdc6d48a56fbb35db781432390a703a215)
+
 #### [0.6.4](https://github.com/eea/volto-eea-website-theme/compare/0.6.3...0.6.4)
 
+> 2 June 2022
+
+- Release [`#31`](https://github.com/eea/volto-eea-website-theme/pull/31)
 - Fix: missing translations [`53b0f20`](https://github.com/eea/volto-eea-website-theme/commit/53b0f20daf01f48d81d6b79f9f7a5bcd166b0d2d)
 - Customize Toolbar.jsx - volto 16.0.0-alpha.7 [`b26182f`](https://github.com/eea/volto-eea-website-theme/commit/b26182f9ac7369497f3602fb5842248f7b7da7c5)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "0.6.4",
+  "version": "0.6.7",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/config.js

@@ -8,60 +8,151 @@ import ccaLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/
 import copernicusLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/logo/copernicus.svg';
 import industryLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/logo/industry.svg';
 import marineLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/logo/marine.svg';
+import eionetLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/logo/eionet.svg';
+import eeaLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/logo/eea.svg';
 
 // TODO: to be consolidated with headerLinks
-export const partnerWebsites = [
-  {
-    link: 'https://biodiversity.europa.eu/',
-    src: biseLogo,
-    alt: 'Biodiversity',
-  },
-  {
-    link: 'https://climate-energy.eea.europa.eu/',
-    src: energyLogo,
-    alt: 'Climate and energy in the EU',
-  },
-  {
-    link: 'https://insitu.copernicus.eu/',
-    src: insituLogo,
-    alt: 'Copernicus in situ',
-  },
-  {
-    link: 'https://ipchem.jrc.ec.europa.eu/RDSIdiscovery/ipchem/index.html',
-    src: ipchemLogo,
-    alt: 'Information platform for chemical monitoring',
-  },
-  {
-    link: 'https://water.europa.eu/freshwater',
-    src: freshwaterLogo,
-    alt: 'WISE freshwater',
-  },
-  {
-    link: 'https://forest.eea.europa.eu/',
-    src: fiseLogo,
-    alt: 'Forest information system for europe',
-  },
-  {
-    link: 'https://climate-adapt.eea.europa.eu/',
-    src: ccaLogo,
-    alt: 'Climate adapt',
-  },
-  {
-    link: 'https://land.copernicus.eu/',
-    src: copernicusLogo,
-    alt: 'Copernicus land monitoring service',
-  },
-  {
-    link: 'https://industry.eea.europa.eu/',
-    src: industryLogo,
-    alt: 'European industrial emissions portal',
-  },
-  {
-    link: 'https://water.europa.eu/marine',
-    src: marineLogo,
-    alt: 'WISE marine',
-  },
-];
+// Footer.jsx config options
+export const footerOpts = {
+  header: 'EEA information systems',
+  logosHeader: 'Managed by',
+  contactHeader: 'Contact Us',
+  actions: [
+    {
+      title: 'Login',
+      link: '/login',
+    },
+    {
+      link: '/sitemap',
+      title: 'Sitemap',
+    },
+    {
+      link: '/privacy',
+      title: 'Privacy',
+    },
+    {
+      link: '/copyright',
+      title: 'Copyright',
+      copy: true,
+    },
+  ],
+  sites: [
+    {
+      link: 'https://biodiversity.europa.eu/',
+      src: biseLogo,
+      alt: 'Biodiversity',
+    },
+    {
+      link: 'https://climate-energy.eea.europa.eu/',
+      src: energyLogo,
+      alt: 'Climate and energy in the EU',
+    },
+    {
+      link: 'https://insitu.copernicus.eu/',
+      src: insituLogo,
+      alt: 'Copernicus in situ',
+    },
+    {
+      link: 'https://ipchem.jrc.ec.europa.eu/RDSIdiscovery/ipchem/index.html',
+      src: ipchemLogo,
+      alt: 'Information platform for chemical monitoring',
+    },
+    {
+      link: 'https://water.europa.eu/freshwater',
+      src: freshwaterLogo,
+      alt: 'WISE freshwater',
+    },
+    {
+      link: 'https://forest.eea.europa.eu/',
+      src: fiseLogo,
+      alt: 'Forest information system for europe',
+    },
+    {
+      link: 'https://climate-adapt.eea.europa.eu/',
+      src: ccaLogo,
+      alt: 'Climate adapt',
+    },
+    {
+      link: 'https://land.copernicus.eu/',
+      src: copernicusLogo,
+      alt: 'Copernicus land monitoring service',
+    },
+    {
+      link: 'https://industry.eea.europa.eu/',
+      src: industryLogo,
+      alt: 'European industrial emissions portal',
+    },
+    {
+      link: 'https://water.europa.eu/marine',
+      src: marineLogo,
+      alt: 'WISE marine',
+    },
+  ],
+  managedBy: [
+    {
+      link: 'https://www.eea.europa.eu/',
+      src: eeaLogo,
+      alt: 'EEA Logo',
+      className: 'site logo',
+      columnSize: {
+        mobile: 6,
+        tablet: 12,
+        computer: 5,
+      },
+    },
+    {
+      link: 'https://www.eionet.europa.eu/',
+      src: eionetLogo,
+      alt: 'EIONET Logo',
+      className: 'eionet logo',
+      columnSize: {
+        mobile: 6,
+        tablet: 12,
+        computer: 7,
+      },
+    },
+  ],
+  social: [
+    {
+      name: 'twitter',
+      icon: 'ri-twitter-fill',
+      link: 'https://twitter.com/euenvironment',
+    },
+    {
+      name: 'facebook',
+      icon: 'ri-facebook-box-fill',
+      link: 'https://www.facebook.com/European.Environment.Agency',
+    },
+    {
+      name: 'linkedin',
+      icon: 'ri-linkedin-fill',
+      link: 'https://www.linkedin.com/company/european-environment-agency',
+    },
+    {
+      name: 'youtube',
+      icon: 'ri-youtube-fill',
+      link: 'https://www.youtube.com/user/EEAvideos',
+    },
+    {
+      name: 'rss',
+      icon: 'ri-rss-fill',
+      link: '/subscription/news-feeds',
+    },
+  ],
+  contacts: [
+    {
+      icon: 'comment outline',
+      text: 'Ask your question',
+      link: '/contact-us',
+    },
+    {
+      icon: 'envelope outline',
+      text: 'Sign up to our newsletter',
+      link: '/newsletter',
+    },
+  ],
+  address: 'Kongens Nytorv 6 1050 Copenhagen K (+45) 33 36 71 00',
+};
 
 export const globalHeaderPartnerLinks = {
   title: 'Environmental information systems',
@@ -101,64 +192,6 @@ export const globalHeaderPartnerLinks = {
   ],
 };
 
-export const globalActions = [
-  {
-    link: '/login',
-    title: 'CMS Login',
-  },
-  {
-    link: '/sitemap',
-    title: 'Sitemap',
-  },
-  {
-    link: '/privacy',
-    title: 'Privacy',
-  },
-  {
-    link: '/copyright',
-    title: 'Copyright',
-    copy: true,
-  },
-];
-
-export const socialActions = [
-  {
-    name: 'twitter',
-    link: 'https://twitter.com/euenvironment',
-  },
-  {
-    name: 'facebook',
-    link: 'https://www.facebook.com/European.Environment.Agency',
-  },
-  {
-    name: 'linkedin',
-    link: 'https://www.linkedin.com/company/european-environment-agency',
-  },
-  {
-    name: 'youtube',
-    link: 'https://www.youtube.com/user/EEAvideos',
-  },
-  {
-    name: 'rss',
-    link: '/subscription/news-feeds',
-  },
-];
-
-export const footerActions = [
-  {
-    icon: 'comment outline',
-    text: 'Ask your question',
-    link: '/contact-us',
-  },
-  {
-    icon: 'envelope outline',
-    text: 'Sign up to our newsletter',
-    link: '/newsletter',
-  },
-];
-
-export const address = 'Kongens Nytorv 6 1050 Copenhagen K (+45) 33 36 71 00';
-
 export const languages = [
   { name: 'Български', code: 'bg' },
   { name: 'čeština', code: 'cs' },

package/src/customizations/volto/components/theme/Footer/Footer.jsx

@@ -5,68 +5,15 @@
 
 import React from 'react';
 import EEAFooter from '@eeacms/volto-eea-design-system/ui/Footer/Footer';
-import { Grid, Image } from 'semantic-ui-react';
-import { Link } from 'react-router-dom';
-
-import EIONETLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/logo/EIONETLogo.png';
-import EEALogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/logo/EEA-Logo-white.svg';
-
 import config from '@plone/volto/registry';
 
 const Footer = (props) => {
   const { eea } = config.settings;
-
   return (
     <EEAFooter>
-      <EEAFooter.Header>The EEA also contributes to</EEAFooter.Header>
-      <EEAFooter.Sites sites={config.settings.eea.partnerWebsites} />
-
-      <EEAFooter.SubFooter>
-        <div className="subfooter">
-          <Grid>
-            <Grid.Column mobile={6} tablet={7} computer={8}>
-              <div className="item">
-                <div className="site logo">
-                  <Link to="/">
-                    <Image src={EEALogo} alt="EEA Logo"></Image>
-                  </Link>
-                  <p className="description">An agency of the European Union</p>
-                </div>
-
-                <div className="eionet logo">
-                  <a href="https://www.eionet.europa.eu/">
-                    <Image src={EIONETLogo} alt="EIONET Logo"></Image>
-                  </a>
-                  <p className="description">
-                    European Environment
-                    <br />
-                    Information and
-                    <br />
-                    Observation Network
-                  </p>
-                </div>
-              </div>
-            </Grid.Column>
-            <Grid.Column mobile={6} tablet={5} computer={4}>
-              <div className="item">
-                <EEAFooter.Contact
-                  contacts={eea.footerActions}
-                  header="Contact Us"
-                  address={eea.address}
-                />
-                <EEAFooter.Social social={eea.socialActions} />
-              </div>
-            </Grid.Column>
-          </Grid>
-          <Grid>
-            <Grid.Row>
-              <Grid.Column>
-                <EEAFooter.Actions actions={eea.globalActions} />
-              </Grid.Column>
-            </Grid.Row>
-          </Grid>
-        </div>
-      </EEAFooter.SubFooter>
+      <EEAFooter.Header>{eea.footerOpts.header}</EEAFooter.Header>
+      <EEAFooter.Sites sites={eea.footerOpts.sites} />
+      <EEAFooter.SubFooter {...eea.footerOpts} />
     </EEAFooter>
   );
 };

package/src/index.js

@@ -3,6 +3,7 @@ import InpageNavigation from '@eeacms/volto-eea-design-system/ui/InpageNavigatio
 import installCustomTitle from '@eeacms/volto-eea-website-theme/components/manage/Blocks/Title';
 import CustomCSS from '@eeacms/volto-eea-website-theme/components/theme/CustomCSS/CustomCSS';
 import DraftBackground from '@eeacms/volto-eea-website-theme/components/theme/DraftBackground/DraftBackground';
+import { TokenWidget } from '@eeacms/volto-eea-website-theme/components/theme/Widgets/TokenWidget';
 
 const applyConfig = (config) => {
   config.settings.eea = {
@@ -15,10 +16,26 @@ const applyConfig = (config) => {
     config.blocks.blocksConfig.accordion.semanticIcon = 'ri-arrow-down-s-line';
   }
 
+  // Apply tabs block customization
+  if (config.blocks.blocksConfig.tabs_block) {
+    if (config.blocks.blocksConfig.tabs_block.templates.accordion) {
+      config.blocks.blocksConfig.tabs_block.templates.accordion.semanticIcon = {
+        opened: 'ri-arrow-up-s-line',
+        closed: 'ri-arrow-down-s-line',
+      };
+    }
+  }
+
   // Description block custom CSS
   config.blocks.blocksConfig.description.className =
     'documentDescription eea callout';
 
+  // Custom TokenWidget
+  if (config.widgets.views) {
+    config.widgets.views.id.subjects = TokenWidget;
+    config.widgets.views.widget.tags = TokenWidget;
+  }
+
   // apply inPage navigation
   config.settings.appExtras = [
     ...(config.settings.appExtras || []),