@eeacms/volto-eea-website-theme 0.6.16 → 0.7.0

package/CHANGELOG.md

@@ -4,8 +4,30 @@ 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.7.0](https://github.com/eea/volto-eea-website-theme/compare/0.6.18...0.7.0)
+
+- Update package.json [`a1bf047`](https://github.com/eea/volto-eea-website-theme/commit/a1bf0473236b1663d23c9b4bdf4c55db6a6f00aa)
+- change(footer): Alignment as per storybook mockups [`f812944`](https://github.com/eea/volto-eea-website-theme/commit/f8129441b83ad484bf1b3bb9e7c7884031005a90)
+- change(footer): Aligment as per storybook mockups [`1033166`](https://github.com/eea/volto-eea-website-theme/commit/103316636d53a08e8f627b554cfafb1180750a1f)
+
+#### [0.6.18](https://github.com/eea/volto-eea-website-theme/compare/0.6.17...0.6.18)
+
+> 4 August 2022
+
+- change(megamenu): added icon on mega menu header section [`#53`](https://github.com/eea/volto-eea-website-theme/pull/53)
+
+#### [0.6.17](https://github.com/eea/volto-eea-website-theme/compare/0.6.16...0.6.17)
+
+> 3 August 2022
+
+- Develop [`#52`](https://github.com/eea/volto-eea-website-theme/pull/52)
+- Set focus on search input field in the popup on click [`#50`](https://github.com/eea/volto-eea-website-theme/pull/50)
+
 #### [0.6.16](https://github.com/eea/volto-eea-website-theme/compare/0.6.15...0.6.16)
 
+> 1 August 2022
+
+- Release [`#49`](https://github.com/eea/volto-eea-website-theme/pull/49)
 - Nonapi breadcrumbs [`#48`](https://github.com/eea/volto-eea-website-theme/pull/48)
 - Make Breadcrumbs behave better with non-content routes [`9407840`](https://github.com/eea/volto-eea-website-theme/commit/94078403458a5a3ea725ce9126fffed9d463097d)
 - change(megamenu): add border for active element of menu [`252efc4`](https://github.com/eea/volto-eea-website-theme/commit/252efc4485961c8d05e3703fee06179a0fdc8da3)

package/package.json

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

package/src/config.js

@@ -14,26 +14,27 @@ import climateLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/ass
 // TODO: to be consolidated with headerLinks
 // Footer.jsx config options
 export const footerOpts = {
-  header: 'EEA information systems',
+  header: 'Thematic information platforms',
   logosHeader: 'Managed by',
   contactHeader: 'Contact Us',
   actions: [
     {
-      title: 'Login',
-      link: '/login',
+      title: 'Privacy',
+      link: '/privacy',
     },
     {
       link: '/sitemap',
       title: 'Sitemap',
     },
     {
-      link: '/privacy',
-      title: 'Privacy',
+      link: '/login',
+      title: 'CMS Login',
     },
+  ],
+  copyright: [
     {
       link: '/copyright',
-      title: 'Copyright',
-      copy: true,
+      site: 'EEA',
     },
   ],
   sites: [
@@ -42,41 +43,36 @@ export const footerOpts = {
       src: marineLogo,
       alt: 'WISE marine',
     },
-    {
-      link: 'https://biodiversity.europa.eu/',
-      src: biseLogo,
-      alt: 'Biodiversity',
-    },
-    {
-      link: 'https://climate-adapt.eea.europa.eu/observatory',
-      src: climateLogo,
-      alt: 'European Climate and Health Observatory',
-    },
-    {
-      link: 'https://industry.eea.europa.eu/',
-      src: industryLogo,
-      alt: 'European industrial emissions portal',
-    },
-    {
-      link: 'https://insitu.copernicus.eu/',
-      src: insituLogo,
-      alt: 'Copernicus in situ',
-    },
     {
       link: 'https://water.europa.eu/freshwater',
       src: freshwaterLogo,
       alt: 'WISE freshwater',
     },
+    {
+      link: 'https://biodiversity.europa.eu/',
+      src: biseLogo,
+      alt: 'Biodiversity',
+    },
     {
       link: 'https://forest.eea.europa.eu/',
       src: fiseLogo,
       alt: 'Forest information system for europe',
     },
+    {
+      link: 'https://climate-adapt.eea.europa.eu/observatory',
+      src: climateLogo,
+      alt: 'European Climate and Health Observatory',
+    },
     {
       link: 'https://climate-adapt.eea.europa.eu/',
       src: ccaLogo,
       alt: 'Climate adapt',
     },
+    {
+      link: 'https://industry.eea.europa.eu/',
+      src: industryLogo,
+      alt: 'European industrial emissions portal',
+    },
     {
       link: 'https://climate-energy.eea.europa.eu/',
       src: energyLogo,
@@ -87,6 +83,11 @@ export const footerOpts = {
       src: copernicusLogo,
       alt: 'Copernicus land monitoring service',
     },
+    {
+      link: 'https://insitu.copernicus.eu/',
+      src: insituLogo,
+      alt: 'Copernicus in situ',
+    },
   ],
   managedBy: [
     {
@@ -97,7 +98,7 @@ export const footerOpts = {
       columnSize: {
         mobile: 6,
         tablet: 12,
-        computer: 5,
+        computer: 4,
       },
     },
     {
@@ -108,7 +109,7 @@ export const footerOpts = {
       columnSize: {
         mobile: 6,
         tablet: 12,
-        computer: 6,
+        computer: 4,
       },
     },
   ],
@@ -133,6 +134,11 @@ export const footerOpts = {
       icon: 'ri-youtube-fill',
       link: 'https://www.youtube.com/user/EEAvideos',
     },
+    {
+      name: 'instagram',
+      icon: 'ri-instagram-fill',
+      link: 'https://www.instagram.com/ourplanet_eu',
+    },
     {
       name: 'rss',
       icon: 'ri-rss-fill',
@@ -142,7 +148,22 @@ export const footerOpts = {
   contacts: [
     {
       icon: 'comment outline',
-      text: 'Ask your question',
+      text: 'About us',
+      link: '/about',
+      children: [
+        {
+          link: '/faq',
+          text: 'FAQs',
+        },
+        {
+          link: '/careers',
+          text: 'Careers',
+        },
+      ],
+    },
+    {
+      icon: 'comment outline',
+      text: 'Contact us',
       link: '/contact-us',
     },
     {

package/src/customizations/@eeacms/volto-eea-design-system/ui/Header/HeaderSearchPopUp.js

@@ -3,7 +3,12 @@ import { Container, Input } from 'semantic-ui-react';
 import { withRouter } from 'react-router-dom';
 import { useClickOutside } from '@eeacms/volto-eea-design-system/helpers';
 
-function HeaderSearchPopUp({ history, onClose, triggerRefs = [] }) {
+function HeaderSearchPopUp({
+  history,
+  onClose,
+  searchInputRef,
+  triggerRefs = [],
+}) {
   const nodeRef = React.useRef();
   const [text, setText] = React.useState('');
 
@@ -30,6 +35,7 @@ function HeaderSearchPopUp({ history, onClose, triggerRefs = [] }) {
       <Container>
         <div className="wrapper">
           <Input
+            ref={searchInputRef}
             className="search"
             onChange={onChangeText}
             icon={{

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

@@ -11,9 +11,13 @@ const Footer = (props) => {
   const { eea } = config.settings;
   return (
     <EEAFooter>
+      <EEAFooter.SubFooter {...eea.footerOpts} />
       <EEAFooter.Header>{eea.footerOpts.header}</EEAFooter.Header>
       <EEAFooter.Sites sites={eea.footerOpts.sites} />
-      <EEAFooter.SubFooter {...eea.footerOpts} />
+      <EEAFooter.Actions
+        actions={eea.footerOpts.actions}
+        copyright={eea.footerOpts.copyright}
+      />
     </EEAFooter>
   );
 };

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

@@ -203,8 +203,9 @@ const EEAHeader = ({ pathname, token, items, history }) => {
               active: item.url === router_pathname,
             })}
           >
-            {props?.children}
+            {props?.iconPosition !== 'right' && props?.children}
             <span>{item.title}</span>
+            {props?.iconPosition === 'right' && props?.children}
           </UniversalLink>
         )}
       ></Header.Main>