Skip to content

Commit

Permalink
Merge pull request #79 from eea/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
alecghica authored Jul 19, 2024
2 parents a63da06 + 743442f commit 1bf5ba1
Show file tree
Hide file tree
Showing 8 changed files with 454 additions and 105 deletions.
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,24 @@ 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.46](https://github.com/eea/volto-climate-advisory-board-policy/compare/0.1.45...0.1.46) - 29 April 2024
### [0.1.47](https://github.com/eea/volto-climate-advisory-board-policy/compare/0.1.46...0.1.47) - 18 July 2024

#### :rocket: New Features

- feat: cicle through dots and show active dot [Teodor - [`d60c12b`](https://github.com/eea/volto-climate-advisory-board-policy/commit/d60c12b3a49d27b0168c7cc5b53d317834213c67)]

#### :hammer_and_wrench: Others

- code cleanup [Teodor - [`8c0b09d`](https://github.com/eea/volto-climate-advisory-board-policy/commit/8c0b09d1c177e0e7e468415681dc4350ad313bcc)]
- update dependencies [Teodor - [`e2acd47`](https://github.com/eea/volto-climate-advisory-board-policy/commit/e2acd470da821eae0ee498c94db6f0defa5aa624)]
- fix schema of hero to fix bug [Teodor - [`9968bdd`](https://github.com/eea/volto-climate-advisory-board-policy/commit/9968bdd1513ba51e6ab01b8322e49a482c4393f6)]
- Fix button on hero block [Teodor - [`2ca1e2d`](https://github.com/eea/volto-climate-advisory-board-policy/commit/2ca1e2d5242719552d4a9931f22b8b0742aff1c4)]
- pin dependencies for volto 16 [Teodor - [`e54b1ac`](https://github.com/eea/volto-climate-advisory-board-policy/commit/e54b1acf5074f878dcddbd98645078206e3749f2)]
- pin dependencies for volto 16 [Teodor - [`642baa6`](https://github.com/eea/volto-climate-advisory-board-policy/commit/642baa68ece358bb466788d701e855b372bb9e2c)]
- update dependencies [Teodor - [`639a830`](https://github.com/eea/volto-climate-advisory-board-policy/commit/639a8306fa5cf148f8266079a976a3a2ea2d7f2c)]
- 5 dots for carousel on mobile version [Teodor - [`af04dd6`](https://github.com/eea/volto-climate-advisory-board-policy/commit/af04dd6d450dd666edd355ce26950a5845b96737)]
- no filters selected by default [Teodor - [`919fb65`](https://github.com/eea/volto-climate-advisory-board-policy/commit/919fb65a2403de22b9201f4ade15de46aaa994d2)]
### [0.1.46](https://github.com/eea/volto-climate-advisory-board-policy/compare/0.1.45...0.1.46) - 8 May 2024

#### :hammer_and_wrench: Others

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-climate-advisory-board-policy",
"version": "0.1.46",
"version": "0.1.47",
"description": "@eeacms/volto-climate-advisory-board-policy: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency",
Expand All @@ -21,10 +21,10 @@
],
"dependencies": {
"@eeacms/volto-eea-design-system": "*",
"@eeacms/volto-eea-website-theme": "*",
"@eeacms/volto-hero-block": "*",
"@eeacms/volto-listing-block": "*",
"@eeacms/volto-spotlight": "*"
"@eeacms/volto-eea-website-theme": "^1.33.2",
"@eeacms/volto-hero-block": "^6.0.1",
"@eeacms/volto-listing-block": "^7.1.0",
"@eeacms/volto-spotlight": "^2.0.10"
},
"repository": {
"type": "git",
Expand Down
6 changes: 4 additions & 2 deletions src/components/manage/Blocks/Hero/HeroMetadata.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import React from 'react';
import cx from 'classnames';
import { UniversalLink } from '@plone/volto/components';

const HeroMetadata = ({ buttonLabel, buttonLink, inverted, styles }) => {
const { buttonVariant } = styles || {};
const HeroMetadata = ({ buttonLabel, buttonLink, inverted, styles = {} }) => {
const isStylesEmpty = Object.keys(styles).length === 0;

const buttonVariant = isStylesEmpty ? 'default' : styles.buttonVariant;

return buttonLabel ? (
<UniversalLink
Expand Down
188 changes: 93 additions & 95 deletions src/components/manage/Blocks/Hero/schema.js
Original file line number Diff line number Diff line change
@@ -1,96 +1,94 @@
export default () => {
return {
title: 'Hero',
fieldsets: [
{
id: 'default',
title: 'Default',
fields: [
'fullWidth',
'fullHeight',
'aboveBreadcrumbs',
'quoted',
'spaced',
'inverted',
'hidePublishingDate',
'buttonLabel',
'buttonLink',
'overlay',
'image',
],
},
{
id: 'copyright',
title: 'Copyright',
fields: ['copyright', 'copyrightIcon', 'copyrightPosition'],
},
],
properties: {
fullWidth: {
title: 'Full width',
type: 'boolean',
defaultValue: true,
},
fullHeight: {
title: 'Full height',
type: 'boolean',
defaultValue: true,
},
aboveBreadcrumbs: {
title: 'Above breadcrumbs',
type: 'boolean',
defaultValue: true,
},
quoted: {
title: 'Quoted',
type: 'boolean',
defaultValue: false,
},
spaced: {
title: 'Spaced',
type: 'boolean',
defaultValue: false,
},
inverted: {
title: 'Inverted',
type: 'boolean',
defaultValue: true,
},
hidePublishingDate: {
title: 'Hide publishing date',
type: 'boolean',
},
buttonLabel: {
title: 'Button label',
widget: 'textarea',
},
buttonLink: {
title: 'Button link',
widget: 'url',
},
overlay: {
title: 'Image darken overlay',
type: 'boolean',
defaultValue: true,
},
image: {
title: 'Image',
widget: 'attachedimage',
},
copyright: {
title: 'Text',
},
copyrightIcon: {
title: 'Icon',
default: 'ri-copyright-line',
},
copyrightPosition: {
title: 'Align',
widget: 'align',
actions: ['left', 'right'],
defaultValue: 'left',
},
},
required: [],
};
export default {
title: 'Hero',
fieldsets: [
{
id: 'default',
title: 'Default',
fields: [
'fullWidth',
'fullHeight',
'aboveBreadcrumbs',
'quoted',
'spaced',
'inverted',
'hidePublishingDate',
'buttonLabel',
'buttonLink',
'overlay',
'image',
],
},
{
id: 'copyright',
title: 'Copyright',
fields: ['copyright', 'copyrightIcon', 'copyrightPosition'],
},
],
properties: {
fullWidth: {
title: 'Full width',
type: 'boolean',
defaultValue: true,
},
fullHeight: {
title: 'Full height',
type: 'boolean',
defaultValue: true,
},
aboveBreadcrumbs: {
title: 'Above breadcrumbs',
type: 'boolean',
defaultValue: true,
},
quoted: {
title: 'Quoted',
type: 'boolean',
defaultValue: false,
},
spaced: {
title: 'Spaced',
type: 'boolean',
defaultValue: false,
},
inverted: {
title: 'Inverted',
type: 'boolean',
defaultValue: true,
},
hidePublishingDate: {
title: 'Hide publishing date',
type: 'boolean',
},
buttonLabel: {
title: 'Button label',
widget: 'textarea',
},
buttonLink: {
title: 'Button link',
widget: 'url',
},
overlay: {
title: 'Image darken overlay',
type: 'boolean',
defaultValue: true,
},
image: {
title: 'Image',
widget: 'attachedimage',
},
copyright: {
title: 'Text',
},
copyrightIcon: {
title: 'Icon',
default: 'ri-copyright-line',
},
copyrightPosition: {
title: 'Align',
widget: 'align',
actions: ['left', 'right'],
defaultValue: 'left',
},
},
required: [],
};
Loading

0 comments on commit 1bf5ba1

Please sign in to comment.