@eeacms/volto-bise-policy 1.0.3 → 1.0.4

package/CHANGELOG.md

@@ -4,11 +4,18 @@ 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).
 
-### [1.0.3](https://github.com/eea/volto-bise-policy/compare/1.0.2...1.0.3) - 12 April 2023
+### [1.0.4](https://github.com/eea/volto-bise-policy/compare/1.0.3...1.0.4) - 25 April 2023
 
-#### :hammer_and_wrench: Others
+#### :rocket: New Features
+
+- feat(Footer.jsx): add support for customizing footer actions, copyright, social and contact actions from backend [Miu Razvan - [`33ae6fc`](https://github.com/eea/volto-bise-policy/commit/33ae6fc768a53bc72d31c8240924ca33e070a483)]
+
+#### :house: Internal changes
+
+- style(KeyFactsView.jsx): add optional chaining to line.upper.data [Miu Razvan - [`ea4df76`](https://github.com/eea/volto-bise-policy/commit/ea4df7686861d05d2fa56e104c54b5659255f176)]
+
+### [1.0.3](https://github.com/eea/volto-bise-policy/compare/1.0.2...1.0.3) - 12 April 2023
 
-- update [Miu Razvan - [`a75120c`](https://github.com/eea/volto-bise-policy/commit/a75120c5047d4654b064ba1e5114d2405be5d2ff)]
 ### [1.0.2](https://github.com/eea/volto-bise-policy/compare/1.0.1...1.0.2) - 29 March 2023
 
 ### [1.0.1](https://github.com/eea/volto-bise-policy/compare/1.0.0...1.0.1) - 29 March 2023

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-bise-policy",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "@eeacms/volto-bise-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/manage/Blocks/KeyFacts/KeyFactsView.jsx

@@ -42,7 +42,7 @@ const View = ({ data }) => {
           <div className="facts-wrapper">
             {(lines || []).map((line, i) => (
               <div className="fact" key={i}>
-                {line.upper.data ? (
+                {line.upper?.data ? (
                   <>
                     <div
                       className="upper"

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

@@ -4,20 +4,85 @@
  */
 
 import React from 'react';
+import { useSelector, shallowEqual } from 'react-redux';
+import { flattenToAppURL } from '@plone/volto/helpers';
 import EEAFooter from '@eeacms/volto-eea-design-system/ui/Footer/Footer';
 import config from '@plone/volto/registry';
 
-const Footer = (props) => {
+const Footer = () => {
   const { eea } = config.settings;
+  const {
+    footerActions = [],
+    copyrightActions = [],
+    socialActions = [],
+    contactActions = [],
+    contactExtraActions = [],
+  } = useSelector(
+    (state) => ({
+      footerActions: state.actions?.actions?.footer_actions,
+      copyrightActions: state.actions?.actions?.copyright_actions,
+      socialActions: state.actions?.actions?.social_actions,
+      contactActions: state.actions?.actions?.contact_actions,
+      contactExtraActions: state.actions?.actions?.contact_extra_actions,
+    }),
+    shallowEqual,
+  );
+  // ZMI > portal_actions > footer_actions
+  const actions = footerActions.length
+    ? footerActions.map((action) => ({
+        title: action.title,
+        link: flattenToAppURL(action.url),
+      }))
+    : eea.footerOpts.actions;
+
+  // ZMI > portal_actions > copyright_actions
+  const copyright = copyrightActions.length
+    ? copyrightActions.map((action) => ({
+        title: action.title,
+        site: action.title,
+        link: flattenToAppURL(action.url),
+      }))
+    : eea.footerOpts.copyright;
+
+  // ZMI > portal_actions > social_actions
+  const social = socialActions.length
+    ? socialActions.map((action) => ({
+        name: action.id,
+        icon: action.icon,
+        link: action.url,
+      }))
+    : eea.footerOpts.social;
+
+  // ZMI > portal_actions > contact_actions
+  const contacts = contactActions.length
+    ? contactActions.map((action, idx) => ({
+        text: action.title,
+        icon: action.icon,
+        link: flattenToAppURL(action.url),
+        children:
+          idx === 0
+            ? contactExtraActions.map((child) => ({
+                text: child.title,
+                icon: child.icon,
+                link: flattenToAppURL(child.url),
+              }))
+            : [],
+      }))
+    : eea.footerOpts.contacts;
+
+  // Update options with actions from backend
+  const options = {
+    ...eea.footerOpts,
+    social,
+    contacts,
+  };
+
   return (
     <EEAFooter>
-      <EEAFooter.SubFooter {...eea.footerOpts} />
+      <EEAFooter.SubFooter {...options} />
       <EEAFooter.Header>{eea.footerOpts.header}</EEAFooter.Header>
       <EEAFooter.Sites sites={eea.footerOpts.sites} />
-      <EEAFooter.Actions
-        actions={eea.footerOpts.actions}
-        copyright={eea.footerOpts.copyright}
-      />
+      <EEAFooter.Actions actions={actions} copyright={copyright} />
     </EEAFooter>
   );
 };

package/theme/collections/message.overrides

@@ -5,6 +5,10 @@
     padding-top: 1.5rem;
     padding-bottom: 1.5rem;
     font-style: italic;
-    box-shadow: none;
+    position: relative;
+
+    &.shadow-none {
+      box-shadow: none;
+    }
   }
 }

package/theme/globals/site.overrides

@@ -154,36 +154,24 @@ p.has--clear--both:empty {
     padding: 0 !important;
   }
 
-  /* TEXT */
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6,
-  p,
-  a,
-  span,
-  button {
-    font-family: OpenSans, 'Raleway', sans-serif;
-  }
-
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6 {
-    color: @primaryColor !important;
-  }
-
-  h2 {
-    font-weight: 600;
+  .eea.header a:hover {
+    color: @secondaryColor;
   }
 
-  a {
-    color: @secondaryColor;
-    font-weight: 600;
+  .content-area {
+    /* TEXT */
+    // h1,
+    // h2,
+    // h3,
+    // h4,
+    // h5,
+    // h6,
+    // p,
+    // a,
+    // span,
+    // button {
+    //   font-family: OpenSans, 'Raleway', sans-serif;
+    // }
 
     h1,
     h2,
@@ -191,12 +179,16 @@ p.has--clear--both:empty {
     h4,
     h5,
     h6 {
-      color: @secondaryColor !important;
+      color: @primaryColor !important;
     }
 
-    &:hover {
+    h2 {
+      font-weight: 600;
+    }
+
+    a {
       color: @secondaryColor;
-      text-decoration: underline;
+      font-weight: 600;
 
       h1,
       h2,
@@ -206,21 +198,6 @@ p.has--clear--both:empty {
       h6 {
         color: @secondaryColor !important;
       }
-    }
-  }
-
-  .light-links {
-    h1,
-    h2,
-    h3,
-    h4,
-    h5,
-    h6 {
-      color: @secondaryColor !important;
-    }
-
-    a {
-      color: @secondaryColor;
 
       &:hover {
         color: @secondaryColor;
@@ -236,15 +213,44 @@ p.has--clear--both:empty {
         }
       }
     }
-  }
 
-  .dark-links {
-    a {
-      color: @primaryColor;
+    .light-links {
+      h1,
+      h2,
+      h3,
+      h4,
+      h5,
+      h6 {
+        color: @secondaryColor !important;
+      }
 
-      &:hover {
+      a {
+        color: @secondaryColor;
+
+        &:hover {
+          color: @secondaryColor;
+          text-decoration: underline;
+
+          h1,
+          h2,
+          h3,
+          h4,
+          h5,
+          h6 {
+            color: @secondaryColor !important;
+          }
+        }
+      }
+    }
+
+    .dark-links {
+      a {
         color: @primaryColor;
-        text-decoration: underline;
+
+        &:hover {
+          color: @primaryColor;
+          text-decoration: underline;
+        }
       }
     }
   }
@@ -264,28 +270,6 @@ p.has--clear--both:empty {
   z-index: 6;
 }
 
-
-@{view} {
-  .red-bg::before {
-    .full-width();
-  }
-}
-
-@{edit} {
-  .red-bg::before {
-    .full-width-edit();
-  }
-}
-
-.red-bg {
-  position: relative;
-  color: #fff;
-
-  &::before {
-    content: '';
-    height: 100%;
-    background-color: coral;
-    z-index: -1 !important;
-    position: absolute !important;
-  }
+.simple-data-table {
+  padding: 0;
 }

package/theme/globals/site.variables

@@ -4,8 +4,8 @@
 
 @import '@eeacms/volto-bise-policy/../theme/tokens/tokens';
 
-@fontName: 'OpenSans';
-@fontSize: 16px;
+// @fontName: 'OpenSans';
+// @fontSize: 16px;
 
 /*-------------------
     Brand Colors