Skip to content

Commit 81b2365

Browse files
GhitaBGhitaB
authored
Merge pull request #10 from eea/develop
Develop
2 parents 3b047e2 + cf70d76 commit 81b2365

10 files changed

+341
-79
lines changed

‎.dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ cypress*.json
2323
docker-compose.yml
2424
Jenkinsfile
2525
start_.sh
26+
data
27+
*.tgz

‎CHANGELOG.md

+31
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,37 @@ 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+
### [1.6.0](https://github.com/eea/cca-frontend/compare/1.5.0...1.6.0) - 27 February 2023
8+
9+
#### :rocket: Dependency updates
10+
11+
- Release @eeacms/volto-eea-kitkat@12.0.1 [EEA Jenkins - [`a415f64`](https://github.com/eea/cca-frontend/commit/a415f64e4f93591cb59635b097eaaddc5d4ec427)]
12+
- Release @eeacms/volto-eea-website-theme@1.9.0 [EEA Jenkins - [`0709bce`](https://github.com/eea/cca-frontend/commit/0709bce9a0b30b8ed7350e50f2ee00ccb047b3fe)]
13+
- Release @eeacms/volto-eea-website-theme@1.8.2 [EEA Jenkins - [`289edae`](https://github.com/eea/cca-frontend/commit/289edaeb05221c93afef3606231469dc914bc111)]
14+
- Release @eeacms/volto-eea-website-theme@1.8.1 [EEA Jenkins - [`a012561`](https://github.com/eea/cca-frontend/commit/a0125619f8537082d6e0dcaa0ed056b14c563b84)]
15+
- Release @eeacms/volto-eea-kitkat@12.0.0 [EEA Jenkins - [`0a4e3ce`](https://github.com/eea/cca-frontend/commit/0a4e3cede6340333a7f588cf7c593ddd913eb127)]
16+
- Release @eeacms/volto-eea-website-theme@1.8.0 [EEA Jenkins - [`cb6bb7a`](https://github.com/eea/cca-frontend/commit/cb6bb7a4eb28d8dd5af118a386e388eccefb1fc9)]
17+
- Release @eeacms/volto-eea-website-theme@1.7.0 [EEA Jenkins - [`93766b9`](https://github.com/eea/cca-frontend/commit/93766b93939f5e6274bf9e0faebf74296214d649)]
18+
- Release @eeacms/volto-eea-kitkat@11.0.0 [EEA Jenkins - [`730ad52`](https://github.com/eea/cca-frontend/commit/730ad5210276eb5847d8798b49b39ce574775a9f)]
19+
20+
#### :hammer_and_wrench: Others
21+
22+
- Refs #160935 - Add volto-openlayers-map. [GhitaB - [`7861cf7`](https://github.com/eea/cca-frontend/commit/7861cf7bf179b1f03f1fc65ba01f58c221037da2)]
23+
- Update dependencies [kreafox - [`71bf4f1`](https://github.com/eea/cca-frontend/commit/71bf4f17ebb94ebb208db228564dfd3549632463)]
24+
- Update eea-website-theme branch [kreafox - [`f5bd459`](https://github.com/eea/cca-frontend/commit/f5bd4595e2d874bc97d68abc720e6b3b588e724a)]
25+
- Update openlayers branch [kreafox - [`02eef17`](https://github.com/eea/cca-frontend/commit/02eef178c9e36409da1db0830e18bcddd3470dc6)]
26+
- Update dependencies [kreafox - [`ac737ca`](https://github.com/eea/cca-frontend/commit/ac737ca5c05b7eb6b24f582e82a6ea2a4b2aaa17)]
27+
- Use branch for eea-theme [Tiberiu Ichim - [`ad6d606`](https://github.com/eea/cca-frontend/commit/ad6d606047f98896fd260f472c942b534e5dab5c)]
28+
- Don't need memory limits here [Tiberiu Ichim - [`1958a57`](https://github.com/eea/cca-frontend/commit/1958a57c330f471eb676272ff2a9503cd4ff66d0)]
29+
- Optimize the dockerfile [Tiberiu Ichim - [`1f4a2c0`](https://github.com/eea/cca-frontend/commit/1f4a2c06556a6a125c0e97dd867d67a487058778)]
30+
- Don't need labels [Tiberiu Ichim - [`25a96fe`](https://github.com/eea/cca-frontend/commit/25a96fe367277f560df954402843997def77411c)]
31+
- openlayers branch [Tiberiu Ichim - [`79cab0e`](https://github.com/eea/cca-frontend/commit/79cab0ee9acf99a0c9bfd069feee6f18acda69e3)]
32+
- Don't need these here [Tiberiu Ichim - [`58f6715`](https://github.com/eea/cca-frontend/commit/58f6715991610ae6e443b0048d78a17e063a057c)]
33+
- Update lock [Tiberiu Ichim - [`7c8ff27`](https://github.com/eea/cca-frontend/commit/7c8ff27f1c8357a96319c8bfec6741faaf62601b)]
34+
- Add eea-map [Tiberiu Ichim - [`3668ddd`](https://github.com/eea/cca-frontend/commit/3668ddd0a68292aad5db4a70b1c1565df27d6922)]
35+
- Add openlayers map [Tiberiu Ichim - [`d2af44b`](https://github.com/eea/cca-frontend/commit/d2af44b04d4c0c49d410106579d4faa903f30f2e)]
36+
- Update lock [Tiberiu Ichim - [`a7dba1d`](https://github.com/eea/cca-frontend/commit/a7dba1d246e11da718878829b68c834b39a2f083)]
37+
- Add more [Tiberiu Ichim - [`4f73887`](https://github.com/eea/cca-frontend/commit/4f73887d1676958e9374f34fabfca87703d07644)]
738
### [1.5.0](https://github.com/eea/cca-frontend/compare/1.4.0...1.5.0) - 7 February 2023
839

940
#### :hammer_and_wrench: Others

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ all: develop install
4545

4646
.PHONY: develop
4747
develop: ## Runs missdev in the local project (mrs.developer.json should be present)
48-
npx -p mrs-developer missdev --config=jsconfig.json --output=addons --fetch-https
48+
npx -p mrs-developer@latest missdev --config=jsconfig.json --output=addons --fetch-https
4949

5050
.PHONY: install
5151
install: ## Frontend: Install project and add-ons

‎docker-compose.override-example.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
services:
22
backend:
3-
# build: ./eea.docker.plone-climateadapt
3+
build: ./eea.docker.plone-climateadapt
44
entrypoint: sh -c "tail -f /dev/null"

‎docker-compose.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@ services:
1515
# - backend
1616

1717
memcached:
18-
mem_limit: 73400320
18+
# mem_limit: 73400320
1919
image: memcached:1.5.12
2020
environment:
2121
TZ: Europe/Copenhagen
22-
mem_reservation: 52428800
22+
# mem_reservation: 52428800
2323
command:
2424
- -m
2525
- '2048'
26-
labels:
27-
io.rancher.scheduler.affinity:host_label_ne: reserved=yes
26+
# labels:
27+
# io.rancher.scheduler.affinity:host_label_ne: reserved=yes
2828

2929
backend:
3030
#build: ./eea-website-backend/
3131
# image: eeacms/eea.docker.plone-climateadapt:v9.105
32-
image: laszlocseh/climateadapt:10.0.0
32+
image: eeacms/eea.docker.plone-climateadapt:latest
3333
ports:
3434
- "${BACKEND:-8080}:8080"
3535
volumes:
3636
- ./data:/data
3737
- ./backend/src:/plone/instance/src
3838
- ./eea.docker.plone-climateadapt/buildout.cfg:/plone/instance/buildout.cfg
39-
mem_limit: 4294967296
40-
mem_reservation: 4294967296
39+
# mem_limit: 4294967296
40+
# mem_reservation: 4294967296
4141
environment:
4242
SITE: "cca"
4343
TZ: Europe/Copenhagen

‎eea.docker.plone-climateadapt

‎jsconfig.json

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
],
1313
"@eeacms/volto-embed": [
1414
"addons/volto-embed/src"
15+
],
16+
"@eeacms/volto-openlayers-map": [
17+
"addons/volto-openlayers-map/src"
18+
],
19+
"@eeacms/volto-eea-map": [
20+
"addons/volto-eea-map/src"
1521
]
1622
},
1723
"baseUrl": "src"

‎mrs.developer.json

+16
Original file line numberDiff line numberDiff line change
@@ -350,5 +350,21 @@
350350
"branch": "main",
351351
"develop": false,
352352
"path": "src"
353+
},
354+
"volto-eea-map": {
355+
"url": "[email protected]:eea/volto-eea-map.git",
356+
"https": "https://github.com/eea/volto-eea-map.git",
357+
"package": "@eeacms/volto-eea-map",
358+
"branch": "develop",
359+
"develop": true,
360+
"path": "src"
361+
},
362+
"volto-openlayers-map": {
363+
"url": "[email protected]:eea/volto-openlayers-map.git",
364+
"https": "https://github.com/eea/volto-openlayers-map.git",
365+
"package": "@eeacms/volto-openlayers-map",
366+
"branch": "develop",
367+
"develop": true,
368+
"path": "src"
353369
}
354370
}

‎package.json

+12-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cca-frontend",
33
"description": "CCA frontend (Plone 4)",
44
"license": "MIT",
5-
"version": "1.5.0",
5+
"version": "1.6.0",
66
"scripts": {
77
"start": "razzle start",
88
"postinstall": "make omelette && make patches",
@@ -45,12 +45,13 @@
4545
"src/addons/*"
4646
],
4747
"addons": [
48-
"volto-subsites",
4948
"@eeacms/volto-eea-kitkat",
49+
"@eeacms/volto-embed",
50+
"@eeacms/volto-openlayers-map",
5051
"@eeacms/volto-eea-design-system",
5152
"@eeacms/volto-eea-website-theme",
52-
"@eeacms/volto-embed",
53-
"@eeacms/volto-cca-policy"
53+
"@eeacms/volto-cca-policy",
54+
"volto-subsites"
5455
],
5556
"jest": {
5657
"modulePathIgnorePatterns": [
@@ -150,14 +151,16 @@
150151
"node": "^12 || ^14 || ^16"
151152
},
152153
"resolutions": {
153-
"@eeacms/volto-eea-design-system": "1.0.0-alpha.14"
154+
"@eeacms/volto-eea-design-system": "1.0.0-beta.3",
155+
"@eeacms/volto-widget-theme-picker": "1.0.3"
154156
},
155157
"dependencies": {
156158
"@eeacms/volto-cca-policy": "0.1.5",
157-
"@eeacms/volto-eea-design-system": "1.0.0-alpha.14",
158-
"@eeacms/volto-eea-kitkat": "10.6.1",
159-
"@eeacms/volto-eea-website-theme": "1.6.4",
160-
"@eeacms/volto-embed": "*",
159+
"@eeacms/volto-eea-design-system": "1.0.0-beta.3",
160+
"@eeacms/volto-eea-kitkat": "12.0.1",
161+
"@eeacms/volto-eea-website-theme": "1.9.0",
162+
"@eeacms/volto-embed": "5.0.1",
163+
"@eeacms/volto-openlayers-map": "*",
161164
"@plone/volto": "16.6.0",
162165
"volto-subsites": "4.0.0"
163166
},

0 commit comments

Comments
 (0)