Merge pull request #25 from eea/develop

Develop

CHANGELOG.md

@@ -4,6 +4,19 @@ 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.17.0](https://github.com/eea/advisory-board-frontend/compare/0.16.0...0.17.0) - 23 March 2023
+
+#### :rocket: New Features
+
+- feat: implement custom sitemap [Mimi - [`51256c9`](https://github.com/eea/advisory-board-frontend/commit/51256c984a60e6d1f6c981632997369a57406813)]
+
+#### :rocket: Dependency updates
+
+
+#### :bug: Bug Fixes
+
+- fix: rounded card show organization without details [Alexandru Medesan - [`2285d4b`](https://github.com/eea/advisory-board-frontend/commit/2285d4b3a57e35844cd9e57041f7f2b5078cc634)]
+
 ### [0.16.0](https://github.com/eea/advisory-board-frontend/compare/0.15.0...0.16.0) - 23 March 2023
 
 #### :rocket: New Features

README.md

@@ -3,7 +3,7 @@
 [![Release](https://img.shields.io/github/v/release/eea/advisory-board-frontend?sort=semver)](https://github.com/eea/advisory-board-frontend/releases)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/master/lastBuild/display/redirect)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/develop/lastBuild/display/redirect)
-[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2F0.16.0&build=last&subject=release%20v0.16.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/0.16.0/lastBuild/display/redirect/)
+[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2F0.17.0&build=last&subject=release%20v0.17.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/0.17.0/lastBuild/display/redirect/)
 
 
 ## Documentation

package.json

@@ -2,7 +2,7 @@
   "name": "advisory-board-frontend",
   "description": "A Volto-powered Plone frontend",
   "license": "MIT",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "scripts": {
     "start": "razzle start",
     "postinstall": "make omelette && make patches",
@@ -142,7 +142,7 @@
     "@eeacms/volto-eea-design-system": "1.0.0-beta.2"
   },
   "dependencies": {
-    "@eeacms/volto-climate-advisory-board-policy": "0.1.12",
+    "@eeacms/volto-climate-advisory-board-policy": "0.1.13",
     "@eeacms/volto-eea-design-system": "1.0.2",
     "@eeacms/volto-eea-kitkat": "13.0.0",
     "@eeacms/volto-eea-website-theme": "1.11.2",

src/components/CardOrganization.jsx

@@ -8,14 +8,12 @@ const CardOrganization = (props) => {
   const desc = description || Description;
   const show = hasDescription && desc;
 
-  return show ? (
+  return (
     <>
-      {' '}
-      <UiCard.Description content={`(${desc})`} />
-      {' '}
-      <UiCard.Description content={organization} />
+      {show && <UiCard.Description content={`(${desc})`} />}
+      {organization && <UiCard.Description content={organization} className='organization-underline'/> }
     </>
-  ) : null;
+  );
 };
 
 export default CardOrganization;

src/customizations/volto/components/theme/Sitemap/Sitemap.jsx

@@ -69,14 +69,31 @@ class Sitemap extends Component {
       </ul>
     );
   };
+
+  renderActions = (actions) => {
+    return (
+      <ul>
+        {actions.map((action) => (
+          <li key={action.url}>
+            <Link to={action.url}>{action.title}</Link>
+            {action.actions && this.renderActions(action.actions)}
+          </li>
+        ))}
+      </ul>
+    );
+  };
+
   render() {
-    const { items } = this.props;
+    const { items, actions } = this.props;
     return (
       <div id="page-sitemap">
         <Helmet title={this.props.intl.formatMessage(messages.Sitemap)} />
         <Container className="view-wrapper">
           <h1>{this.props.intl.formatMessage(messages.Sitemap)} </h1>
+          <h3>Primary navigation</h3>
           {items && this.renderItems(items)}
+          <h3>Footer</h3>
+          {actions && this.renderActions(actions)}
         </Container>
       </div>
     );
@@ -89,6 +106,7 @@ export default compose(
     (state) => ({
       items: state.navigation.items,
       lang: state.intl.locale,
+      actions: state.actions?.actions?.footer_actions,
     }),
     { getNavigation, listActions },
   ),

yarn.lock

@@ -1998,13 +1998,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-climate-advisory-board-policy@npm:0.1.12":
-  version: 0.1.12
-  resolution: "@eeacms/volto-climate-advisory-board-policy@npm:0.1.12"
+"@eeacms/volto-climate-advisory-board-policy@npm:0.1.13":
+  version: 0.1.13
+  resolution: "@eeacms/volto-climate-advisory-board-policy@npm:0.1.13"
   dependencies:
     "@eeacms/volto-eea-design-system": "*"
     "@eeacms/volto-eea-website-theme": "*"
-  checksum: e536542f66e0abce451ed90978e71b4ed9f8b9e2ba43f3a5eca4c403eef597cf46dbd4a3726de935efac95b01611ca1c2ce939b57f71d2caf653d8b7de6f262b
+  checksum: 5e927da5eb9f5fa30e77c7b50a84890d9188223af4c1959af51417a93432eff0be4d50f0b5b7b8ad733c542b1b246d7e8277cdf7a1ef998c0359b1457ca3eaff
   languageName: node
   linkType: hard
 
@@ -6293,7 +6293,7 @@ __metadata:
   resolution: "advisory-board-frontend@workspace:."
   dependencies:
     "@cypress/code-coverage": 3.10.0
-    "@eeacms/volto-climate-advisory-board-policy": 0.1.12
+    "@eeacms/volto-climate-advisory-board-policy": 0.1.13
     "@eeacms/volto-eea-design-system": 1.0.2
     "@eeacms/volto-eea-kitkat": 13.0.0
     "@eeacms/volto-eea-website-theme": 1.11.2