new types and requirements

src/api/article/content-types/article/schema.json

@@ -36,18 +36,14 @@
       "type": "media",
       "multiple": false,
       "required": false,
-      "allowedTypes": [
+      "allowedTypes": ["images"],
-        "images"
-      ],
       "pluginOptions": {}
     },
     "attachment": {
       "type": "media",
       "multiple": true,
       "required": false,
-      "allowedTypes": [
+      "allowedTypes": ["images"],
-        "images"
-      ],
       "pluginOptions": {}
     },
     "date": {

src/api/collection-lookup/content-types/collection-lookup/schema.json

@@ -22,30 +22,32 @@
       "enum": ["events", "vehicles", "articles", "operations"],
       "required": true
     },
-    "image_item": {
+    "show_image": {
       "type": "boolean",
       "default": false,
+      "required": false
+    },
+    "show_date": {
+      "type": "boolean",
+      "default": false,
+      "required": false
+    },
+    "list_with_date": {
+      "type": "enumeration",
+      "enum": ["none", "by-year", "by-month"],
+      "default": "none",
       "required": true
     },
-    "date_list": {
+    "items_with_number": {
-      "type": "boolean",
+      "type": "enumeration",
-      "default": false,
+      "enum": ["none", "numbered", "inverted"],
-      "required": true
+      "default": "none",
-    },
-    "numbered_item": {
-      "type": "boolean",
-      "default": false,
-      "required": true
-    },
-    "inverse_count": {
-      "type": "boolean",
-      "default": false,
       "required": true
     },
     "enable_detail": {
       "type": "boolean",
       "default": false,
-      "required": true
+      "required": false
     }
   }
 }

src/api/event/content-types/event/schema.json

@@ -36,18 +36,14 @@
       "type": "media",
       "multiple": false,
       "required": false,
-      "allowedTypes": [
+      "allowedTypes": ["images"],
-        "images"
-      ],
       "pluginOptions": {}
     },
     "attachment": {
       "type": "media",
       "multiple": true,
       "required": false,
-      "allowedTypes": [
+      "allowedTypes": ["images"],
-        "images"
-      ],
       "pluginOptions": {}
     },
     "date": {

src/api/global/content-types/global/schema.json

@@ -12,19 +12,25 @@
   },
   "pluginOptions": {},
   "attributes": {
+    "logo": {
+      "type": "media",
+      "multiple": false,
+      "required": true,
+      "allowedTypes": ["images"]
+    },
     "navbar": {
       "type": "component",
       "repeatable": false,
       "pluginOptions": {},
       "component": "global.navbar",
-      "required": true
+      "required": false
     },
     "footer": {
       "type": "component",
       "repeatable": false,
       "pluginOptions": {},
       "component": "global.footer",
-      "required": true
+      "required": false
     },
     "SEO": {
       "type": "component",

src/api/operation/content-types/operation/schema.json

@@ -36,18 +36,14 @@
       "type": "media",
       "multiple": false,
       "required": false,
-      "allowedTypes": [
+      "allowedTypes": ["images"],
-        "images"
-      ],
       "pluginOptions": {}
     },
     "attachment": {
       "type": "media",
       "multiple": true,
       "required": false,
-      "allowedTypes": [
+      "allowedTypes": ["images"],
-        "images"
-      ],
       "pluginOptions": {}
     },
     "date": {

src/api/page/content-types/page/schema.json

@@ -29,7 +29,7 @@
       "repeatable": false,
       "pluginOptions": {},
       "component": "items.hero",
-      "required": false
+      "required": true
     },
     "content": {
       "pluginOptions": {},

src/api/vehicle/content-types/vehicle/schema.json

@@ -36,24 +36,20 @@
       "type": "media",
       "multiple": false,
       "required": false,
-      "allowedTypes": [
+      "allowedTypes": ["images"],
-        "images"
-      ],
       "pluginOptions": {}
     },
     "attachment": {
       "type": "media",
       "multiple": true,
       "required": false,
-      "allowedTypes": [
+      "allowedTypes": ["images"],
-        "images"
-      ],
       "pluginOptions": {}
     },
     "date": {
       "pluginOptions": {},
-      "type": "datetime",
+      "type": "date",
-      "required": false
+      "required": true
     }
   }
 }

src/components/dynamic-zone/column-image-text.json

@@ -7,22 +7,20 @@
   },
   "options": {},
   "attributes": {
-    "image": {
-      "type": "media",
-      "multiple": false,
-      "required": true,
-      "allowedTypes": [
-        "images"
-      ]
-    },
-    "text": {
-      "type": "blocks",
-      "required": true
-    },
     "image_left": {
       "type": "boolean",
       "default": true,
       "required": true
+    },
+    "image": {
+      "type": "media",
+      "multiple": false,
+      "required": true,
+      "allowedTypes": ["images"]
+    },
+    "text": {
+      "type": "blocks",
+      "required": true
     }
   }
 }

src/components/dynamic-zone/embedding.json

@@ -5,10 +5,6 @@
   },
   "options": {},
   "attributes": {
-    "title": {
-      "type": "string",
-      "required": true
-    },
     "link": {
       "type": "string"
     }

src/components/dynamic-zone/file-download.json

@@ -11,10 +11,6 @@
       "default": true,
       "required": true
     },
-    "title": {
-      "type": "string",
-      "required": true
-    },
     "file": {
       "type": "media",
       "multiple": false,

src/components/dynamic-zone/section.json

@@ -2,12 +2,12 @@
   "collectionName": "components_dynamic_zone_section",
   "info": {
     "displayName": "Abschnitt",
-    "icon": "apps",
+    "icon": "expand",
     "description": ""
   },
   "options": {},
   "attributes": {
-    "titel": {
+    "title": {
       "type": "string",
       "required": true
     },

src/components/dynamic-zone/spacer.json

@@ -2,7 +2,7 @@
   "collectionName": "components_dynamic_zone_spacer",
   "info": {
     "displayName": "Abstand",
-    "icon": "apps",
+    "icon": "crop",
     "description": ""
   },
   "options": {},

src/components/global/footer.json

@@ -10,7 +10,7 @@
     "copyright": {
       "type": "string"
     },
-    "designed_developed_by": {
+    "maintained_by": {
       "type": "string"
     },
     "links": {

src/components/global/navbar.json

@@ -7,14 +7,6 @@
   },
   "options": {},
   "attributes": {
-    "logo": {
-      "type": "media",
-      "multiple": false,
-      "required": true,
-      "allowedTypes": [
-        "images"
-      ]
-    },
     "navbar_items": {
       "type": "component",
       "repeatable": true,

src/components/global/seo.json

@@ -14,8 +14,8 @@
     },
     "metaDescription": {
       "type": "string",
-      "required": true,
+      "required": false,
-      "minLength": 50
+      "default": ""
     },
     "keywords": {
       "type": "text",

src/components/items/hero.json

@@ -10,12 +10,12 @@
     "banner": {
       "type": "media",
       "multiple": false,
-      "required": true,
+      "required": false,
       "allowedTypes": ["images"]
     },
     "title": {
       "type": "string",
-      "required": true
+      "required": false
     }
   }
 }

src/components/items/navbar-items.json

@@ -8,10 +8,12 @@
   "options": {},
   "attributes": {
     "name": {
-      "type": "string"
+      "type": "string",
+      "required": true
     },
     "URL": {
-      "type": "string"
+      "type": "string",
+      "required": true
     },
     "default_active_child": {
       "type": "string"

src/components/shared/emphasise-article.json

@@ -12,7 +12,7 @@
       "relation": "oneToMany",
       "target": "api::article.article"
     },
-    "base_url": {
+    "link_to_articles": {
       "type": "string",
       "required": false,
       "default": ""

src/components/shared/list.json

@@ -10,7 +10,8 @@
     "lookup": {
       "type": "relation",
       "relation": "oneToOne",
-      "target": "api::collection-lookup.collection-lookup"
+      "target": "api::collection-lookup.collection-lookup",
+      "required": true
     }
   }
 }

types/generated/components.d.ts

@@ -33,7 +33,6 @@ export interface DynamicZoneEmbedding extends Struct.ComponentSchema {
   };
   attributes: {
     link: Schema.Attribute.String;
-    title: Schema.Attribute.String & Schema.Attribute.Required;
   };
 }
 
@@ -46,7 +45,6 @@ export interface DynamicZoneFileDownload extends Struct.ComponentSchema {
   attributes: {
     enable_download: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo<true>;
     file: Schema.Attribute.Media<"files" | "images"> & Schema.Attribute.Required;
-    title: Schema.Attribute.String & Schema.Attribute.Required;
   };
 }
 
@@ -91,11 +89,11 @@ export interface DynamicZoneSection extends Struct.ComponentSchema {
   info: {
     description: "";
     displayName: "Abschnitt";
-    icon: "apps";
+    icon: "expand";
   };
   attributes: {
     description: Schema.Attribute.Text;
-    titel: Schema.Attribute.String & Schema.Attribute.Required;
+    title: Schema.Attribute.String & Schema.Attribute.Required;
   };
 }
 
@@ -104,7 +102,7 @@ export interface DynamicZoneSpacer extends Struct.ComponentSchema {
   info: {
     description: "";
     displayName: "Abstand";
-    icon: "apps";
+    icon: "crop";
   };
   attributes: {};
 }
@@ -118,8 +116,8 @@ export interface GlobalFooter extends Struct.ComponentSchema {
   };
   attributes: {
     copyright: Schema.Attribute.String;
-    designed_developed_by: Schema.Attribute.String;
     links: Schema.Attribute.Component<"items.link", true>;
+    maintained_by: Schema.Attribute.String;
   };
 }
 
@@ -131,7 +129,6 @@ export interface GlobalNavbar extends Struct.ComponentSchema {
     icon: "bold";
   };
   attributes: {
-    logo: Schema.Attribute.Media<"images"> & Schema.Attribute.Required;
     navbar_items: Schema.Attribute.Component<"items.navbar-items", true>;
   };
 }
@@ -145,11 +142,7 @@ export interface GlobalSeo extends Struct.ComponentSchema {
   };
   attributes: {
     keywords: Schema.Attribute.Text;
-    metaDescription: Schema.Attribute.String &
+    metaDescription: Schema.Attribute.String & Schema.Attribute.DefaultTo<"">;
-      Schema.Attribute.Required &
-      Schema.Attribute.SetMinMaxLength<{
-        minLength: 50;
-      }>;
     metaTitle: Schema.Attribute.String &
       Schema.Attribute.Required &
       Schema.Attribute.SetMinMaxLength<{
@@ -166,8 +159,8 @@ export interface ItemsHero extends Struct.ComponentSchema {
     icon: "rocket";
   };
   attributes: {
-    banner: Schema.Attribute.Media<"images"> & Schema.Attribute.Required;
+    banner: Schema.Attribute.Media<"images">;
-    title: Schema.Attribute.String & Schema.Attribute.Required;
+    title: Schema.Attribute.String;
   };
 }
 
@@ -196,10 +189,10 @@ export interface ItemsNavbarItems extends Struct.ComponentSchema {
   };
   attributes: {
     default_active_child: Schema.Attribute.String;
-    name: Schema.Attribute.String;
+    name: Schema.Attribute.String & Schema.Attribute.Required;
     navbar_sub_items: Schema.Attribute.Component<"items.navbar-sub-items", true>;
     page: Schema.Attribute.Relation<"oneToOne", "api::page.page">;
-    URL: Schema.Attribute.String;
+    URL: Schema.Attribute.String & Schema.Attribute.Required;
   };
 }
 
@@ -226,7 +219,7 @@ export interface SharedEmphasiseArticle extends Struct.ComponentSchema {
   };
   attributes: {
     articles: Schema.Attribute.Relation<"oneToMany", "api::article.article">;
-    base_url: Schema.Attribute.String & Schema.Attribute.DefaultTo<"">;
+    link_to_articles: Schema.Attribute.String & Schema.Attribute.DefaultTo<"">;
   };
 }
 
@@ -238,7 +231,8 @@ export interface SharedList extends Struct.ComponentSchema {
     icon: "apps";
   };
   attributes: {
-    lookup: Schema.Attribute.Relation<"oneToOne", "api::collection-lookup.collection-lookup">;
+    lookup: Schema.Attribute.Relation<"oneToOne", "api::collection-lookup.collection-lookup"> &
+      Schema.Attribute.Required;
   };
 }
 

types/generated/contentTypes.d.ts

@@ -373,16 +373,20 @@ export interface ApiCollectionLookupCollectionLookup extends Struct.CollectionTy
       Schema.Attribute.Required;
     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<false>;
+    enable_detail: Schema.Attribute.Boolean & Schema.Attribute.DefaultTo<false>;
-    enable_detail: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo<false>;
+    items_with_number: Schema.Attribute.Enumeration<["none", "numbered", "inverted"]> &
-    image_item: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo<false>;
+      Schema.Attribute.Required &
-    inverse_count: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo<false>;
+      Schema.Attribute.DefaultTo<"none">;
+    list_with_date: Schema.Attribute.Enumeration<["none", "by-year", "by-month"]> &
+      Schema.Attribute.Required &
+      Schema.Attribute.DefaultTo<"none">;
     locale: Schema.Attribute.String & Schema.Attribute.Private;
     localizations: Schema.Attribute.Relation<"oneToMany", "api::collection-lookup.collection-lookup"> &
       Schema.Attribute.Private;
-    numbered_item: Schema.Attribute.Boolean & Schema.Attribute.Required & Schema.Attribute.DefaultTo<false>;
     publishedAt: Schema.Attribute.DateTime;
     reference: Schema.Attribute.String & Schema.Attribute.Required & Schema.Attribute.Unique;
+    show_date: Schema.Attribute.Boolean & Schema.Attribute.DefaultTo<false>;
+    show_image: Schema.Attribute.Boolean & Schema.Attribute.DefaultTo<false>;
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<"oneToOne", "admin::user"> & Schema.Attribute.Private;
   };
@@ -431,10 +435,11 @@ 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> & Schema.Attribute.Required;
+    footer: Schema.Attribute.Component<"global.footer", false>;
     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;
+    logo: Schema.Attribute.Media<"images"> & Schema.Attribute.Required;
+    navbar: Schema.Attribute.Component<"global.navbar", false>;
     publishedAt: Schema.Attribute.DateTime;
     SEO: Schema.Attribute.Component<"global.seo", false>;
     updatedAt: Schema.Attribute.DateTime;
@@ -459,13 +464,13 @@ export interface ApiHomepageHomepage extends Struct.SingleTypeSchema {
       [
         "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.dual-column-text",
         "dynamic-zone.column-image-text",
-        "dynamic-zone.file-download",
-        "dynamic-zone.embedding",
         "shared.emphasise-article",
         "shared.list",
       ]
@@ -538,7 +543,7 @@ export interface ApiPagePage extends Struct.CollectionTypeSchema {
     >;
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<"oneToOne", "admin::user"> & Schema.Attribute.Private;
-    hero: Schema.Attribute.Component<"items.hero", false>;
+    hero: Schema.Attribute.Component<"items.hero", false> & Schema.Attribute.Required;
     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;
@@ -565,7 +570,7 @@ export interface ApiVehicleVehicle extends Struct.CollectionTypeSchema {
     content: Schema.Attribute.Blocks;
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<"oneToOne", "admin::user"> & Schema.Attribute.Private;
-    date: Schema.Attribute.DateTime;
+    date: Schema.Attribute.Date & Schema.Attribute.Required;
     description: Schema.Attribute.String & Schema.Attribute.Required;
     image: Schema.Attribute.Media<"images">;
     locale: Schema.Attribute.String & Schema.Attribute.Private;