From 487df7f39887a32ae2051dd4ceb8bfe9ca8e9f7d Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard29 Date: Tue, 3 Oct 2023 16:49:29 +0200 Subject: [PATCH] Revert "feature/COR-1597-contact-page-improved-design (#4873)" This reverts commit dae12d5e34c05ec1ea75f56166c7c4a5cb37b52c. --- .../components/contact/contact-page-group.tsx | 27 ----- .../contact/contact-page-item-links.tsx | 51 -------- .../components/contact/contact-page-item.tsx | 35 ------ .../components/contact/contact-page-link.tsx | 56 --------- packages/app/src/components/contact/types.ts | 31 ----- packages/app/src/components/typography.tsx | 13 +- .../app/src/domain/layout/content-layout.tsx | 14 --- packages/app/src/pages/contact.tsx | 112 +++++++++--------- packages/app/src/pages/over.tsx | 5 +- .../app/src/pages/veelgestelde-vragen.tsx | 5 +- .../format-link-according-to-type.spec.ts | 34 ------ .../utils/format-link-according-to-type.ts | 13 -- .../src/schemas/documents/pages/contact.ts | 28 +++++ .../schemas/documents/pages/contact/group.ts | 31 ----- .../schemas/documents/pages/contact/index.ts | 23 ---- .../schemas/documents/pages/contact/item.ts | 78 ------------ .../schemas/documents/pages/contact/link.ts | 36 ------ packages/cms/src/schemas/index.ts | 11 +- packages/cms/src/schemas/objects/link-type.ts | 23 ---- packages/icons/icons.md | 1 - packages/icons/src/icon-name2filename.ts | 2 - packages/icons/src/svg/telephone.svg | 1 - 22 files changed, 93 insertions(+), 537 deletions(-) delete mode 100644 packages/app/src/components/contact/contact-page-group.tsx delete mode 100644 packages/app/src/components/contact/contact-page-item-links.tsx delete mode 100644 packages/app/src/components/contact/contact-page-item.tsx delete mode 100644 packages/app/src/components/contact/contact-page-link.tsx delete mode 100644 packages/app/src/components/contact/types.ts delete mode 100644 packages/app/src/domain/layout/content-layout.tsx delete mode 100644 packages/app/src/utils/__tests__/format-link-according-to-type.spec.ts delete mode 100644 packages/app/src/utils/format-link-according-to-type.ts create mode 100644 packages/cms/src/schemas/documents/pages/contact.ts delete mode 100644 packages/cms/src/schemas/documents/pages/contact/group.ts delete mode 100644 packages/cms/src/schemas/documents/pages/contact/index.ts delete mode 100644 packages/cms/src/schemas/documents/pages/contact/item.ts delete mode 100644 packages/cms/src/schemas/documents/pages/contact/link.ts delete mode 100644 packages/cms/src/schemas/objects/link-type.ts delete mode 100644 packages/icons/src/svg/telephone.svg diff --git a/packages/app/src/components/contact/contact-page-group.tsx b/packages/app/src/components/contact/contact-page-group.tsx deleted file mode 100644 index c27046886e..0000000000 --- a/packages/app/src/components/contact/contact-page-group.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import { space } from '~/style/theme'; -import { Box } from '../base/box'; -import { Heading } from '../typography'; -import { ContactPageGroupItem } from './contact-page-item'; -import { PageGroup } from './types'; - -interface ContactPageGroupProps { - groups: PageGroup[]; -} - -export const ContactPageGroup = ({ groups }: ContactPageGroupProps) => { - return ( - - {groups.map(({ id, title, items }) => ( -
- - {title} - - - {items.map((item, index) => ( - - ))} -
- ))} - - ); -}; diff --git a/packages/app/src/components/contact/contact-page-item-links.tsx b/packages/app/src/components/contact/contact-page-item-links.tsx deleted file mode 100644 index 6f24a26640..0000000000 --- a/packages/app/src/components/contact/contact-page-item-links.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import { colors } from '@corona-dashboard/common'; -import styled from 'styled-components'; -import { mediaQueries, radii, space } from '~/style/theme'; -import { Box } from '../base/box'; -import { Text } from '../typography'; -import { ContactPageLink } from './contact-page-link'; -import { ItemLink } from './types'; - -interface ContactPageItemLinksProps { - links: ItemLink[]; -} - -export const ContactPageItemLinks = ({ links }: ContactPageItemLinksProps) => { - return ( - - {links.map(({ id, titleAboveLink, href, label, linkType }) => ( -
- {titleAboveLink && ( - - {titleAboveLink} - - )} - - - - -
- ))} - - ); -}; - -const LinkListItem = styled.div` - border-radius: ${radii[1]}px; - border: 1px solid ${colors.gray3}; - display: block; - padding: ${space[2]} ${space[3]}; - transition: all 0.2s; - - &:hover { - background-color: ${colors.blue8}; - - a { - color: ${colors.white}; - } - } - - @media ${mediaQueries.sm} { - display: inline-block; - } -`; diff --git a/packages/app/src/components/contact/contact-page-item.tsx b/packages/app/src/components/contact/contact-page-item.tsx deleted file mode 100644 index 733f97e9f5..0000000000 --- a/packages/app/src/components/contact/contact-page-item.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { colors } from '@corona-dashboard/common'; -import styled from 'styled-components'; -import { radii, space } from '~/style/theme'; -import { Box } from '../base/box'; -import { RichContent } from '../cms/rich-content'; -import { Heading } from '../typography'; -import { ContactPageLink } from './contact-page-link'; -import { ContactPageItemLinks } from './contact-page-item-links'; -import { GroupItem } from './types'; - -interface ContactPageGroupItemProps { - groupItemsLength: number; - index: number; - item: GroupItem; -} - -export const ContactPageGroupItem = ({ item, index, groupItemsLength }: ContactPageGroupItemProps) => { - const { title, titleUrl, linkType, description, links } = item; - - return ( - - - {titleUrl ? : title} - - - - - {links && } - - ); -}; - -const RichContentWrapper = styled.div` - width: 100%; -`; diff --git a/packages/app/src/components/contact/contact-page-link.tsx b/packages/app/src/components/contact/contact-page-link.tsx deleted file mode 100644 index e7896b39f0..0000000000 --- a/packages/app/src/components/contact/contact-page-link.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import { ChevronRight, External, Telephone } from '@corona-dashboard/icons'; -import styled from 'styled-components'; -import { ExternalLink } from '~/components/external-link'; -import { space } from '~/style/theme'; -import { formatLinkAccordingToType } from '~/utils/format-link-according-to-type'; -import { isInternalUrl } from '~/utils/is-internal-url'; -import { Link } from '~/utils/link'; -import { LinkType } from './types'; - -interface ContactPageLinkProps { - href: string; - label: string; - linkType: LinkType | undefined; -} - -export const ContactPageLink = ({ href, label, linkType }: ContactPageLinkProps) => { - if (isInternalUrl(href)) { - return ( - - - - {label} - - - - - ); - } - - return ( - - - {linkType === 'phone' && } - {label} - {linkType !== 'phone' && } - - - ); -}; - -interface LinkWrapperProps { - iconMargin: string; -} - -const LinkWrapper = styled.div` - a { - align-items: center; - display: flex; - } - - svg { - height: 16px; - margin: ${({ iconMargin }) => iconMargin}; - width: 16px; - } -`; diff --git a/packages/app/src/components/contact/types.ts b/packages/app/src/components/contact/types.ts deleted file mode 100644 index d01f33a080..0000000000 --- a/packages/app/src/components/contact/types.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { RichContentBlock } from '~/types/cms'; - -export type LinkType = 'regular' | 'email' | 'phone'; - -interface Base { - title: string; - id: string; -} - -export interface ItemLink { - id: string; - href: string; - label: string; - linkType: LinkType; - titleAboveLink?: string; -} - -export interface GroupItem extends Base { - description: RichContentBlock[]; - links?: ItemLink[]; - titleUrl?: string; - linkType?: LinkType; -} - -export interface PageGroup extends Base { - items: GroupItem[]; -} - -export interface ContactPage { - groups: PageGroup[]; -} diff --git a/packages/app/src/components/typography.tsx b/packages/app/src/components/typography.tsx index bf0048d955..e4e31c3069 100644 --- a/packages/app/src/components/typography.tsx +++ b/packages/app/src/components/typography.tsx @@ -3,14 +3,7 @@ import css, { CSSProperties } from '@styled-system/css'; import styled, { DefaultTheme } from 'styled-components'; import { Preset, preset } from '~/style/preset'; -interface AllMarginProps { - margin?: CSSProperties['margin']; - marginRight?: CSSProperties['marginRight']; - marginBottom?: CSSProperties['marginBottom']; - marginLeft?: CSSProperties['marginLeft']; -} - -export interface TextProps extends AllMarginProps { +export interface TextProps { variant?: keyof Preset['typography']; fontWeight?: keyof DefaultTheme['fontWeights']; textTransform?: CSSProperties['textTransform']; @@ -39,10 +32,6 @@ export const textStyle = (props: TextProps & { as?: string }) => { ...(props.textTransform ? { textTransform: props.textTransform } : undefined), ...(props.textAlign ? { textAlign: props.textAlign } : undefined), ...(props.hyphens ? { hyphens: props.hyphens } : undefined), - ...(props.margin ? { margin: props.margin } : undefined), - ...(props.marginRight ? { marginRight: props.marginRight } : undefined), - ...(props.marginBottom ? { marginBottom: props.marginBottom } : undefined), - ...(props.marginLeft ? { marginLeft: props.marginLeft } : undefined), }); }; diff --git a/packages/app/src/domain/layout/content-layout.tsx b/packages/app/src/domain/layout/content-layout.tsx deleted file mode 100644 index b0fb00ea77..0000000000 --- a/packages/app/src/domain/layout/content-layout.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { Box } from '~/components/base/box'; -import { sizes, space } from '~/style/theme'; - -interface ContentLayoutProps { - children?: React.ReactNode; -} - -export const ContentLayout = ({ children }: ContentLayoutProps) => { - return ( - - {children} - - ); -}; diff --git a/packages/app/src/pages/contact.tsx b/packages/app/src/pages/contact.tsx index 30cde7ba17..287d60eb6c 100644 --- a/packages/app/src/pages/contact.tsx +++ b/packages/app/src/pages/contact.tsx @@ -1,82 +1,86 @@ +import css from '@styled-system/css'; import Head from 'next/head'; import styled from 'styled-components'; -import { VisuallyHidden } from '~/components'; -import { ContactPageGroup } from '~/components/contact/contact-page-group'; -import { ContactPage } from '~/components/contact/types'; +import { RichContent } from '~/components/cms/rich-content'; import { Heading } from '~/components/typography'; -import { ContentLayout } from '~/domain/layout/content-layout'; +import { Content } from '~/domain/layout/content'; import { Layout } from '~/domain/layout/layout'; import { useIntl } from '~/intl'; -import { StaticProps, createGetStaticProps } from '~/static-props/create-get-static-props'; -import { createGetContent, getLastGeneratedDate } from '~/static-props/get-data'; -import { mediaQueries, space } from '~/style/theme'; +import { + createGetStaticProps, + StaticProps, +} from '~/static-props/create-get-static-props'; +import { + createGetContent, + getLastGeneratedDate, +} from '~/static-props/get-data'; +import { RichContentBlock } from '~/types/cms'; + +interface ContactData { + title: string | null; + description: RichContentBlock[] | null; +} export const getStaticProps = createGetStaticProps( getLastGeneratedDate, - createGetContent((context) => { + createGetContent((context) => { const { locale } = context; - return `// groq - *[_type == 'contact'] { - 'groups': contactPageGroups[]->{ - 'id': _id, - 'title': title.${locale}, - 'items': contactPageGroupItems[]->{ - 'id': _id, - 'title': title.${locale}, - 'titleUrl': itemTitleUrl, - 'linkType': linkType.linkType, - 'description': description.${locale}, - 'links': contactPageItemLinks[] { - 'id': _id, - 'titleAboveLink': title.${locale}, - 'linkType': linkType.linkType, - 'label': link.title.${locale}, - 'href': link.href - } - } + return `*[_type == 'contact']{ + title, + "description": { + "_type": description._type, + "${locale}": [ + ...description.${locale}[] + { + ..., + "asset": asset-> + }, + ] } - }[0]`; + }[0] + `; }) ); const Contact = (props: StaticProps) => { const { commonTexts } = useIntl(); - const { - content: { groups }, - lastGenerated, - } = props; - - const middleIndexOfGroups = Math.ceil(groups.length / 2); - const firstHalf = groups.slice(0, middleIndexOfGroups); - const secondHalf = groups.slice(middleIndexOfGroups); + const { content, lastGenerated } = props; return ( - - + + - - Contact - - - - - - - - + + {content.title && {content.title}} + {content.description && ( + + )} + ); }; -const ContactLayout = styled.div` - @media ${mediaQueries.sm} { - display: flex; - gap: ${space[4]} ${space[5]}; - } -`; +const RichContentWrapper = styled.div( + css({ + maxWidth: 'maxWidthText', + width: '100%', + }) +); export default Contact; diff --git a/packages/app/src/pages/over.tsx b/packages/app/src/pages/over.tsx index 7c48cc01d8..ed7bd73620 100644 --- a/packages/app/src/pages/over.tsx +++ b/packages/app/src/pages/over.tsx @@ -5,7 +5,6 @@ import { ContentImage } from '~/components/cms/content-image'; import { RichContent } from '~/components/cms/rich-content'; import { FullscreenChartTile } from '~/components/fullscreen-chart-tile'; import { Heading } from '~/components/typography'; -import { ContentLayout } from '~/domain/layout/content-layout'; import { Layout } from '~/domain/layout/layout'; import { useIntl } from '~/intl'; import { createGetStaticProps, StaticProps } from '~/static-props/create-get-static-props'; @@ -61,7 +60,7 @@ const Over = (props: StaticProps) => { return ( - + @@ -86,7 +85,7 @@ const Over = (props: StaticProps) => { - + ); }; diff --git a/packages/app/src/pages/veelgestelde-vragen.tsx b/packages/app/src/pages/veelgestelde-vragen.tsx index 331d3e25b2..b09608ebe4 100644 --- a/packages/app/src/pages/veelgestelde-vragen.tsx +++ b/packages/app/src/pages/veelgestelde-vragen.tsx @@ -5,7 +5,6 @@ import { Box } from '~/components/base/box'; import { RichContent } from '~/components/cms/rich-content'; import { FaqSection } from '~/components/faq/faq-section'; import { Heading } from '~/components/typography'; -import { ContentLayout } from '~/domain/layout/content-layout'; import { Layout } from '~/domain/layout/layout'; import { useIntl } from '~/intl'; import { createGetStaticProps, StaticProps } from '~/static-props/create-get-static-props'; @@ -69,7 +68,7 @@ const Verantwoording = (props: StaticProps) => { return ( - + @@ -88,7 +87,7 @@ const Verantwoording = (props: StaticProps) => { - + ); }; diff --git a/packages/app/src/utils/__tests__/format-link-according-to-type.spec.ts b/packages/app/src/utils/__tests__/format-link-according-to-type.spec.ts deleted file mode 100644 index 4bff96a984..0000000000 --- a/packages/app/src/utils/__tests__/format-link-according-to-type.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { suite } from 'uvu'; -import * as assert from 'uvu/assert'; -import { formatLinkAccordingToType } from '../format-link-according-to-type'; - -const FormatLinkAccordingToType = suite('formatLinkAccordingToType'); - -FormatLinkAccordingToType('should not do anything to a regular link', () => { - const linkType = 'regular'; - const href = '/'; - - const result = formatLinkAccordingToType(href, linkType); - - assert.is(result, '/'); -}); - -FormatLinkAccordingToType('should format as a telephone link', () => { - const linkType = 'phone'; - const href = '123-456-789'; - - const result = formatLinkAccordingToType(href, linkType); - - assert.is(result, 'tel:123456789'); -}); - -FormatLinkAccordingToType('should format as a email link', () => { - const linkType = 'email'; - const href = 'test@test.com'; - - const result = formatLinkAccordingToType(href, linkType); - - assert.is(result, 'mailto:test@test.com'); -}); - -FormatLinkAccordingToType.run(); diff --git a/packages/app/src/utils/format-link-according-to-type.ts b/packages/app/src/utils/format-link-according-to-type.ts deleted file mode 100644 index 5223ef69f1..0000000000 --- a/packages/app/src/utils/format-link-according-to-type.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Returns a formatted link based on the link type of email, phone, regular - */ -export const formatLinkAccordingToType = (href: string, linkType: string | undefined) => { - switch (linkType) { - case 'email': - return `mailto:${href}`; - case 'phone': - return `tel:${href.replace(/\s/g, '').replaceAll('-', '')}`; - default: - return href; - } -}; diff --git a/packages/cms/src/schemas/documents/pages/contact.ts b/packages/cms/src/schemas/documents/pages/contact.ts new file mode 100644 index 0000000000..7f88393b98 --- /dev/null +++ b/packages/cms/src/schemas/documents/pages/contact.ts @@ -0,0 +1,28 @@ +import { localeStringValidation, localeValidation } from '../../../studio/validation/locale-validation'; +import { defineField, defineType } from 'sanity'; + +export const contact = defineType({ + name: 'contact', + type: 'document', + title: 'Contact', + fields: [ + defineField({ + name: 'title', + type: 'localeString', + title: 'Titel', + validation: localeStringValidation((rule) => rule.required()), + }), + defineField({ + name: 'description', + type: 'localeBlock', + title: 'Beschrijving', + validation: localeValidation((rule) => rule.required()), + }), + ], + preview: { + select: { + title: 'title.nl', + subtitle: 'description.nl', + }, + }, +}); diff --git a/packages/cms/src/schemas/documents/pages/contact/group.ts b/packages/cms/src/schemas/documents/pages/contact/group.ts deleted file mode 100644 index b73ccaa498..0000000000 --- a/packages/cms/src/schemas/documents/pages/contact/group.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { defineArrayMember, defineField, defineType } from 'sanity'; -import { localeStringValidation } from '../../../../studio/validation/locale-validation'; - -export const contactPageGroup = defineType({ - name: 'contactPageGroup', - title: 'Contactpaginagroep', - description: 'Configureer een groep voor de contactpagina. Stel de titel voor een groep in en voeg er items aan toe.', - type: 'document', - fields: [ - defineField({ - name: 'title', - title: 'Groepstitel', - type: 'localeString', - description: 'Configureer de titel voor deze groep.', - validation: localeStringValidation((rule) => rule.required()), - }), - defineField({ - name: 'contactPageGroupItems', - title: 'Groep Items', - type: 'array', - description: 'Voeg items toe aan deze groep.', - of: [defineArrayMember({ type: 'reference', to: { type: 'contactPageGroupItem' } })], - validation: (rule) => rule.required(), - }), - ], - preview: { - select: { - title: 'title.nl', - }, - }, -}); diff --git a/packages/cms/src/schemas/documents/pages/contact/index.ts b/packages/cms/src/schemas/documents/pages/contact/index.ts deleted file mode 100644 index efb43e11c0..0000000000 --- a/packages/cms/src/schemas/documents/pages/contact/index.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { defineArrayMember, defineField, defineType } from 'sanity'; - -export const contact = defineType({ - name: 'contact', - title: 'Contact Page', - description: 'Dit is het startpunt voor het configureren van de contactpagina. Voeg er secties aan toe met behulp van de onderstaande lijst.', - type: 'document', - fields: [ - defineField({ - name: 'contactPageGroups', - title: 'Pagina Groepen', - description: 'Groepen toevoegen, verwijderen of opnieuw rangschikken op de contactpagina.', - type: 'array', - of: [defineArrayMember({ type: 'reference', to: { type: 'contactPageGroup' } })], - validation: (rule) => rule.required().min(3).error('De contactpagina moet minimaal 3 secties bevatten.'), - }), - ], - preview: { - select: { - title: 'title.nl', - }, - }, -}); diff --git a/packages/cms/src/schemas/documents/pages/contact/item.ts b/packages/cms/src/schemas/documents/pages/contact/item.ts deleted file mode 100644 index 7b3cafba48..0000000000 --- a/packages/cms/src/schemas/documents/pages/contact/item.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { ValidationContext, defineArrayMember, defineField, defineType } from 'sanity'; -import { localeValidation } from '../../../../studio/validation/locale-validation'; - -export const contactPageGroupItem = defineType({ - name: 'contactPageGroupItem', - title: 'Contactpagina Item', - description: 'Configureer een item voor een bepaalde contactpaginagroep.', - type: 'document', - fieldsets: [ - { - title: 'Item Titel Configuratie', - name: 'titleConfiguration', - options: { - collapsible: true, - collapsed: false, - }, - }, - { - title: 'Item Beschrijving', - name: 'itemDescription', - options: { - collapsible: true, - collapsed: false, - }, - }, - ], - fields: [ - defineField({ - name: 'title', - title: 'Titel', - description: - 'Configureer de titel en de link voor dit item. Als u een link aan een e-mail wilt toevoegen, vult u alleen het e-mailadres in. Als je een link naar een telefoonnummer wilt toevoegen, voeg dan alleen het nummer toe.', - type: 'localeString', - fieldset: 'titleConfiguration', - validation: (rule) => rule.required(), - }), - defineField({ - name: 'itemTitleUrl', - title: 'Link', - description: - 'De bestemming voor de link naar de itemtitel. U kunt dit veld leeg laten als de titel geen link vereist. Als u een link aan een e-mail wilt toevoegen, vult u alleen het e-mailadres in. Als je een link naar een telefoonnummer wilt toevoegen, voeg dan alleen het nummer toe.', - type: 'string', - fieldset: 'titleConfiguration', - }), - defineField({ - name: 'linkType', - type: 'linkType', - fieldset: 'titleConfiguration', - validation: (rule) => - rule.custom((value, context: ValidationContext) => { - const parent = context.parent as { itemTitleUrl: string }; - return 'itemTitleUrl' in parent && parent.itemTitleUrl.length && value === undefined ? 'Dit veld is verplicht als uw titel een link bevat' : true; - }), - hidden: ({ parent }) => !('itemTitleUrl' in parent && parent.itemTitleUrl.length), - }), - defineField({ - name: 'description', - title: 'Beschrijving', - description: 'Configureer een beschrijving. Wordt onder de titel getoond.', - type: 'localeBlock', - fieldset: 'itemDescription', - validation: localeValidation((rule) => rule.required()), - }), - defineField({ - name: 'contactPageItemLinks', - title: 'Item Links', - description: 'Configureer een lijst met links voor dit item. Als er geen links nodig zijn, kan deze leeg gelaten worden. Deze worden onder de beschrijving weergegeven.', - type: 'array', - of: [defineArrayMember({ type: 'contactPageItemLink' })], - }), - ], - preview: { - select: { - title: 'title.nl', - subtitle: 'description.nl', - }, - }, -}); diff --git a/packages/cms/src/schemas/documents/pages/contact/link.ts b/packages/cms/src/schemas/documents/pages/contact/link.ts deleted file mode 100644 index 8ff6209e5d..0000000000 --- a/packages/cms/src/schemas/documents/pages/contact/link.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { defineField, defineType } from 'sanity'; - -export const contactPageItemLink = defineType({ - name: 'contactPageItemLink', - title: 'Contactpagina Itemlink', - description: - 'Configureer een link voor een bepaald pagina-item. Kies het linktype en voeg een label toe. Als u een link aan een e-mail wilt toevoegen, vult u alleen het e-mailadres in. Als je een link naar een telefoonnummer wilt toevoegen, voeg dan alleen het nummer toe.', - type: 'document', - fields: [ - defineField({ - name: 'link', - title: 'Link', - description: - "Configureer de link en het bijbehorende label. Als de link een telefoonnummer is, vermijd dan het gebruik van spaties. Als het een internationaal nummer is, vervang dan '+' door '00'.", - type: 'link', - validation: (rule) => rule.required(), - }), - defineField({ - name: 'linkType', - type: 'linkType', - validation: (rule) => rule.required(), - }), - defineField({ - name: 'title', - title: 'Link Titel', - description: 'Configureer indien nodig een titel die boven de link wordt weergegeven. Dit is niet het linklabel. Gebruik dit alleen als het linklabel niet voldoende is.', - type: 'localeString', - }), - ], - preview: { - select: { - title: 'link.title.nl', - subtitle: 'link.href', - }, - }, -}); diff --git a/packages/cms/src/schemas/index.ts b/packages/cms/src/schemas/index.ts index e34dd3613c..3cff87000c 100644 --- a/packages/cms/src/schemas/index.ts +++ b/packages/cms/src/schemas/index.ts @@ -9,9 +9,6 @@ import { links } from './documents/page-parts/links'; import { about } from './documents/pages/about'; import { accessibility } from './documents/pages/accessibility'; import { contact } from './documents/pages/contact'; -import { contactPageGroup } from './documents/pages/contact/group'; -import { contactPageGroupItem } from './documents/pages/contact/item'; -import { contactPageItemLink } from './documents/pages/contact/link'; import { dataExplained } from './documents/pages/data-explained'; import { dataExplainedGroups } from './documents/pages/data-explained/groups'; import { dataExplainedItem } from './documents/pages/data-explained/item'; @@ -40,23 +37,19 @@ import { timeSeries } from './elements/time-series'; import { timelineEvent } from './elements/timeline-event'; import { timelineEventCollection } from './elements/timeline-event-collection'; import { block } from './locale/block'; -import { image } from './locale/image'; import { richContentBlock } from './locale/rich-content-block'; import { string } from './locale/string'; import { text } from './locale/text'; +import { image } from './locale/image'; import { inlineBlock } from './objects/inline-block'; import { inlineCollapsible } from './objects/inline-collapsible'; import { link } from './objects/link'; -import { linkType } from './objects/link-type'; const localeSpecificSchemas = [block, richContentBlock, string, text, image]; const richContentSchemas = [inlineBlock, inlineCollapsible]; const documentSchemas = [ advice, article, - contactPageGroup, - contactPageGroupItem, - contactPageItemLink, dataExplainedGroups, dataExplainedItem, faqGroups, @@ -82,6 +75,6 @@ const documentSchemas = [ const pageSchemas = [about, accessibility, contact, dataExplained, faq, homepage, notFound]; const pagePartSchemas = [articles, dataExplainedParts, faqParts, highlights, links]; const elementSchemas = [timelineEvent, timelineEventCollection, timeSeries]; -const objectSchemas = [link, linkType]; +const objectSchemas = [link]; export const schemaTypes = [...localeSpecificSchemas, ...richContentSchemas, ...documentSchemas, ...elementSchemas, ...pageSchemas, ...pagePartSchemas, ...objectSchemas]; diff --git a/packages/cms/src/schemas/objects/link-type.ts b/packages/cms/src/schemas/objects/link-type.ts deleted file mode 100644 index 18335e681d..0000000000 --- a/packages/cms/src/schemas/objects/link-type.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { defineField, defineType } from 'sanity'; - -export const linkType = defineType({ - name: 'linkType', - title: 'Linktype', - type: 'object', - fields: [ - defineField({ - name: 'linkType', - title: 'Linktype', - description: 'Selecteer het type link op basis van of het een e-mail, telefoon of normaal link is.', - type: 'string', - options: { - list: [ - { value: 'regular', title: 'Normaal' }, - { value: 'email', title: 'E-mail' }, - { value: 'phone', title: 'Telefoon' }, - ], - layout: 'dropdown', - }, - }), - ], -}); diff --git a/packages/icons/icons.md b/packages/icons/icons.md index b791afa664..f25d8423a3 100644 --- a/packages/icons/icons.md +++ b/packages/icons/icons.md @@ -120,7 +120,6 @@ See below an overview of all the available icons in this package. This file is g | Stap1WinkelsOpen |
Stap1WinkelsOpen
| | Stopwatch |
Stopwatch
| | Taxi |
Taxi
| -| Telephone |
Telephone
| | Testbewijs |
Testbewijs
| | Toegangsbewijzen |
Toegangsbewijzen
| | Town |
Town
| diff --git a/packages/icons/src/icon-name2filename.ts b/packages/icons/src/icon-name2filename.ts index 307f71583c..5474596caa 100644 --- a/packages/icons/src/icon-name2filename.ts +++ b/packages/icons/src/icon-name2filename.ts @@ -115,7 +115,6 @@ export type IconName = | 'Stap1WinkelsOpen' | 'Stopwatch' | 'Taxi' - | 'Telephone' | 'Testbewijs' | 'Toegangsbewijzen' | 'Town' @@ -255,7 +254,6 @@ export const iconName2filename: Record = { Stap1WinkelsOpen: 'stap_1_winkels_open.svg', Stopwatch: 'stopwatch.svg', Taxi: 'taxi.svg', - Telephone: 'telephone.svg', Testbewijs: 'testbewijs.svg', Toegangsbewijzen: 'toegangsbewijzen.svg', Town: 'town.svg', diff --git a/packages/icons/src/svg/telephone.svg b/packages/icons/src/svg/telephone.svg deleted file mode 100644 index 5048827c1f..0000000000 --- a/packages/icons/src/svg/telephone.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file