Skip to content

Commit

Permalink
Rename package and block: Group
Browse files Browse the repository at this point in the history
  • Loading branch information
avoinea committed Sep 22, 2020
1 parent d078df7 commit 7475d28
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 36 deletions.
12 changes: 6 additions & 6 deletions DEVELOP.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# volto-meta-block
# volto-group-block

## Develop

Expand All @@ -25,16 +25,16 @@ Before starting make sure your development environment is properly set. See [Vol
},

"addons": [
"@eeacms/volto-meta-block"
"@eeacms/volto-group-block"
],
}

1. Add the following to `mrs.developer.json`:

{
"volto-meta-block": {
"url": "https://github.com/eea/volto-meta-block.git",
"package": "@eeacms/volto-meta-block",
"volto-group-block": {
"url": "https://github.com/eea/volto-group-block.git",
"package": "@eeacms/volto-group-block",
"branch": "develop",
"path": "src"
}
Expand Down Expand Up @@ -63,4 +63,4 @@ Before starting make sure your development environment is properly set. See [Vol

1. Happy hacking!

$ cd src/addons/volto-meta-block/
$ cd src/addons/volto-group-block/
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# volto-meta-block
[![Releases](https://img.shields.io/github/v/release/eea/volto-meta-block)](https://github.com/eea/volto-meta-block/releases)
# volto-group-block
[![Releases](https://img.shields.io/github/v/release/eea/volto-group-block)](https://github.com/eea/volto-group-block/releases)

[Volto](https://github.com/plone/volto) add-on

Expand All @@ -21,11 +21,11 @@ Demo GIF
1. Update `package.json`:
``` JSON
"addons": [
"@eeacms/volto-meta-block"
"@eeacms/volto-group-block"
],

"dependencies": {
"@eeacms/volto-meta-block": "1.0.0"
"@eeacms/volto-group-block": "1.0.0"
}
```

Expand All @@ -41,14 +41,14 @@ Demo GIF

## How to contribute

See [DEVELOP.md](https://github.com/eea/volto-meta-block/blob/master/DEVELOP.md2).
See [DEVELOP.md](https://github.com/eea/volto-group-block/blob/master/DEVELOP.md2).

## Copyright and license

The Initial Owner of the Original Code is European Environment Agency (EEA).
All Rights Reserved.

See [LICENSE.md](https://github.com/eea/volto-meta-block/blob/master/LICENSE.md) for details.
See [LICENSE.md](https://github.com/eea/volto-group-block/blob/master/LICENSE.md) for details.

## Funding

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"name": "@eeacms/volto-meta-block",
"name": "@eeacms/volto-group-block",
"version": "0.1.0",
"description": "volto-meta-block: Volto add-on",
"description": "volto-group-block: Volto block to be used to group other blocks",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
"license": "MIT",
"homepage": "https://github.com/eea/volto-meta-block",
"homepage": "https://github.com/eea/volto-group-block",
"keywords": [
"volto-addon",
"volto-block",
"volto-meta",
"volto-group",
"volto",
"plone",
"react"
],
"repository": {
"type": "git",
"url": "git@github.com:eea/volto-meta-block.git"
"url": "git@github.com:eea/volto-group-block.git"
},
"devDependencies": {
"release-it": "*"
Expand Down
6 changes: 3 additions & 3 deletions src/components/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export { MetaBlockEdit } from './manage/Blocks/Meta/Edit';
export { MetaBlockView } from './manage/Blocks/Meta/View';
export { MetaBlockSchema } from './manage/Blocks/Meta/Schema';
export GroupBlockEdit from './manage/Blocks/Group/Edit';
export GroupBlockView from './manage/Blocks/Group/View';
export GroupBlockSchema from './manage/Blocks/Group/Schema';
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { BlocksForm } from '@eeacms/volto-blocks-form/components';
import { emptyBlocksForm } from '@eeacms/volto-blocks-form/helpers';
import './editor.less';

export const MetaBlockEdit = (props) => {
const Edit = (props) => {
const { block, data, onChangeBlock, pathname, selected, manage } = props;

const properties = isEmpty(data?.data?.blocks)
Expand Down Expand Up @@ -45,3 +45,5 @@ export const MetaBlockEdit = (props) => {
</section>
);
};

export default Edit;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const MetaBlockSchema = {
title: 'Meta block settings',
const Schema = {
title: 'Group block settings',
fieldsets: [
{
id: 'default',
Expand Down Expand Up @@ -52,3 +52,5 @@ export const MetaBlockSchema = {
},
required: [],
};

export default Schema;
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React from 'react';
import { RenderBlocks } from '@eeacms/volto-blocks-form/components';

export const MetaBlockView = (props) => {
const View = (props) => {
const { data } = props;
return <RenderBlocks {...props} content={data?.data || {}} />;
};

export default View;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.block-editor-metaBlock {
.block-editor-group {
margin: 0 -2rem;
.block.metaBlock.selected::before,
.block.metaBlock:hover::before {
.block.group.selected::before,
.block.group:hover::before {
border-style: dashed;
border-radius: 1rem;
}
Expand Down
18 changes: 9 additions & 9 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import codeSVG from '@plone/volto/icons/show-blocks.svg';
import { MetaBlockEdit, MetaBlockView, MetaBlockSchema } from './components';
import { GroupBlockEdit, GroupBlockView, GroupBlockSchema } from './components';

const applyConfig = (config) => {
const choices = Object.keys(config.blocks.blocksConfig)
Expand All @@ -14,24 +14,24 @@ const applyConfig = (config) => {
.filter((val) => !!val);

const schema = {
...MetaBlockSchema,
...GroupBlockSchema,
properties: {
...MetaBlockSchema.properties,
...GroupBlockSchema.properties,
allowedBlocks: {
...MetaBlockSchema.properties.allowedBlocks,
...GroupBlockSchema.properties.allowedBlocks,
items: {
choices: choices,
},
},
},
};
config.blocks.blocksConfig.metaBlock = {
id: 'metaBlock',
title: 'Meta',
config.blocks.blocksConfig.group = {
id: 'group',
title: 'Group',
icon: codeSVG,
group: 'common',
view: MetaBlockView,
edit: MetaBlockEdit,
view: GroupBlockView,
edit: GroupBlockEdit,
schema: schema,
restricted: false,
mostUsed: false,
Expand Down

0 comments on commit 7475d28

Please sign in to comment.