Skip to content

Commit

Permalink
Merge pull request #53 from eea/develop
Browse files Browse the repository at this point in the history
use volto-tableau@2.0.0
  • Loading branch information
razvanMiu committed Apr 5, 2023
2 parents 0eab9bc + 2d5c6e1 commit f8daf28
Show file tree
Hide file tree
Showing 8 changed files with 199 additions and 38 deletions.
163 changes: 159 additions & 4 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Release](https://img.shields.io/github/v/release/eea/industry-frontend?sort=semver)](https://github.com/eea/industry-frontend/releases)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/master/lastBuild/display/redirect)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/develop/lastBuild/display/redirect)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2F3.22.0&build=last&subject=release%20v3.22.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/3.22.0/lastBuild/display/redirect/)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2F3.23.0&build=last&subject=release%20v3.23.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/3.23.0/lastBuild/display/redirect/)


## Documentation
Expand Down
6 changes: 1 addition & 5 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"compilerOptions": {
"paths": {
"@eeacms/volto-industry-theme": [
"addons/volto-industry-theme/src"
]
},
"paths": {},
"baseUrl": "src"
}
}
2 changes: 1 addition & 1 deletion locales/de.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion locales/en.json

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion mrs.developer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"package": "@eeacms/volto-industry-theme",
"branch": "develop",
"path": "src",
"develop": true
"develop": false
},
"volto-datablocks": {
"url": "git@github.com:eea/volto-datablocks.git",
Expand All @@ -14,5 +14,13 @@
"branch": "develop",
"path": "src",
"develop": false
},
"volto-block-style": {
"url": "git@github.com:eea/volto-block-style.git",
"https": "https://github.com/eea/volto-block-style.git",
"package": "@eeacms/volto-block-style",
"branch": "develop",
"path": "src",
"develop": false
}
}
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@eeacms/industry-frontend",
"description": "Volto-based frontend server and SPA for the Industrial Emissions Portal website (former EPRTR) industry.eea.europa.eu",
"license": "MIT",
"version": "3.22.0",
"version": "3.23.0",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
"homepage": "https://github.com/eea/industry-frontend",
Expand Down Expand Up @@ -41,7 +41,7 @@
"src/addons/*"
],
"addons": [
"@eeacms/volto-tableau",
"@eeacms/volto-spotlight",
"@eeacms/volto-datablocks",
"@eeacms/volto-openlayers-map",
"@eeacms/volto-industry-theme",
Expand Down Expand Up @@ -147,12 +147,16 @@
"engines": {
"node": "^14 || ^16"
},
"resolutions": {
"@eeacms/volto-tableau": "2.0.0"
},
"dependencies": {
"@eeacms/volto-datablocks": "4.0.4",
"@eeacms/volto-eea-kitkat": "15.1.0",
"@eeacms/volto-industry-theme": "2.0.14",
"@eeacms/volto-openlayers-map": "0.2.2",
"@eeacms/volto-tableau": "3.0.6",
"@eeacms/volto-spotlight": "1.0.0",
"@eeacms/volto-tableau": "2.0.0",
"@plone/volto": "16.19.0"
},
"devDependencies": {
Expand Down
42 changes: 20 additions & 22 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1754,7 +1754,8 @@ __metadata:
"@eeacms/volto-eea-kitkat": 15.1.0
"@eeacms/volto-industry-theme": 2.0.14
"@eeacms/volto-openlayers-map": 0.2.2
"@eeacms/volto-tableau": 3.0.6
"@eeacms/volto-spotlight": 1.0.0
"@eeacms/volto-tableau": 2.0.0
"@plone/scripts": ^2.1.5
"@plone/volto": 16.19.0
"@storybook/addon-actions": ^6.3.0
Expand Down Expand Up @@ -1829,24 +1830,25 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-block-style@npm:*, @eeacms/volto-block-style@npm:5.1.0":
version: 5.1.0
resolution: "@eeacms/volto-block-style@npm:5.1.0"
"@eeacms/volto-block-style@npm:*":
version: 5.2.0
resolution: "@eeacms/volto-block-style@npm:5.2.0"
dependencies:
"@eeacms/volto-resize-helper": "*"
"@eeacms/volto-widget-theme-picker": "*"
react-color: ~2.18.1
checksum: 90b555b00c7ad51bab736eb6fda5d299e6b60927f87f05dbc0417c4309ae3cad914b35bff43864f0e631cfbb7508b7daa86f784e0b03b63e9516e1293f200bd1
checksum: 0071148d44166367afae90057d7b37e1aad11e5ce3e432b2270c42f183d51d8cb6a5e50a7ee61ad15317a0eb9b36329bab7e49a8cf490c4429263d1aa8ccab16
languageName: node
linkType: hard

"@eeacms/volto-block-style@npm:4.1.0":
version: 4.1.0
resolution: "@eeacms/volto-block-style@npm:4.1.0"
"@eeacms/volto-block-style@npm:5.1.0":
version: 5.1.0
resolution: "@eeacms/volto-block-style@npm:5.1.0"
dependencies:
"@eeacms/volto-resize-helper": "*"
"@eeacms/volto-widget-theme-picker": "*"
react-color: ~2.18.1
checksum: f73a61347faf4807f81ec0c9d282f63db3a292a837dbe392ba096be2fa111b8d0d207dc966759cbb49b8bc3e2de63beab553a855645bd1fdbfc5d894ff565ce4
checksum: 90b555b00c7ad51bab736eb6fda5d299e6b60927f87f05dbc0417c4309ae3cad914b35bff43864f0e631cfbb7508b7daa86f784e0b03b63e9516e1293f200bd1
languageName: node
linkType: hard

Expand Down Expand Up @@ -1953,7 +1955,7 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-embed@npm:*, @eeacms/volto-embed@npm:5.0.0":
"@eeacms/volto-embed@npm:*":
version: 5.0.0
resolution: "@eeacms/volto-embed@npm:5.0.0"
dependencies:
Expand Down Expand Up @@ -2121,6 +2123,13 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-spotlight@npm:1.0.0":
version: 1.0.0
resolution: "@eeacms/volto-spotlight@npm:1.0.0"
checksum: 1b4144103fa37ffdbf234958f76e343d17250ecebe6ae751c50ea9f99bbccce1bf4249b548b8e21a0fd25a743e22b29e136ed0cb9b9c42ef98cf6af3f9e54ccc
languageName: node
linkType: hard

"@eeacms/volto-statistic-block@npm:1.1.0":
version: 1.1.0
resolution: "@eeacms/volto-statistic-block@npm:1.1.0"
Expand All @@ -2131,7 +2140,7 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-tableau@npm:*":
"@eeacms/volto-tableau@npm:2.0.0":
version: 2.0.0
resolution: "@eeacms/volto-tableau@npm:2.0.0"
dependencies:
Expand All @@ -2140,17 +2149,6 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-tableau@npm:3.0.6":
version: 3.0.6
resolution: "@eeacms/volto-tableau@npm:3.0.6"
dependencies:
"@eeacms/volto-block-style": 4.1.0
"@eeacms/volto-embed": 5.0.0
"@eeacms/volto-resize-helper": ^0.2.4
checksum: 09c55d79fc875d4640554deda409bbeed73c6e4e970ba60693196a2c337cbfbbdf52f0deac092fc7797f396955fa4a02af09d92d7132bfa6378a4510093d517e
languageName: node
linkType: hard

"@eeacms/volto-tabs-block@npm:4.0.1":
version: 4.0.1
resolution: "@eeacms/volto-tabs-block@npm:4.0.1"
Expand Down

0 comments on commit f8daf28

Please sign in to comment.