@eeacms/volto-eea-website-theme 0.7.5 → 0.7.7

package/CHANGELOG.md

@@ -4,11 +4,25 @@ 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.5](https://github.com/eea/volto-eea-website-theme/compare/0.7.4...0.7.5) - 27 September 2022
+### [0.7.7](https://github.com/eea/volto-eea-website-theme/compare/0.7.6...0.7.7) - 19 October 2022
+
+#### :hammer_and_wrench: Others
+
+- feature(theme): added context copyright component [g-stamatis - [`ab4079c`](https://github.com/eea/volto-eea-website-theme/commit/ab4079c2be9bc7eff46f84ef83d552431f8e79bc)]
+- Fix hardcoded search link [kreafox - [`c42d32e`](https://github.com/eea/volto-eea-website-theme/commit/c42d32eee8f1e0974da1526dccb8ac12e92d4bef)]
+- Better handling of active view [kreafox - [`944ce20`](https://github.com/eea/volto-eea-website-theme/commit/944ce20fa3cc10beb02d05cf1f8261d3988520ac)]
+### [0.7.6](https://github.com/eea/volto-eea-website-theme/compare/0.7.5...0.7.6) - 5 October 2022
+
+#### :rocket: New Features
+
+- feat(StyleWrapper): Re-enable textAlign and fontWeight - refs #148213 [Alin Voinea - [`98aba2a`](https://github.com/eea/volto-eea-website-theme/commit/98aba2a17bc876eedbe0547de12eb99024c5e2f7)]
 
 #### :bug: Bug Fixes
 
-- fix(block-style): Keep only Preset styles - refs #148213 [Alin Voinea - [`d372a7d`](https://github.com/eea/volto-eea-website-theme/commit/d372a7ddf6b4bd1820a5abcd3ea90f65a2932e52)]
+- fix(List): Align slate list ul/ol to EEA Design System - refs #155248 [Alin Voinea - [`e4c3ab0`](https://github.com/eea/volto-eea-website-theme/commit/e4c3ab01850dac871fc274ef800cdb55f84b0118)]
+- fix(accordion): Remove styled, fluid and set default theme secondary - refs #153783 [Alin Voinea - [`8ebb9ac`](https://github.com/eea/volto-eea-website-theme/commit/8ebb9ac385ab8030a47988d9750b5eba38cbdeb9)]
+
+### [0.7.5](https://github.com/eea/volto-eea-website-theme/compare/0.7.4...0.7.5) - 27 September 2022
 
 ### [0.7.4](https://github.com/eea/volto-eea-website-theme/compare/0.7.3...0.7.4) - 27 September 2022
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -27,7 +27,8 @@
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",
-    "babel-plugin-transform-class-properties": "^6.24.1"
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "md5": "^2.3.0"
   },
   "scripts": {
     "release": "release-it",

package/src/config.js

@@ -248,6 +248,21 @@ export const websiteTitle = 'Site';
 export const organisationName = 'European Environment Agency';
 export const logoTargetUrl = '/';
 
+export const headerSearchBox = [
+  {
+    isDefault: true,
+    path: '/en/advanced-search',
+    placeholder: 'Search...',
+  },
+  {
+    path: '/en/datahub',
+    placeholder: 'Search Datahub...',
+    description:
+      'Looking for more information? Try searching the full EEA website content',
+    buttonTitle: 'Go to full site search',
+  },
+];
+
 export const colors = [
   // Primary & shades
   '#007B6C',

package/src/customizations/@eeacms/volto-block-style/StyleWrapper/schema.js

@@ -12,12 +12,32 @@ export const StyleSchema = () => {
         title: 'Preset styles',
         fields: ['style_name'],
       },
+      {
+        id: 'text',
+        title: 'Text',
+        fields: ['textAlign', 'fontWeight'],
+      },
     ],
     properties: {
       style_name: {
         title: 'Style',
         widget: 'style_select',
       },
+      textAlign: {
+        title: 'Text align',
+        widget: 'style_text_align',
+      },
+      fontWeight: {
+        title: 'Font weight',
+        description: 'The weight (or boldness) of the font',
+        choices: [
+          ['300', 'Light'],
+          ['400', 'Regular'],
+          ['500', 'Medium'],
+          ['600', 'SemiBold'],
+          ['700', 'Bold'],
+        ],
+      },
     },
     required: [],
   };

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

@@ -2,14 +2,23 @@ import React from 'react';
 import { Container, Input } from 'semantic-ui-react';
 import { withRouter } from 'react-router-dom';
 import { useClickOutside } from '@eeacms/volto-eea-design-system/helpers';
+import config from '@plone/volto/registry';
 
 function HeaderSearchPopUp({
   history,
+  location,
   onClose,
   searchInputRef,
   triggerRefs = [],
 }) {
   const nodeRef = React.useRef();
+  const { eea } = config.settings;
+  const defaultView = eea.headerSearchBox.filter((v) => v.isDefault);
+  const localView = eea.headerSearchBox.filter((v) =>
+    location.pathname.includes(v.path),
+  );
+  const activeView = localView.length > 0 ? localView[0] : defaultView[0];
+
   const [text, setText] = React.useState('');
 
   useClickOutside({ targetRefs: [nodeRef, ...triggerRefs], callback: onClose });
@@ -20,7 +29,7 @@ function HeaderSearchPopUp({
   };
 
   const onSubmit = (event) => {
-    history.push(`/en/advanced-search?q=${text}`);
+    history.push(`${activeView.path}?q=${text}`);
 
     if (window?.searchContext?.resetSearch) {
       window.searchContext.resetSearch({ searchTerm: text });
@@ -31,24 +40,40 @@ function HeaderSearchPopUp({
   };
 
   return (
-    <form id="search-box" ref={nodeRef} method="get" onSubmit={onSubmit}>
-      <Container>
-        <div className="wrapper">
-          <Input
-            ref={searchInputRef}
-            className="search"
-            onChange={onChangeText}
-            icon={{
-              className: 'ri-search-line',
-              link: true,
-              onClick: onSubmit,
-            }}
-            placeholder="Search..."
-            fluid
-          />
+    <div id="search-box" ref={nodeRef}>
+      <form method="get" onSubmit={onSubmit}>
+        <Container>
+          <div className="wrapper">
+            <Input
+              ref={searchInputRef}
+              className="search"
+              onChange={onChangeText}
+              icon={{
+                className: 'ri-search-line',
+                link: true,
+                onClick: onSubmit,
+              }}
+              placeholder={activeView.placeholder}
+              fluid
+            />
+          </div>
+        </Container>
+      </form>
+      {(activeView.description || activeView.buttonTitle) && (
+        <div className="advanced-search">
+          <Container>
+            <p>{activeView.description}</p>
+            <a
+              href={defaultView[0].path}
+              className="ui button white inverted"
+              title="Advanced search"
+            >
+              {activeView.buttonTitle}
+            </a>
+          </Container>
         </div>
-      </Container>
-    </form>
+      )}
+    </div>
   );
 }
 

package/src/index.js

@@ -10,6 +10,7 @@ import { Icon } from '@plone/volto/components';
 import paintSVG from '@plone/volto/icons/paint.svg';
 import contentBoxSVG from './icons/content-box.svg';
 import voltoCustomMiddleware from './middleware/voltoCustom';
+import { List } from 'semantic-ui-react';
 
 const applyConfig = (config) => {
   // EEA specific settings
@@ -28,6 +29,8 @@ const applyConfig = (config) => {
   // Apply accordion block customization
   if (config.blocks.blocksConfig.accordion) {
     config.blocks.blocksConfig.accordion.semanticIcon = 'ri-arrow-down-s-line';
+    config.blocks.blocksConfig.accordion.options = {};
+    config.blocks.blocksConfig.accordion.defaults.theme = 'secondary';
   }
 
   // Apply tabs block customization
@@ -76,8 +79,27 @@ const applyConfig = (config) => {
     },
   ];
 
-  // Slate StyleMenu configuration
   if (config.settings.slate) {
+    // Align Slate Lists to EEA Design System
+    config.settings.slate.elements.ul = ({ attributes, children }) => (
+      <List bulleted as="ul" {...attributes}>
+        {children}
+      </List>
+    );
+
+    config.settings.slate.elements.ol = ({ attributes, children }) => (
+      <List ordered as="ol" {...attributes}>
+        {children}
+      </List>
+    );
+
+    config.settings.slate.elements.li = ({ attributes, children }) => (
+      <List.Item as="li" {...attributes}>
+        {children}
+      </List.Item>
+    );
+
+    // Slate StyleMenu configuration
     config.settings.slate.styleMenu = {
       ...(config.settings.slate.styleMenu || {}),
       blockStyles: [

package/theme/theme.config

@@ -109,6 +109,7 @@
 @callout : 'eea';
 @quote   : 'eea';
 @hero    : 'eea';
+@copyright        : 'eea';
 
 /*******************************
             Folders