@eeacms/volto-clms-theme 1.0.35 → 1.0.36

package/.coverage.babel.config.js

@@ -1 +1,9 @@
-module.exports = require('@plone/volto/babel');
+const defaultBabel = require('@plone/volto/babel');
+
+function applyDefault(api) {
+  const voltoBabel = defaultBabel(api);
+  voltoBabel.plugins.push('@babel/plugin-transform-modules-commonjs', 'transform-class-properties', 'istanbul');
+  return voltoBabel;
+}
+
+module.exports = applyDefault;

package/.project.eslintrc.js

@@ -0,0 +1,46 @@
+const fs = require('fs');
+const path = require('path');
+
+const projectRootPath = fs.realpathSync('./project');    // __dirname
+// const packageJson = require(path.join(projectRootPath, 'package.json'));
+const jsConfig = require(path.join(projectRootPath, 'jsconfig.json')).compilerOptions;
+
+const pathsConfig = jsConfig.paths;
+
+let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
+
+Object.keys(pathsConfig).forEach(pkg => {
+  if (pkg === '@plone/volto') {
+    voltoPath = `./${jsConfig.baseUrl}/${pathsConfig[pkg][0]}`;
+  }
+});
+const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
+const reg = new AddonConfigurationRegistry(projectRootPath);
+
+// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
+const addonAliases = Object.keys(reg.packages).map(o => [
+  o,
+  reg.packages[o].modulePath,
+]);
+
+
+module.exports = {
+  extends: `${projectRootPath}/node_modules/@plone/volto/.eslintrc`,
+  settings: {
+    'import/resolver': {
+      alias: {
+        map: [
+          ['@plone/volto', '@plone/volto/src'],
+          ...addonAliases,
+          ['@package', `${__dirname}/src`],
+          ['~', `${__dirname}/src`],
+        ],
+        extensions: ['.js', '.jsx', '.json'],
+      },
+      'babel-plugin-root-import': {
+        rootPathSuffix: 'src',
+      },
+    },
+  },
+};
+

package/.release-it.json

@@ -1,18 +1,18 @@
 {
+  "npm": {
+    "publish": false
+  },
   "git": {
     "commitMessage": "Automated release ${version}",
     "requireBranch": "develop",
-    "requireCleanWorkingDir": false,
-    "git.requireCommits": true
+    "changelog": "npx auto-changelog --stdout --commit-limit false -u --template https://raw.githubusercontent.com/release-it/release-it/master/templates/changelog-compact.hbs",
+    "tagName": "${version}"
   },
   "github": {
-    "release": false,
+    "release": true,
     "releaseName": "${version}",
     "releaseNotes": "npx auto-changelog --stdout --sort-commits date --commit-limit false -u --template https://raw.githubusercontent.com/release-it/release-it/master/templates/changelog-compact.hbs"
   },
-  "npm": {
-    "publish": false
-  },
   "hooks": {
     "after:bump": "npx auto-changelog --sort-commits date  --commit-limit false -p"
   }

package/CHANGELOG.md

@@ -4,8 +4,38 @@ 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.36](https://github.com/eea/volto-clms-theme/compare/1.0.35...1.0.36)
+
+- Unification work based on volto-sustainability-theme [`#103`](https://github.com/eea/volto-clms-theme/pull/103)
+- Footer, Service desk and work oportunities corrections [`#104`](https://github.com/eea/volto-clms-theme/pull/104)
+- add volto-arcgis-block dependency [`c698fd9`](https://github.com/eea/volto-clms-theme/commit/c698fd9f2915d706c97118511e9c7f895baa4f94)
+- add needed addons [`9ff03af`](https://github.com/eea/volto-clms-theme/commit/9ff03af81e84e989366b90180476270c036825cd)
+- reorganize packages.json [`6a574a7`](https://github.com/eea/volto-clms-theme/commit/6a574a7877e9637041f2a32f2bcea0d79b3eeec7)
+- Footer 'expert support provided by' hidden temporaly [`a6815ef`](https://github.com/eea/volto-clms-theme/commit/a6815efd3e6715c6f6e4e70f9e54ac01ed230f18)
+- work oportunities open/close status fixed [`1f28116`](https://github.com/eea/volto-clms-theme/commit/1f2811641ca4752100574f12e16c9abab2c23e8a)
+- Work opportunities working without is_open checkbox [`1f64c61`](https://github.com/eea/volto-clms-theme/commit/1f64c612d67470bf56fd2fd63cbd8f1dc7e80242)
+- work oportunities open/close depends on submission deadline [`a35d5c9`](https://github.com/eea/volto-clms-theme/commit/a35d5c98c343190b45c3fc7052e1db47e12d45b8)
+- change class with className and for with htmlFor [`1b0b8d4`](https://github.com/eea/volto-clms-theme/commit/1b0b8d4876e6fa8f92d907428062d753a06f7bb1)
+- service desk link and style fix [`85479e8`](https://github.com/eea/volto-clms-theme/commit/85479e8124fd176920ae177a3b01f9fe282e383e)
+- Service desk view created [`d7dec45`](https://github.com/eea/volto-clms-theme/commit/d7dec45ef8cfe5e199a0b31d84ebddc5f6e4a608)
+- FAQ style fixed when using a listing block inside acordion block [`ca26614`](https://github.com/eea/volto-clms-theme/commit/ca2661459d3454a5749d23de4c5210bb735b748c)
+- correction in card [`6830866`](https://github.com/eea/volto-clms-theme/commit/683086608caf1d1c127db423a24867b5da125aea)
+- upgrade kitkat [`2f9b905`](https://github.com/eea/volto-clms-theme/commit/2f9b9058d29d48d6f4d7dd6f04840c0076d202ae)
+- merge develop into branch [`26aa1dc`](https://github.com/eea/volto-clms-theme/commit/26aa1dc087dafdc568f1ca3cbb62dbd1ef730502)
+- add commitMessage and requireBranch [`adfc26f`](https://github.com/eea/volto-clms-theme/commit/adfc26f2a87b89b9e7881d591c6215e8467242cd)
+- remove slate dependency [`1863b3c`](https://github.com/eea/volto-clms-theme/commit/1863b3c8e6df0cd4a43ca059ef72ea9804cc5371)
+- add kitkat to dependencies [`5a64f80`](https://github.com/eea/volto-clms-theme/commit/5a64f8068bf3ce33de1685219a50be612450cb05)
+- add kitkat to dependencies [`773a7ed`](https://github.com/eea/volto-clms-theme/commit/773a7ed6cb63fde1eedf52a2eb84f918dc7a439d)
+- unification procces [`63b7258`](https://github.com/eea/volto-clms-theme/commit/63b7258fbe6701f5e4cc4fd1a960446a3b6614cf)
+- package.json modifications [`deade8e`](https://github.com/eea/volto-clms-theme/commit/deade8ea5bad7fe91ecfdaed83ef0fb0afe56ef2)
+- card change [`7f25b11`](https://github.com/eea/volto-clms-theme/commit/7f25b11f2aa49eab7d43f3efe894775ccf8ba217)
+- block card style fix [`06d9631`](https://github.com/eea/volto-clms-theme/commit/06d9631b7fb4188600faa1eb05c8bbad335c2a58)
+- Service desk view first commit [`468289d`](https://github.com/eea/volto-clms-theme/commit/468289def4edcca58c2bf2771c0c14cf89003e4c)
+
 #### [1.0.35](https://github.com/eea/volto-clms-theme/compare/1.0.34...1.0.35)
 
+> 26 October 2021
+
 - Develop into master [`#105`](https://github.com/eea/volto-clms-theme/pull/105)
 - remove slate from addons [`5eaa93c`](https://github.com/eea/volto-clms-theme/commit/5eaa93cd3d3aba1680137236d92b43816a0289e5)
 - removed volto-slate dependency [`a1ba7e5`](https://github.com/eea/volto-clms-theme/commit/a1ba7e50779400df9748ca0ec46f336945d97994)

package/DEVELOP.md

@@ -6,13 +6,11 @@ Before starting make sure your development environment is properly set. See [Vol
 
 1.  Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`
 
-        $ npm install -g yo
-        $ npm install -g @plone/generator-volto
-        $ npm install -g mrs-developer
+        $ npm install -g yo @plone/generator-volto mrs-developer
 
 1.  Create new volto app
 
-        $ yo @plone/volto my-volto-project --addon @eeacms/volto-addon-template
+        $ yo @plone/volto my-volto-project --addon @eeacms/volto-clms-theme --skip-install
         $ cd my-volto-project
 
 1.  Add the following to `mrs.developer.json`:

package/Makefile

@@ -0,0 +1,39 @@
+SHELL=/bin/bash
+
+DIR=$(shell basename $$(pwd))
+ADDON ?= "@eeacms/volto-clms-theme"
+
+# We like colors
+# From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
+RED=`tput setaf 1`
+GREEN=`tput setaf 2`
+RESET=`tput sgr0`
+YELLOW=`tput setaf 3`
+
+project:
+	npm install -g yo
+	npm install -g @plone/generator-volto
+	npm install -g mrs-developer
+	yo @plone/volto project --addon ${ADDON} --workspace "src/addons/${DIR}" --no-interactive
+	ln -sf $$(pwd) project/src/addons/
+	cp .project.eslintrc.js .eslintrc.js
+	cd project && yarn
+	@echo "-------------------"
+	@echo "$(GREEN)Volto project is ready!$(RESET)"
+	@echo "$(RED)Now run: cd project && yarn start$(RESET)"
+
+all: project
+
+.PHONY: start-test-backend
+start-test-backend: ## Start Test Plone Backend
+	@echo "$(GREEN)==> Start Test Plone Backend$(RESET)"
+	docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e SITE=plone -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,kitconcept.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,kitconcept.volto,kitconcept.volto.cors -e ADDONS='plone.app.robotframework plone.app.contenttypes plone.restapi kitconcept.volto' plone ./bin/robot-server plone.app.robotframework.testing.PLONE_ROBOT_TESTING
+
+.PHONY: start-backend-docker
+start-backend-docker:		## Starts a Docker-based backend
+	@echo "$(GREEN)==> Start Docker-based Plone Backend$(RESET)"
+	docker run -it --rm --name=plone -p 8080:8080 -e SITE=Plone -e ADDONS="kitconcept.volto" -e ZCML="kitconcept.volto.cors" plone
+
+.PHONY: help
+help:		## Show this help.
+	@echo -e "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -27,21 +27,36 @@
     "@eeacms/volto-tabs-block"
   ],
   "dependencies": {
+    "@eeacms/volto-tabs-block": "1.2.7",
+    "@eeacms/volto-accordion-block": "3.4.7",
+    "@eeacms/volto-columns-block": "4.4.3",
+    "@eeacms/volto-metadata-block": "^2.1.0",
+    "@eeacms/volto-resize-helper": "0.2.1",
     "volto-dropdownmenu": "2.2.7",
-    "@eeacms/volto-arcgis-block": "0.1.11",
     "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/free-regular-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",
-    "@eeacms/volto-tabs-block": "1.2.7",
     "react-slick": "0.28.1",
     "slick-carousel": "1.8.1",
-    "@eeacms/volto-accordion-block": "3.4.4",
-    "@eeacms/volto-columns-block": "4.4.3",
-    "@eeacms/volto-metadata-block": "^2.1.0",
     "react-svg": "14.0.4",
-    "react-native-mime-types": "2.3.0",
-    "@eeacms/volto-resize-helper": "0.2.1"
+    "@eeacms/volto-arcgis-block": "*",
+    "react-native-mime-types": "2.3.0"
+  },
+  "devDependencies": {
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^8.2.0",
+    "eslint-plugin-prettier": "3.1.3",
+    "eslint-plugin-react-app": "^6.2.2",
+    "husky": "6.0.0",
+    "jsconfig": "^0.2.0",
+    "prettier": "2.0.5",
+    "prettier-eslint": "^12.0.0",
+    "stylelint": "^13.12.0",
+    "stylelint-config-idiomatic-order": "8.1.0",
+    "stylelint-prettier": "1.1.2",
+    "@cypress/code-coverage": "^3.9.5",
+    "babel-plugin-transform-class-properties": "^6.24.1"
   },
   "prettier": {
     "trailingComma": "all",
@@ -94,20 +109,5 @@
     "cypress:open": "NODE_ENV=production CYPRESS_API=plone ../../../node_modules/cypress/bin/cypress open",
     "precommit": "yarn stylelint && yarn prettier && yarn lint",
     "prepare": "husky install"
-  },
-  "devDependencies": {
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^8.2.0",
-    "eslint-plugin-prettier": "3.1.3",
-    "eslint-plugin-react-app": "^6.2.2",
-    "husky": "6.0.0",
-    "jsconfig": "^0.2.0",
-    "prettier": "2.0.5",
-    "prettier-eslint": "^12.0.0",
-    "stylelint": "^13.12.0",
-    "stylelint-config-idiomatic-order": "8.1.0",
-    "stylelint-prettier": "1.1.2",
-    "@cypress/code-coverage": "^3.9.5",
-    "babel-plugin-transform-class-properties": "^6.24.1"
   }
 }

package/src/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingWorkOpportunities.jsx

@@ -36,17 +36,33 @@ const CclWorkOpportunity = (props) => {
   );
 };
 
+function formatDate(date) {
+  var d = new Date(date),
+    month = '' + (d.getMonth() + 1),
+    day = '' + d.getDate(),
+    year = d.getFullYear();
+
+  if (month.length < 2) month = '0' + month;
+  if (day.length < 2) day = '0' + day;
+
+  return [year, month, day].join('-');
+}
+
+var Today = formatDate(Date.now());
+
 const CclListingWorkOpportunities = (props) => {
   const { items, variation } = props;
   const intl = useIntl();
 
   const regex = /CclWO/;
   const status = variation?.replace(regex, '');
-
   return (
     <>
       {items
-        .filter((item) => item.is_open && status === 'OpenTenders')
+        .filter(
+          (item) =>
+            item.submission_deadline < Today && status === 'CloseTenders',
+        )
         .map((item, index) => (
           <CclWorkOpportunity
             key={index}
@@ -55,7 +71,10 @@ const CclListingWorkOpportunities = (props) => {
           ></CclWorkOpportunity>
         ))}
       {items
-        .filter((item) => !item.is_open && status === 'CloseTenders')
+        .filter(
+          (item) =>
+            item.submission_deadline > Today && status === 'OpenTenders',
+        )
         .map((item, index) => (
           <CclWorkOpportunity
             key={index}

package/src/components/CLMSServiceDeskView/CLMSServiceDeskView.jsx

@@ -0,0 +1,112 @@
+/* eslint-disable jsx-a11y/label-has-associated-control */
+import React from 'react';
+import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
+
+const ServiceDeskView = () => {
+  return (
+    <>
+      <div className="ui container">
+        <section className="page-section">
+          <h1 className="page-title">Service desk</h1>
+          <div className="page-description">
+            <p>
+              Have you checked our <a href="/en/faq">FAQ section</a>? If you
+              haven't found an answer to your problem or question, please fill
+              in this form to contact the Copernicus land service desk.
+            </p>
+            <p>
+              We will try to respond as soon as possible within office working
+              hours from Monday to Friday.
+            </p>
+            <p>Please note, that the support is provided in English only.</p>
+          </div>
+          <div className="ccl-container">
+            <form className="ccl-form user-form contact-form">
+              <div className="ccl-fieldset">
+                <div className="ccl-form-group">
+                  <label
+                    className="ccl-form-label"
+                    htmlFor="contact_form_email"
+                  >
+                    E-mail
+                  </label>
+                  <span className="label-required">*</span>
+                  <input
+                    type="text"
+                    className="ccl-text-input"
+                    id="contact_form_email"
+                    name=""
+                    placeholder="Enter an email address"
+                  />
+                </div>
+                <div className="ccl-form-group">
+                  <label
+                    className="ccl-form-label"
+                    htmlFor="contact_form_subject"
+                  >
+                    Subject
+                  </label>
+                  <span className="label-required">*</span>
+                  <span className="form-tip">
+                    A short indication of the problem, question or issue, i.e.
+                    login, download, errors in the product, thematic question
+                    etc.
+                  </span>
+                  <input
+                    type="text"
+                    className="ccl-text-input"
+                    id="contact_form_subject"
+                    name=""
+                    placeholder="Enter an subject"
+                  />
+                </div>
+                <div className="ccl-form-group">
+                  <label
+                    className="ccl-form-label"
+                    htmlFor="contact_form_message"
+                  >
+                    Message
+                  </label>
+                  <span className="label-required">*</span>
+                  <span className="form-tip">
+                    A short description of the problem, question or issue.
+                    Please don't forget to specify which product(s) you are
+                    referring to in your message.
+                  </span>
+                  <textarea
+                    className="ccl-textarea"
+                    id="contact_form_message"
+                    name=""
+                    cols="30"
+                    rows="10"
+                    placeholder="Enter a message"
+                  ></textarea>
+                </div>
+                <div className="ccl-form-group">
+                  <label
+                    className="ccl-form-label"
+                    htmlFor="contact_form_verification"
+                  >
+                    Verification
+                  </label>
+                  <span className="label-required">*</span>
+                  <div className="validation-image"></div>
+                  <input
+                    type="text"
+                    className="ccl-text-input"
+                    id="contact_form_verification"
+                    name=""
+                    placeholder="Enter validation code"
+                  />
+                </div>
+              </div>
+              <CclButton mode="default">Submit</CclButton>
+            </form>
+          </div>
+        </section>
+      </div>
+    </>
+  );
+};
+
+export default ServiceDeskView;

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

@@ -325,10 +325,10 @@ const Footer = () => {
               </a>
               <span>{intl.formatMessage(messages.jointResearchCenter)}</span>
             </div>
-            <div className="ccl-footer-col-title">
+            {/* <div className="ccl-footer-col-title">
               {intl.formatMessage(messages.expertSupportProvidedBy)}
             </div>
-            <p>{intl.formatMessage(messages.EIONETActionGroup)}</p>
+            <p>{intl.formatMessage(messages.EIONETActionGroup)}</p> */}
           </CclFooterColumn>
         </div>
       </div>

package/src/index.js

@@ -10,6 +10,7 @@ import CLMSMeetingSubscribersView from '@eeacms/volto-clms-theme/components/CLMS
 import CLMSMeetingEmailsView from '@eeacms/volto-clms-theme/components/CLMSMeetingView/CLMSMeetingEmailsView';
 import CLMSMeetingEmailView from '@eeacms/volto-clms-theme/components/CLMSMeetingView/CLMSMeetingEmailView';
 import CLMSMeetingSubscriberView from '@eeacms/volto-clms-theme/components/CLMSMeetingView/CLMSMeetingSubscriberView';
+import ServiceDeskView from '@eeacms/volto-clms-theme/components/CLMSServiceDeskView/CLMSServiceDeskView';
 // WIDGET IMPORTS
 import TabsWidget from './components/Blocks/CustomTemplates/VoltoTabsBlock/TabsWidget';
 import BoundingWidget from './components/Widgets/BoundingWidget';
@@ -104,6 +105,10 @@ const applyConfig = (config) => {
       path: '/**/profile',
       component: ProfileView,
     },
+    {
+      path: '/**/contact-service-desk',
+      component: ServiceDeskView,
+    },
     {
       path: '/**/download-by-area',
       component: CLMSMapViewerView,

package/theme/clms/css/faq.less

@@ -25,7 +25,7 @@
   h2.accordion-title span::before {
     margin-right: 1rem;
     color: #a0b128;
-    content: "Q";
+    content: 'Q';
     float: left;
     font-size: 1.75rem;
     line-height: 1.125rem;
@@ -36,6 +36,11 @@
     margin-bottom: 0.5rem;
   }
 
+  .accordion-block > .accordion > .content > .rah-static > div {
+    width: 100%;
+    margin-bottom: 0.5rem;
+  }
+
   .accordion .content {
     padding: 1rem !important;
     border-left: solid 4px #adb0b8;
@@ -49,7 +54,7 @@
   .accordion .content > div::before {
     margin-right: 1rem;
     color: #adb0b8;
-    content: "A";
+    content: 'A';
     float: left;
     font-size: 1.75rem;
     font-weight: bold;