Skip to content

Commit dc5297c

Browse files
authored
Merge pull request #91 from eea/develop
Release
2 parents a76efa1 + b75edff commit dc5297c

File tree

4 files changed

+34
-42
lines changed

4 files changed

+34
-42
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
### [5.2.4](https://github.com/eea/volto-block-style/compare/5.2.3...5.2.4) - 29 September 2023
8+
9+
#### :house: Documentation changes
10+
11+
- docs: Update README and DEVELOP [Alin Voinea - [`235ce19`](https://github.com/eea/volto-block-style/commit/235ce1995257e6ba8a4c945e2f5fffcc0dd44ee7)]
12+
- docs: Update README and DEVELOP [Alin Voinea - [`6424344`](https://github.com/eea/volto-block-style/commit/642434458757c1887b863a7fa5e7b0ffcc2c8593)]
13+
714
### [5.2.3](https://github.com/eea/volto-block-style/compare/5.2.2...5.2.3) - 25 September 2023
815

916
#### :bug: Bug Fixes

DEVELOP.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

1717
1. Go to http://localhost:3000
1818

19-
1. Happy hacking!
19+
1. Initialize git hooks
2020

2121
```Bash
22-
cd src/addons/volto-block-style/
22+
yarn prepare
2323
```
2424

25+
1. Happy hacking!
26+
2527
### Or add @eeacms/volto-block-style to your Volto project
2628

2729
Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
@@ -48,18 +50,15 @@ Before starting make sure your development environment is properly set. See [Vol
4850

4951
1. Install
5052

51-
yarn develop
53+
make develop
5254
yarn
5355

5456
1. Start backend
5557

56-
docker pull plone
57-
docker run -d --name plone -p 8080:8080 -e SITE=Plone -e PROFILES="profile-plone.restapi:blocks" plone
58+
docker run --pull always -it --rm --name plone -p 8080:8080 -e SITE=Plone plone/plone-backend
5859

5960
...wait for backend to setup and start - `Ready to handle requests`:
6061

61-
docker logs -f plone
62-
6362
...you can also check http://localhost:8080/Plone
6463

6564
1. Start frontend

README.md

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,12 @@ block types that you want to enable. By default it is enabled for all blocks.
3131

3232
### Try volto-block-style with Docker
3333

34-
1. Get the latest Docker images
34+
git clone https://github.com/eea/volto-block-style.git
35+
cd volto-block-style
36+
make
37+
make start
3538

36-
```
37-
docker pull plone
38-
docker pull plone/volto
39-
```
40-
41-
1. Start Plone backend
42-
43-
```
44-
docker run -d --name plone -p 8080:8080 -e SITE=Plone -e PROFILES="profile-plone.restapi:blocks" plone
45-
```
46-
47-
1. Start Volto frontend
48-
49-
```
50-
docker run -it --rm -p 3000:3000 --link plone -e ADDONS="@eeacms/volto-block-style" plone/volto
51-
```
52-
53-
1. Go to http://localhost:3000
39+
Go to http://localhost:3000
5440

5541
### Add volto-block-style to your Volto project
5642

@@ -62,25 +48,25 @@ block types that you want to enable. By default it is enabled for all blocks.
6248

6349
1. Start Volto frontend
6450

65-
- If you already have a volto project, just update `package.json`:
51+
* If you already have a volto project, just update `package.json`:
6652

67-
```JSON
68-
"addons": [
69-
"@eeacms/volto-block-style"
70-
],
53+
```JSON
54+
"addons": [
55+
"@eeacms/volto-block-style"
56+
],
7157

72-
"dependencies": {
73-
"@eeacms/volto-block-style": "^1.0.0"
74-
}
75-
```
58+
"dependencies": {
59+
"@eeacms/volto-block-style": "*"
60+
}
61+
```
7662

77-
- If not, create one:
63+
* If not, create one:
7864

79-
```
80-
npm install -g yo @plone/generator-volto
81-
yo @plone/volto my-volto-project --addon @eeacms/volto-block-style
82-
cd my-volto-project
83-
```
65+
```
66+
npm install -g yo @plone/generator-volto
67+
yo @plone/volto my-volto-project --canary --addon @eeacms/volto-block-style
68+
cd my-volto-project
69+
```
8470

8571
1. Install new add-ons and restart Volto:
8672

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@eeacms/volto-block-style",
3-
"version": "5.2.3",
3+
"version": "5.2.4",
44
"description": "volto-block-style: Volto add-on",
55
"main": "src/index.js",
66
"author": "European Environment Agency: IDM2 A-Team",

0 commit comments

Comments
 (0)