Merge pull request #22 from plone/update-versions

LGTM. I just updated the content database from the live site to testing, let's update testing now to the latest and check.

backend/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG PLONE_VERSION=6.0.4
+ARG PLONE_VERSION=6.0.7
 FROM plone/plone-backend:${PLONE_VERSION}
 
 LABEL maintainer="Simples Consultoria <[email protected]>" \

backend/Dockerfile.acceptance

@@ -1,4 +1,4 @@
-ARG PLONE_VERSION=6.0.4
+ARG PLONE_VERSION=6.0.7
 FROM plone/plone-backend:${PLONE_VERSION}
 
 LABEL maintainer="Jonas Piterek <[email protected]>" \

backend/Makefile

@@ -15,7 +15,7 @@ GREEN=`tput setaf 2`
 RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
-PLONE_VERSION=6.0.4
+PLONE_VERSION=6.0.7
 
 BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 

backend/constraints.txt

@@ -1 +1 @@
--c https://dist.plone.org/release/6.0.4/constraints.txt
+-c https://dist.plone.org/release/6.0-dev/constraints.txt

frontend/package.json

@@ -140,19 +140,19 @@
     "node": "^16 || ^18"
   },
   "dependencies": {
-    "@eeacms/volto-accordion-block": "8.0.0",
-    "@eeacms/volto-matomo": "3.0.1",
-    "@kitconcept/volto-blocks-grid": "8.0.0",
-    "@kitconcept/volto-button-block": "2.2.0",
-    "@kitconcept/volto-dsgvo-banner": "2.1.0",
+    "@eeacms/volto-accordion-block": "10.3.0",
+    "@eeacms/volto-matomo": "4.1.3",
+    "@kitconcept/volto-blocks-grid": "8.0.3",
+    "@kitconcept/volto-button-block": "2.3.1",
+    "@kitconcept/volto-dsgvo-banner": "2.2.0",
     "@kitconcept/volto-export": "1.1.0",
-    "@kitconcept/volto-heading-block": "2.3.0",
-    "@kitconcept/volto-separator-block": "3.2.1",
+    "@kitconcept/volto-heading-block": "2.4.0",
+    "@kitconcept/volto-separator-block": "4.0.0",
     "@kitconcept/volto-slider-block": "4.3.0",
     "@plone-collective/volto-authomatic": "1.3.0",
-    "@plone/volto": "17.0.0-alpha.16",
+    "@plone/volto": "17.0.0-alpha.26",
     "date-fns": "2.30.0",
-    "volto-form-block": "3.0.1"
+    "volto-form-block": "3.1.0"
   },
   "devDependencies": {
     "@plone/scripts": "^3.0.0",

frontend/src/addons/volto-plonede/src/customizations/volto/components/theme/Header/Header.jsx

@@ -46,7 +46,7 @@ class Header extends Component {
         <Container>
           <div className="header">
             <div className="logo-nav-wrapper">
-              <div className="logo">
+              <div className="logo-wrapper">
                 <Logo />
               </div>
               <div className="nav-search-wrapper">

frontend/src/addons/volto-plonede/src/customizations/volto/components/theme/Logo/Logo.jsx

@@ -0,0 +1,59 @@
+/**
+ * Logo component.
+ * @module components/theme/Logo/Logo
+ */
+import { useEffect } from 'react';
+import { Image } from 'semantic-ui-react';
+import { ConditionalLink } from '@plone/volto/components';
+import LogoImage from '@plone/volto/components/theme/Logo/Logo.svg';
+import { useSelector, useDispatch } from 'react-redux';
+import { getNavroot } from '@plone/volto/actions';
+import {
+  flattenToAppURL,
+  hasApiExpander,
+  getBaseUrl,
+  toPublicURL,
+} from '@plone/volto/helpers';
+
+/**
+ * Logo component class.
+ * @function Logo
+ * @param {Object} intl Intl object
+ * @returns {string} Markup of the component.
+ */
+const Logo = () => {
+  const pathname = useSelector((state) => state.router.location.pathname);
+  const site = useSelector((state) => state.site.data);
+  const navroot = useSelector((state) => state.navroot.data);
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    if (pathname && !hasApiExpander('navroot', getBaseUrl(pathname))) {
+      dispatch(getNavroot(getBaseUrl(pathname)));
+    }
+  }, [dispatch, pathname]);
+
+  // remove trailing slash
+  const currentURL = toPublicURL(pathname).replace(/\/$/, '');
+
+  return (
+    <ConditionalLink
+      href={navroot?.navroot?.['@id']}
+      title={navroot?.navroot?.title}
+      condition={currentURL !== navroot?.navroot?.['@id']}
+    >
+      <Image
+        className="logo"
+        src={
+          site['plone.site_logo']
+            ? flattenToAppURL(site['plone.site_logo'])
+            : LogoImage
+        }
+        alt={navroot?.navroot?.title}
+        title={navroot?.navroot?.title}
+      />
+    </ConditionalLink>
+  );
+};
+
+export default Logo;

frontend/theme/extras/custom.less

@@ -128,7 +128,7 @@ body.cms-ui .ui.basic.segment.content-area {
         position: relative;
         height: 69px;
 
-        .logo {
+        .logo-wrapper {
           display: flex;
           width: 155px;
           height: 40px;
@@ -374,7 +374,7 @@ body.cms-ui .ui.basic.segment.content-area {
   color: @plone-blue !important;
 }
 
-img.ui.image {
+img.ui.image:not(.logo) {
   display: inline;
   margin-bottom: 14px;
 }
@@ -461,7 +461,7 @@ body #page-sitemap .ui.container {
       .ui.container {
         .header {
           .logo-nav-wrapper {
-            .logo {
+            .logo-wrapper {
               margin: auto;
             }
 
@@ -515,7 +515,7 @@ body #page-sitemap .ui.container {
       .ui.container {
         .header {
           .logo-nav-wrapper {
-            .logo {
+            .logo-wrapper {
               margin: auto;
             }