Merge pull request #25 from eea/develop

Release
eea · Nov 4, 2024 · 4b10012 · 4b10012
2 parents 89cb835 + b91c1fe
commit 4b10012
Show file tree

Hide file tree

Showing 38 changed files with 819 additions and 375 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,2 @@
+[ -n "$CI" ] && exit 0
+yarn lint-staged
diff --git a/.i18n.babel.config.js b/.i18n.babel.config.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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).
 
+### [2.0.16](https://github.com/eea/volto-industry-theme/compare/2.0.15...2.0.16) - 4 October 2024
+
+#### :bug: Bug Fixes
+
+- fix: sonarqube bug [Claudia Ifrim - [`c1cba78`](https://github.com/eea/volto-industry-theme/commit/c1cba784cb38378ab8e29f5aa38ea030c4100f19)]
+- fix: sonarqube bugs [Claudia Ifrim - [`d94c6c7`](https://github.com/eea/volto-industry-theme/commit/d94c6c79367238db5efaf3a9fc0952a1c84a64ef)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`1600588`](https://github.com/eea/volto-industry-theme/commit/16005880c0fc9e2c6afb9c357fed58986ace13e5)]
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`86174da`](https://github.com/eea/volto-industry-theme/commit/86174da55a5e16ca991f259cf2b7030ceff45e36)]
+- chore: husky, lint-staged use fixed versions [valentinab25 - [`18ebada`](https://github.com/eea/volto-industry-theme/commit/18ebada4ff42df96ad4f9a6166e83c2128f5d389)]
+- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`33fbe24`](https://github.com/eea/volto-industry-theme/commit/33fbe248ba43e5579b9978c196cbdafdbb1e1b92)]
+
+#### :house: Documentation changes
+
+- docs: Cleanup Makefile, update DEVELOP documentation, i18n - refs #254894 [valentinab25 - [`3e78401`](https://github.com/eea/volto-industry-theme/commit/3e78401dc2466c803c095e35a7794ac91233b0bf)]
+
+#### :hammer_and_wrench: Others
+
+- remove cypress tests [Claudia Ifrim - [`88ff9bd`](https://github.com/eea/volto-industry-theme/commit/88ff9bdd6c41cd4a04c1fede01c45aef787b6e74)]
+- update logo and color scheme [Claudia Ifrim - [`26c9173`](https://github.com/eea/volto-industry-theme/commit/26c9173b1ab8d168a17c57839a515119b4e82849)]
+- reorder packages [Claudia Ifrim - [`d3b698c`](https://github.com/eea/volto-industry-theme/commit/d3b698c311d232797ecf57efbc767d8b5aa1bdaa)]
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`78e172f`](https://github.com/eea/volto-industry-theme/commit/78e172fce2dba466cac2dfeb00818f6b7ced6150)]
+- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`f098c38`](https://github.com/eea/volto-industry-theme/commit/f098c383138e03c10af323d298aed3a2895c9ae0)]
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`177cbfc`](https://github.com/eea/volto-industry-theme/commit/177cbfc6965d7a8ad2d7f93a268e060dd4f9f11b)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`808e709`](https://github.com/eea/volto-industry-theme/commit/808e70902da7c8bcb30861c776f968ea5baaabe7)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`9d065e9`](https://github.com/eea/volto-industry-theme/commit/9d065e988c2846a24902d90dd26e0e0157cf5b13)]
+- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`ab9367f`](https://github.com/eea/volto-industry-theme/commit/ab9367f5029ade7a35170ff7a77314865020400a)]
+- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`d279712`](https://github.com/eea/volto-industry-theme/commit/d2797120706691d0453ce5cf60dd7503b9092715)]
 ### [2.0.15](https://github.com/eea/volto-industry-theme/compare/2.0.14...2.0.15) - 4 July 2023
 
 #### :house: Internal changes

diff --git a/DEVELOP.md b/DEVELOP.md
@@ -2,6 +2,30 @@
 
 ## Develop
 
+1. Make sure you have `docker` and `docker compose` installed and running on your machine:
+
+    ```Bash
+    git clone https://github.com/eea/volto-industry-theme.git
+    cd volto-industry-theme
+    git checkout -b bugfix-123456 develop
+    make
+    make start
+    ```
+
+1. Wait for `Volto started at 0.0.0.0:3000` meesage
+
+1. Go to http://localhost:3000
+
+1. Initialize git hooks
+
+    ```Bash
+    yarn prepare
+    ```
+
+1.  Happy hacking!
+
+### Or add @eeacms/volto-industry-theme 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/)
 
 1.  Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`
@@ -26,18 +50,15 @@ Before starting make sure your development environment is properly set. See [Vol
 
 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
@@ -49,3 +70,37 @@ Before starting make sure your development environment is properly set. See [Vol
 1.  Happy hacking!
 
         cd src/addons/volto-industry-theme/
+
+## Cypress
+
+To run cypress locally, first make sure you don't have any Volto/Plone running on ports `8080` and `3000`.
+
+You don't have to be in a `clean-volto-project`, you can be in any Volto Frontend
+project where you added `volto-industry-theme` to `mrs.developer.json`
+
+Go to:
+
+  ```BASH
+  cd src/addons/volto-industry-theme/
+  ```
+
+Start:
+
+  ```Bash
+  make
+  make start
+  ```
+
+This will build and start with Docker a clean `Plone backend` and `Volto Frontend` with `volto-industry-theme` block installed.
+
+Open Cypress Interface:
+
+  ```Bash
+  make cypress-open
+  ```
+
+Or run it:
+
+  ```Bash
+  make cypress-run
+  ```
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,14 @@
+# syntax=docker/dockerfile:1
+ARG VOLTO_VERSION
+FROM eeacms/frontend-builder:${VOLTO_VERSION}
+
+ARG ADDON_NAME
+ARG ADDON_PATH
+
+COPY --chown=node:node ./ /app/src/addons/${ADDON_PATH}/
+
+RUN /setupAddon
+RUN yarn install
+
+ENTRYPOINT ["yarn"]
+CMD ["start"]