@eeacms/volto-cca-policy 0.1.8 → 0.1.9

package/CHANGELOG.md

@@ -4,6 +4,17 @@ 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.9](https://github.com/eea/volto-cca-policy/compare/0.1.8...0.1.9) - 20 March 2023
+
+#### :hammer_and_wrench: Others
+
+- Set all paths not contaning /en/mission as external routes. (Disabled in development mode to prevent infinite redirect.) [GhitaB - [`42c76ae`](https://github.com/eea/volto-cca-policy/commit/42c76ae36687077c33f87c752310ad170b0a639e)]
+- Remove unused import [kreafox - [`32229f6`](https://github.com/eea/volto-cca-policy/commit/32229f671fa11260da4441aab625c4b731c03744)]
+- Fix eslint [kreafox - [`dc023e7`](https://github.com/eea/volto-cca-policy/commit/dc023e76b660ad6fd4880287df2a03c82284e6cf)]
+- Use latest eea-design-system [kreafox - [`460a28b`](https://github.com/eea/volto-cca-policy/commit/460a28b99d7aa17d1eab27052772841e08ba44fe)]
+- Better logo [kreafox - [`5dda132`](https://github.com/eea/volto-cca-policy/commit/5dda132268f5943e3fbfcf0689088afbc9a85d25)]
+- Update footer [kreafox - [`680f29a`](https://github.com/eea/volto-cca-policy/commit/680f29acf1458ea238df114ad464c3d0025cd707)]
+- Add override for volto-banner [Tiberiu Ichim - [`16d921a`](https://github.com/eea/volto-cca-policy/commit/16d921a65948c1c5adda6a5e16e18b5ccf262fdc)]
 ### [0.1.8](https://github.com/eea/volto-cca-policy/compare/0.1.7...0.1.8) - 16 March 2023
 
 #### :hammer_and_wrench: Others
@@ -268,7 +279,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #158294 - Update supported languages list. [GhitaB - [`0a4f91f`](https://github.com/eea/volto-cca-policy/commit/0a4f91f39b7edc367bd4c127d6a8f273c7788361)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`8f1f9ce`](https://github.com/eea/volto-cca-policy/commit/8f1f9ce6c22805670cc0800d3c779b6d619d0f31)]
 ### [0.1.1](https://github.com/eea/volto-cca-policy/compare/0.1.0...0.1.1) - 13 December 2022
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -21,7 +21,7 @@
     "@eeacms/volto-eea-design-system"
   ],
   "dependencies": {
-    "@eeacms/volto-eea-design-system": "1.0.0-beta.4",
+    "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-openlayers-map": "*"
   },
   "devDependencies": {

package/src/customizations/@eeacms/volto-banner/index.js

@@ -0,0 +1,3 @@
+export default function dummyConfig(config) {
+  return config;
+}

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

@@ -7,7 +7,7 @@ import React from 'react';
 import { Dropdown, Image } from 'semantic-ui-react';
 import { connect, useDispatch, useSelector } from 'react-redux';
 
-import { withRouter, Link } from 'react-router-dom';
+import { withRouter } from 'react-router-dom';
 import { UniversalLink } from '@plone/volto/components';
 import {
   getBaseUrl,
@@ -204,7 +204,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
         transparency={isHomePageInverse ? true : false}
         logo={
           <div {...(isSubsite ? { className: 'logo-wrapper' } : {})}>
-            {!!subsite && subsite.title && (
+            {!!subsite && subsite.title ? (
               <>
                 {subsite.subsite_logo ? (
                   <Logo
@@ -216,14 +216,23 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
                 ) : (
                   subsite.title
                 )}
+                <div className="subsite-logo">
+                  <Logo
+                    src={isHomePageInverse ? logoWhite : logo}
+                    title={eea.websiteTitle}
+                    alt={eea.organisationName}
+                    url={eea.logoTargetUrl}
+                  />
+                </div>
               </>
-            )}
-            <Link to={eea.logoTargetUrl} className="subsite-logo">
-              <Image
+            ) : (
+              <Logo
                 src={isHomePageInverse ? logoWhite : logo}
-                alt={eea.websiteTitle}
+                title={eea.websiteTitle}
+                alt={eea.organisationName}
+                url={eea.logoTargetUrl}
               />
-            </Link>
+            )}
           </div>
         }
         menuItems={items}

package/src/index.js

@@ -17,6 +17,20 @@ import europeanComissionLogo from '@eeacms/volto-cca-policy/../theme//assets/ima
 import installBlocks from './components/manage/Blocks';
 
 const applyConfig = (config) => {
+  const notInEnMission = /^(?!(\/en\/mission)).*$/;
+  if (!__DEVELOPMENT__) {
+    config.settings.externalRoutes = [
+      ...(config.settings.externalRoutes || []),
+      {
+        match: {
+          path: notInEnMission,
+          exact: false,
+          strict: false,
+        },
+      },
+    ];
+  }
+
   config.settings.dateLocale = 'en-gb';
   config.settings.isMultilingual = true;
   config.settings.defaultLanguage =
@@ -62,17 +76,23 @@ const applyConfig = (config) => {
         },
       ],
       social: [],
+      actions: [
+        {
+          link: '/en/mission/login',
+          title: 'CMS Login',
+        },
+      ],
       contacts: [
         {
           icon: 'comment outline',
           text: 'About us',
-          link: '/about',
+          link: '/en/mission/about-us',
           children: [],
         },
         {
           icon: 'comment outline',
           text: 'Contact us',
-          link: '/contact-us',
+          link: '/en/mission/contact-us',
         },
         // {
         //   icon: 'envelope outline',
@@ -145,10 +165,6 @@ const applyConfig = (config) => {
     config = installExpressMiddleware(config);
   }
 
-  config.settings.eea.footerOpts.actions = [
-    { link: '/en/mission/login', title: 'CMS Login' },
-  ];
-
   return installBlocks(config);
 };
 

package/theme/globals/site.overrides

@@ -93,10 +93,6 @@ body.subsite-mkh {
     max-width: 252px;
   }
 
-  .eea.header .subsite-logo {
-    left: 280px;
-  }
-
   .subfooter .footer-description {
     margin-top: 3em;
     margin-bottom: 1em;
@@ -138,8 +134,15 @@ body.subsite-mkh {
   }
 
   .eea.header .subsite-logo {
-    .ui.image {
-      max-height: 60px;
+    height: 100%;
+
+    .logo {
+      display: inline-block;
+      height: 100%;
+
+      img {
+        max-width: 320px;
+      }
     }
 
     &:before {
@@ -157,3 +160,9 @@ body.subsite-mkh {
     background: @subsiteBackgroundGradient;
   }
 }
+
+@media only screen and (min-width: @largestSmallMonitor) {
+  .eea.header .subsite-logo {
+    left: 280px !important;
+  }
+}