From 5d39f05c6371d072a447bd68d0163f478eec6091 Mon Sep 17 00:00:00 2001 From: kreafox Date: Fri, 18 Nov 2022 16:11:11 +0200 Subject: [PATCH] change(cards): Remove block style wrapper temporarily and unused styling --- src/blocks/Listing/index.js | 16 ++++---- src/blocks/Listing/schema.js | 72 ++++++++++++++++++------------------ src/blocks/Teaser/index.js | 8 ++-- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/blocks/Listing/index.js b/src/blocks/Listing/index.js index bb74b075..9512ab6d 100644 --- a/src/blocks/Listing/index.js +++ b/src/blocks/Listing/index.js @@ -1,4 +1,4 @@ -import { addStyling } from '@plone/volto/helpers'; +// import { addStyling } from '@plone/volto/helpers'; import UniversalCard from '@eeacms/volto-listing-block/components/UniversalCard/UniversalCard'; import { composeSchema } from '@eeacms/volto-listing-block/schema-utils'; @@ -6,7 +6,7 @@ import Carousel from './layout-templates/Carousel'; import Gallery from './layout-templates/Gallery'; import Listing from './layout-templates/Listing'; import { - setBasicStylingSchema, + // setBasicStylingSchema, setCardStylingSchema, setCardModelSchema, setItemModelSchema, @@ -52,8 +52,8 @@ const applyConfig = (config) => { title: 'Listing', template: Listing, schemaEnhancer: composeSchema( - addStyling, - setBasicStylingSchema, + // addStyling, + // setBasicStylingSchema, UniversalCard.schemaEnhancer, ), }, @@ -63,8 +63,8 @@ const applyConfig = (config) => { title: 'Carousel', template: Carousel, schemaEnhancer: composeSchema( - addStyling, - setBasicStylingSchema, + // addStyling, + // setBasicStylingSchema, UniversalCard.schemaEnhancer, Carousel.schemaEnhancer, ), @@ -75,8 +75,8 @@ const applyConfig = (config) => { title: 'Gallery', template: Gallery, schemaEnhancer: composeSchema( - addStyling, - setBasicStylingSchema, + // addStyling, + // setBasicStylingSchema, UniversalCard.schemaEnhancer, Gallery.schemaEnhancer, ), diff --git a/src/blocks/Listing/schema.js b/src/blocks/Listing/schema.js index 37ea9169..1451cade 100644 --- a/src/blocks/Listing/schema.js +++ b/src/blocks/Listing/schema.js @@ -8,43 +8,43 @@ const ALIGN_INFO_MAP = { align_center: [alignCenterSVG, 'Center'], }; -export const setBasicStylingSchema = (args) => { - const { schema, intl } = args; - schema.properties.styles.schema = { - fieldsets: [ - { - id: 'styling', - title: 'Styling', - fields: ['theme', 'inverted', 'rounded'], - }, - ], - properties: { - theme: { - title: intl.formatMessage(messages.Theme), - description: intl.formatMessage(messages.ThemeHelp), - choices: [ - ['', intl.formatMessage(messages.ThemeDefault)], - ['primary', intl.formatMessage(messages.ThemePrimary)], - ['secondary', intl.formatMessage(messages.ThemeSecondary)], - ['tertiary', intl.formatMessage(messages.ThemeTertiary)], - ], - }, - inverted: { - title: intl.formatMessage(messages.Inverted), - description: intl.formatMessage(messages.InvertedHelp), - type: 'boolean', - }, - rounded: { - title: intl.formatMessage(messages.Rounded), - description: intl.formatMessage(messages.RoundedHelp), - type: 'boolean', - }, - }, - required: [], - }; +// export const setBasicStylingSchema = (args) => { +// const { schema, intl } = args; +// schema.properties.styles.schema = { +// fieldsets: [ +// { +// id: 'styling', +// title: 'Styling', +// fields: ['theme', 'inverted', 'rounded'], +// }, +// ], +// properties: { +// theme: { +// title: intl.formatMessage(messages.Theme), +// description: intl.formatMessage(messages.ThemeHelp), +// choices: [ +// ['', intl.formatMessage(messages.ThemeDefault)], +// ['primary', intl.formatMessage(messages.ThemePrimary)], +// ['secondary', intl.formatMessage(messages.ThemeSecondary)], +// ['tertiary', intl.formatMessage(messages.ThemeTertiary)], +// ], +// }, +// inverted: { +// title: intl.formatMessage(messages.Inverted), +// description: intl.formatMessage(messages.InvertedHelp), +// type: 'boolean', +// }, +// rounded: { +// title: intl.formatMessage(messages.Rounded), +// description: intl.formatMessage(messages.RoundedHelp), +// type: 'boolean', +// }, +// }, +// required: [], +// }; - return schema; -}; +// return schema; +// }; const CallToActionSchema = ({ formData }) => { return { diff --git a/src/blocks/Teaser/index.js b/src/blocks/Teaser/index.js index 81aa1082..48cc5994 100644 --- a/src/blocks/Teaser/index.js +++ b/src/blocks/Teaser/index.js @@ -1,17 +1,17 @@ import { composeSchema } from '@eeacms/volto-listing-block/schema-utils'; -import { addStyling } from '@plone/volto/helpers'; +// import { addStyling } from '@plone/volto/helpers'; import TeaserCardTemplate from './Card'; import { adjustTeaserSchema } from './schema'; import UniversalCard from '@eeacms/volto-listing-block/components/UniversalCard/UniversalCard'; -import { setBasicStylingSchema } from '../Listing/schema'; +// import { setBasicStylingSchema } from '../Listing/schema'; export default (config) => { if (config.blocks.blocksConfig.teaser) { config.blocks.blocksConfig.teaser.schemaEnhancer = composeSchema( config.blocks.blocksConfig.teaser.schemaEnhancer, - addStyling, - setBasicStylingSchema, + // addStyling, + // setBasicStylingSchema, ); config.blocks.blocksConfig.teaser.variations = [