@kitconcept/volto-light-theme 3.1.2 → 3.2.0

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2024-02-08T13:36:14.317Z\n"
+"POT-Creation-Date: 2024-03-22T15:33:53.504Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -55,7 +55,7 @@ msgid "Close menu"
 msgstr ""
 
 #. Default: "Contact"
-#: components/Theme/EventView
+#: components/Blocks/EventMetadata/View
 msgid "Contact"
 msgstr ""
 
@@ -80,7 +80,7 @@ msgid "Distributed under the {license}."
 msgstr ""
 
 #. Default: "End"
-#: components/Theme/EventView
+#: components/Blocks/EventMetadata/View
 msgid "End"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgid "Home"
 msgstr ""
 
 #. Default: "ICS Download"
-#: components/Theme/EventView
+#: components/Blocks/EventMetadata/View
 msgid "ICS-Download"
 msgstr ""
 
@@ -126,7 +126,7 @@ msgid "Left"
 msgstr ""
 
 #. Default: "Location"
-#: components/Theme/EventView
+#: components/Blocks/EventMetadata/View
 msgid "Location"
 msgstr ""
 
@@ -167,7 +167,7 @@ msgid "Overview"
 msgstr ""
 
 #. Default: "Phone"
-#: components/Theme/EventView
+#: components/Blocks/EventMetadata/View
 msgid "Phone"
 msgstr ""
 
@@ -272,7 +272,7 @@ msgid "Source"
 msgstr ""
 
 #. Default: "Start"
-#: components/Theme/EventView
+#: components/Blocks/EventMetadata/View
 msgid "Start"
 msgstr ""
 
@@ -297,7 +297,7 @@ msgid "Uploading image"
 msgstr ""
 
 #. Default: "Website"
-#: components/Theme/EventView
+#: components/Blocks/EventMetadata/View
 msgid "Website"
 msgstr ""
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitconcept/volto-light-theme",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "Volto Light Theme by kitconcept",
   "main": "src/index.js",
   "types": "src/types/index.d.ts",
@@ -34,26 +34,8 @@
     "release-rc": "release-it --preRelease=rc"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.22.15",
-    "@plone/scripts": "^3.3.2",
-    "eslint": "8.49.0",
-    "eslint-config-prettier": "9.0.0",
-    "eslint-config-react-app": "7.0.1",
-    "eslint-import-resolver-alias": "1.1.2",
-    "eslint-import-resolver-babel-plugin-root-import": "1.1.1",
-    "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-prettier": "5.0.0",
-    "eslint-plugin-react": "7.33.2",
-    "eslint-plugin-react-hooks": "4.6.0",
-    "postcss-scss": "4.0.6",
-    "prettier": "3.0.3",
-    "razzle-plugin-scss": "4.2.18",
-    "release-it": "^16.2.1",
-    "stylelint": "15.10.3",
-    "stylelint-config-idiomatic-order": "9.0.0",
-    "stylelint-config-sass-guidelines": "10.0.0",
-    "stylelint-prettier": "4.0.2"
+    "@plone/scripts": "^3.6.1",
+    "release-it": "^17.1.1"
   },
   "peerAddons": [
     "@eeacms/volto-accordion-block",
@@ -68,13 +50,13 @@
     "@plone/components": "2.0.0-alpha.6"
   },
   "peerDependencies": {
-    "@eeacms/volto-accordion-block": "^10.4.0",
+    "@eeacms/volto-accordion-block": "^10.4.6",
     "@kitconcept/volto-button-block": "^2.3.1",
-    "@kitconcept/volto-dsgvo-banner": "^1.3.0",
+    "@kitconcept/volto-dsgvo-banner": "^2.3.2",
     "@kitconcept/volto-heading-block": "^2.4.0",
-    "@kitconcept/volto-highlight-block": "^3.0.0",
+    "@kitconcept/volto-highlight-block": "^3.0.1",
     "@kitconcept/volto-introduction-block": "^1.0.0",
-    "@kitconcept/volto-separator-block": "^4.0.0",
-    "@kitconcept/volto-slider-block": "^6.1.0"
+    "@kitconcept/volto-separator-block": "^4.1.1",
+    "@kitconcept/volto-slider-block": "^6.3.1"
   }
 }

package/src/components/Blocks/Image/Edit.jsx

@@ -303,21 +303,21 @@ class Edit extends Component {
                 data.image_scales
                   ? undefined
                   : isInternalURL(data.url)
-                  ? // Backwards compat in the case that the block is storing the full server URL
-                    (() => {
-                      if (data.size === 'l')
+                    ? // Backwards compat in the case that the block is storing the full server URL
+                      (() => {
+                        if (data.size === 'l')
+                          return `${flattenToAppURL(data.url)}/@@images/image`;
+                        if (data.size === 'm')
+                          return `${flattenToAppURL(
+                            data.url,
+                          )}/@@images/image/preview`;
+                        if (data.size === 's')
+                          return `${flattenToAppURL(
+                            data.url,
+                          )}/@@images/image/mini`;
                         return `${flattenToAppURL(data.url)}/@@images/image`;
-                      if (data.size === 'm')
-                        return `${flattenToAppURL(
-                          data.url,
-                        )}/@@images/image/preview`;
-                      if (data.size === 's')
-                        return `${flattenToAppURL(
-                          data.url,
-                        )}/@@images/image/mini`;
-                      return `${flattenToAppURL(data.url)}/@@images/image`;
-                    })()
-                  : data.url
+                      })()
+                    : data.url
               }
               sizes={config.blocks.blocksConfig.image.getSizes(data)}
               alt={data.alt || ''}

package/src/components/Blocks/Image/ImageSidebar.jsx

@@ -66,9 +66,9 @@ const ImageSidebar = (props) => {
                 data.image_scales
                   ? undefined
                   : isInternalURL(data.url)
-                  ? // Backwards compat in the case that the block is storing the full server URL
-                    `${flattenToAppURL(data.url)}/@@images/image/preview`
-                  : data.url
+                    ? // Backwards compat in the case that the block is storing the full server URL
+                      `${flattenToAppURL(data.url)}/@@images/image/preview`
+                    : data.url
               }
               sizes="188px"
               alt={intl.formatMessage(messages.preview)}

package/src/components/Blocks/Image/View.jsx

@@ -93,23 +93,23 @@ export const ImageView = ({ className, data, detached, properties, style }) => {
                     data.image_scales
                       ? undefined
                       : isInternalURL(data.url)
-                      ? // Backwards compat in the case that the block is storing the full server URL
-                        (() => {
-                          if (data.size === 'l')
-                            return `${flattenToAppURL(
-                              data.url,
-                            )}/@@images/image`;
-                          if (data.size === 'm')
-                            return `${flattenToAppURL(
-                              data.url,
-                            )}/@@images/image/preview`;
-                          if (data.size === 's')
-                            return `${flattenToAppURL(
-                              data.url,
-                            )}/@@images/image/mini`;
-                          return `${flattenToAppURL(data.url)}/@@images/image`;
-                        })()
-                      : data.url
+                        ? // Backwards compat in the case that the block is storing the full server URL
+                          (() => {
+                            if (data.size === 'l')
+                              return `${flattenToAppURL(
+                                data.url,
+                              )}/@@images/image`;
+                            if (data.size === 'm')
+                              return `${flattenToAppURL(
+                                data.url,
+                              )}/@@images/image/preview`;
+                            if (data.size === 's')
+                              return `${flattenToAppURL(
+                                data.url,
+                              )}/@@images/image/mini`;
+                            return `${flattenToAppURL(data.url)}/@@images/image`;
+                          })()
+                        : data.url
                   }
                   sizes={config.blocks.blocksConfig.image.getSizes(data)}
                   alt={data.alt || ''}

package/src/components/Footer/Footer.jsx

@@ -93,8 +93,8 @@ const Footer = ({ intl }) => {
                               : addAppURL(item.id)
                           }`
                         : item.url
-                        ? flattenToAppURL(item.url)
-                        : addAppURL(item.id)
+                          ? flattenToAppURL(item.url)
+                          : addAppURL(item.id)
                     }
                   >
                     {item?.title}

package/src/components/Header/Header.jsx

@@ -28,6 +28,18 @@ const InternetHeader = ({ pathname, siteLabel, token, siteAction }) => {
   return (
     <>
       <div className="header">
+        <div className="logo-nav-wrapper">
+          <div className="logo">
+            <Logo />
+          </div>
+          <Navigation pathname={pathname} />
+          <MobileNavigation pathname={pathname} />
+          <div className="search-wrapper navigation-desktop">
+            <div className="search">
+              <SearchWidget />
+            </div>
+          </div>
+        </div>
         <div className="tools-wrapper">
           <LanguageSelector />
 
@@ -46,18 +58,6 @@ const InternetHeader = ({ pathname, siteLabel, token, siteAction }) => {
             </div>
           )}
         </div>
-        <div className="logo-nav-wrapper">
-          <div className="logo">
-            <Logo />
-          </div>
-          <Navigation pathname={pathname} />
-          <MobileNavigation pathname={pathname} />
-          <div className="search-wrapper navigation-desktop">
-            <div className="search">
-              <SearchWidget />
-            </div>
-          </div>
-        </div>
       </div>
     </>
   );

package/src/theme/_header.scss

@@ -1,6 +1,6 @@
 .header-wrapper .header {
   display: flex;
-  flex-direction: column;
+  flex-direction: column-reverse;
 
   .logo-nav-wrapper {
     display: flex;

package/.dockerignore

@@ -1 +0,0 @@
-node_modules

package/.editorconfig

@@ -1,34 +0,0 @@
-# EditorConfig Configurtaion file, for more details see:
-# http://EditorConfig.org
-# EditorConfig is a convention description, that could be interpreted
-# by multiple editors to enforce common coding conventions for specific
-# file types
-
-# top-most EditorConfig file:
-# Will ignore other EditorConfig files in Home directory or upper tree level.
-root = true
-
-
-[*]  # For All Files
-# Unix-style newlines with a newline ending every file
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-# Set default charset
-charset = utf-8
-# Indent style default
-indent_style = space
-
-[*.{py,cfg,ini}]
-# 4 space indentation
-indent_size = 4
-
-[*.{html,dtml,pt,zpt,xml,zcml,js,jsx,json,less,css,yaml,yml}]
-# 2 space indentation
-indent_size = 2
-
-[{Makefile,.gitmodules}]
-# Tab indentation (no size specified, but view as 4 spaces)
-indent_style = tab
-indent_size = unset
-tab_width = unset

package/.eslintignore

@@ -1,6 +0,0 @@
-container-query-polyfill.modern.js
-cypress
-node_modules
-acceptance
-*.json
-remove_me

package/.eslintrc

@@ -1,53 +0,0 @@
-{
-  "extends": ["react-app", "prettier", "plugin:jsx-a11y/recommended"],
-  "plugins": ["prettier", "react-hooks", "jsx-a11y"],
-  "env": {
-    "es6": true,
-    "browser": true,
-    "node": true,
-    "mocha": true,
-    "jasmine": true
-  },
-  "parser": "@babel/eslint-parser",
-  "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "legacyDecorators": true
-    }
-  },
-  "rules": {
-    "import/no-unresolved": 0,
-    "no-alert": 1,
-    "no-console": 1,
-    "no-debugger": 1,
-    "prettier/prettier": [
-      "error",
-      { "trailingComma": "all", "singleQuote": true }
-    ],
-    "react-hooks/rules-of-hooks": "error",
-    "react-hooks/exhaustive-deps": "warn",
-    "react/react-in-jsx-scope": "off"
-  },
-  "settings": {
-    "react": {
-      "version": "17.0.2"
-    }
-  },
-  "globals": {
-    "root": true,
-    "__DEVELOPMENT__": true,
-    "__CLIENT__": true,
-    "__SERVER__": true,
-    "__DISABLE_SSR__": true,
-    "__DEVTOOLS__": true,
-    "__DEBUG__": true,
-    "__SSR__": true,
-    "__SENTRY__": true,
-    "cy": true,
-    "Cypress": true,
-    "jest": true,
-    "socket": true,
-    "webpackIsomorphicTools": true
-  }
-}

package/.github/workflows/acceptance.yml

@@ -1,98 +0,0 @@
-name: Acceptance tests
-on: [push, pull_request]
-
-env:
-  ADDON_NAME: "@kitconcept/volto-light-theme"
-  ADDON_PATH: "volto-light-theme"
-  VOLTO_VERSION: "17.15.5"
-
-jobs:
-
-  acceptance:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Install Cypress
-        run: |
-          cd acceptance
-          yarn
-
-      - name: "Cypress: Acceptance tests"
-        uses: cypress-io/github-action@v6
-        env:
-          BABEL_ENV: production
-          CYPRESS_RETRIES: 2
-        with:
-          parallel: false
-          browser: chrome
-          working-directory: acceptance
-          spec: cypress/tests/main/**/*.js
-          install: false
-          start: |
-            docker compose -f ci.yml --profile prod up
-          wait-on: 'npx wait-on --httpTimeout 20000 http-get://localhost:55001/plone http://localhost:3000'
-
-      # Upload Cypress screenshots
-      - uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: cypress-screenshots-acceptance
-          path: acceptance/cypress/screenshots
-
-      # Upload Cypress videos
-      - uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: cypress-videos-acceptance
-          path: acceptance/cypress/videos
-
-  acceptance-a11y:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Install Cypress
-        run: |
-          cd acceptance
-          yarn
-
-      - name: "Cypress: Acceptance tests"
-        uses: cypress-io/github-action@v6
-        env:
-          BABEL_ENV: production
-          CYPRESS_RETRIES: 2
-          CYPRESS_a11y: 1
-        with:
-          parallel: false
-          browser: chrome
-          working-directory: acceptance
-          spec: cypress/tests/a11y/**/*.js
-          install: false
-          start: |
-            docker compose -f ci-a11y.yml --profile prod up
-          wait-on: 'npx wait-on --httpTimeout 20000 http-get://localhost:8080/Plone http://localhost:3000'
-
-      # Upload Cypress screenshots
-      - uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: cypress-screenshots-acceptance
-          path: acceptance/cypress/screenshots
-
-      # Upload Cypress videos
-      - uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: cypress-videos-acceptance
-          path: acceptance/cypress/videos

package/.github/workflows/changelog.yml

@@ -1,43 +0,0 @@
-name: Changelog check
-on:
-  pull_request:
-    types: [assigned, opened, synchronize, reopened, labeled, unlabeled]
-    branches:
-      - main
-
-env:
-  node-version: 20.x
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          # Fetch all history
-          fetch-depth: '0'
-
-      - name: Install pipx
-        run: pip install towncrier
-
-      # node setup
-      - name: Use Node.js ${{ env.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ env.node-version }}
-          cache: 'yarn'
-
-      # node install
-      - name: Install dependencies
-        run: yarn
-
-      - name: Check for presence of a Change Log fragment (only pull requests)
-        run: |
-          # Fetch the pull request' base branch so towncrier will be able to
-          # compare the current branch with the base branch.
-          # Source: https://github.com/actions/checkout/#fetch-all-branches.
-          git fetch --no-tags origin main
-          towncrier check --compare-with origin/main
-        env:
-          BASE_BRANCH: ${{ github.base_ref }}
-        if: github.event_name == 'pull_request'

package/.github/workflows/code.yml

@@ -1,16 +0,0 @@
-name: Code analysis checks
-on: [push, pull_request]
-jobs:
-  codeanalysis:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x]
-
-    steps:
-      - name: Main checkout
-        uses: actions/checkout@v3
-
-      - name: Linting
-        run: make lint

package/.github/workflows/deploy.yml

@@ -1,105 +0,0 @@
-name: Release and deploy
-on:
-  workflow_run:
-    workflows: [Acceptance Tests]
-    types:
-      - completed
-    branches:
-      - main
-  workflow_dispatch:
-
-env:
-  ENVIRONMENT: "light-theme.kitconcept.io"
-  IMAGE_NAME: "ghcr.io/kitconcept/voltolighttheme-frontend"
-  VOLTO_VERSION: "17.15.5"
-
-jobs:
-  meta:
-    runs-on: ubuntu-latest
-    outputs:
-      ENVIRONMENT: ${{ steps.vars.outputs.ENVIRONMENT }}
-      STACK_NAME: ${{ steps.vars.outputs.STACK_NAME }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set Env Vars
-        id: vars
-        run: |
-          ENVIRONMENT=${{ env.ENVIRONMENT }}
-          echo "ENVIRONMENT=${ENVIRONMENT}" >> $GITHUB_OUTPUT
-          echo "STACK_NAME=${ENVIRONMENT//./-}" >> $GITHUB_OUTPUT
-
-  release:
-    runs-on: ubuntu-latest
-    needs:
-      - meta
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.IMAGE_NAME }}
-          labels: |
-            org.label-schema.docker.cmd=docker run -d -p 3000:3000 ${{ env.IMAGE_NAME }}
-          flavor: |
-            latest=false
-          tags: |
-            type=ref,event=branch
-            type=sha
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/amd64
-          context: ./
-          file: dockerfiles/Dockerfile
-          build-args: |
-            ADDON_NAME=@kitconcept/volto-light-theme
-            ADDON_PATH=volto-light-theme
-            VOLTO_VERSION=${{ env.VOLTO_VERSION }}
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: $${{ steps.meta.outputs.labels }}
-  deploy:
-    if: ${{ github.ref == 'refs/heads/main' }}
-    runs-on: ubuntu-latest
-    needs:
-      - meta
-      - release
-    environment: ${{ needs.meta.outputs.ENVIRONMENT }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Deploy to cluster
-        uses: kitconcept/docker-stack-deploy@v1.2.0
-        with:
-          registry: "ghcr.io"
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          remote_host: ${{ secrets.DEPLOY_HOST }}
-          remote_port: ${{ secrets.DEPLOY_PORT }}
-          remote_user: ${{ secrets.DEPLOY_USER }}
-          remote_private_key: ${{ secrets.DEPLOY_SSH }}
-          stack_file: devops/stacks/${{ needs.meta.outputs.ENVIRONMENT }}.yml
-          stack_name: ${{ needs.meta.outputs.STACK_NAME }}
-          stack_param: ${{ github.ref_name }}
-          env_file: ${{ secrets.ENV_FILE }}
-          deploy_timeout: 480

package/.github/workflows/unit.yml

@@ -1,16 +0,0 @@
-name: Unit Tests
-on: [push, pull_request]
-jobs:
-  unit:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x]
-
-    steps:
-      - name: Main checkout
-        uses: actions/checkout@v3
-
-      - name: Unit tests
-        run: make test-ci

package/.prettierignore

@@ -1,3 +0,0 @@
-container-query-polyfill.modern.js
-CHANGELOG.md
-README.md

package/.prettierrc

@@ -1,12 +0,0 @@
-{
-  "trailingComma": "all",
-  "singleQuote": true,
-  "overrides": [
-    {
-      "files": "*.overrides",
-      "options": {
-        "parser": "less"
-      }
-    }
-  ]
-}