Restructuring industrial site

eea · Apr 27, 2021 · 9811180 · 9811180
1 parent 36abe2d
commit 9811180
Show file tree

Hide file tree

Showing 73 changed files with 3,769 additions and 1,479 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -10,8 +10,17 @@
             "volto-embed": [
                 "addons/volto-embed/src"
             ],
+            "@eeacms/volto-block-style": [
+                "addons/volto-block-style/src"
+            ],
+            "@eeacms/volto-columns-block": [
+                "addons/volto-columns-block/src"
+            ],
             "@eeacms/volto-grid-block": [
                 "addons/volto-grid-block/src"
+            ],
+            "@eeacms/volto-tabs-block": [
+                "addons/volto-tabs-block/src"
             ]
         },
         "baseUrl": "src"

diff --git a/mrs.developer.json b/mrs.developer.json
@@ -5,6 +5,20 @@
     "path": "src",
     "develop": true
   },
+  "volto-block-style": {
+    "url": "https://github.com/eea/volto-block-style.git",
+    "path": "src",
+    "package": "@eeacms/volto-block-style",
+    "branch": "develop",
+    "develop": true
+  },
+  "volto-columns-block": {
+    "url": "https://github.com/eea/volto-columns-block.git",
+    "branch": "develop",
+    "path": "src",
+    "package": "@eeacms/volto-columns-block",
+    "develop": true
+  },
   "volto-datablocks": {
     "url": "https://github.com/eea/volto-datablocks.git",
     "branch": "master",
@@ -23,6 +37,13 @@
     "path": "src",
     "package": "@eeacms/volto-grid-block",
     "develop": true
+  },
+  "volto-tabs-block": {
+    "url": "https://github.com/eea/volto-tabs-block.git",
+    "path": "src",
+    "package": "@eeacms/volto-tabs-block",
+    "branch": "master",
+    "develop": true
   }
 }
 
diff --git a/package.json b/package.json
@@ -41,19 +41,23 @@
     "@eeacms/volto-sentry-rancher-config",
     "@eeacms/volto-matomo",
     "@eeacms/volto-grid-block",
+    "@eeacms/volto-columns-block",
     "volto-datablocks",
     "volto-embed",
-    "volto-addons"
+    "volto-addons",
+    "@eeacms/volto-block-style",
+    "@eeacms/volto-tabs-block"
   ],
   "dependencies": {
-    "@eeacms/volto-slate-metadata-mentions": "github:eea/volto-slate-metadata-mentions#2.2.0",
-    "@eeacms/volto-widgets-view": "github:eea/volto-widgets-view#2.1.0",
-    "@eeacms/volto-object-widget": "github:eea/volto-object-widget#2.2.0",
-    "@eeacms/volto-widget-toggle": "github:eea/volto-widget-toggle#2.2.0",
+    "@eeacms/volto-matomo": "github:eea/volto-matomo#2.0.0",
     "@eeacms/volto-metadata-block": "github:eea/volto-metadata-block#2.1.0",
+    "@eeacms/volto-object-widget": "github:eea/volto-object-widget#2.2.0",
     "@eeacms/volto-sentry-rancher-config": "github:eea/volto-sentry-rancher-config#2.1.0",
-    "@eeacms/volto-matomo": "github:eea/volto-matomo#2.0.0",
+    "@eeacms/volto-slate-metadata-mentions": "github:eea/volto-slate-metadata-mentions#2.2.0",
+    "@eeacms/volto-widget-toggle": "github:eea/volto-widget-toggle#2.2.0",
+    "@eeacms/volto-widgets-view": "github:eea/volto-widgets-view#2.1.0",
     "@material/react-linear-progress": "^0.15.0",
+    "@plone/volto": "12.10.1",
     "axios": "^0.20.0",
     "jsonp": "^0.2.1",
     "ol": "^6.4.3",
@@ -62,12 +66,11 @@
     "react-iframe": "^1.8.0",
     "react-tooltip": "^4.2.9",
     "react-visibility-sensor": "^5.1.1",
-    "@plone/volto": "12.10.1",
     "volto-slate": "github:eea/volto-slate#2.4.0"
   },
   "devDependencies": {
-    "mrs-developer": "1.6.0",
     "eslint-plugin-prettier": "3.1.3",
+    "mrs-developer": "1.6.0",
     "prettier": "2.0.5",
     "stylelint": "13.3.3",
     "stylelint-config-idiomatic-order": "8.1.0",

diff --git a/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx b/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx
@@ -154,12 +154,7 @@ const ReportingYears = (props) => {
     >
       <div>
         <span className="floating-icon" data-tip={'Something'}>
-          <Icon
-            className="firefox-icon"
-            name={infoSVG}
-            size="20"
-            color="#fff"
-          />
+          <Icon name={infoSVG} size={20} color="#fff" />
         </span>
         <p className="lighter">Last report was submitted on:</p>
         <p className="bold">{getDate(packages[0])}</p>

diff --git a/src/components/manage/Blocks/DiscodataComponents/Text/View.jsx b/src/components/manage/Blocks/DiscodataComponents/Text/View.jsx
@@ -22,7 +22,7 @@ const components = {
       {components.bold(bold, text)}
       {tooltip && tooltipText ? (
         <span data-tip={tooltip && tooltipText ? tooltipText : false}>
-          <Icon name={infoSVG} size="20" color={color} />
+          <Icon name={infoSVG} size={20} color={color} />
         </span>
       ) : (
         ''

diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection.jsx
@@ -72,12 +72,7 @@ export default ({ children, data = {}, block, onShow, ...rest }) => {
                         className="floating-icon mr-1"
                         data-tip={dataprotection.privacy_statement}
                       >
-                        <Icon
-                          className="firefox-icon"
-                          name={infoSVG}
-                          size="20"
-                          color="#D63D27"
-                        />
+                        <Icon name={infoSVG} size={20} color="#D63D27" />
                       </span>
                     ) : (
                       ''
@@ -112,8 +107,8 @@ export default ({ children, data = {}, block, onShow, ...rest }) => {
 
                   <p className="discreet">
                     Your choice will be saved in a cookie managed by{' '}
-                    {config.settings.ownDomain || '.eea.europa.eu'} that will expire in{' '}
-                    {getExpDays()} days.
+                    {config.settings.ownDomain || '.eea.europa.eu'} that will
+                    expire in {getExpDays()} days.
                   </p>
                 </div>
               </div>

diff --git a/src/components/manage/Blocks/ExploreEprtr/View.jsx b/src/components/manage/Blocks/ExploreEprtr/View.jsx
@@ -20,7 +20,9 @@ const View = (props) => {
           tablet="7"
           mobile="12"
         >
-          <img src={explore} alt="Explore the data" />
+          <Link to="/browse/explore-data-map/map">
+            <img src={explore} alt="Explore the data" />
+          </Link>
         </Grid.Column>
         <Grid.Column
           className="description"
@@ -30,7 +32,7 @@ const View = (props) => {
           tablet="5"
           mobile="12"
         >
-          <Link to="/analyse">
+          <Link to="/analysis/country-group">
             <div className="explore-tile">
               <img src={analyse} alt="Analyse" />
               <div>

diff --git a/src/components/manage/Blocks/ExploreEprtr/styles.css b/src/components/manage/Blocks/ExploreEprtr/styles.css
@@ -12,9 +12,13 @@
   margin-bottom: 1rem !important;
 }
 
+.ui.grid.explore-eprtr .explore-map a img {
+  width: 100%;
+}
+
 .explore-eprtr .description {
   display: flex !important;
-  justify-content: space-between;
+  justify-content: space-between !important;
 }
 
 .explore-eprtr .description .explore-tile {

diff --git a/src/components/manage/Blocks/Iframe/View.jsx b/src/components/manage/Blocks/Iframe/View.jsx
@@ -204,12 +204,7 @@ const View = ({ content, ...props }) => {
             <div className="header-tooltip">
               <h3 className={cx('blue', titleClassName)}>{title}</h3>
               <span className="floating-icon" data-tip={'This is a tooltip'}>
-                <Icon
-                  className="firefox-icon"
-                  name={infoSVG}
-                  size="20"
-                  color="#D63D27"
-                />
+                <Icon name={infoSVG} size={20} color="#D63D27" />
               </span>
             </div>
           ) : title ? (
@@ -253,7 +248,7 @@ const View = ({ content, ...props }) => {
 
 export default compose(
   connect((state, props) => ({
-    query: state.router.location.search,
+    query: qs.parse(state.router.location.search.replace('?', '')),
     search: state.discodata_query.search,
     flags: state.flags,
   })),