@eeacms/volto-bise-policy 1.2.7 → 1.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.js +65 -0
- package/.husky/pre-commit +2 -0
- package/CHANGELOG.md +36 -0
- package/DEVELOP.md +6 -7
- package/RELEASE.md +14 -14
- package/cypress.config.js +2 -2
- package/docker-compose.yml +5 -1
- package/jest-addon.config.js +16 -4
- package/jest.setup.js +62 -0
- package/package.json +34 -6
- package/razzle.extend.js +2 -3
- package/src/customizations/@root/theme.js +2 -0
- package/src/customizations/volto/components/theme/Header/Header.jsx +2 -2
- package/src/index.js +19 -0
- package/theme/assets/images/Header/bise-logo-white.svg +124 -46
- package/theme/assets/images/Header/bise-logo.svg +125 -132
- package/theme/theme.config +1 -2
- package/.project.eslintrc.js +0 -47
package/.eslintrc.js
ADDED
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
const fs = require('fs');
|
|
2
|
+
const path = require('path');
|
|
3
|
+
const projectRootPath = fs.realpathSync(__dirname + '/../../../');
|
|
4
|
+
|
|
5
|
+
let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
|
|
6
|
+
let configFile;
|
|
7
|
+
if (fs.existsSync(`${projectRootPath}/tsconfig.json`))
|
|
8
|
+
configFile = `${projectRootPath}/tsconfig.json`;
|
|
9
|
+
else if (fs.existsSync(`${projectRootPath}/jsconfig.json`))
|
|
10
|
+
configFile = `${projectRootPath}/jsconfig.json`;
|
|
11
|
+
|
|
12
|
+
if (configFile) {
|
|
13
|
+
const jsConfig = require(configFile).compilerOptions;
|
|
14
|
+
const pathsConfig = jsConfig.paths;
|
|
15
|
+
if (pathsConfig['@plone/volto'])
|
|
16
|
+
voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
|
|
20
|
+
const reg = new AddonConfigurationRegistry(projectRootPath);
|
|
21
|
+
|
|
22
|
+
// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
|
|
23
|
+
const addonAliases = Object.keys(reg.packages).map((o) => [
|
|
24
|
+
o,
|
|
25
|
+
reg.packages[o].modulePath,
|
|
26
|
+
]);
|
|
27
|
+
|
|
28
|
+
const addonExtenders = reg.getEslintExtenders().map((m) => require(m));
|
|
29
|
+
|
|
30
|
+
const defaultConfig = {
|
|
31
|
+
extends: `${voltoPath}/.eslintrc`,
|
|
32
|
+
settings: {
|
|
33
|
+
'import/resolver': {
|
|
34
|
+
alias: {
|
|
35
|
+
map: [
|
|
36
|
+
['@plone/volto', '@plone/volto/src'],
|
|
37
|
+
['@plone/volto-slate', '@plone/volto/packages/volto-slate/src'],
|
|
38
|
+
...addonAliases,
|
|
39
|
+
['@package', `${__dirname}/src`],
|
|
40
|
+
['@root', `${__dirname}/src`],
|
|
41
|
+
['~', `${__dirname}/src`],
|
|
42
|
+
],
|
|
43
|
+
extensions: ['.js', '.jsx', '.json'],
|
|
44
|
+
},
|
|
45
|
+
'babel-plugin-root-import': {
|
|
46
|
+
rootPathSuffix: 'src',
|
|
47
|
+
},
|
|
48
|
+
},
|
|
49
|
+
},
|
|
50
|
+
rules: {
|
|
51
|
+
'react/jsx-no-target-blank': [
|
|
52
|
+
'error',
|
|
53
|
+
{
|
|
54
|
+
allowReferrer: true,
|
|
55
|
+
},
|
|
56
|
+
],
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
const config = addonExtenders.reduce(
|
|
61
|
+
(acc, extender) => extender.modify(acc),
|
|
62
|
+
defaultConfig,
|
|
63
|
+
);
|
|
64
|
+
|
|
65
|
+
module.exports = config;
|
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,42 @@ All notable changes to this project will be documented in this file. Dates are d
|
|
|
4
4
|
|
|
5
5
|
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
6
6
|
|
|
7
|
+
### [1.2.8](https://github.com/eea/volto-bise-policy/compare/1.2.7...1.2.8) - 9 February 2024
|
|
8
|
+
|
|
9
|
+
#### :house: Internal changes
|
|
10
|
+
|
|
11
|
+
- style: add width and height to logos -refs #264593 [ana-oprea - [`a178aad`](https://github.com/eea/volto-bise-policy/commit/a178aad4d0986962b74dba812ca76430c57ef845)]
|
|
12
|
+
- chore: fix package.json [ana-oprea - [`f0107dc`](https://github.com/eea/volto-bise-policy/commit/f0107dc419c7ae7e969dea15785b4e393e59264b)]
|
|
13
|
+
- chore: customize root theme to use volto-spotlight - refs #259794 [ana-oprea - [`347f96e`](https://github.com/eea/volto-bise-policy/commit/347f96e335139f9656abd34c308c531b05de85e7)]
|
|
14
|
+
- chore: change the theme and alias to volto-spotlight and add volto-spotlight to package.json - refs #259794 [ana-oprea - [`52732a1`](https://github.com/eea/volto-bise-policy/commit/52732a17b3247a04ffae0a3f5118e173afa98157)]
|
|
15
|
+
- chore: change theme to eea-volto-theme, change config.alias - refs #259794 [ana-oprea - [`c2d08ea`](https://github.com/eea/volto-bise-policy/commit/c2d08ea08a7f0e5f6f7d32149e60ea3f3e901923)]
|
|
16
|
+
- chore: [JENKINS] Refactor automated testing [valentinab25 - [`a3c9488`](https://github.com/eea/volto-bise-policy/commit/a3c9488c5d09ba97fe5976675524d436080a2460)]
|
|
17
|
+
- chore: husky, lint-staged use fixed versions [valentinab25 - [`fddc30f`](https://github.com/eea/volto-bise-policy/commit/fddc30f11a1d8ec290edaca2d924282f5e113bc6)]
|
|
18
|
+
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`005ce74`](https://github.com/eea/volto-bise-policy/commit/005ce742dbd014fde27e417059251233365766dd)]
|
|
19
|
+
|
|
20
|
+
#### :hammer_and_wrench: Others
|
|
21
|
+
|
|
22
|
+
- tests: fix deps [Claudia Ifrim - [`4a1f6fa`](https://github.com/eea/volto-bise-policy/commit/4a1f6fa42738749ceedb8bca594ddb0df668d788)]
|
|
23
|
+
- fix tests [Claudia Ifrim - [`a8fc12f`](https://github.com/eea/volto-bise-policy/commit/a8fc12fbf962289c1aac42f4b54352bb585af735)]
|
|
24
|
+
- test: in cypress don't wait for breadcrumbs [ana-oprea - [`89e3810`](https://github.com/eea/volto-bise-policy/commit/89e38104e6f8292cdbf2b948f7fe4b7dc064bcef)]
|
|
25
|
+
- Replace norefferer with noopener for links that open in new tab [David Ichim - [`ef3781a`](https://github.com/eea/volto-bise-policy/commit/ef3781ac7368bf8f497082aaee0c63538c0760da)]
|
|
26
|
+
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c1277ba`](https://github.com/eea/volto-bise-policy/commit/c1277bacf840ee9feccbfd6a2c85f0b25a9a9125)]
|
|
27
|
+
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c944153`](https://github.com/eea/volto-bise-policy/commit/c944153710fd53c5d48863cf363464273e25f52e)]
|
|
28
|
+
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`d648d52`](https://github.com/eea/volto-bise-policy/commit/d648d525a2fc5076577fe0f75ff9782bf0d1d4e9)]
|
|
29
|
+
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`2a7affe`](https://github.com/eea/volto-bise-policy/commit/2a7affe33d737704bdba117c4a5c8c6748ef7a47)]
|
|
30
|
+
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`5929642`](https://github.com/eea/volto-bise-policy/commit/59296420105d0e8c1f1547aa0cd17a019e478c2b)]
|
|
31
|
+
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`b1142f1`](https://github.com/eea/volto-bise-policy/commit/b1142f1da3667a9f56720f65bebce897a5dd8005)]
|
|
32
|
+
- test: cypress should not wait for navigation, actions, types - refs #259794 [ana-oprea - [`188637c`](https://github.com/eea/volto-bise-policy/commit/188637c78a0cae71b5ee48022507d559dfaceb3e)]
|
|
33
|
+
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`fa4e473`](https://github.com/eea/volto-bise-policy/commit/fa4e473018386ec3f09d7300d655c8cccdc19a0e)]
|
|
34
|
+
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`1d9135b`](https://github.com/eea/volto-bise-policy/commit/1d9135bb878b3c7a1b828085b99b9d27d78ce60e)]
|
|
35
|
+
- remove cypress tests as it doesn t work on bise [Dobricean Ioan Dorian - [`ba7e2de`](https://github.com/eea/volto-bise-policy/commit/ba7e2defea2dcfd01537c3abb41fa9515ff0a3e3)]
|
|
36
|
+
- add mega menu layout settings as #259794 said [dobri1408 - [`b9a3683`](https://github.com/eea/volto-bise-policy/commit/b9a3683e7d85f8c88ad8feac975c47c434f62c4a)]
|
|
37
|
+
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`9181908`](https://github.com/eea/volto-bise-policy/commit/9181908c7f4b51bdf83a34f8c7f25827de9b1cc6)]
|
|
38
|
+
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`099d796`](https://github.com/eea/volto-bise-policy/commit/099d79669471e6924bf1e0bc51a79d54379c3a1a)]
|
|
39
|
+
- test: [JENKINS] Improve cypress time [valentinab25 - [`6d5d8e2`](https://github.com/eea/volto-bise-policy/commit/6d5d8e29b04ddb92628245570055067ca3dcbb6c)]
|
|
40
|
+
- test: fix comment [valentinab25 - [`4f27d5a`](https://github.com/eea/volto-bise-policy/commit/4f27d5af2e8895c7af4f1157521ca42682b96e23)]
|
|
41
|
+
- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`4c2fcb0`](https://github.com/eea/volto-bise-policy/commit/4c2fcb01065e1ef962317ba7be788fd1df079618)]
|
|
42
|
+
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`89afaa1`](https://github.com/eea/volto-bise-policy/commit/89afaa15892930452027ef8c8593fc6d193cda70)]
|
|
7
43
|
### [1.2.7](https://github.com/eea/volto-bise-policy/compare/1.2.6...1.2.7) - 9 August 2023
|
|
8
44
|
|
|
9
45
|
#### :house: Documentation changes
|
package/DEVELOP.md
CHANGED
|
@@ -16,12 +16,14 @@
|
|
|
16
16
|
|
|
17
17
|
1. Go to http://localhost:3000
|
|
18
18
|
|
|
19
|
-
1.
|
|
19
|
+
1. Initialize git hooks
|
|
20
20
|
|
|
21
21
|
```Bash
|
|
22
|
-
|
|
22
|
+
yarn prepare
|
|
23
23
|
```
|
|
24
24
|
|
|
25
|
+
1. Happy hacking!
|
|
26
|
+
|
|
25
27
|
### Or add @eeacms/volto-bise-policy to your Volto project
|
|
26
28
|
|
|
27
29
|
Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
|
|
@@ -48,18 +50,15 @@ Before starting make sure your development environment is properly set. See [Vol
|
|
|
48
50
|
|
|
49
51
|
1. Install
|
|
50
52
|
|
|
51
|
-
|
|
53
|
+
make develop
|
|
52
54
|
yarn
|
|
53
55
|
|
|
54
56
|
1. Start backend
|
|
55
57
|
|
|
56
|
-
docker pull plone
|
|
57
|
-
docker run -d --name plone -p 8080:8080 -e SITE=Plone -e PROFILES="profile-plone.restapi:blocks" plone
|
|
58
|
+
docker run --pull always -it --rm --name plone -p 8080:8080 -e SITE=Plone plone/plone-backend
|
|
58
59
|
|
|
59
60
|
...wait for backend to setup and start - `Ready to handle requests`:
|
|
60
61
|
|
|
61
|
-
docker logs -f plone
|
|
62
|
-
|
|
63
62
|
...you can also check http://localhost:8080/Plone
|
|
64
63
|
|
|
65
64
|
1. Start frontend
|
package/RELEASE.md
CHANGED
|
@@ -20,9 +20,9 @@ You need to first install the [release-it](https://github.com/release-it/release
|
|
|
20
20
|
```
|
|
21
21
|
npm install -g release-it
|
|
22
22
|
```
|
|
23
|
-
|
|
23
|
+
|
|
24
24
|
Release-it uses the configuration written in the [`.release-it.json`](./.release-it.json) file located in the root of the repository.
|
|
25
|
-
|
|
25
|
+
|
|
26
26
|
Release-it is a tool that automates 4 important steps in the release process:
|
|
27
27
|
|
|
28
28
|
1. Version increase in `package.json` ( increased from the current version in `package.json`)
|
|
@@ -30,45 +30,45 @@ Release-it is a tool that automates 4 important steps in the release process:
|
|
|
30
30
|
3. GitHub release on the commit with the changelog and package.json modification on the develop branch
|
|
31
31
|
4. NPM release ( by default it's disabled, but can be enabled in the configuration file )
|
|
32
32
|
|
|
33
|
-
To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens)
|
|
33
|
+
To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens)
|
|
34
34
|
|
|
35
35
|
```
|
|
36
36
|
export GITHUB_TOKEN=XXX-XXXXXXXXXXXXXXXXXXXXXX
|
|
37
37
|
```
|
|
38
|
-
|
|
38
|
+
|
|
39
39
|
To configure npm, you can use the `npm login` command or use a configuration file with a TOKEN :
|
|
40
|
-
|
|
40
|
+
|
|
41
41
|
```
|
|
42
42
|
echo "//registry.npmjs.org/:_authToken=YYYYYYYYYYYYYYYYYYYYYYYYYYYYYY" > .npmrc
|
|
43
43
|
```
|
|
44
44
|
|
|
45
45
|
#### Using release-it tool
|
|
46
|
-
|
|
46
|
+
|
|
47
47
|
There are 3 yarn scripts that can be run to do the release
|
|
48
48
|
|
|
49
49
|
##### yarn release-beta
|
|
50
50
|
|
|
51
|
-
Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input).
|
|
51
|
+
Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input).
|
|
52
52
|
|
|
53
53
|
```
|
|
54
|
-
? Select increment (next version):
|
|
55
|
-
❯ prepatch (0.1.1-beta.0)
|
|
56
|
-
preminor (0.2.0-beta.0)
|
|
57
|
-
premajor (1.0.0-beta.0)
|
|
58
|
-
Other, please specify...
|
|
54
|
+
? Select increment (next version):
|
|
55
|
+
❯ prepatch (0.1.1-beta.0)
|
|
56
|
+
preminor (0.2.0-beta.0)
|
|
57
|
+
premajor (1.0.0-beta.0)
|
|
58
|
+
Other, please specify...
|
|
59
59
|
```
|
|
60
60
|
|
|
61
61
|
##### yarn release-major-beta
|
|
62
62
|
|
|
63
63
|
Same as `yarn release-beta`, but with premajor version pre-selected.
|
|
64
|
-
|
|
64
|
+
|
|
65
65
|
##### yarn release
|
|
66
66
|
|
|
67
67
|
Generic command, does not automatically add the `beta` to version, but you can still manually write it if you choose Other.
|
|
68
68
|
|
|
69
69
|
#### Important notes
|
|
70
70
|
|
|
71
|
-
> Do not use release-it tool on master branch, the commit on CHANGELOG.md file and the version increase in the package.json file can't be done without a PULL REQUEST.
|
|
71
|
+
> Do not use release-it tool on master branch, the commit on CHANGELOG.md file and the version increase in the package.json file can't be done without a PULL REQUEST.
|
|
72
72
|
|
|
73
73
|
> Do not keep Pull Requests from develop to master branches open when you are doing beta releases from the develop branch. As long as a PR to master is open, an automatic script will run on every commit and will update both the version and the changelog to a production-ready state - ( MAJOR.MINOR.PATCH mandatory format for version).
|
|
74
74
|
|
package/cypress.config.js
CHANGED
package/docker-compose.yml
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
version: "3"
|
|
2
2
|
services:
|
|
3
3
|
backend:
|
|
4
|
-
image:
|
|
4
|
+
image: eeacms/plone-backend
|
|
5
5
|
ports:
|
|
6
6
|
- "8080:8080"
|
|
7
7
|
environment:
|
|
8
8
|
SITE: "Plone"
|
|
9
|
+
PROFILES: "eea.kitkat:testing"
|
|
9
10
|
|
|
10
11
|
frontend:
|
|
11
12
|
build:
|
|
@@ -23,6 +24,9 @@ services:
|
|
|
23
24
|
volumes:
|
|
24
25
|
- ./:/app/src/addons/${ADDON_PATH}
|
|
25
26
|
environment:
|
|
27
|
+
CI: "true"
|
|
28
|
+
NODE_ENV: "development"
|
|
29
|
+
RAZZLE_JEST_CONFIG: "src/addons/${ADDON_PATH}/jest-addon.config.js"
|
|
26
30
|
RAZZLE_INTERNAL_API_PATH: "http://backend:8080/Plone"
|
|
27
31
|
RAZZLE_DEV_PROXY_API_PATH: "http://backend:8080/Plone"
|
|
28
32
|
HOST: "0.0.0.0"
|
package/jest-addon.config.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
require('dotenv').config({ path: __dirname + '/.env' })
|
|
2
|
+
|
|
1
3
|
module.exports = {
|
|
2
4
|
testMatch: ['**/src/addons/**/?(*.)+(spec|test).[jt]s?(x)'],
|
|
3
5
|
collectCoverageFrom: [
|
|
@@ -9,16 +11,21 @@ module.exports = {
|
|
|
9
11
|
'@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
|
|
10
12
|
'@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
|
|
11
13
|
'@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
|
|
12
|
-
'@package/(.*)$': '<rootDir>/src/$1',
|
|
13
|
-
'@root/(.*)$': '<rootDir>/src/$1',
|
|
14
|
+
'@package/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
|
|
15
|
+
'@root/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
|
|
14
16
|
'@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
|
|
15
17
|
'@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
|
|
16
|
-
'@plone/volto-slate':
|
|
18
|
+
'@plone/volto-slate$':
|
|
17
19
|
'<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
|
|
20
|
+
'@plone/volto-slate/(.*)$':
|
|
21
|
+
'<rootDir>/node_modules/@plone/volto/packages/volto-slate/src/$1',
|
|
18
22
|
'~/(.*)$': '<rootDir>/src/$1',
|
|
19
23
|
'load-volto-addons':
|
|
20
24
|
'<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
|
|
21
25
|
},
|
|
26
|
+
transformIgnorePatterns: [
|
|
27
|
+
'/node_modules/(?!(@plone|@root|@package|@eeacms)/).*/',
|
|
28
|
+
],
|
|
22
29
|
transform: {
|
|
23
30
|
'^.+\\.js(x)?$': 'babel-jest',
|
|
24
31
|
'^.+\\.(png)$': 'jest-file',
|
|
@@ -33,4 +40,9 @@ module.exports = {
|
|
|
33
40
|
statements: 5,
|
|
34
41
|
},
|
|
35
42
|
},
|
|
36
|
-
|
|
43
|
+
...(process.env.JEST_USE_SETUP === 'ON' && {
|
|
44
|
+
setupFilesAfterEnv: [
|
|
45
|
+
'<rootDir>/node_modules/@eeacms/volto-bise-policy/jest.setup.js',
|
|
46
|
+
],
|
|
47
|
+
}),
|
|
48
|
+
}
|
package/jest.setup.js
ADDED
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { jest } from '@jest/globals';
|
|
2
|
+
import configureStore from 'redux-mock-store';
|
|
3
|
+
import thunk from 'redux-thunk';
|
|
4
|
+
import config from '@plone/volto/registry';
|
|
5
|
+
import { blocksConfig } from '@plone/volto/config/Blocks';
|
|
6
|
+
import installSlate from '@plone/volto-slate/index';
|
|
7
|
+
|
|
8
|
+
config.blocks.blocksConfig = {
|
|
9
|
+
...blocksConfig,
|
|
10
|
+
...config.blocks.blocksConfig,
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
[installSlate].reduce((acc, apply) => apply(acc), config);
|
|
14
|
+
|
|
15
|
+
const mockStore = configureStore([thunk]);
|
|
16
|
+
|
|
17
|
+
global.store = mockStore({
|
|
18
|
+
intl: {
|
|
19
|
+
locale: 'en',
|
|
20
|
+
messages: {},
|
|
21
|
+
formatMessage: jest.fn(),
|
|
22
|
+
},
|
|
23
|
+
content: {
|
|
24
|
+
create: {},
|
|
25
|
+
subrequests: [],
|
|
26
|
+
},
|
|
27
|
+
connected_data_parameters: {},
|
|
28
|
+
screen: {
|
|
29
|
+
page: {
|
|
30
|
+
width: 768,
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
const mockSemanticComponents = jest.requireActual('semantic-ui-react');
|
|
36
|
+
const mockComponents = jest.requireActual('@plone/volto/components');
|
|
37
|
+
|
|
38
|
+
jest.mock('semantic-ui-react', () => ({
|
|
39
|
+
...mockSemanticComponents,
|
|
40
|
+
Popup: ({ content, trigger }) => {
|
|
41
|
+
return (
|
|
42
|
+
<div className="popup">
|
|
43
|
+
<div className="trigger">{trigger}</div>
|
|
44
|
+
<div className="content">{content}</div>
|
|
45
|
+
</div>
|
|
46
|
+
);
|
|
47
|
+
},
|
|
48
|
+
}));
|
|
49
|
+
|
|
50
|
+
jest.doMock('@plone/volto/components', () => {
|
|
51
|
+
return {
|
|
52
|
+
__esModule: true,
|
|
53
|
+
...mockComponents,
|
|
54
|
+
SidebarPortal: ({ children }) => <div id="sidebar">{children}</div>,
|
|
55
|
+
};
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
global.fetch = jest.fn(() =>
|
|
59
|
+
Promise.resolve({
|
|
60
|
+
json: () => Promise.resolve({}),
|
|
61
|
+
}),
|
|
62
|
+
);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eeacms/volto-bise-policy",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.8",
|
|
4
4
|
"description": "@eeacms/volto-bise-policy: Volto add-on",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"author": "European Environment Agency: IDM2 A-Team",
|
|
@@ -16,7 +16,8 @@
|
|
|
16
16
|
"@eeacms/volto-datablocks",
|
|
17
17
|
"@eeacms/volto-block-toc",
|
|
18
18
|
"@eeacms/volto-eea-design-system",
|
|
19
|
-
"@eeacms/volto-eea-website-theme"
|
|
19
|
+
"@eeacms/volto-eea-website-theme",
|
|
20
|
+
"@eeacms/volto-spotlight"
|
|
20
21
|
],
|
|
21
22
|
"repository": {
|
|
22
23
|
"type": "git",
|
|
@@ -27,15 +28,41 @@
|
|
|
27
28
|
"@eeacms/volto-datablocks": "*",
|
|
28
29
|
"@eeacms/volto-eea-design-system": "*",
|
|
29
30
|
"@eeacms/volto-eea-website-theme": "*",
|
|
30
|
-
"
|
|
31
|
+
"@eeacms/volto-spotlight": "*",
|
|
32
|
+
"esri-loader": "3.7.0",
|
|
33
|
+
"plotly.js": "^2.28.0",
|
|
34
|
+
"react-plotly.js": "2.6.0"
|
|
31
35
|
},
|
|
32
36
|
"devDependencies": {
|
|
33
37
|
"@cypress/code-coverage": "^3.10.0",
|
|
34
38
|
"@plone/scripts": "*",
|
|
35
39
|
"babel-plugin-transform-class-properties": "^6.24.1",
|
|
36
40
|
"cypress-fail-fast": "^5.0.1",
|
|
37
|
-
"
|
|
38
|
-
"
|
|
41
|
+
"dotenv": "^16.3.2",
|
|
42
|
+
"husky": "^8.0.3",
|
|
43
|
+
"lint-staged": "^14.0.1",
|
|
44
|
+
"md5": "^2.3.0"
|
|
45
|
+
},
|
|
46
|
+
"lint-staged": {
|
|
47
|
+
"src/**/*.{js,jsx,ts,tsx,json}": [
|
|
48
|
+
"make lint-fix",
|
|
49
|
+
"make prettier-fix"
|
|
50
|
+
],
|
|
51
|
+
"src/**/*.{jsx}": [
|
|
52
|
+
"make i18n"
|
|
53
|
+
],
|
|
54
|
+
"theme/**/*.{css,less}": [
|
|
55
|
+
"make stylelint-fix"
|
|
56
|
+
],
|
|
57
|
+
"src/**/*.{css,less}": [
|
|
58
|
+
"make stylelint-fix"
|
|
59
|
+
],
|
|
60
|
+
"theme/**/*.overrides": [
|
|
61
|
+
"make stylelint-fix"
|
|
62
|
+
],
|
|
63
|
+
"src/**/*.overrides": [
|
|
64
|
+
"make stylelint-fix"
|
|
65
|
+
]
|
|
39
66
|
},
|
|
40
67
|
"scripts": {
|
|
41
68
|
"release": "release-it",
|
|
@@ -54,6 +81,7 @@
|
|
|
54
81
|
"lint:fix": "make lint-fix",
|
|
55
82
|
"i18n": "make i18n",
|
|
56
83
|
"cypress:run": "make cypress-run",
|
|
57
|
-
"cypress:open": "make cypress-open"
|
|
84
|
+
"cypress:open": "make cypress-open",
|
|
85
|
+
"prepare": "husky install"
|
|
58
86
|
}
|
|
59
87
|
}
|
package/razzle.extend.js
CHANGED
|
@@ -17,9 +17,8 @@ const modify = (config, { target, dev }, webpack) => {
|
|
|
17
17
|
const semanticLessPath = `${projectRootPath}/node_modules/semantic-ui-less`;
|
|
18
18
|
const hasDesignSystemInstalled =
|
|
19
19
|
config.resolve.alias['volto-spotlight-themes'];
|
|
20
|
-
config.resolve.alias[
|
|
21
|
-
|
|
22
|
-
] = hasDesignSystemInstalled ? themeLessPath : semanticLessPath;
|
|
20
|
+
config.resolve.alias['volto-spotlight-theme-folder'] =
|
|
21
|
+
hasDesignSystemInstalled ? themeLessPath : semanticLessPath;
|
|
23
22
|
|
|
24
23
|
return config;
|
|
25
24
|
};
|
|
@@ -178,7 +178,7 @@ const EEAHeader = ({ token, history, subsite, content, ...props }) => {
|
|
|
178
178
|
<a
|
|
179
179
|
href="https://europa.eu/european-union/contact/institutions-bodies_en"
|
|
180
180
|
target="_blank"
|
|
181
|
-
rel="
|
|
181
|
+
rel="noopener"
|
|
182
182
|
onKeyDown={(evt) => evt.stopPropagation()}
|
|
183
183
|
>
|
|
184
184
|
See all EU institutions and bodies
|
|
@@ -211,7 +211,7 @@ const EEAHeader = ({ token, history, subsite, content, ...props }) => {
|
|
|
211
211
|
href={item.href}
|
|
212
212
|
className="site"
|
|
213
213
|
target="_blank"
|
|
214
|
-
rel="
|
|
214
|
+
rel="noopener"
|
|
215
215
|
onKeyDown={(evt) => evt.stopPropagation()}
|
|
216
216
|
>
|
|
217
217
|
{item.title}
|
package/src/index.js
CHANGED
|
@@ -59,6 +59,25 @@ const applyConfig = (config) => {
|
|
|
59
59
|
config.settings.defaultLanguage =
|
|
60
60
|
config.settings.eea?.defaultLanguage || 'en';
|
|
61
61
|
|
|
62
|
+
// mega menu layout settings
|
|
63
|
+
config.settings.menuItemsLayouts = {
|
|
64
|
+
'/policy': {
|
|
65
|
+
hideChildrenFromNavigation: false,
|
|
66
|
+
},
|
|
67
|
+
'/europes-biodiversity': {
|
|
68
|
+
hideChildrenFromNavigation: false,
|
|
69
|
+
},
|
|
70
|
+
'/countries': {
|
|
71
|
+
menuItemColumns: ['eight wide column', 'four wide column'],
|
|
72
|
+
menuItemChildrenListColumns: [5, 2],
|
|
73
|
+
appendExtraMenuItemsToLastColumn: true,
|
|
74
|
+
hideChildrenFromNavigation: false,
|
|
75
|
+
},
|
|
76
|
+
'/resources': {
|
|
77
|
+
hideChildrenFromNavigation: false,
|
|
78
|
+
},
|
|
79
|
+
};
|
|
80
|
+
|
|
62
81
|
// EEA customizations
|
|
63
82
|
config.settings.eea = {
|
|
64
83
|
...(config.settings.eea || {}),
|
|
@@ -1,47 +1,125 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
<
|
|
4
|
-
|
|
5
|
-
<
|
|
6
|
-
|
|
7
|
-
<
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
<
|
|
22
|
-
|
|
23
|
-
<path d="
|
|
24
|
-
|
|
25
|
-
<path d="
|
|
26
|
-
|
|
27
|
-
<path d="
|
|
28
|
-
|
|
29
|
-
<path d="
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
<
|
|
34
|
-
|
|
35
|
-
<
|
|
36
|
-
|
|
37
|
-
<path d="
|
|
38
|
-
|
|
39
|
-
<path d="
|
|
40
|
-
|
|
41
|
-
<path d="
|
|
42
|
-
|
|
43
|
-
<path d="
|
|
44
|
-
|
|
45
|
-
<path d="
|
|
46
|
-
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
|
|
3
|
+
<svg width="166" height="50" id="Text_labels" data-name="Text labels" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1280 200.04">
|
|
4
|
+
|
|
5
|
+
<defs>
|
|
6
|
+
|
|
7
|
+
<style>
|
|
8
|
+
|
|
9
|
+
.cls-1 {
|
|
10
|
+
|
|
11
|
+
fill: #fff;
|
|
12
|
+
|
|
13
|
+
stroke-width: 0px;
|
|
14
|
+
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
</style>
|
|
18
|
+
|
|
19
|
+
</defs>
|
|
20
|
+
|
|
21
|
+
<g>
|
|
22
|
+
|
|
23
|
+
<path class="cls-1" d="m0,197.37V2.67h69.93c25.05,0,44.11,4.59,57.16,13.77,13.06,9.18,19.59,22.51,19.59,39.98,0,10.08-2.32,18.67-6.95,25.81-4.63,7.13-11.45,12.39-20.46,15.78,10.16,2.67,17.97,7.67,23.4,14.98,5.43,7.31,8.16,16.23,8.16,26.74,0,19.07-6.04,33.41-18.12,42.99-12.08,9.58-29.97,14.46-53.69,14.64H0Zm46.93-113.53h24.47c10.25-.09,17.56-1.97,21.93-5.64,4.36-3.66,6.55-9.07,6.55-16.23,0-8.22-2.36-14.15-7.09-17.77-4.73-3.62-12.35-5.43-22.87-5.43h-23v45.06Zm0,30.75v46.67h30.75c8.47,0,14.98-1.94,19.52-5.82,4.55-3.88,6.82-9.34,6.82-16.38,0-16.23-8.07-24.38-24.2-24.47h-32.89Z"/>
|
|
24
|
+
|
|
25
|
+
<path class="cls-1" d="m226.65,197.37h-46.8V2.67h46.8v194.69Z"/>
|
|
26
|
+
|
|
27
|
+
<path class="cls-1" d="m359.7,145.62c0-6.87-2.43-12.22-7.29-16.05-4.86-3.83-13.39-7.8-25.61-11.9-12.22-4.1-22.2-8.07-29.95-11.9-25.22-12.39-37.84-29.42-37.84-51.08,0-10.78,3.14-20.31,9.43-28.55,6.28-8.24,15.18-14.66,26.68-19.26,11.5-4.59,24.42-6.89,38.78-6.89s26.54,2.49,37.64,7.49c11.1,5,19.72,12.1,25.87,21.33s9.23,19.77,9.23,31.62h-46.8c0-7.94-2.43-14.09-7.29-18.45-4.86-4.36-11.43-6.55-19.72-6.55s-15,1.85-19.86,5.55c-4.86,3.7-7.29,8.41-7.29,14.11,0,5,2.67,9.51,8.02,13.57,5.35,4.06,14.76,8.24,28.21,12.57,13.46,4.33,24.52,8.98,33.16,13.97,21.04,12.12,31.56,28.83,31.56,50.14,0,17.03-6.42,30.4-19.26,40.11-12.84,9.71-30.44,14.58-52.82,14.58-15.78,0-30.07-2.83-42.86-8.49-12.79-5.66-22.42-13.42-28.88-23.27-6.47-9.85-9.69-21.19-9.69-34.03h47.07c0,10.43,2.69,18.12,8.09,23.07,5.4,4.95,14.15,7.42,26.28,7.42,7.76,0,13.89-1.67,18.39-5.01,4.5-3.34,6.75-8.04,6.75-14.11Z"/>
|
|
28
|
+
|
|
29
|
+
<path class="cls-1" d="m551.45,114.73h-73.81v46.53h87.18v36.1h-134.12V2.67h134.38v36.24h-87.45v41.05h73.81v34.77Z"/>
|
|
30
|
+
|
|
31
|
+
</g>
|
|
32
|
+
|
|
33
|
+
<g>
|
|
34
|
+
|
|
35
|
+
<g>
|
|
36
|
+
|
|
37
|
+
<path class="cls-1" d="m602.66,45.22V.61h16.02c5.74,0,10.11,1.05,13.1,3.16,2.99,2.1,4.49,5.16,4.49,9.16,0,2.31-.53,4.28-1.59,5.91-1.06,1.63-2.62,2.84-4.69,3.61,2.33.61,4.12,1.76,5.36,3.43,1.25,1.67,1.87,3.72,1.87,6.13,0,4.37-1.38,7.65-4.15,9.85-2.77,2.19-6.87,3.31-12.3,3.35h-18.11Zm10.75-26.01h5.61c2.35-.02,4.02-.45,5.02-1.29,1-.84,1.5-2.08,1.5-3.72,0-1.88-.54-3.24-1.62-4.07s-2.83-1.25-5.24-1.25h-5.27v10.32Zm0,7.05v10.69h7.05c1.94,0,3.43-.44,4.47-1.33s1.56-2.14,1.56-3.75c0-3.72-1.85-5.59-5.54-5.61h-7.54Z"/>
|
|
38
|
+
|
|
39
|
+
<path class="cls-1" d="m654.59,45.22h-10.72V.61h10.72v44.6Z"/>
|
|
40
|
+
|
|
41
|
+
<path class="cls-1" d="m699.83,23.83c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62-5.23-4.24-6.88-7.49c-1.64-3.25-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
42
|
+
|
|
43
|
+
<path class="cls-1" d="m705.38,45.22V.61h14.37c3.94,0,7.49.89,10.63,2.68,3.14,1.79,5.6,4.31,7.37,7.57,1.77,3.26,2.66,6.91,2.68,10.95v2.05c0,4.09-.86,7.75-2.59,10.98-1.73,3.24-4.16,5.77-7.29,7.6-3.14,1.83-6.63,2.75-10.49,2.77h-14.67Zm10.75-36.3v28.03h3.74c3.08,0,5.45-1.1,7.11-3.29,1.65-2.19,2.48-5.46,2.48-9.79v-1.93c0-4.31-.83-7.56-2.48-9.74-1.65-2.19-4.06-3.28-7.23-3.28h-3.61Z"/>
|
|
44
|
+
|
|
45
|
+
<path class="cls-1" d="m757.4,45.22h-10.72V.61h10.72v44.6Z"/>
|
|
46
|
+
|
|
47
|
+
<path class="cls-1" d="m782.18,33.09l8.88-32.47h12.01l-15.01,44.6h-11.76l-14.89-44.6h11.92l8.85,32.47Z"/>
|
|
48
|
+
|
|
49
|
+
<path class="cls-1" d="m833.98,26.28h-16.91v10.66h19.97v8.27h-30.73V.61h30.79v8.3h-20.04v9.4h16.91v7.97Z"/>
|
|
50
|
+
|
|
51
|
+
<path class="cls-1" d="m858,29.44h-5.82v15.78h-10.75V.61h17.55c5.29,0,9.42,1.17,12.41,3.52,2.98,2.35,4.47,5.66,4.47,9.95,0,3.1-.63,5.67-1.88,7.71-1.26,2.04-3.22,3.69-5.9,4.96l9.31,18.01v.46h-11.52l-7.87-15.78Zm-5.82-8.27h6.8c2.04,0,3.58-.54,4.61-1.61,1.03-1.07,1.55-2.57,1.55-4.5s-.52-3.44-1.56-4.53c-1.04-1.1-2.57-1.64-4.6-1.64h-6.8v12.28Z"/>
|
|
52
|
+
|
|
53
|
+
<path class="cls-1" d="m905.36,33.36c0-1.57-.56-2.8-1.67-3.68-1.11-.88-3.07-1.79-5.87-2.73-2.8-.94-5.09-1.85-6.86-2.73-5.78-2.84-8.67-6.74-8.67-11.7,0-2.47.72-4.65,2.16-6.54,1.44-1.89,3.48-3.36,6.11-4.41,2.63-1.05,5.6-1.58,8.88-1.58s6.08.57,8.62,1.72c2.54,1.14,4.52,2.77,5.93,4.89,1.41,2.11,2.11,4.53,2.11,7.25h-10.72c0-1.82-.56-3.23-1.67-4.23s-2.62-1.5-4.52-1.5-3.44.42-4.55,1.27-1.67,1.93-1.67,3.23c0,1.14.61,2.18,1.84,3.11s3.38,1.89,6.46,2.88c3.08.99,5.62,2.06,7.6,3.2,4.82,2.78,7.23,6.61,7.23,11.49,0,3.9-1.47,6.97-4.41,9.19-2.94,2.23-6.97,3.34-12.1,3.34-3.61,0-6.89-.65-9.82-1.95-2.93-1.3-5.14-3.07-6.62-5.33-1.48-2.26-2.22-4.86-2.22-7.8h10.78c0,2.39.62,4.15,1.85,5.28,1.24,1.13,3.24,1.7,6.02,1.7,1.78,0,3.18-.38,4.21-1.15,1.03-.77,1.55-1.84,1.55-3.23Z"/>
|
|
54
|
+
|
|
55
|
+
<path class="cls-1" d="m933.09,45.22h-10.72V.61h10.72v44.6Z"/>
|
|
56
|
+
|
|
57
|
+
<path class="cls-1" d="m975.58,8.91h-13.39v36.3h-10.75V8.91h-13.14V.61h37.28v8.3Z"/>
|
|
58
|
+
|
|
59
|
+
<path class="cls-1" d="m996.93,19.97l8.21-19.36h11.61l-14.37,28.58v16.02h-10.91v-16.02l-14.34-28.58h11.55l8.24,19.36Z"/>
|
|
60
|
+
|
|
61
|
+
</g>
|
|
62
|
+
|
|
63
|
+
<g>
|
|
64
|
+
|
|
65
|
+
<path class="cls-1" d="m630.75,181.66h-17.34v17.77h-10.75v-44.6h29.84v8.3h-19.09v10.26h17.34v8.27Z"/>
|
|
66
|
+
|
|
67
|
+
<path class="cls-1" d="m674.74,178.04c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62c-2.94-1.75-5.23-4.24-6.88-7.49s-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46c1.47-2.31,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
68
|
+
|
|
69
|
+
<path class="cls-1" d="m696.86,183.65h-5.82v15.78h-10.75v-44.6h17.55c5.29,0,9.42,1.17,12.41,3.52,2.98,2.35,4.47,5.66,4.47,9.95,0,3.1-.63,5.67-1.88,7.71-1.26,2.04-3.22,3.69-5.9,4.96l9.31,18.01v.46h-11.52l-7.87-15.78Zm-5.82-8.27h6.8c2.04,0,3.58-.54,4.61-1.61,1.03-1.07,1.55-2.57,1.55-4.5s-.52-3.44-1.56-4.53c-1.04-1.1-2.57-1.64-4.6-1.64h-6.8v12.28Z"/>
|
|
70
|
+
|
|
71
|
+
<path class="cls-1" d="m764.5,180.49h-16.91v10.66h19.97v8.27h-30.73v-44.6h30.79v8.3h-20.04v9.4h16.91v7.97Z"/>
|
|
72
|
+
|
|
73
|
+
<path class="cls-1" d="m806.93,154.82v29.2c0,3.31-.7,6.17-2.11,8.59-1.41,2.42-3.43,4.26-6.07,5.53-2.63,1.27-5.75,1.9-9.34,1.9-5.43,0-9.71-1.41-12.84-4.23-3.12-2.82-4.72-6.68-4.78-11.58v-29.41h10.81v29.62c.12,4.88,2.39,7.32,6.8,7.32,2.23,0,3.91-.61,5.05-1.84s1.72-3.22,1.72-5.97v-29.13h10.75Z"/>
|
|
74
|
+
|
|
75
|
+
<path class="cls-1" d="m830.22,183.65h-5.82v15.78h-10.75v-44.6h17.55c5.29,0,9.42,1.17,12.41,3.52,2.98,2.35,4.47,5.66,4.47,9.95,0,3.1-.63,5.67-1.88,7.71-1.26,2.04-3.22,3.69-5.9,4.96l9.31,18.01v.46h-11.52l-7.87-15.78Zm-5.82-8.27h6.8c2.04,0,3.58-.54,4.61-1.61,1.03-1.07,1.55-2.57,1.55-4.5s-.52-3.44-1.56-4.53c-1.04-1.1-2.57-1.64-4.6-1.64h-6.8v12.28Z"/>
|
|
76
|
+
|
|
77
|
+
<path class="cls-1" d="m892.34,178.04c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62c-2.94-1.75-5.23-4.24-6.88-7.49-1.64-3.25-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46c1.47-2.31,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
78
|
+
|
|
79
|
+
<path class="cls-1" d="m908.64,184.29v15.13h-10.75v-44.6h17.8c3.41,0,6.43.63,9.05,1.88,2.62,1.26,4.66,3.04,6.1,5.36s2.16,4.95,2.16,7.89c0,4.35-1.56,7.83-4.67,10.43-3.11,2.6-7.39,3.91-12.82,3.91h-6.86Zm0-8.3h7.05c2.08,0,3.67-.52,4.76-1.56,1.09-1.04,1.64-2.51,1.64-4.41,0-2.08-.56-3.75-1.68-4.99-1.12-1.25-2.65-1.88-4.6-1.9h-7.17v12.87Z"/>
|
|
80
|
+
|
|
81
|
+
<path class="cls-1" d="m966.39,180.49h-16.91v10.66h19.97v8.27h-30.73v-44.6h30.79v8.3h-20.04v9.4h16.91v7.97Z"/>
|
|
82
|
+
|
|
83
|
+
</g>
|
|
84
|
+
|
|
85
|
+
<g>
|
|
86
|
+
|
|
87
|
+
<path class="cls-1" d="m614.12,122.32h-10.72v-44.6h10.72v44.6Z"/>
|
|
88
|
+
|
|
89
|
+
<path class="cls-1" d="m658.84,122.32h-10.69l-15.81-27.76v27.76h-10.75v-44.6h10.75l15.78,27.76v-27.76h10.72v44.6Z"/>
|
|
90
|
+
|
|
91
|
+
<path class="cls-1" d="m693.74,104.55h-17.34v17.77h-10.75v-44.6h29.84v8.3h-19.09v10.26h17.34v8.27Z"/>
|
|
92
|
+
|
|
93
|
+
<path class="cls-1" d="m737.73,100.94c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62c-2.94-1.75-5.23-4.24-6.88-7.49-1.64-3.25-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46c1.47-2.31,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
94
|
+
|
|
95
|
+
<path class="cls-1" d="m759.85,106.55h-5.82v15.78h-10.75v-44.6h17.55c5.29,0,9.42,1.17,12.41,3.52,2.98,2.35,4.47,5.66,4.47,9.95,0,3.1-.63,5.67-1.88,7.71-1.26,2.04-3.22,3.69-5.9,4.96l9.31,18.01v.46h-11.52l-7.87-15.78Zm-5.82-8.27h6.8c2.04,0,3.58-.54,4.61-1.61,1.03-1.07,1.55-2.57,1.55-4.5s-.52-3.44-1.56-4.53c-1.04-1.1-2.57-1.64-4.6-1.64h-6.8v12.28Z"/>
|
|
96
|
+
|
|
97
|
+
<path class="cls-1" d="m798.33,77.72l9.96,31.03,9.93-31.03h14.15v44.6h-10.78v-10.42l1.04-21.32-10.78,31.74h-7.11l-10.81-31.77,1.04,21.35v10.42h-10.75v-44.6h14.12Z"/>
|
|
98
|
+
|
|
99
|
+
<path class="cls-1" d="m864.53,113.99h-14.74l-2.57,8.33h-11.49l16.36-44.6h10.11l16.48,44.6h-11.55l-2.6-8.33Zm-12.16-8.3h9.59l-4.81-15.47-4.78,15.47Z"/>
|
|
100
|
+
|
|
101
|
+
<path class="cls-1" d="m913.27,86.02h-13.39v36.3h-10.75v-36.3h-13.14v-8.3h37.28v8.3Z"/>
|
|
102
|
+
|
|
103
|
+
<path class="cls-1" d="m929.26,122.32h-10.72v-44.6h10.72v44.6Z"/>
|
|
104
|
+
|
|
105
|
+
<path class="cls-1" d="m974.51,100.94c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62c-2.94-1.75-5.23-4.24-6.88-7.49-1.64-3.25-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46c1.47-2.31,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
106
|
+
|
|
107
|
+
<path class="cls-1" d="m1017.3,122.32h-10.69l-15.81-27.76v27.76h-10.75v-44.6h10.75l15.78,27.76v-27.76h10.72v44.6Z"/>
|
|
108
|
+
|
|
109
|
+
<path class="cls-1" d="m1062.74,110.47c0-1.57-.56-2.8-1.67-3.68-1.11-.88-3.07-1.79-5.87-2.73-2.8-.94-5.09-1.85-6.86-2.73-5.78-2.84-8.67-6.74-8.67-11.7,0-2.47.72-4.65,2.16-6.54,1.44-1.89,3.48-3.36,6.11-4.41,2.63-1.05,5.6-1.58,8.88-1.58s6.08.57,8.62,1.72c2.54,1.14,4.52,2.77,5.93,4.89,1.41,2.11,2.11,4.53,2.11,7.25h-10.72c0-1.82-.56-3.23-1.67-4.23-1.11-1-2.62-1.5-4.52-1.5s-3.44.42-4.55,1.27-1.67,1.93-1.67,3.23c0,1.14.61,2.18,1.84,3.11,1.23.93,3.38,1.89,6.46,2.88,3.08.99,5.62,2.06,7.6,3.2,4.82,2.78,7.23,6.61,7.23,11.49,0,3.9-1.47,6.97-4.41,9.19-2.94,2.23-6.97,3.34-12.1,3.34-3.61,0-6.89-.65-9.82-1.95-2.93-1.3-5.14-3.07-6.62-5.33-1.48-2.26-2.22-4.86-2.22-7.8h10.78c0,2.39.62,4.15,1.85,5.28,1.24,1.13,3.24,1.7,6.02,1.7,1.78,0,3.18-.38,4.21-1.15,1.03-.77,1.55-1.84,1.55-3.23Z"/>
|
|
110
|
+
|
|
111
|
+
<path class="cls-1" d="m1095.33,97.08l8.21-19.36h11.61l-14.37,28.58v16.02h-10.91v-16.02l-14.34-28.58h11.55l8.24,19.36Z"/>
|
|
112
|
+
|
|
113
|
+
<path class="cls-1" d="m1140.92,110.47c0-1.57-.56-2.8-1.67-3.68-1.11-.88-3.07-1.79-5.87-2.73-2.8-.94-5.09-1.85-6.86-2.73-5.78-2.84-8.67-6.74-8.67-11.7,0-2.47.72-4.65,2.16-6.54,1.44-1.89,3.48-3.36,6.11-4.41,2.63-1.05,5.6-1.58,8.88-1.58s6.08.57,8.62,1.72,4.52,2.77,5.93,4.89c1.41,2.11,2.11,4.53,2.11,7.25h-10.72c0-1.82-.56-3.23-1.67-4.23-1.11-1-2.62-1.5-4.52-1.5s-3.44.42-4.55,1.27-1.67,1.93-1.67,3.23c0,1.14.61,2.18,1.84,3.11,1.23.93,3.38,1.89,6.46,2.88,3.08.99,5.62,2.06,7.6,3.2,4.82,2.78,7.23,6.61,7.23,11.49,0,3.9-1.47,6.97-4.41,9.19-2.94,2.23-6.97,3.34-12.1,3.34-3.61,0-6.89-.65-9.82-1.95-2.93-1.3-5.14-3.07-6.62-5.33-1.48-2.26-2.22-4.86-2.22-7.8h10.78c0,2.39.62,4.15,1.85,5.28s3.24,1.7,6.02,1.7c1.78,0,3.18-.38,4.21-1.15,1.03-.77,1.55-1.84,1.55-3.23Z"/>
|
|
114
|
+
|
|
115
|
+
<path class="cls-1" d="m1192.2,86.02h-13.39v36.3h-10.75v-36.3h-13.14v-8.3h37.28v8.3Z"/>
|
|
116
|
+
|
|
117
|
+
<path class="cls-1" d="m1224.4,103.39h-16.91v10.66h19.97v8.27h-30.73v-44.6h30.79v8.3h-20.04v9.4h16.91v7.97Z"/>
|
|
118
|
+
|
|
119
|
+
<path class="cls-1" d="m1245.96,77.72l9.96,31.03,9.93-31.03h14.15v44.6h-10.78v-10.42l1.04-21.32-10.78,31.74h-7.11l-10.81-31.77,1.04,21.35v10.42h-10.75v-44.6h14.12Z"/>
|
|
120
|
+
|
|
121
|
+
</g>
|
|
122
|
+
|
|
123
|
+
</g>
|
|
124
|
+
|
|
47
125
|
</svg>
|
|
@@ -1,132 +1,125 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
<
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
d="
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
<path
|
|
127
|
-
d="M119.441 47.3337C119.187 47.3337 118.933 47.2883 118.697 47.1885C118.479 47.0977 118.279 46.9615 118.116 46.789C117.952 46.6165 117.825 46.4168 117.744 46.1989C117.653 45.972 117.607 45.7269 117.607 45.4817C117.607 45.2366 117.653 44.9915 117.744 44.7645C118.016 44.0655 118.697 43.6116 119.441 43.6207C119.695 43.6207 119.95 43.6661 120.177 43.7659C120.603 43.9566 120.939 44.3106 121.103 44.7555C121.184 44.9734 121.23 45.2094 121.23 45.4454C121.23 45.4908 121.23 45.5362 121.23 45.5816C121.23 45.6179 121.221 45.6452 121.221 45.6724H118.252C118.261 45.8449 118.306 46.0083 118.379 46.1626C118.443 46.3079 118.533 46.435 118.651 46.5439C118.76 46.6438 118.887 46.7346 119.024 46.789C119.16 46.8435 119.314 46.8798 119.459 46.8798C119.568 46.8798 119.677 46.8617 119.786 46.8344C119.886 46.8072 119.986 46.7618 120.077 46.7164C120.168 46.671 120.249 46.6075 120.322 46.5348C120.394 46.4622 120.449 46.3805 120.485 46.2897L121.012 46.435C120.948 46.5711 120.867 46.6892 120.767 46.7981C120.667 46.9161 120.54 47.0069 120.413 47.0886C120.267 47.1703 120.122 47.2339 119.959 47.2793C119.786 47.3156 119.614 47.3337 119.441 47.3337ZM120.676 45.2275C120.667 45.0641 120.621 44.9098 120.549 44.7555C120.485 44.6193 120.394 44.4922 120.286 44.3833C119.941 44.0655 119.441 43.9747 119.005 44.1472C118.869 44.2017 118.742 44.2834 118.633 44.3923C118.524 44.5013 118.434 44.6193 118.37 44.7555C118.306 44.9007 118.261 45.0641 118.252 45.2185L120.676 45.2275Z"
|
|
128
|
-
fill="#666666" />
|
|
129
|
-
<path
|
|
130
|
-
d="M61.8842 22.4902C62.1838 22.1997 62.329 21.8002 62.3018 21.3917C62.329 21.0013 62.1929 20.62 61.9387 20.3295C61.7117 20.0844 61.394 19.9482 61.0581 19.9573H57.7717V22.8533H60.9401C61.285 22.8533 61.6209 22.7262 61.8842 22.4902ZM61.4848 25.3862H57.7626V28.4365H61.3395C61.7299 28.4456 62.1021 28.3003 62.3835 28.0189C62.6649 27.7284 62.8102 27.338 62.8011 26.9386C62.8102 26.5391 62.6831 26.1487 62.4289 25.8401C62.2019 25.5496 61.857 25.3771 61.4848 25.3862ZM77.8712 23.3163C77.2357 23.3072 76.6365 23.5796 76.228 24.0607C76.0101 24.3149 75.8467 24.6054 75.7469 24.9141C75.6288 25.2681 75.5653 25.6313 75.5653 26.0035C75.529 26.7116 75.765 27.4106 76.2189 27.9644C76.6365 28.4456 77.2357 28.7088 77.8712 28.6907C78.1799 28.6907 78.4885 28.6271 78.779 28.491C79.0514 28.3548 79.2965 28.1732 79.4962 27.9372C79.705 27.683 79.8684 27.3925 79.9774 27.0838C80.0954 26.7298 80.1589 26.3666 80.1499 25.9944C80.1862 25.2863 79.9501 24.5873 79.5053 24.0335C79.0968 23.5705 78.4976 23.3072 77.8712 23.3163ZM59.4966 0.747498C46.0515 0.747498 35.1484 11.6506 35.1484 25.0957C35.1484 38.5407 46.0515 49.4438 59.4966 49.4438C72.9417 49.4438 83.8448 38.5407 83.8448 25.0957C83.8357 11.6506 72.9417 0.756576 59.4966 0.747498ZM42.0389 13.2302L42.8378 10.8245L43.6367 13.2302H46.1786L44.136 14.7554L44.944 17.252L42.8287 15.6451L40.7135 17.252L41.5214 14.7554L39.4879 13.2302H42.0389ZM44.9621 38.2593L42.8469 36.6524L40.7407 38.1776L41.5396 35.6992L39.506 34.174H42.048L42.8469 31.7683L43.6458 34.174H46.1696L44.136 35.7627L44.9621 38.2593ZM47.8309 27.7738L45.7701 26.1487L43.6095 27.6648L44.4084 25.2046L42.3748 23.7521L44.9167 23.6794L45.7974 21.2737L46.5236 23.6704H49.0474L47.0229 25.2591L47.8309 27.7738ZM65.7153 29.1628C65.4702 29.6076 65.1161 29.9889 64.6894 30.2703C64.2264 30.579 63.718 30.8059 63.1733 30.9421C62.5742 31.0965 61.9568 31.1691 61.3395 31.1691H54.5307V17.1975H62.3018C62.7557 17.1884 63.2096 17.2973 63.6182 17.5152C63.9995 17.715 64.3444 17.9964 64.6259 18.3323C64.9073 18.6682 65.1252 19.0585 65.2614 19.4762C65.4157 19.8938 65.4883 20.3386 65.4883 20.7925C65.4883 21.4552 65.3158 22.1089 64.989 22.6808C64.644 23.28 64.1175 23.7521 63.482 24.0153C64.2355 24.2241 64.8982 24.6599 65.3794 25.2772C65.8696 25.949 66.1147 26.7661 66.0784 27.6013C66.1056 28.146 65.9785 28.6816 65.7153 29.1628ZM70.899 31.1782H67.7488V20.8379H70.899V31.1782ZM70.899 19.6668H67.7488V16.8071H70.899V19.6668ZM81.9655 29.771C81.4753 30.2794 80.8761 30.6788 80.2225 30.9421C78.7064 31.5231 77.036 31.5231 75.5199 30.9421C74.8663 30.6788 74.2762 30.2794 73.7769 29.771C73.3048 29.2808 72.9416 28.6998 72.7056 28.0552C72.2245 26.7388 72.2245 25.2954 72.7056 23.979C72.9416 23.3435 73.3048 22.7534 73.7769 22.2632C74.2762 21.7548 74.8663 21.3554 75.5199 21.083C76.2643 20.7744 77.0632 20.6291 77.8712 20.6473C78.6701 20.6291 79.469 20.7834 80.2043 21.083C80.858 21.3554 81.4481 21.7548 81.9383 22.2632C82.4104 22.7534 82.7826 23.3345 83.0186 23.979C83.2637 24.6327 83.3908 25.3226 83.3908 26.0126C83.3908 26.7116 83.2728 27.4016 83.0277 28.0461C82.8007 28.6907 82.4376 29.2717 81.9655 29.771Z"
|
|
131
|
-
fill="#00A390" />
|
|
132
|
-
</svg>
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
|
|
3
|
+
<svg width="166" height="50" id="Text_labels" data-name="Text labels" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1280 200.04">
|
|
4
|
+
|
|
5
|
+
<defs>
|
|
6
|
+
|
|
7
|
+
<style>
|
|
8
|
+
|
|
9
|
+
.cls-1 {
|
|
10
|
+
|
|
11
|
+
fill: #50b0a4;
|
|
12
|
+
|
|
13
|
+
stroke-width: 0px;
|
|
14
|
+
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
</style>
|
|
18
|
+
|
|
19
|
+
</defs>
|
|
20
|
+
|
|
21
|
+
<g>
|
|
22
|
+
|
|
23
|
+
<path class="cls-1" d="m0,197.37V2.67h69.93c25.05,0,44.11,4.59,57.16,13.77,13.06,9.18,19.59,22.51,19.59,39.98,0,10.08-2.32,18.67-6.95,25.81-4.63,7.13-11.45,12.39-20.46,15.78,10.16,2.67,17.97,7.67,23.4,14.98,5.43,7.31,8.16,16.23,8.16,26.74,0,19.07-6.04,33.41-18.12,42.99-12.08,9.58-29.97,14.46-53.69,14.64H0Zm46.93-113.53h24.47c10.25-.09,17.56-1.97,21.93-5.64,4.36-3.66,6.55-9.07,6.55-16.23,0-8.22-2.36-14.15-7.09-17.77-4.73-3.62-12.35-5.43-22.87-5.43h-23v45.06Zm0,30.75v46.67h30.75c8.47,0,14.98-1.94,19.52-5.82,4.55-3.88,6.82-9.34,6.82-16.38,0-16.23-8.07-24.38-24.2-24.47h-32.89Z"/>
|
|
24
|
+
|
|
25
|
+
<path class="cls-1" d="m226.65,197.37h-46.8V2.67h46.8v194.69Z"/>
|
|
26
|
+
|
|
27
|
+
<path class="cls-1" d="m359.7,145.62c0-6.87-2.43-12.22-7.29-16.05-4.86-3.83-13.39-7.8-25.61-11.9-12.22-4.1-22.2-8.07-29.95-11.9-25.22-12.39-37.84-29.42-37.84-51.08,0-10.78,3.14-20.31,9.43-28.55,6.28-8.24,15.18-14.66,26.68-19.26,11.5-4.59,24.42-6.89,38.78-6.89s26.54,2.49,37.64,7.49c11.1,5,19.72,12.1,25.87,21.33s9.23,19.77,9.23,31.62h-46.8c0-7.94-2.43-14.09-7.29-18.45-4.86-4.36-11.43-6.55-19.72-6.55s-15,1.85-19.86,5.55c-4.86,3.7-7.29,8.41-7.29,14.11,0,5,2.67,9.51,8.02,13.57,5.35,4.06,14.76,8.24,28.21,12.57,13.46,4.33,24.52,8.98,33.16,13.97,21.04,12.12,31.56,28.83,31.56,50.14,0,17.03-6.42,30.4-19.26,40.11-12.84,9.71-30.44,14.58-52.82,14.58-15.78,0-30.07-2.83-42.86-8.49-12.79-5.66-22.42-13.42-28.88-23.27-6.47-9.85-9.69-21.19-9.69-34.03h47.07c0,10.43,2.69,18.12,8.09,23.07,5.4,4.95,14.15,7.42,26.28,7.42,7.76,0,13.89-1.67,18.39-5.01,4.5-3.34,6.75-8.04,6.75-14.11Z"/>
|
|
28
|
+
|
|
29
|
+
<path class="cls-1" d="m551.45,114.73h-73.81v46.53h87.18v36.1h-134.12V2.67h134.38v36.24h-87.45v41.05h73.81v34.77Z"/>
|
|
30
|
+
|
|
31
|
+
</g>
|
|
32
|
+
|
|
33
|
+
<g>
|
|
34
|
+
|
|
35
|
+
<g>
|
|
36
|
+
|
|
37
|
+
<path class="cls-1" d="m602.66,45.22V.61h16.02c5.74,0,10.11,1.05,13.1,3.16,2.99,2.1,4.49,5.16,4.49,9.16,0,2.31-.53,4.28-1.59,5.91-1.06,1.63-2.62,2.84-4.69,3.61,2.33.61,4.12,1.76,5.36,3.43,1.25,1.67,1.87,3.72,1.87,6.13,0,4.37-1.38,7.65-4.15,9.85-2.77,2.19-6.87,3.31-12.3,3.35h-18.11Zm10.75-26.01h5.61c2.35-.02,4.02-.45,5.02-1.29,1-.84,1.5-2.08,1.5-3.72,0-1.88-.54-3.24-1.62-4.07s-2.83-1.25-5.24-1.25h-5.27v10.32Zm0,7.05v10.69h7.05c1.94,0,3.43-.44,4.47-1.33s1.56-2.14,1.56-3.75c0-3.72-1.85-5.59-5.54-5.61h-7.54Z"/>
|
|
38
|
+
|
|
39
|
+
<path class="cls-1" d="m654.59,45.22h-10.72V.61h10.72v44.6Z"/>
|
|
40
|
+
|
|
41
|
+
<path class="cls-1" d="m699.83,23.83c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62-5.23-4.24-6.88-7.49c-1.64-3.25-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
42
|
+
|
|
43
|
+
<path class="cls-1" d="m705.38,45.22V.61h14.37c3.94,0,7.49.89,10.63,2.68,3.14,1.79,5.6,4.31,7.37,7.57,1.77,3.26,2.66,6.91,2.68,10.95v2.05c0,4.09-.86,7.75-2.59,10.98-1.73,3.24-4.16,5.77-7.29,7.6-3.14,1.83-6.63,2.75-10.49,2.77h-14.67Zm10.75-36.3v28.03h3.74c3.08,0,5.45-1.1,7.11-3.29,1.65-2.19,2.48-5.46,2.48-9.79v-1.93c0-4.31-.83-7.56-2.48-9.74-1.65-2.19-4.06-3.28-7.23-3.28h-3.61Z"/>
|
|
44
|
+
|
|
45
|
+
<path class="cls-1" d="m757.4,45.22h-10.72V.61h10.72v44.6Z"/>
|
|
46
|
+
|
|
47
|
+
<path class="cls-1" d="m782.18,33.09l8.88-32.47h12.01l-15.01,44.6h-11.76l-14.89-44.6h11.92l8.85,32.47Z"/>
|
|
48
|
+
|
|
49
|
+
<path class="cls-1" d="m833.98,26.28h-16.91v10.66h19.97v8.27h-30.73V.61h30.79v8.3h-20.04v9.4h16.91v7.97Z"/>
|
|
50
|
+
|
|
51
|
+
<path class="cls-1" d="m858,29.44h-5.82v15.78h-10.75V.61h17.55c5.29,0,9.42,1.17,12.41,3.52,2.98,2.35,4.47,5.66,4.47,9.95,0,3.1-.63,5.67-1.88,7.71-1.26,2.04-3.22,3.69-5.9,4.96l9.31,18.01v.46h-11.52l-7.87-15.78Zm-5.82-8.27h6.8c2.04,0,3.58-.54,4.61-1.61,1.03-1.07,1.55-2.57,1.55-4.5s-.52-3.44-1.56-4.53c-1.04-1.1-2.57-1.64-4.6-1.64h-6.8v12.28Z"/>
|
|
52
|
+
|
|
53
|
+
<path class="cls-1" d="m905.36,33.36c0-1.57-.56-2.8-1.67-3.68-1.11-.88-3.07-1.79-5.87-2.73-2.8-.94-5.09-1.85-6.86-2.73-5.78-2.84-8.67-6.74-8.67-11.7,0-2.47.72-4.65,2.16-6.54,1.44-1.89,3.48-3.36,6.11-4.41,2.63-1.05,5.6-1.58,8.88-1.58s6.08.57,8.62,1.72c2.54,1.14,4.52,2.77,5.93,4.89,1.41,2.11,2.11,4.53,2.11,7.25h-10.72c0-1.82-.56-3.23-1.67-4.23s-2.62-1.5-4.52-1.5-3.44.42-4.55,1.27-1.67,1.93-1.67,3.23c0,1.14.61,2.18,1.84,3.11s3.38,1.89,6.46,2.88c3.08.99,5.62,2.06,7.6,3.2,4.82,2.78,7.23,6.61,7.23,11.49,0,3.9-1.47,6.97-4.41,9.19-2.94,2.23-6.97,3.34-12.1,3.34-3.61,0-6.89-.65-9.82-1.95-2.93-1.3-5.14-3.07-6.62-5.33-1.48-2.26-2.22-4.86-2.22-7.8h10.78c0,2.39.62,4.15,1.85,5.28,1.24,1.13,3.24,1.7,6.02,1.7,1.78,0,3.18-.38,4.21-1.15,1.03-.77,1.55-1.84,1.55-3.23Z"/>
|
|
54
|
+
|
|
55
|
+
<path class="cls-1" d="m933.09,45.22h-10.72V.61h10.72v44.6Z"/>
|
|
56
|
+
|
|
57
|
+
<path class="cls-1" d="m975.58,8.91h-13.39v36.3h-10.75V8.91h-13.14V.61h37.28v8.3Z"/>
|
|
58
|
+
|
|
59
|
+
<path class="cls-1" d="m996.93,19.97l8.21-19.36h11.61l-14.37,28.58v16.02h-10.91v-16.02l-14.34-28.58h11.55l8.24,19.36Z"/>
|
|
60
|
+
|
|
61
|
+
</g>
|
|
62
|
+
|
|
63
|
+
<g>
|
|
64
|
+
|
|
65
|
+
<path class="cls-1" d="m630.75,181.66h-17.34v17.77h-10.75v-44.6h29.84v8.3h-19.09v10.26h17.34v8.27Z"/>
|
|
66
|
+
|
|
67
|
+
<path class="cls-1" d="m674.74,178.04c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62c-2.94-1.75-5.23-4.24-6.88-7.49s-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46c1.47-2.31,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
68
|
+
|
|
69
|
+
<path class="cls-1" d="m696.86,183.65h-5.82v15.78h-10.75v-44.6h17.55c5.29,0,9.42,1.17,12.41,3.52,2.98,2.35,4.47,5.66,4.47,9.95,0,3.1-.63,5.67-1.88,7.71-1.26,2.04-3.22,3.69-5.9,4.96l9.31,18.01v.46h-11.52l-7.87-15.78Zm-5.82-8.27h6.8c2.04,0,3.58-.54,4.61-1.61,1.03-1.07,1.55-2.57,1.55-4.5s-.52-3.44-1.56-4.53c-1.04-1.1-2.57-1.64-4.6-1.64h-6.8v12.28Z"/>
|
|
70
|
+
|
|
71
|
+
<path class="cls-1" d="m764.5,180.49h-16.91v10.66h19.97v8.27h-30.73v-44.6h30.79v8.3h-20.04v9.4h16.91v7.97Z"/>
|
|
72
|
+
|
|
73
|
+
<path class="cls-1" d="m806.93,154.82v29.2c0,3.31-.7,6.17-2.11,8.59-1.41,2.42-3.43,4.26-6.07,5.53-2.63,1.27-5.75,1.9-9.34,1.9-5.43,0-9.71-1.41-12.84-4.23-3.12-2.82-4.72-6.68-4.78-11.58v-29.41h10.81v29.62c.12,4.88,2.39,7.32,6.8,7.32,2.23,0,3.91-.61,5.05-1.84s1.72-3.22,1.72-5.97v-29.13h10.75Z"/>
|
|
74
|
+
|
|
75
|
+
<path class="cls-1" d="m830.22,183.65h-5.82v15.78h-10.75v-44.6h17.55c5.29,0,9.42,1.17,12.41,3.52,2.98,2.35,4.47,5.66,4.47,9.95,0,3.1-.63,5.67-1.88,7.71-1.26,2.04-3.22,3.69-5.9,4.96l9.31,18.01v.46h-11.52l-7.87-15.78Zm-5.82-8.27h6.8c2.04,0,3.58-.54,4.61-1.61,1.03-1.07,1.55-2.57,1.55-4.5s-.52-3.44-1.56-4.53c-1.04-1.1-2.57-1.64-4.6-1.64h-6.8v12.28Z"/>
|
|
76
|
+
|
|
77
|
+
<path class="cls-1" d="m892.34,178.04c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62c-2.94-1.75-5.23-4.24-6.88-7.49-1.64-3.25-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46c1.47-2.31,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
78
|
+
|
|
79
|
+
<path class="cls-1" d="m908.64,184.29v15.13h-10.75v-44.6h17.8c3.41,0,6.43.63,9.05,1.88,2.62,1.26,4.66,3.04,6.1,5.36s2.16,4.95,2.16,7.89c0,4.35-1.56,7.83-4.67,10.43-3.11,2.6-7.39,3.91-12.82,3.91h-6.86Zm0-8.3h7.05c2.08,0,3.67-.52,4.76-1.56,1.09-1.04,1.64-2.51,1.64-4.41,0-2.08-.56-3.75-1.68-4.99-1.12-1.25-2.65-1.88-4.6-1.9h-7.17v12.87Z"/>
|
|
80
|
+
|
|
81
|
+
<path class="cls-1" d="m966.39,180.49h-16.91v10.66h19.97v8.27h-30.73v-44.6h30.79v8.3h-20.04v9.4h16.91v7.97Z"/>
|
|
82
|
+
|
|
83
|
+
</g>
|
|
84
|
+
|
|
85
|
+
<g>
|
|
86
|
+
|
|
87
|
+
<path class="cls-1" d="m614.12,122.32h-10.72v-44.6h10.72v44.6Z"/>
|
|
88
|
+
|
|
89
|
+
<path class="cls-1" d="m658.84,122.32h-10.69l-15.81-27.76v27.76h-10.75v-44.6h10.75l15.78,27.76v-27.76h10.72v44.6Z"/>
|
|
90
|
+
|
|
91
|
+
<path class="cls-1" d="m693.74,104.55h-17.34v17.77h-10.75v-44.6h29.84v8.3h-19.09v10.26h17.34v8.27Z"/>
|
|
92
|
+
|
|
93
|
+
<path class="cls-1" d="m737.73,100.94c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62c-2.94-1.75-5.23-4.24-6.88-7.49-1.64-3.25-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46c1.47-2.31,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
94
|
+
|
|
95
|
+
<path class="cls-1" d="m759.85,106.55h-5.82v15.78h-10.75v-44.6h17.55c5.29,0,9.42,1.17,12.41,3.52,2.98,2.35,4.47,5.66,4.47,9.95,0,3.1-.63,5.67-1.88,7.71-1.26,2.04-3.22,3.69-5.9,4.96l9.31,18.01v.46h-11.52l-7.87-15.78Zm-5.82-8.27h6.8c2.04,0,3.58-.54,4.61-1.61,1.03-1.07,1.55-2.57,1.55-4.5s-.52-3.44-1.56-4.53c-1.04-1.1-2.57-1.64-4.6-1.64h-6.8v12.28Z"/>
|
|
96
|
+
|
|
97
|
+
<path class="cls-1" d="m798.33,77.72l9.96,31.03,9.93-31.03h14.15v44.6h-10.78v-10.42l1.04-21.32-10.78,31.74h-7.11l-10.81-31.77,1.04,21.35v10.42h-10.75v-44.6h14.12Z"/>
|
|
98
|
+
|
|
99
|
+
<path class="cls-1" d="m864.53,113.99h-14.74l-2.57,8.33h-11.49l16.36-44.6h10.11l16.48,44.6h-11.55l-2.6-8.33Zm-12.16-8.3h9.59l-4.81-15.47-4.78,15.47Z"/>
|
|
100
|
+
|
|
101
|
+
<path class="cls-1" d="m913.27,86.02h-13.39v36.3h-10.75v-36.3h-13.14v-8.3h37.28v8.3Z"/>
|
|
102
|
+
|
|
103
|
+
<path class="cls-1" d="m929.26,122.32h-10.72v-44.6h10.72v44.6Z"/>
|
|
104
|
+
|
|
105
|
+
<path class="cls-1" d="m974.51,100.94c0,4.35-.81,8.2-2.42,11.55-1.61,3.35-3.91,5.93-6.88,7.74-2.97,1.81-6.36,2.71-10.16,2.71s-7.17-.87-10.11-2.62c-2.94-1.75-5.23-4.24-6.88-7.49-1.64-3.25-2.51-6.97-2.59-11.18v-2.51c0-4.37.8-8.23,2.4-11.56,1.6-3.34,3.9-5.92,6.89-7.74,2.99-1.82,6.4-2.73,10.22-2.73s7.15.9,10.11,2.7c2.96,1.8,5.26,4.35,6.91,7.67,1.64,3.32,2.48,7.12,2.5,11.41v2.05Zm-10.94-1.87c0-4.43-.74-7.8-2.22-10.09-1.48-2.3-3.6-3.45-6.36-3.45-5.39,0-8.24,4.04-8.55,12.13l-.03,3.28c0,4.37.72,7.73,2.18,10.08,1.45,2.35,3.6,3.52,6.46,3.52s4.81-1.15,6.28-3.46c1.47-2.31,2.22-5.63,2.24-9.96v-2.05Z"/>
|
|
106
|
+
|
|
107
|
+
<path class="cls-1" d="m1017.3,122.32h-10.69l-15.81-27.76v27.76h-10.75v-44.6h10.75l15.78,27.76v-27.76h10.72v44.6Z"/>
|
|
108
|
+
|
|
109
|
+
<path class="cls-1" d="m1062.74,110.47c0-1.57-.56-2.8-1.67-3.68-1.11-.88-3.07-1.79-5.87-2.73-2.8-.94-5.09-1.85-6.86-2.73-5.78-2.84-8.67-6.74-8.67-11.7,0-2.47.72-4.65,2.16-6.54,1.44-1.89,3.48-3.36,6.11-4.41,2.63-1.05,5.6-1.58,8.88-1.58s6.08.57,8.62,1.72c2.54,1.14,4.52,2.77,5.93,4.89,1.41,2.11,2.11,4.53,2.11,7.25h-10.72c0-1.82-.56-3.23-1.67-4.23-1.11-1-2.62-1.5-4.52-1.5s-3.44.42-4.55,1.27-1.67,1.93-1.67,3.23c0,1.14.61,2.18,1.84,3.11,1.23.93,3.38,1.89,6.46,2.88,3.08.99,5.62,2.06,7.6,3.2,4.82,2.78,7.23,6.61,7.23,11.49,0,3.9-1.47,6.97-4.41,9.19-2.94,2.23-6.97,3.34-12.1,3.34-3.61,0-6.89-.65-9.82-1.95-2.93-1.3-5.14-3.07-6.62-5.33-1.48-2.26-2.22-4.86-2.22-7.8h10.78c0,2.39.62,4.15,1.85,5.28,1.24,1.13,3.24,1.7,6.02,1.7,1.78,0,3.18-.38,4.21-1.15,1.03-.77,1.55-1.84,1.55-3.23Z"/>
|
|
110
|
+
|
|
111
|
+
<path class="cls-1" d="m1095.33,97.08l8.21-19.36h11.61l-14.37,28.58v16.02h-10.91v-16.02l-14.34-28.58h11.55l8.24,19.36Z"/>
|
|
112
|
+
|
|
113
|
+
<path class="cls-1" d="m1140.92,110.47c0-1.57-.56-2.8-1.67-3.68-1.11-.88-3.07-1.79-5.87-2.73-2.8-.94-5.09-1.85-6.86-2.73-5.78-2.84-8.67-6.74-8.67-11.7,0-2.47.72-4.65,2.16-6.54,1.44-1.89,3.48-3.36,6.11-4.41,2.63-1.05,5.6-1.58,8.88-1.58s6.08.57,8.62,1.72,4.52,2.77,5.93,4.89c1.41,2.11,2.11,4.53,2.11,7.25h-10.72c0-1.82-.56-3.23-1.67-4.23-1.11-1-2.62-1.5-4.52-1.5s-3.44.42-4.55,1.27-1.67,1.93-1.67,3.23c0,1.14.61,2.18,1.84,3.11,1.23.93,3.38,1.89,6.46,2.88,3.08.99,5.62,2.06,7.6,3.2,4.82,2.78,7.23,6.61,7.23,11.49,0,3.9-1.47,6.97-4.41,9.19-2.94,2.23-6.97,3.34-12.1,3.34-3.61,0-6.89-.65-9.82-1.95-2.93-1.3-5.14-3.07-6.62-5.33-1.48-2.26-2.22-4.86-2.22-7.8h10.78c0,2.39.62,4.15,1.85,5.28s3.24,1.7,6.02,1.7c1.78,0,3.18-.38,4.21-1.15,1.03-.77,1.55-1.84,1.55-3.23Z"/>
|
|
114
|
+
|
|
115
|
+
<path class="cls-1" d="m1192.2,86.02h-13.39v36.3h-10.75v-36.3h-13.14v-8.3h37.28v8.3Z"/>
|
|
116
|
+
|
|
117
|
+
<path class="cls-1" d="m1224.4,103.39h-16.91v10.66h19.97v8.27h-30.73v-44.6h30.79v8.3h-20.04v9.4h16.91v7.97Z"/>
|
|
118
|
+
|
|
119
|
+
<path class="cls-1" d="m1245.96,77.72l9.96,31.03,9.93-31.03h14.15v44.6h-10.78v-10.42l1.04-21.32-10.78,31.74h-7.11l-10.81-31.77,1.04,21.35v10.42h-10.75v-44.6h14.12Z"/>
|
|
120
|
+
|
|
121
|
+
</g>
|
|
122
|
+
|
|
123
|
+
</g>
|
|
124
|
+
|
|
125
|
+
</svg>
|
package/theme/theme.config
CHANGED
package/.project.eslintrc.js
DELETED
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
const fs = require('fs');
|
|
2
|
-
const path = require('path');
|
|
3
|
-
|
|
4
|
-
const projectRootPath = fs.existsSync('./project')
|
|
5
|
-
? fs.realpathSync('./project')
|
|
6
|
-
: fs.realpathSync('./../../../');
|
|
7
|
-
const packageJson = require(path.join(projectRootPath, 'package.json'));
|
|
8
|
-
const jsConfig = require(path.join(projectRootPath, 'jsconfig.json'))
|
|
9
|
-
.compilerOptions;
|
|
10
|
-
|
|
11
|
-
const pathsConfig = jsConfig.paths;
|
|
12
|
-
|
|
13
|
-
let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
|
|
14
|
-
|
|
15
|
-
Object.keys(pathsConfig).forEach((pkg) => {
|
|
16
|
-
if (pkg === '@plone/volto') {
|
|
17
|
-
voltoPath = `./${jsConfig.baseUrl}/${pathsConfig[pkg][0]}`;
|
|
18
|
-
}
|
|
19
|
-
});
|
|
20
|
-
const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
|
|
21
|
-
const reg = new AddonConfigurationRegistry(projectRootPath);
|
|
22
|
-
|
|
23
|
-
// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
|
|
24
|
-
const addonAliases = Object.keys(reg.packages).map((o) => [
|
|
25
|
-
o,
|
|
26
|
-
reg.packages[o].modulePath,
|
|
27
|
-
]);
|
|
28
|
-
|
|
29
|
-
module.exports = {
|
|
30
|
-
extends: `${projectRootPath}/node_modules/@plone/volto/.eslintrc`,
|
|
31
|
-
settings: {
|
|
32
|
-
'import/resolver': {
|
|
33
|
-
alias: {
|
|
34
|
-
map: [
|
|
35
|
-
['@plone/volto', '@plone/volto/src'],
|
|
36
|
-
...addonAliases,
|
|
37
|
-
['@package', `${__dirname}/src`],
|
|
38
|
-
['~', `${__dirname}/src`],
|
|
39
|
-
],
|
|
40
|
-
extensions: ['.js', '.jsx', '.json'],
|
|
41
|
-
},
|
|
42
|
-
'babel-plugin-root-import': {
|
|
43
|
-
rootPathSuffix: 'src',
|
|
44
|
-
},
|
|
45
|
-
},
|
|
46
|
-
},
|
|
47
|
-
};
|