Skip to content

Commit

Permalink
Merge pull request #11 from eea/volto-core
Browse files Browse the repository at this point in the history
use BlocksFrom from volto-core
  • Loading branch information
avoinea authored Mar 8, 2021
2 parents 3621835 + 4cb36d7 commit 9c841c0
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {
GIT_NAME = "volto-accordion-block"
NAMESPACE = "@eeacms"
SONARQUBE_TAGS = "volto.eea.europa.eu"
DEPENDENCIES = "@eeacms/volto-blocks-form"
DEPENDENCIES = ""
}

stages {
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
"devDependencies": {
"release-it": "*"
},
"dependencies": {
"@eeacms/volto-blocks-form": "^2.0.0"
},
"dependencies": {},
"scripts": {
"release": "release-it",
"bootstrap": "node bootstrap",
Expand Down
4 changes: 2 additions & 2 deletions src/components/manage/Blocks/Accordion/Edit.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { isEmpty } from 'lodash';
import { BlocksForm } from '@eeacms/volto-blocks-form/components';
import { emptyBlocksForm } from '@eeacms/volto-blocks-form/helpers';
import { BlocksForm } from '@plone/volto/components';
import { emptyBlocksForm } from '@plone/volto/helpers';
import { SidebarPortal } from '@plone/volto/components';
import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
import { accordionBlockSchema } from './Schema';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/Accordion/View.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { RenderBlocks } from '@eeacms/volto-blocks-form/components';
import { RenderBlocks } from '@plone/volto/components';
import { getPanels, accordionBlockHasValue } from './util';
import { Accordion } from 'semantic-ui-react';

Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/Accordion/util.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { v4 as uuid } from 'uuid';
import { emptyBlocksForm } from '@eeacms/volto-blocks-form/helpers';
import { emptyBlocksForm } from '@plone/volto/helpers';
import { map } from 'lodash';

import {
Expand Down
4 changes: 2 additions & 2 deletions src/components/manage/Widgets/PanelsWidget.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { v4 as uuid } from 'uuid';
import { omit, without } from 'lodash';
import move from 'lodash-move';
import { Icon, FormFieldWrapper } from '@plone/volto/components';
import { DragDropList } from '@eeacms/volto-blocks-form/components';
import { emptyBlocksForm } from '@eeacms/volto-blocks-form/helpers';
import { DragDropList } from '@plone/volto/components';
import { emptyBlocksForm } from '@plone/volto/helpers';

import dragSVG from '@plone/volto/icons/drag.svg';
import trashSVG from '@plone/volto/icons/delete.svg';
Expand Down

0 comments on commit 9c841c0

Please sign in to comment.