Skip to content

Commit

Permalink
Merge pull request #30 from eea/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
claudiaifrim authored Nov 22, 2023
2 parents 88c9d46 + 5436aba commit f3af088
Show file tree
Hide file tree
Showing 21 changed files with 318 additions and 733 deletions.
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,36 @@ 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).

### [0.1.26](https://github.com/eea/volto-forest-policy/compare/0.1.25...0.1.26) - 22 November 2023

#### :rocket: New Features

- feat: use Sources from volto-embed [Miu Razvan - [`866e3bf`](https://github.com/eea/volto-forest-policy/commit/866e3bf12ab9c0cb05efde6e25baf4a9badf5fbf)]

#### :bug: Bug Fixes

- fix: sonarqube issues [Claudia Ifrim - [`e988d2e`](https://github.com/eea/volto-forest-policy/commit/e988d2eef9e2abe399b5431fc5b288a5e85cd79b)]
- fix: update tests [Claudia Ifrim - [`aca51b4`](https://github.com/eea/volto-forest-policy/commit/aca51b4d4d1c7ba4aa1231a7465a13f939cfb801)]
- fix: pretty package.json [Claudia Ifrim - [`f389495`](https://github.com/eea/volto-forest-policy/commit/f3894950f70095d0efaaba6d290f11e5b7ea2b17)]

#### :house: Internal changes

- chore: Cleanup tpl files [Alin Voinea - [`927b4e5`](https://github.com/eea/volto-forest-policy/commit/927b4e55a32939eb866335500dc44e0f8030373c)]
- style: Automated code fix [eea-jenkins - [`0a5a555`](https://github.com/eea/volto-forest-policy/commit/0a5a55514b526d2198c34449f60d3154708c61be)]
- chore: [JENKINS] Refactor automated testing [valentinab25 - [`6b470b3`](https://github.com/eea/volto-forest-policy/commit/6b470b301f73f3de4c3fa6f5594528b2ed1fa72d)]
- chore: husky, lint-staged use fixed versions [valentinab25 - [`0b61630`](https://github.com/eea/volto-forest-policy/commit/0b61630a0c69c57c5d3b504121a45ec64eb48286)]
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`078dbc4`](https://github.com/eea/volto-forest-policy/commit/078dbc4545043a9181b13c5e44203c373ad216e1)]

#### :hammer_and_wrench: Others

- fix sonarqube [Miu Razvan - [`8e3f3b6`](https://github.com/eea/volto-forest-policy/commit/8e3f3b6279e211436522515708c9be37811ca874)]
- update test [Claudia Ifrim - [`33a3ef1`](https://github.com/eea/volto-forest-policy/commit/33a3ef1a80e2cf37a94e20c99b62e112a569ac3e)]
- Pin d3-array to 2.12.1 - refs #251399 [Claudia Ifrim - [`0048bbd`](https://github.com/eea/volto-forest-policy/commit/0048bbd71da25c364ecf6e2e91043067234c57cd)]
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`e920388`](https://github.com/eea/volto-forest-policy/commit/e9203886bfe8307f7b74876e44a6f154adeab88c)]
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`7a26d73`](https://github.com/eea/volto-forest-policy/commit/7a26d7343494edd15752f664831b0a552496a225)]
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`58a48d2`](https://github.com/eea/volto-forest-policy/commit/58a48d2a2486d777ff0d40b7ccbf62f5b8329f67)]
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`a85d8cb`](https://github.com/eea/volto-forest-policy/commit/a85d8cb9f3e8c2e6a9ba10d5f9553d4b938bd9ea)]
- test: [JENKINS] Improve cypress time [valentinab25 - [`a222cf9`](https://github.com/eea/volto-forest-policy/commit/a222cf981a928312fb2f05ae22870ce502741096)]
### [0.1.25](https://github.com/eea/volto-forest-policy/compare/0.1.24...0.1.25) - 19 September 2023

#### :hammer_and_wrench: Others
Expand Down
27 changes: 14 additions & 13 deletions DEVELOP.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# volto-addon-template
# volto-forest-policy

## Develop

Expand All @@ -16,12 +16,14 @@

1. Go to http://localhost:3000

1. Happy hacking!
1. Initialize git hooks

```Bash
cd src/addons/volto-forest-policy/
yarn prepare
```

1. Happy hacking!

### Or add @eeacms/volto-forest-policy to your Volto project

Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
Expand All @@ -32,34 +34,31 @@ Before starting make sure your development environment is properly set. See [Vol

1. Create new volto app

yo @plone/volto my-volto-project --addon @eeacms/volto-addon-template --skip-install
yo @plone/volto my-volto-project --addon @eeacms/volto-forest-policy --skip-install
cd my-volto-project

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

{
"volto-addon-template": {
"url": "https://github.com/eea/volto-addon-template.git",
"package": "@eeacms/volto-addon-template",
"volto-forest-policy": {
"url": "https://github.com/eea/volto-forest-policy.git",
"package": "@eeacms/volto-forest-policy",
"branch": "develop",
"path": "src"
}
}

1. Install

yarn develop
make develop
yarn

1. Start backend

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

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

docker logs -f plone

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

1. Start frontend
Expand All @@ -70,7 +69,7 @@ Before starting make sure your development environment is properly set. See [Vol

1. Happy hacking!

cd src/addons/volto-addon-template/
cd src/addons/volto-forest-policy/

## Cypress

Expand Down Expand Up @@ -105,3 +104,5 @@ Or run it:
```Bash
make cypress-run
```

```
51 changes: 0 additions & 51 deletions DEVELOP.md.tpl

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG VOLTO_VERSION
FROM plone/frontend-builder:${VOLTO_VERSION}
FROM eeacms/frontend-builder:${VOLTO_VERSION}

ARG ADDON_NAME
ARG ADDON_PATH
Expand Down
Loading

0 comments on commit f3af088

Please sign in to comment.