diff --git a/packages/app/src/domain/topical/components/topical-measure-tile.tsx b/packages/app/src/domain/topical/components/topical-measure-tile.tsx
deleted file mode 100644
index 0a6316d819..0000000000
--- a/packages/app/src/domain/topical/components/topical-measure-tile.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Box } from '~/components/base';
-import styled from 'styled-components';
-import { colors } from '@corona-dashboard/common';
-import DynamicIcon from '~/components/get-icon-by-name';
-import { IconName as TopicalIcon } from '@corona-dashboard/icons/src/icon-name2filename';
-import { space } from '~/style/theme';
-import { RichContent } from '~/components/cms/rich-content';
-import { PortableTextEntry } from '@sanity/block-content-to-react';
-
-interface TopicalMeasureTileProps {
- icon: TopicalIcon;
- title: PortableTextEntry[];
-}
-
-export const TopicalMeasureTile = ({ icon, title }: TopicalMeasureTileProps) => {
- return (
-
-
-
-
-
-
-
-
-
-
-
- );
-};
-
-const StyledKpiIcon = styled.div`
- color: ${colors.blue8};
- display: flex;
- width: 40px;
- height: 40px;
- margin-right: ${space[3]};
-`;
diff --git a/packages/app/src/pages/index.tsx b/packages/app/src/pages/index.tsx
index 2365cd5e6c..faa5b2bf11 100644
--- a/packages/app/src/pages/index.tsx
+++ b/packages/app/src/pages/index.tsx
@@ -22,7 +22,6 @@ import { TopicalArticlesList } from '~/domain/topical/components/topical-article
import { TopicalHeader } from '~/domain/topical/components/topical-header';
import { TopicalTile } from '~/domain/topical/components/topical-kpi-tile/topical-tile';
import { TopicalLinksList } from '~/domain/topical/components/topical-links-list';
-import { TopicalMeasureTile } from '~/domain/topical/components/topical-measure-tile';
import { TopicalSectionHeader } from '~/domain/topical/components/topical-section-header';
import { TopicalThemeHeader } from '~/domain/topical/components/topical-theme-header';
import { TrendIcon } from '~/domain/topical/types';
@@ -72,7 +71,7 @@ const Home = (props: StaticProps) => {
const { topicalStructure } = content;
- const { topicalConfig, measureTheme, thermometer, kpiThemes, weeklySummary } = topicalStructure;
+ const { topicalConfig, thermometer, kpiThemes, weeklySummary } = topicalStructure;
const { textNl, textShared } = useDynamicLokalizeTexts(pageText, selectLokalizeTexts);
@@ -183,30 +182,32 @@ const Home = (props: StaticProps) => {
-
- {theme.tiles.map((themeTile) => {
- const sourceLabel = themeTile.sourceLabel ? replaceVariablesInText(themeTile.sourceLabel, { date: themeTile.tileDate }) : null;
- return (
-
- );
- })}
-
+ {theme.tiles && (
+
+ {theme.tiles.map((themeTile) => {
+ const sourceLabel = themeTile.sourceLabel ? replaceVariablesInText(themeTile.sourceLabel, { date: themeTile.tileDate }) : null;
+ return (
+
+ );
+ })}
+
+ )}
{theme.links && (
) => {
);
})}
-
-
-
-
-
-
- {measureTheme.tiles.map((measureTile, index) => {
- return ;
- })}
-
-
diff --git a/packages/app/src/queries/get-topical-structure-query.ts b/packages/app/src/queries/get-topical-structure-query.ts
index 990114292c..9922cdd03b 100644
--- a/packages/app/src/queries/get-topical-structure-query.ts
+++ b/packages/app/src/queries/get-topical-structure-query.ts
@@ -57,17 +57,6 @@ export function getTopicalStructureQuery(locale: string) {
},
},
},
- 'measureTheme': *[
- _type == 'measureTheme' && !(_id in path('drafts.**'))
- ][0]{
- 'title': title.${locale},
- themeIcon,
- 'subTitle': subTitle.${locale},
- 'tiles': tiles[]->{
- tileIcon,
- 'description': description.${locale}
- },
- },
'thermometer': *[
_type == 'thermometer' && !(_id in path('drafts.**'))
][0]{
diff --git a/packages/app/src/queries/query-types.ts b/packages/app/src/queries/query-types.ts
index 2f8dab3f72..96b98766f2 100644
--- a/packages/app/src/queries/query-types.ts
+++ b/packages/app/src/queries/query-types.ts
@@ -7,7 +7,6 @@ export interface TopicalSanityData {
topicalConfig: TopicalConfig;
weeklySummary: WeeklySummary;
kpiThemes: KpiThemes;
- measureTheme: MeasureTheme;
thermometer: ThermometerConfig;
}
@@ -66,9 +65,6 @@ interface Theme {
interface WeeklySummary extends Theme {
items: BaseTile[];
}
-interface MeasureTheme extends Theme {
- tiles: BaseTile[];
-}
interface TopicalTheme extends Theme {
tiles: TopicalTile[];
diff --git a/packages/app/src/style/theme.ts b/packages/app/src/style/theme.ts
index a34fa242a3..8e132279dc 100644
--- a/packages/app/src/style/theme.ts
+++ b/packages/app/src/style/theme.ts
@@ -113,6 +113,7 @@ const theme = {
colors,
radii,
shadows,
+ sizes,
} as const;
type Theme = typeof theme;
diff --git a/packages/cms/src/desk-structure.ts b/packages/cms/src/desk-structure.ts
index 4f06ecf97b..84a1dae5d9 100644
--- a/packages/cms/src/desk-structure.ts
+++ b/packages/cms/src/desk-structure.ts
@@ -142,7 +142,6 @@ export default () =>
addListItem(BsGearFill, 'Weeksamenvatting', 'weeklySummary'),
addListItem(BsThermometer, 'Thermometer', 'thermometer'),
addListItem(BsGearFill, "KPI thema's", 'themeCollection'),
- addListItem(BsGearFill, 'Advies thema', 'measureTheme'),
])
),
diff --git a/packages/cms/src/schemas/topical/index.ts b/packages/cms/src/schemas/topical/index.ts
index 0bb5e0e84b..34e72f0fc5 100644
--- a/packages/cms/src/schemas/topical/index.ts
+++ b/packages/cms/src/schemas/topical/index.ts
@@ -6,9 +6,6 @@ export * from './theme-link-collection';
export * from './theme-tile';
export * from './theme-tile-date-config';
export * from './theme-tile-collection';
-export * from './measure-theme';
-export * from './measure-tile';
-export * from './measure-tile-collection';
export { thermometer } from './thermometer';
export * from './thermometer-level';
export * from './thermometer-timeline';
diff --git a/packages/cms/src/schemas/topical/measure-theme.ts b/packages/cms/src/schemas/topical/measure-theme.ts
deleted file mode 100644
index 362b2d4e71..0000000000
--- a/packages/cms/src/schemas/topical/measure-theme.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { KpiIconInput } from '../../components/portable-text/kpi-configuration/kpi-icon-input';
-import { REQUIRED } from '../../validation';
-
-export const measureTheme = {
- type: 'object',
- title: 'Thema',
- name: 'measureTheme',
- fields: [
- {
- title: 'Titel',
- name: 'title',
- type: 'localeString',
- validation: REQUIRED,
- },
- {
- title: 'Ondertitel',
- name: 'subTitle',
- type: 'localeRichContentBlock',
- },
- {
- title: 'Thema icoon',
- name: 'themeIcon',
- type: 'string',
- inputComponent: KpiIconInput,
- validation: REQUIRED,
- },
- {
- title: 'Tegels',
- name: 'tiles',
- type: 'array',
- of: [{ type: 'reference', to: { type: 'measureTile' } }],
- validation: REQUIRED,
- },
- ],
-};
diff --git a/packages/cms/src/schemas/topical/measure-tile-collection.ts b/packages/cms/src/schemas/topical/measure-tile-collection.ts
deleted file mode 100644
index 683f3346c2..0000000000
--- a/packages/cms/src/schemas/topical/measure-tile-collection.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { REQUIRED } from '../../validation';
-
-export const measureTileCollection = {
- type: 'object',
- title: 'Thema tegel collectie',
- name: 'measureTileCollection',
- fields: [
- {
- title: 'Tegels',
- name: 'tiles',
- type: 'array',
- of: [{ type: 'reference', to: { type: 'measureTile' } }],
- validation: REQUIRED,
- },
- ],
-};
diff --git a/packages/cms/src/schemas/topical/measure-tile.ts b/packages/cms/src/schemas/topical/measure-tile.ts
deleted file mode 100644
index c8733d81f7..0000000000
--- a/packages/cms/src/schemas/topical/measure-tile.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { KpiIconInput } from '../../components/portable-text/kpi-configuration/kpi-icon-input';
-import { REQUIRED } from '../../validation';
-
-export const measureTile = {
- type: 'document',
- title: 'Maatregelen tegel',
- name: 'measureTile',
- fields: [
- {
- title: 'Tegel icoon',
- name: 'tileIcon',
- type: 'string',
- inputComponent: KpiIconInput,
- validation: REQUIRED,
- },
- {
- title: 'Omschrijving',
- name: 'description',
- type: 'localeRichContentBlock',
- validation: REQUIRED,
- },
- ],
- preview: {
- select: {
- title: 'description.nl',
- },
- },
-};
diff --git a/packages/cms/src/schemas/topical/theme.ts b/packages/cms/src/schemas/topical/theme.ts
index efed784dcb..5067f8fa00 100644
--- a/packages/cms/src/schemas/topical/theme.ts
+++ b/packages/cms/src/schemas/topical/theme.ts
@@ -41,19 +41,16 @@ export const theme = {
name: 'tiles',
type: 'array',
of: [{ type: 'reference', to: { type: 'themeTile' } }],
- validation: REQUIRED,
},
{
title: 'Label voor mobiel',
name: 'labelMobile',
type: 'localeString',
- validation: REQUIRED,
},
{
title: 'Label voor desktop',
name: 'labelDesktop',
type: 'localeString',
- validation: REQUIRED,
},
{
title: 'Links',