From c87710a1273de4baeccef183b07c9f77d5299de7 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Wed, 7 Oct 2020 17:46:32 +0300 Subject: [PATCH] Update docs --- DEVELOP.md | 16 ++++++++++++++-- README.md | 15 +++++++-------- package.json | 2 +- screenshot-a0.png | Bin 21351 -> 0 bytes 4 files changed, 22 insertions(+), 11 deletions(-) delete mode 100644 screenshot-a0.png diff --git a/DEVELOP.md b/DEVELOP.md index 7f5c4bd..63e5d7f 100644 --- a/DEVELOP.md +++ b/DEVELOP.md @@ -20,13 +20,25 @@ Before starting make sure your development environment is properly set. See [Vol 1. Update `package.json` with the following information: { + "private": true, + + "workspaces": [ + "src/addons/volto-columns-block" + ], + "scripts": { "develop": "missdev --config=jsconfig.json --output=addons" }, "addons": [ + "@eeacms/volto-blocks-form", "@eeacms/volto-columns-block" ], + + "dependencies": { + "@plone/volto": "8.2.0", + "@eeacms/volto-blocks-form": "github:eea/volto-blocks-form#0.5.0" + }, } 1. Add the following to `mrs.developer.json`: @@ -35,7 +47,7 @@ Before starting make sure your development environment is properly set. See [Vol "volto-columns-block": { "url": "https://github.com/eea/volto-columns-block.git", "package": "@eeacms/volto-columns-block", - "branch": "develop", + "branch": "master", "path": "src" } } @@ -47,7 +59,7 @@ Before starting make sure your development environment is properly set. See [Vol 1. Start backend - $ docker run -d --name plone -p 8080:8080 -e SITE=Plone -e VERSIONS="plone.restapi=7.0.0a5" -e ADDONS="kitconcept.volto" plone:5 + $ docker run -d --name plone -p 8080:8080 -e SITE=Plone plone:5 ...wait for backend to setup and start - `Ready to handle requests`: diff --git a/README.md b/README.md index 315797b..3596280 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,10 @@ This package gives you a block with columns. Each column is its own separate blocks container. -Note: for the moment this relies on the https://github.com/plone/volto/pull/1826 PR. - -Note: this is a work in progress, UX will be improved. - ### -![first alpha screenshot](screenshot-a0.png) +![Columns Layout](https://github.com/raw/eea/volto-columns-block/docs/docs/layout.png) +![Columns Example](https://github.com/raw/eea/volto-columns-block/docs/docs/columns.png) ## Getting started @@ -28,11 +25,13 @@ Note: this is a work in progress, UX will be improved. 1. Update `package.json`: ``` JSON "addons": [ + "@eeacms/volto-blocks-form", "@eeacms/volto-columns-block" ], "dependencies": { - "@eeacms/volto-columns-block": "github:eea/volto-columns-block#0.1.0" + "@eeacms/volto-blocks-form": "github:eea/volto-blocks-form#0.5.0", + "@eeacms/volto-columns-block": "github:eea/volto-columns-block#0.2.0" } ``` @@ -48,14 +47,14 @@ Note: this is a work in progress, UX will be improved. ## How to contribute -See [DEVELOP.md](DEVELOP.md). +See [DEVELOP.md](https://github.com/eea/volto-columns-block/blob/master/DEVELOP.md). ## Copyright and license The Initial Owner of the Original Code is European Environment Agency (EEA). All Rights Reserved. -See [LICENSE.md](LICENSE.md) for details. +See [LICENSE.md](https://github.com/eea/volto-columns-block/blob/master/LICENSE.md) for details. ## Funding diff --git a/package.json b/package.json index b247002..a717f13 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-columns-block", - "version": "0.1.0", + "version": "0.2.0", "description": "volto-columns-block: Volto add-on", "main": "src/index.js", "repository": "https://github.com/eea/volto-columns-block", diff --git a/screenshot-a0.png b/screenshot-a0.png deleted file mode 100644 index 1d03e73946f8eb86b51bcf57a6f14437f68b5ebd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21351 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