From 88c5147363e450a141d6167c63a730acb3bb6f4e Mon Sep 17 00:00:00 2001 From: Mario Linz Date: Fri, 18 Mar 2022 21:33:01 +0100 Subject: [PATCH] =?UTF-8?q?Collections=20f=C3=BCr=20neue=20Projekte=20opti?= =?UTF-8?q?miert...work=20in=20progress...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .prettierrc | 2 +- api/collections/_article.yml | 139 +++++++++++++++++++++++++++++++++++ api/collections/articles.yml | 59 ++------------- api/collections/content.yml | 67 ++--------------- api/collections/general.yml | 38 +++++----- 5 files changed, 173 insertions(+), 132 deletions(-) create mode 100644 api/collections/_article.yml diff --git a/.prettierrc b/.prettierrc index fc75096..5aa9151 100644 --- a/.prettierrc +++ b/.prettierrc @@ -10,7 +10,7 @@ "check-parameters" ], "no-var-keyword": true, - "svelteSortOrder": "scripts-styles-markup", + "svelteSortOrder": "scripts-markup-styles", "svelteStrictMode": true, "svelteBracketNewLine": true, "svelteAllowShorthand": true, diff --git a/api/collections/_article.yml b/api/collections/_article.yml new file mode 100644 index 0000000..7542806 --- /dev/null +++ b/api/collections/_article.yml @@ -0,0 +1,139 @@ +name: article +type: tabs +meta: + label: + de: Inhalt des Artikel + en: Content of Article + activeTab: 0 +subFields: + - name: content + type: object + meta: + label: + de: Inhalt + en: Content + css: + subFields: + - name: title + type: string + meta: + label: { de: "Titel", en: "Title" } + - name: subtitle + type: string + meta: + label: { de: "Untertitel", en: "Subtitle" } + - name: types + type: tabs + meta: + label: + de: Inhalt dieses Artikel + en: Article Content + activeTab: 0 + subFields: + - name: teaser + type: string + meta: + widget: richtext + label: { de: "Teaser-Text des Artikel", en: "Article Teaser Text" } + - name: details + type: string + meta: + widget: richtext + label: { de: "Detail-Text des Artikel", en: "Article Detail Text" } + - name: contentMedia + type: object + meta: + label: + de: Medien + en: Media + css: + subFields: + - name: mediaFiles + type: object[] + meta: + label: { de: "Bilder", en: "Images" } + subFields: + - name: title + type: string + meta: + label: { de: "Datei-Titel", en: "File Title" } + - name: alternateText + type: string + meta: + label: { de: "Alternativer Text", en: "Alternate Text" } + - name: id + type: string + meta: + label: { de: "Technischer Name / ID", en: "Technical name / ID" } + - name: file + type: file + meta: + label: { de: "Datei", en: "File" } + - name: contentAttachments + type: object + meta: + label: + de: Anhänge / Downloads + en: Attachments / Downloads + css: + subFields: + - name: attachments + type: object[] + meta: + label: { de: "Anhänge", en: "Attachments" } + subFields: + - name: title + type: string + meta: + label: { de: "Datei-Titel", en: "File Title" } + - name: id + type: string + meta: + label: { de: "Technischer Name / ID", en: "Technical name / ID" } + - name: file + type: file + meta: + label: { de: "", en: "" } + - name: layout + type: object + meta: + label: + de: Layout + en: Layout + css: + subFields: + - name: meta + type: object + meta: + label: + de: Meta + en: Meta + css: + subFields: + - name: metaTitle + type: string + meta: + label: + { + de: "Erweitert den Titel der Webseite für diesen Artikel", + en: "Expands the title of the web page for this article", + } + - name: metaDescription + type: string + meta: + label: + { + de: "Erweitert die Beschreibung der Webseite für diesen Artikel", + en: "Expands the description of the web page for this item", + } + - name: metaKeywords + type: string + meta: + label: + { + de: "Erweitert die SEO / Schlüsselwörter für diesen Artikel", + en: "Expands the SEO / keywords for this article", + } + helperText: + de: "Beispiel: Stichwort1, Stichwort2, Stichwort3" + en: "Example: keyword1, keyword2, keyword3" diff --git a/api/collections/articles.yml b/api/collections/articles.yml index fbaefd9..bb12870 100644 --- a/api/collections/articles.yml +++ b/api/collections/articles.yml @@ -37,31 +37,31 @@ imageFilter: - fit: true height: 90 width: 90 - resampling: lanczos + resampling: "lancos" quality: 60 s: - fit: true height: 300 width: 300 - resampling: lanczos + resampling: "lancos" quality: 60 m: - fit: true height: 600 width: 600 - resampling: lanczos + resampling: "lancos" quality: 60 l: - fit: true height: 1200 width: 1200 - resampling: lanczos + resampling: "lancos" quality: 60 xl: - fit: true height: 2000 width: 2000 - resampling: lanczos + resampling: "lancos" quality: 60 permissions: @@ -100,51 +100,4 @@ permissions: # file: hooks/article/delete_return.js fields: - - name: articleTabs - type: tabs - meta: - label: - de: Informationen zu einem Artikel - en: Article Information - activeTab: 0 - subFields: - - name: articleTab - type: object - meta: - label: - de: Artikel - en: Article - css: - subFields: - - name: articleLayoutTab - type: object - meta: - label: - de: Layout - en: Layout - css: - subFields: - - name: articleMediaTab - type: object - meta: - label: - de: Bilder - en: Images - css: - subFields: - - name: articleAttachmentsTab - type: object - meta: - label: - de: Anhänge / Downloads - en: Attachments / Downloads - css: - subFields: - - name: articleMetaTab - type: object - meta: - label: - de: Meta - en: Meta - css: - subFields: + - !include _article.yml \ No newline at end of file diff --git a/api/collections/content.yml b/api/collections/content.yml index 24a767f..5666285 100644 --- a/api/collections/content.yml +++ b/api/collections/content.yml @@ -9,7 +9,7 @@ uploadPath: ../media/content # Metaangaben zur Kollektion welche in der Admin-UI verwendet werden können meta: # Navigationseintrag in der Admin-UI - label: { de: "Inhaltsblöcke", en: "Content Blocks" } + label: { de: "Seiteninhalt", en: "Page Content" } # Icon (Material UI) für den Navigationseintrag muiIcon: web # Identifizierung eines Eintrags für z.B. Select-Boxen in der Admin-UI @@ -34,31 +34,31 @@ imageFilter: - fit: true height: 90 width: 90 - resampling: lanczos + resampling: "lancos" quality: 60 s: - fit: true height: 300 width: 300 - resampling: lanczos + resampling: "lancos" quality: 60 m: - fit: true height: 600 width: 600 - resampling: lanczos + resampling: "lancos" quality: 60 l: - fit: true height: 1200 width: 1200 - resampling: lanczos + resampling: "lancos" quality: 60 xl: - fit: true height: 2000 width: 2000 - resampling: lanczos + resampling: "lancos" quality: 60 # Zugriff auf diese Kollektion @@ -103,62 +103,9 @@ fields: index: [ single, unique ] meta: label: { de: "Pfad", en: "Path" } - - name: blocks type: object[] meta: label: { de: "Oben", en: "Top" } subFields: - - name: layout - type: number - meta: - widget: select - label: { de: "Layout", en: "layout" } - choices: - - { id: 1, name: { de: "Bild links", en: "image left" } } - - { id: 2, name: { de: "Bild rechts", en: "image right" } } - - { - id: 3, - name: - { de: "Bild über Text", en: "image above text" }, - } - - { - id: 4, - name: - { de: "Bild unter Text", en: "image below text" }, - } - - name: title - type: string - meta: - label: { de: "Titel", en: "title" } - - name: subtitle - type: string - meta: - label: { de: "Untertitel", en: "subtitle" } - - name: text - type: string - meta: - widget: richtext - label: { de: "Text", en: "text" } - - name: button_text - type: string - meta: - label: { de: "Button-Text", en: "button text" } - - name: button_url - type: string - meta: - label: { de: "Button-URL", en: "button URL" } - - name: images - type: object[] - meta: - label: { de: "Bild(er)", en: "image(s)" } - subFields: - - name: file - type: file - meta: - widget: image - label: { de: "Datei", en: "file" } - - name: label - type: string - meta: - label: { de: "Label", en: "label" } + - !include _article.yml diff --git a/api/collections/general.yml b/api/collections/general.yml index 2c1d8e1..a519ca5 100644 --- a/api/collections/general.yml +++ b/api/collections/general.yml @@ -39,31 +39,31 @@ imageFilter: - fit: true height: 90 width: 90 - resampling: lanczos + resampling: "lancos" quality: 60 s: - fit: true height: 300 width: 300 - resampling: lanczos + resampling: "lancos" quality: 60 m: - fit: true height: 600 width: 600 - resampling: lanczos + resampling: "lancos" quality: 60 l: - fit: true height: 1200 width: 1200 - resampling: lanczos + resampling: "lancos" quality: 60 xl: - fit: true height: 2000 width: 2000 - resampling: lanczos + resampling: "lancos" quality: 60 permissions: @@ -88,7 +88,7 @@ permissions: delete: false fields: - - name: generalInformationTabs + - name: generalInformation type: tabs meta: label: @@ -96,7 +96,7 @@ fields: en: General Information activeTab: 0 subFields: - - name: generalInformationTab + - name: types type: object meta: label: @@ -113,12 +113,12 @@ fields: helperText: de: "Alle allgemeinen Informationen werden auf der Seite angezeigt." en: "All general information are displayed on the page." - - name: metaInformationTab + - name: meta type: object meta: label: - de: Meta / SEO - en: Meta / SEO + de: Meta + en: Meta css: subFields: - name: metaTitle @@ -136,8 +136,6 @@ fields: label: de: Robots en: Robots - inputProps: - placeholder: "nofollow" defaultValue: [] autocomplete: true choices: @@ -161,7 +159,7 @@ fields: helperText: de: "Beispiel: Stichwort1, Stichwort2, Stichwort3" en: "Example: keyword1, keyword2, keyword3" - - name: personalInformationTab + - name: person type: object meta: label: @@ -201,7 +199,7 @@ fields: type: string meta: label: { de: "E-Mail", en: "E-Mail" } - - name: companyInformationTab + - name: company type: object meta: label: @@ -253,7 +251,7 @@ fields: type: string meta: label: { de: "E-Mail", en: "E-Mail" } - - name: mediaInformationTab + - name: media type: object meta: label: @@ -268,7 +266,7 @@ fields: helperText: de: "Ein Favicon ist ein kleines Icon, Symbol oder Logo, das von Webbrowsern verwendet wird, um eine Website auf wiedererkennbare Weise zu kennzeichnen." en: "A favicon is a small icon, symbol, or logo used by web browsers to identify a website in a recognizable way." - - name: favicon + - name: brand type: file meta: label: { de: "Logo / Brand", en: "Logo / Brand" } @@ -284,6 +282,10 @@ fields: type: string meta: label: { de: "Datei-Titel", en: "File Title" } + - name: alternateText + type: string + meta: + label: { de: "Alternativer Text", en: "Alternate Text" } - name: id type: string meta: @@ -292,7 +294,7 @@ fields: type: file meta: label: { de: "", en: "" } - - name: copyrightInformationTab + - name: copyright type: object meta: label: @@ -300,7 +302,7 @@ fields: en: Copyright css: subFields: - - name: copyright + - name: copyrightText type: string meta: label: { de: "Copyright Text", en: "Copyright Text" }