From 1cfefa450b8f3f4426d8fd3853242a421a2d5353 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Thu, 13 Feb 2025 11:33:54 +0100 Subject: [PATCH] model changes --- .../collection-lookup/schema.json | 5 + .../global/content-types/global/schema.json | 5 +- .../content-types/homepage/schema.json | 13 +- src/api/page/content-types/page/schema.json | 12 +- src/components/dynamic-zone/section.json | 18 + src/components/dynamic-zone/spacer.json | 10 + src/components/global/footer.json | 2 +- src/components/{shared => global}/seo.json | 2 +- src/components/{shared => items}/hero.json | 6 +- src/components/{shared => items}/link.json | 9 +- .../emphasise-article.json | 13 +- src/components/shared/list.json | 5 - .../1.0.0/full_documentation.json | 677 ++++++++++-------- types/generated/components.d.ts | 152 ++-- types/generated/contentTypes.d.ts | 24 +- 15 files changed, 545 insertions(+), 408 deletions(-) create mode 100644 src/components/dynamic-zone/section.json create mode 100644 src/components/dynamic-zone/spacer.json rename src/components/{shared => global}/seo.json (89%) rename src/components/{shared => items}/hero.json (75%) rename src/components/{shared => items}/link.json (72%) rename src/components/{dynamic-zone => shared}/emphasise-article.json (57%) diff --git a/src/api/collection-lookup/content-types/collection-lookup/schema.json b/src/api/collection-lookup/content-types/collection-lookup/schema.json index 27e3ac5..7dafec3 100644 --- a/src/api/collection-lookup/content-types/collection-lookup/schema.json +++ b/src/api/collection-lookup/content-types/collection-lookup/schema.json @@ -41,6 +41,11 @@ "type": "boolean", "default": false, "required": true + }, + "enable_detail": { + "type": "boolean", + "default": false, + "required": true } } } diff --git a/src/api/global/content-types/global/schema.json b/src/api/global/content-types/global/schema.json index d7681f2..55e9912 100644 --- a/src/api/global/content-types/global/schema.json +++ b/src/api/global/content-types/global/schema.json @@ -23,12 +23,13 @@ "type": "component", "repeatable": false, "pluginOptions": {}, - "component": "global.footer" + "component": "global.footer", + "required": true }, "SEO": { "type": "component", "repeatable": false, - "component": "shared.seo" + "component": "global.seo" } } } diff --git a/src/api/homepage/content-types/homepage/schema.json b/src/api/homepage/content-types/homepage/schema.json index cec10bd..976dc83 100644 --- a/src/api/homepage/content-types/homepage/schema.json +++ b/src/api/homepage/content-types/homepage/schema.json @@ -15,23 +15,22 @@ "backdrop": { "type": "media", "multiple": false, - "required": true, + "required": false, "allowedTypes": ["images"] }, - "hide_backdrop": { - "type": "boolean", - "default": false, - "required": true - }, "content": { "type": "dynamiczone", "components": [ + "dynamic-zone.spacer", + "dynamic-zone.section", + "dynamic-zone.embedding", + "dynamic-zone.file-download", "dynamic-zone.gallery", "dynamic-zone.full-text", "dynamic-zone.full-image", - "dynamic-zone.emphasise-article", "dynamic-zone.dual-column-text", "dynamic-zone.column-image-text", + "shared.emphasise-article", "shared.list" ] } diff --git a/src/api/page/content-types/page/schema.json b/src/api/page/content-types/page/schema.json index 17f1301..7a57b2b 100644 --- a/src/api/page/content-types/page/schema.json +++ b/src/api/page/content-types/page/schema.json @@ -28,22 +28,24 @@ "type": "component", "repeatable": false, "pluginOptions": {}, - "component": "shared.hero", + "component": "items.hero", "required": false }, "content": { "pluginOptions": {}, "type": "dynamiczone", "components": [ + "dynamic-zone.spacer", + "dynamic-zone.section", + "dynamic-zone.embedding", + "dynamic-zone.file-download", "dynamic-zone.gallery", "dynamic-zone.full-text", "dynamic-zone.full-image", - "dynamic-zone.emphasise-article", "dynamic-zone.dual-column-text", "dynamic-zone.column-image-text", - "shared.list", - "dynamic-zone.file-download", - "dynamic-zone.embedding" + "shared.emphasise-article", + "shared.list" ] } } diff --git a/src/components/dynamic-zone/section.json b/src/components/dynamic-zone/section.json new file mode 100644 index 0000000..3b8dbbf --- /dev/null +++ b/src/components/dynamic-zone/section.json @@ -0,0 +1,18 @@ +{ + "collectionName": "components_dynamic_zone_section", + "info": { + "displayName": "Abschnitt", + "icon": "apps", + "description": "" + }, + "options": {}, + "attributes": { + "titel": { + "type": "string", + "required": true + }, + "description": { + "type": "text" + } + } +} diff --git a/src/components/dynamic-zone/spacer.json b/src/components/dynamic-zone/spacer.json new file mode 100644 index 0000000..8e75033 --- /dev/null +++ b/src/components/dynamic-zone/spacer.json @@ -0,0 +1,10 @@ +{ + "collectionName": "components_dynamic_zone_spacer", + "info": { + "displayName": "Abstand", + "icon": "apps", + "description": "" + }, + "options": {}, + "attributes": {} +} diff --git a/src/components/global/footer.json b/src/components/global/footer.json index 9babab7..f0ad8e7 100644 --- a/src/components/global/footer.json +++ b/src/components/global/footer.json @@ -16,7 +16,7 @@ "links": { "type": "component", "repeatable": true, - "component": "shared.link" + "component": "items.link" } } } diff --git a/src/components/shared/seo.json b/src/components/global/seo.json similarity index 89% rename from src/components/shared/seo.json rename to src/components/global/seo.json index c268edb..e3cbdc3 100644 --- a/src/components/shared/seo.json +++ b/src/components/global/seo.json @@ -1,5 +1,5 @@ { - "collectionName": "components_shared_seos", + "collectionName": "components_global_seos", "info": { "displayName": "seo", "icon": "search", diff --git a/src/components/shared/hero.json b/src/components/items/hero.json similarity index 75% rename from src/components/shared/hero.json rename to src/components/items/hero.json index db0364f..c5e42bb 100644 --- a/src/components/shared/hero.json +++ b/src/components/items/hero.json @@ -1,5 +1,5 @@ { - "collectionName": "components_shared_heroes", + "collectionName": "components_items_heroes", "info": { "displayName": "hero", "icon": "rocket", @@ -11,9 +11,7 @@ "type": "media", "multiple": false, "required": true, - "allowedTypes": [ - "images" - ] + "allowedTypes": ["images"] }, "title": { "type": "string", diff --git a/src/components/shared/link.json b/src/components/items/link.json similarity index 72% rename from src/components/shared/link.json rename to src/components/items/link.json index e30a189..a049014 100644 --- a/src/components/shared/link.json +++ b/src/components/items/link.json @@ -1,5 +1,5 @@ { - "collectionName": "components_shared_links", + "collectionName": "components_items_links", "info": { "displayName": "Link", "icon": "link", @@ -17,12 +17,7 @@ }, "target": { "type": "enumeration", - "enum": [ - "_blank", - "_self", - "_parent", - "_top" - ], + "enum": ["_blank", "_self", "_parent", "_top"], "default": "_self", "required": true } diff --git a/src/components/dynamic-zone/emphasise-article.json b/src/components/shared/emphasise-article.json similarity index 57% rename from src/components/dynamic-zone/emphasise-article.json rename to src/components/shared/emphasise-article.json index aa1657f..81b1827 100644 --- a/src/components/dynamic-zone/emphasise-article.json +++ b/src/components/shared/emphasise-article.json @@ -1,5 +1,5 @@ { - "collectionName": "components_dynamic_zone_emphasise_articles", + "collectionName": "components_shared_emphasise_articles", "info": { "displayName": "Artikel hervorheben", "icon": "dashboard", @@ -12,17 +12,10 @@ "relation": "oneToMany", "target": "api::article.article" }, - "titel": { - "type": "string", - "required": true - }, - "description": { - "type": "text" - }, "base_url": { "type": "string", - "required": true, - "default": "/artikel" + "required": false, + "default": "" } } } diff --git a/src/components/shared/list.json b/src/components/shared/list.json index 7aa84e4..e5e168f 100644 --- a/src/components/shared/list.json +++ b/src/components/shared/list.json @@ -7,11 +7,6 @@ }, "options": {}, "attributes": { - "enable_detail": { - "type": "boolean", - "default": false, - "required": true - }, "lookup": { "type": "relation", "relation": "oneToOne", diff --git a/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/src/extensions/documentation/documentation/1.0.0/full_documentation.json index 1530c6f..7776cb6 100644 --- a/src/extensions/documentation/documentation/1.0.0/full_documentation.json +++ b/src/extensions/documentation/documentation/1.0.0/full_documentation.json @@ -14,7 +14,7 @@ "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "x-generation-date": "2025-01-18T10:42:17.897Z" + "x-generation-date": "2025-02-13T10:32:51.979Z" }, "x-strapi-config": { "plugins": [ @@ -6444,7 +6444,8 @@ "image_item", "date_list", "numbered_item", - "inverse_count" + "inverse_count", + "enable_detail" ], "type": "object", "properties": { @@ -6472,6 +6473,9 @@ "inverse_count": { "type": "boolean" }, + "enable_detail": { + "type": "boolean" + }, "locale": { "type": "string" }, @@ -6536,7 +6540,8 @@ "image_item", "date_list", "numbered_item", - "inverse_count" + "inverse_count", + "enable_detail" ], "properties": { "id": { @@ -6569,6 +6574,9 @@ "inverse_count": { "type": "boolean" }, + "enable_detail": { + "type": "boolean" + }, "createdAt": { "type": "string", "format": "date-time" @@ -6893,6 +6901,9 @@ "inverse_count": { "type": "boolean" }, + "enable_detail": { + "type": "boolean" + }, "createdAt": { "type": "string", "format": "date-time" @@ -8227,7 +8238,8 @@ "properties": { "data": { "required": [ - "navbar" + "navbar", + "footer" ], "type": "object", "properties": { @@ -8238,7 +8250,7 @@ "$ref": "#/components/schemas/GlobalFooterComponent" }, "SEO": { - "$ref": "#/components/schemas/SharedSeoComponent" + "$ref": "#/components/schemas/GlobalSeoComponent" }, "locale": { "type": "string" @@ -8299,7 +8311,8 @@ "Global": { "type": "object", "required": [ - "navbar" + "navbar", + "footer" ], "properties": { "id": { @@ -8315,7 +8328,7 @@ "$ref": "#/components/schemas/GlobalFooterComponent" }, "SEO": { - "$ref": "#/components/schemas/SharedSeoComponent" + "$ref": "#/components/schemas/GlobalSeoComponent" }, "createdAt": { "type": "string", @@ -8372,7 +8385,7 @@ "$ref": "#/components/schemas/GlobalFooterComponent" }, "SEO": { - "$ref": "#/components/schemas/SharedSeoComponent" + "$ref": "#/components/schemas/GlobalSeoComponent" }, "createdAt": { "type": "string", @@ -8643,7 +8656,7 @@ } } }, - "SharedLinkComponent": { + "ItemsLinkComponent": { "type": "object", "properties": { "id": { @@ -8681,12 +8694,12 @@ "links": { "type": "array", "items": { - "$ref": "#/components/schemas/SharedLinkComponent" + "$ref": "#/components/schemas/ItemsLinkComponent" } } } }, - "SharedSeoComponent": { + "GlobalSeoComponent": { "type": "object", "properties": { "id": { @@ -8703,7 +8716,7 @@ } } }, - "SharedHeroComponent": { + "ItemsHeroComponent": { "type": "object", "properties": { "id": { @@ -8843,6 +8856,209 @@ } } }, + "DynamicZoneSpacerComponent": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "__component": { + "type": "string", + "enum": [ + "dynamic-zone.spacer" + ] + } + } + }, + "DynamicZoneSectionComponent": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "__component": { + "type": "string", + "enum": [ + "dynamic-zone.section" + ] + }, + "titel": { + "type": "string" + }, + "description": { + "type": "string" + } + } + }, + "DynamicZoneEmbeddingComponent": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "__component": { + "type": "string", + "enum": [ + "dynamic-zone.embedding" + ] + }, + "title": { + "type": "string" + }, + "link": { + "type": "string" + } + } + }, + "DynamicZoneFileDownloadComponent": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "__component": { + "type": "string", + "enum": [ + "dynamic-zone.file-download" + ] + }, + "enable_download": { + "type": "boolean" + }, + "title": { + "type": "string" + }, + "file": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "documentId": { + "type": "string" + }, + "name": { + "type": "string" + }, + "alternativeText": { + "type": "string" + }, + "caption": { + "type": "string" + }, + "width": { + "type": "integer" + }, + "height": { + "type": "integer" + }, + "formats": {}, + "hash": { + "type": "string" + }, + "ext": { + "type": "string" + }, + "mime": { + "type": "string" + }, + "size": { + "type": "number", + "format": "float" + }, + "url": { + "type": "string" + }, + "previewUrl": { + "type": "string" + }, + "provider": { + "type": "string" + }, + "provider_metadata": {}, + "related": { + "type": "array", + "items": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "documentId": { + "type": "string" + } + } + } + }, + "folder": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "documentId": { + "type": "string" + } + } + }, + "folderPath": { + "type": "string" + }, + "createdAt": { + "type": "string", + "format": "date-time" + }, + "updatedAt": { + "type": "string", + "format": "date-time" + }, + "publishedAt": { + "type": "string", + "format": "date-time" + }, + "createdBy": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "documentId": { + "type": "string" + } + } + }, + "updatedBy": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "documentId": { + "type": "string" + } + } + }, + "locale": { + "type": "string" + }, + "localizations": { + "type": "array", + "items": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "documentId": { + "type": "string" + } + } + } + } + } + } + } + }, "DynamicZoneGalleryComponent": { "type": "object", "properties": { @@ -9147,43 +9363,6 @@ } } }, - "DynamicZoneEmphasiseArticleComponent": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "__component": { - "type": "string", - "enum": [ - "dynamic-zone.emphasise-article" - ] - }, - "articles": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "documentId": { - "type": "string" - } - } - } - }, - "titel": { - "type": "string" - }, - "description": { - "type": "string" - }, - "base_url": { - "type": "string" - } - } - }, "DynamicZoneDualColumnTextComponent": { "type": "object", "properties": { @@ -9347,6 +9526,37 @@ } } }, + "SharedEmphasiseArticleComponent": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "__component": { + "type": "string", + "enum": [ + "shared.emphasise-article" + ] + }, + "articles": { + "type": "array", + "items": { + "type": "object", + "properties": { + "id": { + "type": "number" + }, + "documentId": { + "type": "string" + } + } + } + }, + "base_url": { + "type": "string" + } + } + }, "SharedListComponent": { "type": "object", "properties": { @@ -9359,9 +9569,6 @@ "shared.list" ] }, - "enable_detail": { - "type": "boolean" - }, "lookup": { "type": "object", "properties": { @@ -9375,175 +9582,6 @@ } } }, - "DynamicZoneFileDownloadComponent": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "__component": { - "type": "string", - "enum": [ - "dynamic-zone.file-download" - ] - }, - "enable_download": { - "type": "boolean" - }, - "title": { - "type": "string" - }, - "file": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "documentId": { - "type": "string" - }, - "name": { - "type": "string" - }, - "alternativeText": { - "type": "string" - }, - "caption": { - "type": "string" - }, - "width": { - "type": "integer" - }, - "height": { - "type": "integer" - }, - "formats": {}, - "hash": { - "type": "string" - }, - "ext": { - "type": "string" - }, - "mime": { - "type": "string" - }, - "size": { - "type": "number", - "format": "float" - }, - "url": { - "type": "string" - }, - "previewUrl": { - "type": "string" - }, - "provider": { - "type": "string" - }, - "provider_metadata": {}, - "related": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "documentId": { - "type": "string" - } - } - } - }, - "folder": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "documentId": { - "type": "string" - } - } - }, - "folderPath": { - "type": "string" - }, - "createdAt": { - "type": "string", - "format": "date-time" - }, - "updatedAt": { - "type": "string", - "format": "date-time" - }, - "publishedAt": { - "type": "string", - "format": "date-time" - }, - "createdBy": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "documentId": { - "type": "string" - } - } - }, - "updatedBy": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "documentId": { - "type": "string" - } - } - }, - "locale": { - "type": "string" - }, - "localizations": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "documentId": { - "type": "string" - } - } - } - } - } - } - } - }, - "DynamicZoneEmbeddingComponent": { - "type": "object", - "properties": { - "id": { - "type": "number" - }, - "__component": { - "type": "string", - "enum": [ - "dynamic-zone.embedding" - ] - }, - "title": { - "type": "string" - }, - "link": { - "type": "string" - } - } - }, "HomepageRequest": { "type": "object", "required": [ @@ -9551,10 +9589,6 @@ ], "properties": { "data": { - "required": [ - "backdrop", - "hide_backdrop" - ], "type": "object", "properties": { "backdrop": { @@ -9568,13 +9602,16 @@ ], "example": "string or id" }, - "hide_backdrop": { - "type": "boolean" - }, "content": { "type": "array", "items": { "anyOf": [ + { + "$ref": "#/components/schemas/DynamicZoneSpacerComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneSectionComponent" + }, { "$ref": "#/components/schemas/DynamicZoneGalleryComponent" }, @@ -9584,15 +9621,21 @@ { "$ref": "#/components/schemas/DynamicZoneFullImageComponent" }, - { - "$ref": "#/components/schemas/DynamicZoneEmphasiseArticleComponent" - }, { "$ref": "#/components/schemas/DynamicZoneDualColumnTextComponent" }, { "$ref": "#/components/schemas/DynamicZoneColumnImageTextComponent" }, + { + "$ref": "#/components/schemas/DynamicZoneFileDownloadComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneEmbeddingComponent" + }, + { + "$ref": "#/components/schemas/SharedEmphasiseArticleComponent" + }, { "$ref": "#/components/schemas/SharedListComponent" } @@ -9601,12 +9644,16 @@ "discriminator": { "propertyName": "__component", "mapping": { + "dynamic-zone.spacer": "#/components/schemas/DynamicZoneSpacerComponent", + "dynamic-zone.section": "#/components/schemas/DynamicZoneSectionComponent", "dynamic-zone.gallery": "#/components/schemas/DynamicZoneGalleryComponent", "dynamic-zone.full-text": "#/components/schemas/DynamicZoneFullTextComponent", "dynamic-zone.full-image": "#/components/schemas/DynamicZoneFullImageComponent", - "dynamic-zone.emphasise-article": "#/components/schemas/DynamicZoneEmphasiseArticleComponent", "dynamic-zone.dual-column-text": "#/components/schemas/DynamicZoneDualColumnTextComponent", "dynamic-zone.column-image-text": "#/components/schemas/DynamicZoneColumnImageTextComponent", + "dynamic-zone.file-download": "#/components/schemas/DynamicZoneFileDownloadComponent", + "dynamic-zone.embedding": "#/components/schemas/DynamicZoneEmbeddingComponent", + "shared.emphasise-article": "#/components/schemas/SharedEmphasiseArticleComponent", "shared.list": "#/components/schemas/SharedListComponent" } } @@ -9669,10 +9716,6 @@ }, "Homepage": { "type": "object", - "required": [ - "backdrop", - "hide_backdrop" - ], "properties": { "id": { "type": "number" @@ -10278,13 +10321,16 @@ } } }, - "hide_backdrop": { - "type": "boolean" - }, "content": { "type": "array", "items": { "anyOf": [ + { + "$ref": "#/components/schemas/DynamicZoneSpacerComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneSectionComponent" + }, { "$ref": "#/components/schemas/DynamicZoneGalleryComponent" }, @@ -10294,15 +10340,21 @@ { "$ref": "#/components/schemas/DynamicZoneFullImageComponent" }, - { - "$ref": "#/components/schemas/DynamicZoneEmphasiseArticleComponent" - }, { "$ref": "#/components/schemas/DynamicZoneDualColumnTextComponent" }, { "$ref": "#/components/schemas/DynamicZoneColumnImageTextComponent" }, + { + "$ref": "#/components/schemas/DynamicZoneFileDownloadComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneEmbeddingComponent" + }, + { + "$ref": "#/components/schemas/SharedEmphasiseArticleComponent" + }, { "$ref": "#/components/schemas/SharedListComponent" } @@ -10311,12 +10363,16 @@ "discriminator": { "propertyName": "__component", "mapping": { + "dynamic-zone.spacer": "#/components/schemas/DynamicZoneSpacerComponent", + "dynamic-zone.section": "#/components/schemas/DynamicZoneSectionComponent", "dynamic-zone.gallery": "#/components/schemas/DynamicZoneGalleryComponent", "dynamic-zone.full-text": "#/components/schemas/DynamicZoneFullTextComponent", "dynamic-zone.full-image": "#/components/schemas/DynamicZoneFullImageComponent", - "dynamic-zone.emphasise-article": "#/components/schemas/DynamicZoneEmphasiseArticleComponent", "dynamic-zone.dual-column-text": "#/components/schemas/DynamicZoneDualColumnTextComponent", "dynamic-zone.column-image-text": "#/components/schemas/DynamicZoneColumnImageTextComponent", + "dynamic-zone.file-download": "#/components/schemas/DynamicZoneFileDownloadComponent", + "dynamic-zone.embedding": "#/components/schemas/DynamicZoneEmbeddingComponent", + "shared.emphasise-article": "#/components/schemas/SharedEmphasiseArticleComponent", "shared.list": "#/components/schemas/SharedListComponent" } } @@ -10498,13 +10554,16 @@ } } }, - "hide_backdrop": { - "type": "boolean" - }, "content": { "type": "array", "items": { "anyOf": [ + { + "$ref": "#/components/schemas/DynamicZoneSpacerComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneSectionComponent" + }, { "$ref": "#/components/schemas/DynamicZoneGalleryComponent" }, @@ -10514,15 +10573,21 @@ { "$ref": "#/components/schemas/DynamicZoneFullImageComponent" }, - { - "$ref": "#/components/schemas/DynamicZoneEmphasiseArticleComponent" - }, { "$ref": "#/components/schemas/DynamicZoneDualColumnTextComponent" }, { "$ref": "#/components/schemas/DynamicZoneColumnImageTextComponent" }, + { + "$ref": "#/components/schemas/DynamicZoneFileDownloadComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneEmbeddingComponent" + }, + { + "$ref": "#/components/schemas/SharedEmphasiseArticleComponent" + }, { "$ref": "#/components/schemas/SharedListComponent" } @@ -10531,12 +10596,16 @@ "discriminator": { "propertyName": "__component", "mapping": { + "dynamic-zone.spacer": "#/components/schemas/DynamicZoneSpacerComponent", + "dynamic-zone.section": "#/components/schemas/DynamicZoneSectionComponent", "dynamic-zone.gallery": "#/components/schemas/DynamicZoneGalleryComponent", "dynamic-zone.full-text": "#/components/schemas/DynamicZoneFullTextComponent", "dynamic-zone.full-image": "#/components/schemas/DynamicZoneFullImageComponent", - "dynamic-zone.emphasise-article": "#/components/schemas/DynamicZoneEmphasiseArticleComponent", "dynamic-zone.dual-column-text": "#/components/schemas/DynamicZoneDualColumnTextComponent", "dynamic-zone.column-image-text": "#/components/schemas/DynamicZoneColumnImageTextComponent", + "dynamic-zone.file-download": "#/components/schemas/DynamicZoneFileDownloadComponent", + "dynamic-zone.embedding": "#/components/schemas/DynamicZoneEmbeddingComponent", + "shared.emphasise-article": "#/components/schemas/SharedEmphasiseArticleComponent", "shared.list": "#/components/schemas/SharedListComponent" } } @@ -11887,12 +11956,24 @@ "type": "string" }, "hero": { - "$ref": "#/components/schemas/SharedHeroComponent" + "$ref": "#/components/schemas/ItemsHeroComponent" }, "content": { "type": "array", "items": { "anyOf": [ + { + "$ref": "#/components/schemas/DynamicZoneSpacerComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneSectionComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneEmbeddingComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneFileDownloadComponent" + }, { "$ref": "#/components/schemas/DynamicZoneGalleryComponent" }, @@ -11902,38 +11983,34 @@ { "$ref": "#/components/schemas/DynamicZoneFullImageComponent" }, - { - "$ref": "#/components/schemas/DynamicZoneEmphasiseArticleComponent" - }, { "$ref": "#/components/schemas/DynamicZoneDualColumnTextComponent" }, { "$ref": "#/components/schemas/DynamicZoneColumnImageTextComponent" }, + { + "$ref": "#/components/schemas/SharedEmphasiseArticleComponent" + }, { "$ref": "#/components/schemas/SharedListComponent" - }, - { - "$ref": "#/components/schemas/DynamicZoneFileDownloadComponent" - }, - { - "$ref": "#/components/schemas/DynamicZoneEmbeddingComponent" } ] }, "discriminator": { "propertyName": "__component", "mapping": { + "dynamic-zone.spacer": "#/components/schemas/DynamicZoneSpacerComponent", + "dynamic-zone.section": "#/components/schemas/DynamicZoneSectionComponent", + "dynamic-zone.embedding": "#/components/schemas/DynamicZoneEmbeddingComponent", + "dynamic-zone.file-download": "#/components/schemas/DynamicZoneFileDownloadComponent", "dynamic-zone.gallery": "#/components/schemas/DynamicZoneGalleryComponent", "dynamic-zone.full-text": "#/components/schemas/DynamicZoneFullTextComponent", "dynamic-zone.full-image": "#/components/schemas/DynamicZoneFullImageComponent", - "dynamic-zone.emphasise-article": "#/components/schemas/DynamicZoneEmphasiseArticleComponent", "dynamic-zone.dual-column-text": "#/components/schemas/DynamicZoneDualColumnTextComponent", "dynamic-zone.column-image-text": "#/components/schemas/DynamicZoneColumnImageTextComponent", - "shared.list": "#/components/schemas/SharedListComponent", - "dynamic-zone.file-download": "#/components/schemas/DynamicZoneFileDownloadComponent", - "dynamic-zone.embedding": "#/components/schemas/DynamicZoneEmbeddingComponent" + "shared.emphasise-article": "#/components/schemas/SharedEmphasiseArticleComponent", + "shared.list": "#/components/schemas/SharedListComponent" } } }, @@ -12013,12 +12090,24 @@ "type": "string" }, "hero": { - "$ref": "#/components/schemas/SharedHeroComponent" + "$ref": "#/components/schemas/ItemsHeroComponent" }, "content": { "type": "array", "items": { "anyOf": [ + { + "$ref": "#/components/schemas/DynamicZoneSpacerComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneSectionComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneEmbeddingComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneFileDownloadComponent" + }, { "$ref": "#/components/schemas/DynamicZoneGalleryComponent" }, @@ -12028,38 +12117,34 @@ { "$ref": "#/components/schemas/DynamicZoneFullImageComponent" }, - { - "$ref": "#/components/schemas/DynamicZoneEmphasiseArticleComponent" - }, { "$ref": "#/components/schemas/DynamicZoneDualColumnTextComponent" }, { "$ref": "#/components/schemas/DynamicZoneColumnImageTextComponent" }, + { + "$ref": "#/components/schemas/SharedEmphasiseArticleComponent" + }, { "$ref": "#/components/schemas/SharedListComponent" - }, - { - "$ref": "#/components/schemas/DynamicZoneFileDownloadComponent" - }, - { - "$ref": "#/components/schemas/DynamicZoneEmbeddingComponent" } ] }, "discriminator": { "propertyName": "__component", "mapping": { + "dynamic-zone.spacer": "#/components/schemas/DynamicZoneSpacerComponent", + "dynamic-zone.section": "#/components/schemas/DynamicZoneSectionComponent", + "dynamic-zone.embedding": "#/components/schemas/DynamicZoneEmbeddingComponent", + "dynamic-zone.file-download": "#/components/schemas/DynamicZoneFileDownloadComponent", "dynamic-zone.gallery": "#/components/schemas/DynamicZoneGalleryComponent", "dynamic-zone.full-text": "#/components/schemas/DynamicZoneFullTextComponent", "dynamic-zone.full-image": "#/components/schemas/DynamicZoneFullImageComponent", - "dynamic-zone.emphasise-article": "#/components/schemas/DynamicZoneEmphasiseArticleComponent", "dynamic-zone.dual-column-text": "#/components/schemas/DynamicZoneDualColumnTextComponent", "dynamic-zone.column-image-text": "#/components/schemas/DynamicZoneColumnImageTextComponent", - "shared.list": "#/components/schemas/SharedListComponent", - "dynamic-zone.file-download": "#/components/schemas/DynamicZoneFileDownloadComponent", - "dynamic-zone.embedding": "#/components/schemas/DynamicZoneEmbeddingComponent" + "shared.emphasise-article": "#/components/schemas/SharedEmphasiseArticleComponent", + "shared.list": "#/components/schemas/SharedListComponent" } } }, @@ -12118,12 +12203,24 @@ "type": "string" }, "hero": { - "$ref": "#/components/schemas/SharedHeroComponent" + "$ref": "#/components/schemas/ItemsHeroComponent" }, "content": { "type": "array", "items": { "anyOf": [ + { + "$ref": "#/components/schemas/DynamicZoneSpacerComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneSectionComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneEmbeddingComponent" + }, + { + "$ref": "#/components/schemas/DynamicZoneFileDownloadComponent" + }, { "$ref": "#/components/schemas/DynamicZoneGalleryComponent" }, @@ -12133,38 +12230,34 @@ { "$ref": "#/components/schemas/DynamicZoneFullImageComponent" }, - { - "$ref": "#/components/schemas/DynamicZoneEmphasiseArticleComponent" - }, { "$ref": "#/components/schemas/DynamicZoneDualColumnTextComponent" }, { "$ref": "#/components/schemas/DynamicZoneColumnImageTextComponent" }, + { + "$ref": "#/components/schemas/SharedEmphasiseArticleComponent" + }, { "$ref": "#/components/schemas/SharedListComponent" - }, - { - "$ref": "#/components/schemas/DynamicZoneFileDownloadComponent" - }, - { - "$ref": "#/components/schemas/DynamicZoneEmbeddingComponent" } ] }, "discriminator": { "propertyName": "__component", "mapping": { + "dynamic-zone.spacer": "#/components/schemas/DynamicZoneSpacerComponent", + "dynamic-zone.section": "#/components/schemas/DynamicZoneSectionComponent", + "dynamic-zone.embedding": "#/components/schemas/DynamicZoneEmbeddingComponent", + "dynamic-zone.file-download": "#/components/schemas/DynamicZoneFileDownloadComponent", "dynamic-zone.gallery": "#/components/schemas/DynamicZoneGalleryComponent", "dynamic-zone.full-text": "#/components/schemas/DynamicZoneFullTextComponent", "dynamic-zone.full-image": "#/components/schemas/DynamicZoneFullImageComponent", - "dynamic-zone.emphasise-article": "#/components/schemas/DynamicZoneEmphasiseArticleComponent", "dynamic-zone.dual-column-text": "#/components/schemas/DynamicZoneDualColumnTextComponent", "dynamic-zone.column-image-text": "#/components/schemas/DynamicZoneColumnImageTextComponent", - "shared.list": "#/components/schemas/SharedListComponent", - "dynamic-zone.file-download": "#/components/schemas/DynamicZoneFileDownloadComponent", - "dynamic-zone.embedding": "#/components/schemas/DynamicZoneEmbeddingComponent" + "shared.emphasise-article": "#/components/schemas/SharedEmphasiseArticleComponent", + "shared.list": "#/components/schemas/SharedListComponent" } } }, diff --git a/types/generated/components.d.ts b/types/generated/components.d.ts index 0fe614e..ddc2acd 100644 --- a/types/generated/components.d.ts +++ b/types/generated/components.d.ts @@ -37,21 +37,6 @@ export interface DynamicZoneEmbedding extends Struct.ComponentSchema { }; } -export interface DynamicZoneEmphasiseArticle extends Struct.ComponentSchema { - collectionName: "components_dynamic_zone_emphasise_articles"; - info: { - description: ""; - displayName: "Artikel hervorheben"; - icon: "dashboard"; - }; - attributes: { - articles: Schema.Attribute.Relation<"oneToMany", "api::article.article">; - base_url: Schema.Attribute.String & Schema.Attribute.Required & Schema.Attribute.DefaultTo<"/artikel">; - description: Schema.Attribute.Text; - titel: Schema.Attribute.String & Schema.Attribute.Required; - }; -} - export interface DynamicZoneFileDownload extends Struct.ComponentSchema { collectionName: "components_dynamic_zone_file_download"; info: { @@ -101,6 +86,29 @@ export interface DynamicZoneGallery extends Struct.ComponentSchema { }; } +export interface DynamicZoneSection extends Struct.ComponentSchema { + collectionName: "components_dynamic_zone_section"; + info: { + description: ""; + displayName: "Abschnitt"; + icon: "apps"; + }; + attributes: { + description: Schema.Attribute.Text; + titel: Schema.Attribute.String & Schema.Attribute.Required; + }; +} + +export interface DynamicZoneSpacer extends Struct.ComponentSchema { + collectionName: "components_dynamic_zone_spacer"; + info: { + description: ""; + displayName: "Abstand"; + icon: "apps"; + }; + attributes: {}; +} + export interface GlobalFooter extends Struct.ComponentSchema { collectionName: "components_global_footers"; info: { @@ -111,7 +119,7 @@ export interface GlobalFooter extends Struct.ComponentSchema { attributes: { copyright: Schema.Attribute.String; designed_developed_by: Schema.Attribute.String; - links: Schema.Attribute.Component<"shared.link", true>; + links: Schema.Attribute.Component<"items.link", true>; }; } @@ -128,6 +136,57 @@ export interface GlobalNavbar extends Struct.ComponentSchema { }; } +export interface GlobalSeo extends Struct.ComponentSchema { + collectionName: "components_global_seos"; + info: { + description: ""; + displayName: "seo"; + icon: "search"; + }; + attributes: { + keywords: Schema.Attribute.Text; + metaDescription: Schema.Attribute.String & + Schema.Attribute.Required & + Schema.Attribute.SetMinMaxLength<{ + minLength: 50; + }>; + metaTitle: Schema.Attribute.String & + Schema.Attribute.Required & + Schema.Attribute.SetMinMaxLength<{ + maxLength: 60; + }>; + }; +} + +export interface ItemsHero extends Struct.ComponentSchema { + collectionName: "components_items_heroes"; + info: { + description: ""; + displayName: "hero"; + icon: "rocket"; + }; + attributes: { + banner: Schema.Attribute.Media<"images"> & Schema.Attribute.Required; + title: Schema.Attribute.String & Schema.Attribute.Required; + }; +} + +export interface ItemsLink extends Struct.ComponentSchema { + collectionName: "components_items_links"; + info: { + description: ""; + displayName: "Link"; + icon: "link"; + }; + attributes: { + target: Schema.Attribute.Enumeration<["_blank", "_self", "_parent", "_top"]> & + Schema.Attribute.Required & + Schema.Attribute.DefaultTo<"_self">; + text: Schema.Attribute.String & Schema.Attribute.Required; + URL: Schema.Attribute.String & Schema.Attribute.Required; + }; +} + export interface ItemsNavbarItems extends Struct.ComponentSchema { collectionName: "components_items_left_navbar_items"; info: { @@ -158,32 +217,16 @@ export interface ItemsNavbarSubItems extends Struct.ComponentSchema { }; } -export interface SharedHero extends Struct.ComponentSchema { - collectionName: "components_shared_heroes"; +export interface SharedEmphasiseArticle extends Struct.ComponentSchema { + collectionName: "components_shared_emphasise_articles"; info: { description: ""; - displayName: "hero"; - icon: "rocket"; + displayName: "Artikel hervorheben"; + icon: "dashboard"; }; attributes: { - banner: Schema.Attribute.Media<"images"> & Schema.Attribute.Required; - title: Schema.Attribute.String & Schema.Attribute.Required; - }; -} - -export interface SharedLink extends Struct.ComponentSchema { - collectionName: "components_shared_links"; - info: { - description: ""; - displayName: "Link"; - icon: "link"; - }; - attributes: { - target: Schema.Attribute.Enumeration<["_blank", "_self", "_parent", "_top"]> & - Schema.Attribute.Required & - Schema.Attribute.DefaultTo<"_self">; - text: Schema.Attribute.String & Schema.Attribute.Required; - URL: Schema.Attribute.String & Schema.Attribute.Required; + articles: Schema.Attribute.Relation<"oneToMany", "api::article.article">; + base_url: Schema.Attribute.String & Schema.Attribute.DefaultTo<"">; }; } @@ -195,52 +238,31 @@ export interface SharedList extends Struct.ComponentSchema { icon: "apps"; }; attributes: { - enable_detail: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo; lookup: Schema.Attribute.Relation<"oneToOne", "api::collection-lookup.collection-lookup">; }; } -export interface SharedSeo extends Struct.ComponentSchema { - collectionName: "components_shared_seos"; - info: { - description: ""; - displayName: "seo"; - icon: "search"; - }; - attributes: { - keywords: Schema.Attribute.Text; - metaDescription: Schema.Attribute.String & - Schema.Attribute.Required & - Schema.Attribute.SetMinMaxLength<{ - minLength: 50; - }>; - metaTitle: Schema.Attribute.String & - Schema.Attribute.Required & - Schema.Attribute.SetMinMaxLength<{ - maxLength: 60; - }>; - }; -} - declare module "@strapi/strapi" { export module Public { export interface ComponentSchemas { "dynamic-zone.column-image-text": DynamicZoneColumnImageText; "dynamic-zone.dual-column-text": DynamicZoneDualColumnText; "dynamic-zone.embedding": DynamicZoneEmbedding; - "dynamic-zone.emphasise-article": DynamicZoneEmphasiseArticle; "dynamic-zone.file-download": DynamicZoneFileDownload; "dynamic-zone.full-image": DynamicZoneFullImage; "dynamic-zone.full-text": DynamicZoneFullText; "dynamic-zone.gallery": DynamicZoneGallery; + "dynamic-zone.section": DynamicZoneSection; + "dynamic-zone.spacer": DynamicZoneSpacer; "global.footer": GlobalFooter; "global.navbar": GlobalNavbar; + "global.seo": GlobalSeo; + "items.hero": ItemsHero; + "items.link": ItemsLink; "items.navbar-items": ItemsNavbarItems; "items.navbar-sub-items": ItemsNavbarSubItems; - "shared.hero": SharedHero; - "shared.link": SharedLink; + "shared.emphasise-article": SharedEmphasiseArticle; "shared.list": SharedList; - "shared.seo": SharedSeo; } } } diff --git a/types/generated/contentTypes.d.ts b/types/generated/contentTypes.d.ts index dd49613..4904cc4 100644 --- a/types/generated/contentTypes.d.ts +++ b/types/generated/contentTypes.d.ts @@ -374,6 +374,7 @@ export interface ApiCollectionLookupCollectionLookup extends Struct.CollectionTy createdAt: Schema.Attribute.DateTime; createdBy: Schema.Attribute.Relation<"oneToOne", "admin::user"> & Schema.Attribute.Private; date_list: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo; + enable_detail: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo; image_item: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo; inverse_count: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo; locale: Schema.Attribute.String & Schema.Attribute.Private; @@ -430,12 +431,12 @@ export interface ApiGlobalGlobal extends Struct.SingleTypeSchema { attributes: { createdAt: Schema.Attribute.DateTime; createdBy: Schema.Attribute.Relation<"oneToOne", "admin::user"> & Schema.Attribute.Private; - footer: Schema.Attribute.Component<"global.footer", false>; + footer: Schema.Attribute.Component<"global.footer", false> & Schema.Attribute.Required; locale: Schema.Attribute.String & Schema.Attribute.Private; localizations: Schema.Attribute.Relation<"oneToMany", "api::global.global"> & Schema.Attribute.Private; navbar: Schema.Attribute.Component<"global.navbar", false> & Schema.Attribute.Required; publishedAt: Schema.Attribute.DateTime; - SEO: Schema.Attribute.Component<"shared.seo", false>; + SEO: Schema.Attribute.Component<"global.seo", false>; updatedAt: Schema.Attribute.DateTime; updatedBy: Schema.Attribute.Relation<"oneToOne", "admin::user"> & Schema.Attribute.Private; }; @@ -453,21 +454,24 @@ export interface ApiHomepageHomepage extends Struct.SingleTypeSchema { draftAndPublish: true; }; attributes: { - backdrop: Schema.Attribute.Media<"images"> & Schema.Attribute.Required; + backdrop: Schema.Attribute.Media<"images">; content: Schema.Attribute.DynamicZone< [ + "dynamic-zone.spacer", + "dynamic-zone.section", "dynamic-zone.gallery", "dynamic-zone.full-text", "dynamic-zone.full-image", - "dynamic-zone.emphasise-article", "dynamic-zone.dual-column-text", "dynamic-zone.column-image-text", + "dynamic-zone.file-download", + "dynamic-zone.embedding", + "shared.emphasise-article", "shared.list", ] >; createdAt: Schema.Attribute.DateTime; createdBy: Schema.Attribute.Relation<"oneToOne", "admin::user"> & Schema.Attribute.Private; - hide_backdrop: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo; locale: Schema.Attribute.String & Schema.Attribute.Private; localizations: Schema.Attribute.Relation<"oneToMany", "api::homepage.homepage"> & Schema.Attribute.Private; publishedAt: Schema.Attribute.DateTime; @@ -519,20 +523,22 @@ export interface ApiPagePage extends Struct.CollectionTypeSchema { attributes: { content: Schema.Attribute.DynamicZone< [ + "dynamic-zone.spacer", + "dynamic-zone.section", + "dynamic-zone.embedding", + "dynamic-zone.file-download", "dynamic-zone.gallery", "dynamic-zone.full-text", "dynamic-zone.full-image", - "dynamic-zone.emphasise-article", "dynamic-zone.dual-column-text", "dynamic-zone.column-image-text", + "shared.emphasise-article", "shared.list", - "dynamic-zone.file-download", - "dynamic-zone.embedding", ] >; createdAt: Schema.Attribute.DateTime; createdBy: Schema.Attribute.Relation<"oneToOne", "admin::user"> & Schema.Attribute.Private; - hero: Schema.Attribute.Component<"shared.hero", false>; + hero: Schema.Attribute.Component<"items.hero", false>; identifier: Schema.Attribute.String & Schema.Attribute.Required & Schema.Attribute.Unique; locale: Schema.Attribute.String & Schema.Attribute.Private; localizations: Schema.Attribute.Relation<"oneToMany", "api::page.page"> & Schema.Attribute.Private;