@eeacms/volto-eea-website-theme 0.7.3 → 0.7.5

package/CHANGELOG.md

@@ -4,6 +4,22 @@ 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.7.5](https://github.com/eea/volto-eea-website-theme/compare/0.7.4...0.7.5) - 27 September 2022
+
+#### :bug: Bug Fixes
+
+- fix(block-style): Keep only Preset styles - refs #148213 [Alin Voinea - [`d372a7d`](https://github.com/eea/volto-eea-website-theme/commit/d372a7ddf6b4bd1820a5abcd3ea90f65a2932e52)]
+
+### [0.7.4](https://github.com/eea/volto-eea-website-theme/compare/0.7.3...0.7.4) - 27 September 2022
+
+#### :bug: Bug Fixes
+
+- fix(voltoCustom.css): Better handle missing file on backend [Alin Voinea - [`679dcc8`](https://github.com/eea/volto-eea-website-theme/commit/679dcc8cbc94dcadec9e7b8c68f654d2d135186f)]
+- fix(voltoCustom.css): resource.get(header) [Alin Voinea - [`708de42`](https://github.com/eea/volto-eea-website-theme/commit/708de42309043c72aea702acaa4a580cd0caea0f)]
+
+#### :hammer_and_wrench: Others
+
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`33b56ac`](https://github.com/eea/volto-eea-website-theme/commit/33b56acb13fbaf0c5b79e8fc6e13c4b699c79c90)]
 ### [0.7.3](https://github.com/eea/volto-eea-website-theme/compare/0.7.2...0.7.3) - 22 September 2022
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/config.js

@@ -247,3 +247,40 @@ export const defaultLanguage = 'en';
 export const websiteTitle = 'Site';
 export const organisationName = 'European Environment Agency';
 export const logoTargetUrl = '/';
+
+export const colors = [
+  // Primary & shades
+  '#007B6C',
+  '#005248',
+  '#007B6C',
+  '#00A390',
+  '#00CCB4',
+  '#00F5D8',
+  '#85FFF1',
+  '#C8FFF8',
+  // Secondary & shades
+  '#004B7F',
+  '#003052',
+  '#004B7F',
+  '#006BB8',
+  '#0083E0',
+  '#0A99FF',
+  '#47B3FF',
+  '#A0D7FF',
+  // Tertiary & shades
+  '#2E3E4C',
+  '#3D5265',
+  '#4C677F',
+  '#6989A5',
+  '#8EA6C2',
+  '#ACCAE5',
+  '#DAE8F4',
+  // Black & White shades
+  '#000000',
+  '#323232',
+  '#67696b',
+  '#BCBEC0',
+  '#E6E7E8',
+  '#F9F9F9',
+  '#FFFFFF',
+];

package/src/customizations/@eeacms/volto-block-style/StyleWrapper/schema.js

@@ -0,0 +1,24 @@
+export const StyleSchema = () => {
+  return {
+    title: 'Styles',
+    fieldsets: [
+      {
+        id: 'default',
+        title: 'Default',
+        fields: [],
+      },
+      {
+        id: 'presets',
+        title: 'Preset styles',
+        fields: ['style_name'],
+      },
+    ],
+    properties: {
+      style_name: {
+        title: 'Style',
+        widget: 'style_select',
+      },
+    },
+    required: [],
+  };
+};

package/src/index.js

@@ -105,6 +105,9 @@ const applyConfig = (config) => {
     };
   }
 
+  // Custom block-style colors
+  config.settings.available_colors = eea.colors;
+
   // Custom block styles
   config.settings.previewText = '';
   config.settings.pluggableStyles = [

package/src/middleware/voltoCustom.js

@@ -13,19 +13,15 @@ function voltoCustomMiddleware(req, res, next) {
     .then((resource) => {
       // Just forward the headers that we need
       HEADERS.forEach((header) => {
-        if (resource.get(header)) {
+        if (resource?.get?.(header)) {
           res.set(header, resource.get(header));
         }
       });
       res.status(resource.statusCode);
       res.send(resource.body);
     })
-    .catch((resource) => {
-      HEADERS.forEach((header) => {
-        if (resource.get(header)) {
-          res.set(header, resource.get(header));
-        }
-      });
+    .catch(() => {
+      res.set('Content-Type', 'text/css; charset=utf-8');
       res.status(200);
       res.send(
         '/* Override this by adding a File called voltoCustom.css to backend at portal_skins/custom/manage_main */',

package/src/customizations/@eeacms/volto-block-style/StyleWrapper/EEAColorscheme.js

@@ -1,38 +0,0 @@
-const updatedEEAColorcheme = [
-  // Primary & shades
-  '#007B6C',
-  '#005248',
-  '#007B6C',
-  '#00A390',
-  '#00CCB4',
-  '#00F5D8',
-  '#85FFF1',
-  '#C8FFF8',
-  // Secondary & shades
-  '#004B7F',
-  '#003052',
-  '#004B7F',
-  '#006BB8',
-  '#0083E0',
-  '#0A99FF',
-  '#47B3FF',
-  '#A0D7FF',
-  // Tertiary & shades
-  '#2E3E4C',
-  '#3D5265',
-  '#4C677F',
-  '#6989A5',
-  '#8EA6C2',
-  '#ACCAE5',
-  '#DAE8F4',
-  // Black & White shades
-  '#000000',
-  '#323232',
-  '#67696b',
-  '#BCBEC0',
-  '#E6E7E8',
-  '#F9F9F9',
-  '#FFFFFF',
-];
-
-export default updatedEEAColorcheme;