Skip to content

Commit

Permalink
Merge pull request #97 from eea/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
avoinea committed Sep 29, 2023
2 parents 7197b52 + 6ca4d3c commit 2903604
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 74 deletions.
29 changes: 29 additions & 0 deletions CHANGELOG.md
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. Dates are d

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

### [10.4.1](https://github.com/eea/volto-accordion-block/compare/10.4.0...10.4.1) - 29 September 2023

#### :house: Documentation changes

- docs: Update README DEVELOP [Alin Voinea - [`14bcb5f`](https://github.com/eea/volto-accordion-block/commit/14bcb5ff46070f76f960191e767c6b6773dc63cf)]

### [10.4.0](https://github.com/eea/volto-accordion-block/compare/10.3.0...10.4.0) - 27 September 2023

#### :bug: Bug Fixes
Expand Down Expand Up @@ -180,13 +186,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`83cfef7`](https://github.com/eea/volto-accordion-block/commit/83cfef72305789fe95c4d463956d446e934e37bd)]
- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`e8d2ff3`](https://github.com/eea/volto-accordion-block/commit/e8d2ff341ff2db8baec52b9e839e2ace6eee7c1a)]

#### :hammer_and_wrench: Others

- Release 8.1.0 [Alin Voinea - [`ae29f46`](https://github.com/eea/volto-accordion-block/commit/ae29f469e449d993f8a67a529acf61d1657b40a0)]
- test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`d077684`](https://github.com/eea/volto-accordion-block/commit/d07768431760471c1d33352e097874dee37edd41)]
- test: Add unit tests for util - refs #253277 [ana-oprea - [`9385394`](https://github.com/eea/volto-accordion-block/commit/9385394cf834dd944d98ab9fdc10e65abdad636d)]
- test: Fix test config, coverage Refs #253277 [valentinab25 - [`67a0667`](https://github.com/eea/volto-accordion-block/commit/67a0667ee563e8ee01c5e660cd2b127eaa1da4fc)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`9c06bd0`](https://github.com/eea/volto-accordion-block/commit/9c06bd0f3d262bb553541ec884c659d31fea70d5)]
## [8.0.0](https://github.com/eea/volto-accordion-block/compare/7.1.0...8.0.0) - 24 March 2023

#### :rocket: New Features
Expand All @@ -199,6 +208,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- test(cypress): Use latest stable Volto for tests [Alin Voinea - [`161325b`](https://github.com/eea/volto-accordion-block/commit/161325bfb990e1ef8bd66a7c26aacf17b5e3989c)]
- Release 7.1.0 [Alin Voinea - [`207318f`](https://github.com/eea/volto-accordion-block/commit/207318f45321d9caf2e9e88a36786d6a6dfbfce6)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`a1279b2`](https://github.com/eea/volto-accordion-block/commit/a1279b20f134b8da44ca45e1e3eecf50401372f8)]
## [7.0.0](https://github.com/eea/volto-accordion-block/compare/6.0.0...7.0.0) - 7 February 2023

#### :nail_care: Enhancements
Expand All @@ -210,7 +220,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Release 7.0.0 [Alin Voinea - [`661c6fd`](https://github.com/eea/volto-accordion-block/commit/661c6fd04aa704ba09172737f9e00e7de8b17673)]
- theme-picker version [Andrei Grigore - [`2d7d7fb`](https://github.com/eea/volto-accordion-block/commit/2d7d7fb64b6f51fb02410140ae4b69eda26dea06)]
- Add theme picker widget [dana-cfc4 - [`b567515`](https://github.com/eea/volto-accordion-block/commit/b5675150e1b5a811e1686404cbefcd9e6b92d515)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`dd14109`](https://github.com/eea/volto-accordion-block/commit/dd14109b3df7aee49ab1fdb57b8ac749193723c7)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`6169240`](https://github.com/eea/volto-accordion-block/commit/6169240953e8b81fbf1200bfa7b77c1be3be318f)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`bbf12a0`](https://github.com/eea/volto-accordion-block/commit/bbf12a07558ea1f2c9d6e62fa4bf897d1c27ad71)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`cb18b3c`](https://github.com/eea/volto-accordion-block/commit/cb18b3c7d12318a671e6031054cb6cb98c5e4766)]
- yarn 3 [Alin Voinea - [`26994da`](https://github.com/eea/volto-accordion-block/commit/26994dab66bce3873911fee6fb46fc51dfce44d7)]
- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`5803993`](https://github.com/eea/volto-accordion-block/commit/5803993b263352f7d3a5e4c14f5ac5b1607a1dc2)]
## [6.0.0](https://github.com/eea/volto-accordion-block/compare/5.0.0...6.0.0) - 16 November 2022

#### :nail_care: Enhancements
Expand Down Expand Up @@ -240,6 +255,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`3c0236e`](https://github.com/eea/volto-accordion-block/commit/3c0236ef0e055bbbac852b66139767cee8631aad)]
- test(cypress): Add missing md5 dependency [Alin Voinea - [`1afae5d`](https://github.com/eea/volto-accordion-block/commit/1afae5d677de53778d5727334f9a6add8120d046)]
## [4.0.0](https://github.com/eea/volto-accordion-block/compare/3.5.0...4.0.0) - 27 September 2022

Expand All @@ -257,12 +273,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Release 3.6.0 [Alin Voinea - [`2c84012`](https://github.com/eea/volto-accordion-block/commit/2c840125496e23e1f1587e9e1ba2713ef538491e)]
- test(prettier): Fix stylelint [Alin Voinea - [`e3fd717`](https://github.com/eea/volto-accordion-block/commit/e3fd717b60d67a09b500282837470707f57747a1)]
- Use volto@16.0.0-alpha.14 in cypress tests [Miu Razvan - [`f4dd7a1`](https://github.com/eea/volto-accordion-block/commit/f4dd7a1221ef2437b813d45b232efbf8c04bb8c5)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`20652bc`](https://github.com/eea/volto-accordion-block/commit/20652bcea7bd1f4f7271cf0b2fe8223401401a4f)]
- update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`7a1af55`](https://github.com/eea/volto-accordion-block/commit/7a1af55061b0c75ecb77fdbae9e2e6586df3b50c)]
### [3.5.0](https://github.com/eea/volto-accordion-block/compare/3.4.16...3.5.0) - 30 June 2022

#### :hammer_and_wrench: Others

- Release 3.5.0 [Alin Voinea - [`c237343`](https://github.com/eea/volto-accordion-block/commit/c237343daa82eb0fb0ddb49e04ee6c49578b8fd2)]
- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`5de2964`](https://github.com/eea/volto-accordion-block/commit/5de296427472925998273bf9c164ba5b65895a14)]
### [3.4.16](https://github.com/eea/volto-accordion-block/compare/3.4.15...3.4.16) - 17 May 2022

#### :hammer_and_wrench: Others
Expand All @@ -272,6 +290,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`66fada5`](https://github.com/eea/volto-accordion-block/commit/66fada5a7084e1adb36ef5ff950d498391729eab)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`9d96b9d`](https://github.com/eea/volto-accordion-block/commit/9d96b9d392004dd8791c061c5fa39deee253c16a)]
### [3.4.14](https://github.com/eea/volto-accordion-block/compare/3.4.13...3.4.14) - 3 March 2022

#### :rocket: New Features
Expand All @@ -295,6 +315,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`197c242`](https://github.com/eea/volto-accordion-block/commit/197c2426f18e3b74296c18ef86781e63596bcd4b)]
### [3.4.10](https://github.com/eea/volto-accordion-block/compare/3.4.9...3.4.10) - 10 December 2021

#### :hammer_and_wrench: Others
Expand All @@ -313,11 +334,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- cy: make tests run with both slate and draftjs [nileshgulia1 - [`e51f7a5`](https://github.com/eea/volto-accordion-block/commit/e51f7a5c36804240d90e19baa9c7b321e41a7c23)]
- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`9f515c3`](https://github.com/eea/volto-accordion-block/commit/9f515c3e1055b07ea5ea7ac8dbf72eb2e4b79c74)]
### [3.4.7](https://github.com/eea/volto-accordion-block/compare/3.4.6...3.4.7) - 25 October 2021

#### :hammer_and_wrench: Others

- Refs #34 ensure floated images from content area don't spill over next accordion title [David Ichim - [`79abc8c`](https://github.com/eea/volto-accordion-block/commit/79abc8c1b13eb26fb78b9dbe53fc2711c02a1ed1)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`f5c2cf9`](https://github.com/eea/volto-accordion-block/commit/f5c2cf969763a5400e4d9fb66bafad761cd17f2f)]
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`92cd189`](https://github.com/eea/volto-accordion-block/commit/92cd1891291a33e92c1f4488ff2afb90642d2706)]
### [3.4.6](https://github.com/eea/volto-accordion-block/compare/3.4.5...3.4.6) - 6 October 2021

#### :house: Internal changes
Expand All @@ -326,6 +350,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`c0bc59d`](https://github.com/eea/volto-accordion-block/commit/c0bc59d897ece309834ffef8ddea516aceef1e5f)]
### [3.4.5](https://github.com/eea/volto-accordion-block/compare/3.4.4...3.4.5) - 29 September 2021

#### :hammer_and_wrench: Others
Expand All @@ -337,6 +362,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`046f3aa`](https://github.com/eea/volto-accordion-block/commit/046f3aae09e1725d44bcdc371d07ed32e8309423)]
### [3.4.3](https://github.com/eea/volto-accordion-block/compare/3.4.2...3.4.3) - 17 September 2021

### [3.4.2](https://github.com/eea/volto-accordion-block/compare/3.4.1...3.4.2) - 16 September 2021
Expand All @@ -346,6 +372,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Add missing onChangeField to make it work with Metadata section block - refs #137434 [Alin Voinea - [`5253b74`](https://github.com/eea/volto-accordion-block/commit/5253b74a52043a3ad7e2e813abaf2d27f0e83a7a)]
- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`1e4d3dc`](https://github.com/eea/volto-accordion-block/commit/1e4d3dc937bc63825bd1fc6156eca9b6d073a40b)]
### [3.4.0](https://github.com/eea/volto-accordion-block/compare/3.3.1...3.4.0) - 7 September 2021

#### :hammer_and_wrench: Others
Expand All @@ -358,6 +385,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Release 3.3.0 [Alin Voinea - [`2cbb1d5`](https://github.com/eea/volto-accordion-block/commit/2cbb1d53ce62b9cb42751c4c4997577ba4165649)]
- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`ab257ac`](https://github.com/eea/volto-accordion-block/commit/ab257acb0c2c8e38b906fcce8f6e148e4690d473)]
### [3.2.4](https://github.com/eea/volto-accordion-block/compare/3.2.3...3.2.4) - 21 July 2021

### [3.2.3](https://github.com/eea/volto-accordion-block/compare/3.2.2...3.2.3) - 27 May 2021
Expand Down Expand Up @@ -484,6 +512,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- remove unused vars [nileshgulia1 - [`5e2c1e9`](https://github.com/eea/volto-accordion-block/commit/5e2c1e990f5ccf9b81f123ff18cacc7769ac696c)]
- accordion title, via Input (semantic ui) [nileshgulia1 - [`0b2aef7`](https://github.com/eea/volto-accordion-block/commit/0b2aef76dd828ef2e0fc5061023a259d6279c11c)]
- add accordion title as a slate editor [nileshgulia1 - [`38e841d`](https://github.com/eea/volto-accordion-block/commit/38e841d9a1a2d1d6a9d657ed6d611220615cbd40)]
- yarn prettier [Alin Voinea - [`afc2d37`](https://github.com/eea/volto-accordion-block/commit/afc2d379490cc4bdd4e2c2296229fac5d549d6a1)]
- make title editable [nileshgulia1 - [`e3233b0`](https://github.com/eea/volto-accordion-block/commit/e3233b00f3e0e1b0ef240a035d4aca7384a23b3c)]
### 0.1.0 - 9 November 2020

Expand Down
74 changes: 29 additions & 45 deletions DEVELOP.md
Expand Up @@ -2,89 +2,74 @@

## Develop

### With Docker

1. Make sure you have `docker` and `docker compose` installed and running on your machine:

```bash
```Bash
git clone https://github.com/eea/volto-accordion-block.git
cd volto-accordion-block
git checkout -b bugfix-123456 develop
make
make start
```

1. Wait for `Volto started at 0.0.0.0:3000` message
1. Wait for `Volto started at 0.0.0.0:3000` meesage

1. Go to http://localhost:3000

1. Happy hacking!
1. Initialize git hooks

```bash
cd src/addons/volto-accordion-block/
```Bash
yarn prepare
```

### Or add volto-accordion-block to your Volto project
1. Happy hacking!

### Or add @eeacms/volto-accordion-block to your Volto project

Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://6.docs.plone.org/volto/getting-started/install.html)
Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)

1. Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`

```bash
npm install -g yo @plone/generator-volto mrs-developer
```
npm install -g yo @plone/generator-volto mrs-developer

1. Create new volto app

```bash
yo @plone/volto my-volto-project --addon @eeacms/volto-accordion-block --skip-install
cd my-volto-project
```
yo @plone/volto my-volto-project --addon @eeacms/volto-accordion-block --skip-install
cd my-volto-project

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

```JSON
{
"volto-accordion-block": {
"url": "https://github.com/eea/volto-accordion-block.git",
"package": "@eeacms/volto-accordion-block",
"branch": "develop",
"path": "src"
{
"volto-accordion-block": {
"url": "https://github.com/eea/volto-accordion-block.git",
"package": "@eeacms/volto-accordion-block",
"branch": "develop",
"path": "src"
}
}
}
```

1. Install

```bash
yarn
```
make develop
yarn

1. Start backend

```bash
docker compose up backend
```
docker run --pull always -it --rm --name plone -p 8080:8080 -e SITE=Plone plone/plone-backend

...wait for backend to set up and start - `Ready to handle requests`:
...wait for backend to setup and start - `Ready to handle requests`:

...you can also check http://localhost:8080/Plone

1. Start frontend

```bash
yarn start
```
yarn start

1. Go to http://localhost:3000

1. Happy hacking!

```bash
cd src/addons/volto-accordion-block/
```

---
cd src/addons/volto-accordion-block/

## Cypress

Expand All @@ -95,13 +80,13 @@ project where you added `volto-accordion-block` to `mrs.developer.json`

Go to:

```bash
```BASH
cd src/addons/volto-accordion-block/
```

Start:

```bash
```Bash
make
make start
```
Expand All @@ -110,16 +95,15 @@ This will build and start with Docker a clean `Plone backend` and `Volto Fronten

Open Cypress Interface:

```bash
```Bash
make cypress-open
```

Or run it:

```bash
```Bash
make cypress-run
```
---

## Prettier

Expand Down
54 changes: 26 additions & 28 deletions README.md
Expand Up @@ -27,51 +27,49 @@

### Try volto-accordion-block with Docker

```bash
git clone https://github.com/eea/volto-accordion-block.git
cd volto-accordion-block
make
make start
```
git clone https://github.com/eea/volto-accordion-block.git
cd volto-accordion-block
make
make start

Go to http://localhost:3000

### Add volto-accordion-block to your Volto project

1. Make sure you have a [Plone backend](https://plone.org/download) up-and-running at http://localhost:8080/Plone

```bash
docker compose up backend
```
```Bash
docker compose up backend
```

1. Start Volto frontend

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

```json
"addons": [
"@eeacms/volto-accordion-block"
],
```JSON
"addons": [
"@eeacms/volto-accordion-block"
],

"dependencies": {
"@eeacms/volto-accordion-block": "*"
}
```
"dependencies": {
"@eeacms/volto-accordion-block": "*"
}
```

- If not, create one:
* If not, create one:

```bash
npm install -g yo @plone/generator-volto
yo @plone/volto my-volto-project --addon @eeacms/volto-accordion-block
cd my-volto-project
```
```
npm install -g yo @plone/generator-volto
yo @plone/volto my-volto-project --canary --addon @eeacms/volto-accordion-block
cd my-volto-project
```

1. Install new add-ons and restart Volto:

```bash
yarn
yarn start
```
```
yarn
yarn start
```

1. Go to http://localhost:3000

Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-accordion-block",
"version": "10.4.0",
"version": "10.4.1",
"description": "volto-accordion-block: Volto accordion block",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down

0 comments on commit 2903604

Please sign in to comment.