Skip to content

Commit

Permalink
Merge pull request #13 from eea/search-block-fix
Browse files Browse the repository at this point in the history
fix search block, upgrade volto
  • Loading branch information
nileshgulia1 authored Apr 7, 2021
2 parents 2ed0a46 + 74df60b commit 5d6572d
Show file tree
Hide file tree
Showing 3 changed files with 178 additions and 168 deletions.
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
],
"addons": [
"volto-slate",
"@eeacms/volto-tabs-block",
"volto-plotlycharts",
"volto-embed",
"volto-datablocks",
Expand All @@ -29,7 +28,8 @@
"@eeacms/volto-corsproxy",
"@eeacms/volto-block-style",
"@eeacms/volto-collection-block",
"@eeacms/volto-sentry-rancher-config"
"@eeacms/volto-sentry-rancher-config",
"@eeacms/volto-tabs-block"
],
"jest": {
"modulePathIgnorePatterns": [
Expand Down Expand Up @@ -107,22 +107,22 @@
"node": "^10 || ^12 || ^14"
},
"dependencies": {
"@eeacms/volto-corsproxy": "2.1.0",
"volto-plotlycharts": "github:eea/volto-plotlycharts",
"volto-embed": "github:eea/volto-embed",
"volto-datablocks": "github:eea/volto-datablocks",
"@eeacms/volto-tabs-block": "github:eea/volto-tabs-block",
"@eeacms/volto-collection-block": "github:eea/volto-collection-block",
"@eeacms/volto-pdf-block": "github:eea/volto-pdf-block",
"@eeacms/volto-block-style": "2.2.0",
"@eeacms/volto-collection-block": "github:eea/volto-collection-block",
"@eeacms/volto-columns-block": "^3.0.0",
"@eeacms/volto-corsproxy": "2.1.0",
"@eeacms/volto-pdf-block": "github:eea/volto-pdf-block",
"@eeacms/volto-sentry-rancher-config": "^2.0.0",
"@eeacms/volto-tabs-block": "github:eea/volto-tabs-block",
"@n8tb1t/use-scroll-position": "^1.0.43",
"@plone/volto": "12.4.0",
"@plone/volto": "12.7.0",
"mgr-pdf-viewer-react": "^1.0.3",
"react-scrollspy": "^3.4.2",
"volto-slate": "^2.1.0",
"volto-addons": "github:eea/volto-addons"
"volto-addons": "github:eea/volto-addons",
"volto-datablocks": "github:eea/volto-datablocks",
"volto-embed": "github:eea/volto-embed",
"volto-plotlycharts": "github:eea/volto-plotlycharts",
"volto-slate": "2.4.0"
},
"devDependencies": {
"eslint-plugin-prettier": "3.1.3",
Expand Down
21 changes: 11 additions & 10 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import ConnectedMapView from 'volto-addons/ConnectedMap/BlockView';
import ConnectedMapEdit from 'volto-addons/ConnectedMap/BlockEdit';

import ConnectedControl from 'volto-addons/ConnectedControl/ConnectedControl';
import SearchEdit from 'volto-addons/SearchBlock/Edit';
import SearchView from 'volto-addons/SearchBlock/View';
// import SearchEdit from 'volto-addons/SearchBlock/Edit';
// import SearchView from 'volto-addons/SearchBlock/View';

import TableEdit from 'volto-addons/TableBlock/Edit';
import TableView from 'volto-addons/TableBlock/View';
Expand Down Expand Up @@ -141,14 +141,15 @@ blocks.blocksConfig.folder_contents_block = {
group: 'custom_addons',
};

blocks.blocksConfig.search_block = {
id: 'search_block',
title: 'Search block',
view: SearchView,
edit: SearchEdit,
icon: chartIcon,
group: 'custom_addons',
};
//Custom Search block
// blocks.blocksConfig.search_block = {
// id: 'search_block',
// title: 'Search block',
// view: SearchView,
// edit: SearchEdit,
// icon: chartIcon,
// group: 'custom_addons',
// };

blocks.blocksConfig.table_block = {
id: 'table_block',
Expand Down
Loading

0 comments on commit 5d6572d

Please sign in to comment.