Merge pull request #10 from eea/develop

Develop
eea · Feb 27, 2023 · 81b2365 · 81b2365
2 parents 3b047e2 + cf70d76
commit 81b2365
Show file tree

Hide file tree

Showing 10 changed files with 341 additions and 79 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -23,3 +23,5 @@ cypress*.json
 docker-compose.yml
 Jenkinsfile
 start_.sh
+data
+*.tgz
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,37 @@ 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).
 
+### [1.6.0](https://github.com/eea/cca-frontend/compare/1.5.0...1.6.0) - 27 February 2023
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-eea-kitkat@12.0.1 [EEA Jenkins - [`a415f64`](https://github.com/eea/cca-frontend/commit/a415f64e4f93591cb59635b097eaaddc5d4ec427)]
+- Release @eeacms/volto-eea-website-theme@1.9.0 [EEA Jenkins - [`0709bce`](https://github.com/eea/cca-frontend/commit/0709bce9a0b30b8ed7350e50f2ee00ccb047b3fe)]
+- Release @eeacms/volto-eea-website-theme@1.8.2 [EEA Jenkins - [`289edae`](https://github.com/eea/cca-frontend/commit/289edaeb05221c93afef3606231469dc914bc111)]
+- Release @eeacms/volto-eea-website-theme@1.8.1 [EEA Jenkins - [`a012561`](https://github.com/eea/cca-frontend/commit/a0125619f8537082d6e0dcaa0ed056b14c563b84)]
+- Release @eeacms/volto-eea-kitkat@12.0.0 [EEA Jenkins - [`0a4e3ce`](https://github.com/eea/cca-frontend/commit/0a4e3cede6340333a7f588cf7c593ddd913eb127)]
+- Release @eeacms/volto-eea-website-theme@1.8.0 [EEA Jenkins - [`cb6bb7a`](https://github.com/eea/cca-frontend/commit/cb6bb7a4eb28d8dd5af118a386e388eccefb1fc9)]
+- Release @eeacms/volto-eea-website-theme@1.7.0 [EEA Jenkins - [`93766b9`](https://github.com/eea/cca-frontend/commit/93766b93939f5e6274bf9e0faebf74296214d649)]
+- Release @eeacms/volto-eea-kitkat@11.0.0 [EEA Jenkins - [`730ad52`](https://github.com/eea/cca-frontend/commit/730ad5210276eb5847d8798b49b39ce574775a9f)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #160935 - Add volto-openlayers-map. [GhitaB - [`7861cf7`](https://github.com/eea/cca-frontend/commit/7861cf7bf179b1f03f1fc65ba01f58c221037da2)]
+- Update dependencies [kreafox - [`71bf4f1`](https://github.com/eea/cca-frontend/commit/71bf4f17ebb94ebb208db228564dfd3549632463)]
+- Update eea-website-theme branch [kreafox - [`f5bd459`](https://github.com/eea/cca-frontend/commit/f5bd4595e2d874bc97d68abc720e6b3b588e724a)]
+- Update openlayers branch [kreafox - [`02eef17`](https://github.com/eea/cca-frontend/commit/02eef178c9e36409da1db0830e18bcddd3470dc6)]
+- Update dependencies [kreafox - [`ac737ca`](https://github.com/eea/cca-frontend/commit/ac737ca5c05b7eb6b24f582e82a6ea2a4b2aaa17)]
+- Use branch for eea-theme [Tiberiu Ichim - [`ad6d606`](https://github.com/eea/cca-frontend/commit/ad6d606047f98896fd260f472c942b534e5dab5c)]
+- Don't need memory limits here [Tiberiu Ichim - [`1958a57`](https://github.com/eea/cca-frontend/commit/1958a57c330f471eb676272ff2a9503cd4ff66d0)]
+- Optimize the dockerfile [Tiberiu Ichim - [`1f4a2c0`](https://github.com/eea/cca-frontend/commit/1f4a2c06556a6a125c0e97dd867d67a487058778)]
+- Don't need labels [Tiberiu Ichim - [`25a96fe`](https://github.com/eea/cca-frontend/commit/25a96fe367277f560df954402843997def77411c)]
+- openlayers branch [Tiberiu Ichim - [`79cab0e`](https://github.com/eea/cca-frontend/commit/79cab0ee9acf99a0c9bfd069feee6f18acda69e3)]
+- Don't need these here [Tiberiu Ichim - [`58f6715`](https://github.com/eea/cca-frontend/commit/58f6715991610ae6e443b0048d78a17e063a057c)]
+- Update lock [Tiberiu Ichim - [`7c8ff27`](https://github.com/eea/cca-frontend/commit/7c8ff27f1c8357a96319c8bfec6741faaf62601b)]
+- Add eea-map [Tiberiu Ichim - [`3668ddd`](https://github.com/eea/cca-frontend/commit/3668ddd0a68292aad5db4a70b1c1565df27d6922)]
+- Add openlayers map [Tiberiu Ichim - [`d2af44b`](https://github.com/eea/cca-frontend/commit/d2af44b04d4c0c49d410106579d4faa903f30f2e)]
+- Update lock [Tiberiu Ichim - [`a7dba1d`](https://github.com/eea/cca-frontend/commit/a7dba1d246e11da718878829b68c834b39a2f083)]
+- Add more [Tiberiu Ichim - [`4f73887`](https://github.com/eea/cca-frontend/commit/4f73887d1676958e9374f34fabfca87703d07644)]
 ### [1.5.0](https://github.com/eea/cca-frontend/compare/1.4.0...1.5.0) - 7 February 2023
 
 #### :hammer_and_wrench: Others

diff --git a/Makefile b/Makefile
@@ -45,7 +45,7 @@ all: develop install
 
 .PHONY: develop
 develop: ## Runs missdev in the local project (mrs.developer.json should be present)
-	npx -p mrs-developer missdev --config=jsconfig.json --output=addons --fetch-https
+	npx -p mrs-developer@latest missdev --config=jsconfig.json --output=addons --fetch-https
 
 .PHONY: install
 install:	## Frontend: Install project and add-ons

diff --git a/docker-compose.override-example.yml b/docker-compose.override-example.yml
@@ -1,4 +1,4 @@
 services:
   backend:
-    # build: ./eea.docker.plone-climateadapt
+    build: ./eea.docker.plone-climateadapt
     entrypoint: sh -c "tail -f /dev/null"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,29 +15,29 @@ services:
   #     - backend
 
   memcached:
-    mem_limit: 73400320
+    # mem_limit: 73400320
     image: memcached:1.5.12
     environment:
       TZ: Europe/Copenhagen
-    mem_reservation: 52428800
+    # mem_reservation: 52428800
     command:
     - -m
     - '2048'
-    labels:
-      io.rancher.scheduler.affinity:host_label_ne: reserved=yes
+    # labels:
+    #   io.rancher.scheduler.affinity:host_label_ne: reserved=yes
 
   backend:
     #build: ./eea-website-backend/
     # image: eeacms/eea.docker.plone-climateadapt:v9.105
-    image: laszlocseh/climateadapt:10.0.0
+    image: eeacms/eea.docker.plone-climateadapt:latest
     ports:
     - "${BACKEND:-8080}:8080"
     volumes:
       - ./data:/data
       - ./backend/src:/plone/instance/src
       - ./eea.docker.plone-climateadapt/buildout.cfg:/plone/instance/buildout.cfg
-    mem_limit: 4294967296
-    mem_reservation: 4294967296
+    # mem_limit: 4294967296
+    # mem_reservation: 4294967296
     environment:
       SITE: "cca"
       TZ: Europe/Copenhagen

diff --git a/eea.docker.plone-climateadapt b/eea.docker.plone-climateadapt
diff --git a/jsconfig.json b/jsconfig.json
@@ -12,6 +12,12 @@
             ],
             "@eeacms/volto-embed": [
                 "addons/volto-embed/src"
+            ],
+            "@eeacms/volto-openlayers-map": [
+                "addons/volto-openlayers-map/src"
+            ],
+            "@eeacms/volto-eea-map": [
+                "addons/volto-eea-map/src"
             ]
         },
         "baseUrl": "src"

diff --git a/mrs.developer.json b/mrs.developer.json
@@ -350,5 +350,21 @@
     "branch": "main",
     "develop": false,
     "path": "src"
+  },
+  "volto-eea-map": {
+    "url": "[email protected]:eea/volto-eea-map.git",
+    "https": "https://github.com/eea/volto-eea-map.git",
+    "package": "@eeacms/volto-eea-map",
+    "branch": "develop",
+    "develop": true,
+    "path": "src"
+  },
+  "volto-openlayers-map": {
+    "url": "[email protected]:eea/volto-openlayers-map.git",
+    "https": "https://github.com/eea/volto-openlayers-map.git",
+    "package": "@eeacms/volto-openlayers-map",
+    "branch": "develop",
+    "develop": true,
+    "path": "src"
   }
 }
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "cca-frontend",
   "description": "CCA frontend (Plone 4)",
   "license": "MIT",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "scripts": {
     "start": "razzle start",
     "postinstall": "make omelette && make patches",
@@ -45,12 +45,13 @@
     "src/addons/*"
   ],
   "addons": [
-    "volto-subsites",
     "@eeacms/volto-eea-kitkat",
+    "@eeacms/volto-embed",
+    "@eeacms/volto-openlayers-map",
     "@eeacms/volto-eea-design-system",
     "@eeacms/volto-eea-website-theme",
-    "@eeacms/volto-embed",
-    "@eeacms/volto-cca-policy"
+    "@eeacms/volto-cca-policy",
+    "volto-subsites"
   ],
   "jest": {
     "modulePathIgnorePatterns": [
@@ -150,14 +151,16 @@
     "node": "^12 || ^14 || ^16"
   },
   "resolutions": {
-    "@eeacms/volto-eea-design-system": "1.0.0-alpha.14"
+    "@eeacms/volto-eea-design-system": "1.0.0-beta.3",
+    "@eeacms/volto-widget-theme-picker": "1.0.3"
   },
   "dependencies": {
     "@eeacms/volto-cca-policy": "0.1.5",
-    "@eeacms/volto-eea-design-system": "1.0.0-alpha.14",
-    "@eeacms/volto-eea-kitkat": "10.6.1",
-    "@eeacms/volto-eea-website-theme": "1.6.4",
-    "@eeacms/volto-embed": "*",
+    "@eeacms/volto-eea-design-system": "1.0.0-beta.3",
+    "@eeacms/volto-eea-kitkat": "12.0.1",
+    "@eeacms/volto-eea-website-theme": "1.9.0",
+    "@eeacms/volto-embed": "5.0.1",
+    "@eeacms/volto-openlayers-map": "*",
     "@plone/volto": "16.6.0",
     "volto-subsites": "4.0.0"
   },