Added white text logo

eea · Feb 17, 2021 · 9514b4a · 9514b4a
1 parent 41df833
commit 9514b4a
Show file tree

Hide file tree

Showing 15 changed files with 2,617 additions and 154 deletions.
diff --git a/src/components/manage/Blocks/DataBase/DB.jsx b/src/components/manage/Blocks/DataBase/DB.jsx
diff --git a/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx b/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { isArray } from 'lodash';
 import { Dropdown, Header } from 'semantic-ui-react';
 import { setQueryParam } from 'volto-datablocks/actions';
-import { ViewDiscodataSqlBuilder } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
 import ReactTooltip from 'react-tooltip';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import moment from 'moment';
@@ -290,7 +290,7 @@ const CountrySelector = (props) => {
 
   return (
     <div className="custom-selector big red">
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           sql: {

diff --git a/src/components/manage/Blocks/DiscodataComponentsBlock/Edit.jsx b/src/components/manage/Blocks/DiscodataComponentsBlock/Edit.jsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import qs from 'query-string';
 import View from './View';
-import { EditDiscodataSqlBuilder } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderEdit } from 'volto-datablocks/components';
 
 const makeChoices = (keys) => keys && keys.map((k) => [k, k]);
 
@@ -433,14 +433,14 @@ const Edit = (props) => {
     /* eslint-disable-next-line */
   }, [props.data, props.discodata_resources, props.discodata_query.search]);
   return (
-    <EditDiscodataSqlBuilder
+    <DiscodataSqlBuilderEdit
       {...props}
       optionalSchema={state.schema}
       title="Discodata components block"
     >
       <h3>Discodata components - edit mode</h3>
       <View {...props} mode="edit" />
-    </EditDiscodataSqlBuilder>
+    </DiscodataSqlBuilderEdit>
   );
 };
 

diff --git a/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx b/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx
@@ -8,7 +8,7 @@ import { arrayToTree } from 'performant-array-to-tree';
 import qs from 'query-string';
 import { Table, Dropdown, List, Header } from 'semantic-ui-react';
 import './style.css';
-import { ViewDiscodataSqlBuilder } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
 import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
 import cx from 'classnames';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
@@ -718,7 +718,7 @@ const View = (props) => {
   let root = arrayToTree(componentsArray);
   if (!__CLIENT__) return '';
   return (
-    <ViewDiscodataSqlBuilder {...props}>
+    <DiscodataSqlBuilderView {...props}>
       <div className="facility-block-wrapper">
         <div>
           {(state.selectedResource &&
@@ -735,7 +735,7 @@ const View = (props) => {
             (props.data.mode === 'edit' ? <p>Add components</p> : '')}
         </div>
       </div>
-    </ViewDiscodataSqlBuilder>
+    </DiscodataSqlBuilderView>
   );
 };
 

diff --git a/src/components/manage/Blocks/DiscodataTableBlock/Edit.jsx b/src/components/manage/Blocks/DiscodataTableBlock/Edit.jsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { injectIntl } from 'react-intl';
 import View from './View';
-import { EditDiscodataSqlBuilder } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderEdit } from 'volto-datablocks/components';
 
 const schema = {
   itemsCountKey: {
@@ -158,13 +158,13 @@ const Edit = React.forwardRef((props) => {
   }
 
   return (
-    <EditDiscodataSqlBuilder
+    <DiscodataSqlBuilderEdit
       {...props}
       optionalSchema={schema}
       title="Discodata components block"
     >
       <View {...props} />
-    </EditDiscodataSqlBuilder>
+    </DiscodataSqlBuilderEdit>
   );
 });
 

diff --git a/src/components/manage/Blocks/DiscodataTableBlock/View.jsx b/src/components/manage/Blocks/DiscodataTableBlock/View.jsx
@@ -8,7 +8,7 @@ import { Table, Pagination } from 'semantic-ui-react';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import { Icon } from '@plone/volto/components';
-import { ViewDiscodataSqlBuilder } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
 import { setQueryParam } from 'volto-datablocks/actions';
 import { Dimmer, Loader } from 'semantic-ui-react';
 import LinearProgress from '@material/react-linear-progress';
@@ -187,7 +187,7 @@ const View = (props) => {
 
   return (
     <div className={`browse-table ${props.className ? props.className : ''}`}>
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         {...props}
         additionalWhereStatements={additionalWhereStatements}
         pagination={{ p: activePage, nrOfHits: itemsPerPage }}
@@ -476,7 +476,7 @@ const View = (props) => {
         ) : (
           <div style={{ width: '100%', height: '400px' }} />
         )}
-      </ViewDiscodataSqlBuilder>
+      </DiscodataSqlBuilderView>
       {!items?.length ? (
         <Dimmer active={loader} inverted>
           <Loader inverted>European Environment Agency</Loader>

diff --git a/src/components/manage/Blocks/PollutantIndex/View.jsx b/src/components/manage/Blocks/PollutantIndex/View.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { Tab, Dropdown, Table } from 'semantic-ui-react';
-import { ViewDiscodataSqlBuilder } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
 import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
 import cx from 'classnames';
 import './style.css';
@@ -799,7 +799,7 @@ const View = (props) => {
 
   return (
     <div className="pollutant-index-container">
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           sql: {

diff --git a/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx b/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ViewDiscodataSqlBuilder } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
 import Flags from '~/components/manage/Blocks/Flags/View';
 
 const QueryBuilder = (props) => {
@@ -10,7 +10,7 @@ const QueryBuilder = (props) => {
         HEADER
         DB: Browse5_Header, site_flags
       */}
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           sql: {
@@ -31,7 +31,7 @@ const QueryBuilder = (props) => {
         SITE DETAILS (POLLUTANTS)
         DB: Browse6Header
       */}
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           groupBy: {
@@ -52,7 +52,7 @@ const QueryBuilder = (props) => {
         FACILITY DETAILS (POLLUTANTS)
         DB: Browse7Header
       */}
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           groupBy: {
@@ -73,7 +73,7 @@ const QueryBuilder = (props) => {
         SITE DETAILS 3
         DB: Browse8Header
       */}
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           sql: {
@@ -94,7 +94,7 @@ const QueryBuilder = (props) => {
         Permits
         DB: Browse9Header_Permit
       */}
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           sql: {
@@ -115,7 +115,7 @@ const QueryBuilder = (props) => {
         BAT Conclusions
         DB: Browse9Header_BATConclusion
       */}
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           sql: {
@@ -136,7 +136,7 @@ const QueryBuilder = (props) => {
         BAT Derogations
         DB: Browse9Header_BATDerogation
       */}
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           sql: {
@@ -157,7 +157,7 @@ const QueryBuilder = (props) => {
         LCP DETAILS
         DB: Browse10_Header
       */}
-      <ViewDiscodataSqlBuilder
+      <DiscodataSqlBuilderView
         data={{
           '@type': 'discodata_sql_builder',
           sql: {

diff --git a/src/config.js b/src/config.js
@@ -19,7 +19,7 @@ import {
   installExpendableList,
   installFolderListing,
 } from 'volto-addons';
-import { installDiscodataBlocks } from 'volto-datablocks';
+import { installDiscodataSqlBuilder } from 'volto-datablocks/config';
 import { applyConfig as eprtrConfig } from './localconfig';
 
 const consoleError = console.error.bind(console);
@@ -35,7 +35,7 @@ const addonConfig = [
   installTableau,
   installExpendableList,
   installFolderListing,
-  installDiscodataBlocks,
+  installDiscodataSqlBuilder,
   eprtrConfig,
 ].reduce((acc, apply) => apply(acc), config);
 

diff --git a/...ions/volto/components/theme/Logo/Logo.png → ...olto/components/theme/Logo/Logo.black.png b/...ions/volto/components/theme/Logo/Logo.png → ...olto/components/theme/Logo/Logo.black.png
diff --git a/src/customizations/volto/components/theme/Logo/Logo.jsx b/src/customizations/volto/components/theme/Logo/Logo.jsx
@@ -10,7 +10,7 @@ import { Image } from 'semantic-ui-react';
 import { useSelector } from 'react-redux';
 import { settings } from '~/config';
 
-import LogoImage from './Logo.png';
+import LogoImage from './Logo.white.png';
 
 const messages = defineMessages({
   site: {

diff --git a/src/customizations/volto/components/theme/Logo/Logo.white.png b/src/customizations/volto/components/theme/Logo/Logo.white.png
diff --git a/src/customizations/volto/components/theme/Search/Search.jsx b/src/customizations/volto/components/theme/Search/Search.jsx
@@ -19,7 +19,7 @@ import { Helmet } from '@plone/volto/helpers';
 import { searchContent } from '@plone/volto/actions';
 import { Toolbar, Icon } from '@plone/volto/components';
 import Highlighter from 'react-highlight-words';
-import { ViewDiscodataSqlBuilder } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
 import { setQueryParam } from 'volto-datablocks/actions';
 import paginationLeftSVG from '@plone/volto/icons/left-key.svg';
 import paginationRightSVG from '@plone/volto/icons/right-key.svg';
@@ -246,7 +246,7 @@ class Search extends Component {
 
     return (
       <Container id="page-search">
-        <ViewDiscodataSqlBuilder
+        <DiscodataSqlBuilderView
           data={{
             '@type': 'discodata_sql_builder',
             sql: {

diff --git a/src/helpers/index.js b/src/helpers/index.js
@@ -8,17 +8,7 @@ import { settings } from '~/config';
 import { getBaseUrl } from '@plone/volto/helpers';
 import { setConnectedDataParameters } from 'volto-datablocks/actions';
 
-export function addCustomGroup(config, customGroup) {
-  const hasCustomGroup = config.blocks.groupBlocksOrder.filter((el) => {
-    return el.id === customGroup.id;
-  });
-  if (hasCustomGroup.length === 0) {
-    config.blocks.groupBlocksOrder.push({
-      id: customGroup.id,
-      title: customGroup.title,
-    });
-  }
-}
+export { addCustomGroup } from 'volto-datablocks/helpers';
 
 export function getBasePath(url) {
   const parseUrl = url === '' ? '/' : url;