From f0a4bac2bd6eb33a82a22eeade2a4968b6095daf Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Tue, 12 Dec 2023 17:13:58 +0100 Subject: [PATCH] revert 65260f63c67562ea2821c31d37a0ac3caa755fd8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert Static CMS v4 (#250) Schließt #247 Reviewed-on: https://git.cantorgymnasium.de/gcg/gcg-website/pulls/250 --- .../admin/config/collections/abiturienten.js | 6 +- static/admin/config/collections/author.js | 81 +++++++++---------- static/admin/config/collections/begabte.js | 7 +- static/admin/config/collections/blog.js | 23 +++--- static/admin/config/collections/cantorfora.js | 11 ++- .../admin/config/collections/cantorpreis.js | 6 +- .../admin/config/collections/chronikjahre.js | 3 + .../admin/config/collections/chronikseiten.js | 1 + static/admin/config/collections/forms.js | 1 + static/admin/config/collections/ganztag.js | 5 +- .../admin/config/collections/index-pages.js | 13 ++- static/admin/config/collections/pages.js | 1 + .../admin/config/collections/projektwoche.js | 2 + .../config/collections/settings-collection.js | 33 +++++--- .../admin/config/collections/superhaufen.js | 6 +- .../admin/config/collections/wettbewerbe.js | 5 +- static/admin/config/index.js | 8 -- static/admin/config/props.js | 11 +-- static/admin/config/schulchronik.js | 8 -- static/admin/config/themes.js | 25 ------ static/admin/index.html | 4 +- static/schulchronik/admin/index.html | 4 +- 22 files changed, 121 insertions(+), 143 deletions(-) delete mode 100644 static/admin/config/themes.js diff --git a/static/admin/config/collections/abiturienten.js b/static/admin/config/collections/abiturienten.js index 4b19d453..b8bb604b 100644 --- a/static/admin/config/collections/abiturienten.js +++ b/static/admin/config/collections/abiturienten.js @@ -1,4 +1,4 @@ -import { MarkdownProps, ImageProps } from "../props.js"; +import { MarkdownProps } from "../props.js"; import { DraftBoolean, Title } from "./widgets.js"; const AbiturientenCollection = { @@ -33,8 +33,9 @@ const AbiturientenCollection = { { name: "image", label: "Bild", + widget: "image", default: "/media/image.webp", - ...ImageProps, + required: false, }, { name: "type", @@ -45,6 +46,7 @@ const AbiturientenCollection = { { name: "body", label: "Text", + widget: "markdown", required: false, ...MarkdownProps, }, diff --git a/static/admin/config/collections/author.js b/static/admin/config/collections/author.js index 841a8fc8..1442df4e 100644 --- a/static/admin/config/collections/author.js +++ b/static/admin/config/collections/author.js @@ -1,4 +1,4 @@ -import { MarkdownProps, PatternEmail, ImageProps } from "../props.js"; +import { MarkdownProps, PatternEmail } from "../props.js"; import { DescriptionText } from "./widgets.js"; const AuthorCollection = { @@ -19,49 +19,38 @@ const AuthorCollection = { field: "type", value: "author", }, - view_filters: { - filters: [ - { - name: "active", - label: "aktiv", - field: "active", - pattern: true, - }, - { - name: "inactive", - label: "inaktiv", - field: "active", - pattern: false, - }, - { - name: "simplified", - label: "einfach", - field: "simplified", - pattern: true, - }, - { - name: "extended", - label: "erweitert", - field: "simplified", - pattern: false, - }, - ], - }, - view_groups: { - default: "active", - groups: [ - { - name: "simplified", - label: "vereinfacht", - field: "simplified", - }, - { - name: "active", - label: "aktiv", - field: "active", - }, - ], - }, + view_filters: [ + { + label: "aktiv", + field: "active", + pattern: true, + }, + { + label: "inaktiv", + field: "active", + pattern: false, + }, + { + label: "einfach", + field: "simplified", + pattern: true, + }, + { + label: "erweitert", + field: "simplified", + pattern: false, + }, + ], + view_groups: [ + { + label: "vereinfacht", + field: "simplified", + }, + { + label: "aktiv", + field: "active", + }, + ], summary_fields: ["title", "active", "simplified", "body"], fields: [ { @@ -81,8 +70,9 @@ const AuthorCollection = { { name: "image", label: "Bild", + widget: "image", + required: false, default: "/media/people/gcg.webp", - ...ImageProps, }, { name: "simplified", @@ -106,6 +96,7 @@ const AuthorCollection = { { name: "body", label: "Beschreibung", + widget: "markdown", required: false, ...MarkdownProps, }, diff --git a/static/admin/config/collections/begabte.js b/static/admin/config/collections/begabte.js index 4232d444..2d41ff96 100644 --- a/static/admin/config/collections/begabte.js +++ b/static/admin/config/collections/begabte.js @@ -1,4 +1,4 @@ -import { MarkdownProps, ImageProps } from "../props.js"; +import { MarkdownProps } from "../props.js"; import { DescriptionText, DraftBoolean, Title } from "./widgets.js"; const BegabteCollection = { @@ -27,9 +27,9 @@ const BegabteCollection = { { name: "image", label: "Titelbild", - default: "/media/image.webp", - ...ImageProps, + widget: "image", required: true, + default: "/media/image.webp", }, { name: "class", @@ -52,6 +52,7 @@ const BegabteCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: true, ...MarkdownProps, }, diff --git a/static/admin/config/collections/blog.js b/static/admin/config/collections/blog.js index d6a59388..1405e936 100644 --- a/static/admin/config/collections/blog.js +++ b/static/admin/config/collections/blog.js @@ -1,4 +1,4 @@ -import { DateFormat, MarkdownProps, ImageProps } from "../props.js"; +import { DateFormat, MarkdownProps } from "../props.js"; import { AuthorRelation, DescriptionText, @@ -24,16 +24,12 @@ const BlogCollection = { field: "type", value: "post", }, - view_groups: { - default: "draft", - groups: [ - { - name: "draft", - label: "Entwurf", - field: "draft", - }, - ], - }, + view_groups: [ + { + label: "Entwurf", + field: "draft", + }, + ], sortable_fields: { fields: ["date", "title"], default: { @@ -57,9 +53,9 @@ const BlogCollection = { name: "image", label: "Titelbild", hint: "16:9 Seitenverhältnis beachten", - default: "/media/image.webp", - ...ImageProps, + widget: "image", required: true, + default: "/media/image.webp", }, AuthorRelation, { @@ -106,6 +102,7 @@ const BlogCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: true, ...MarkdownProps, }, diff --git a/static/admin/config/collections/cantorfora.js b/static/admin/config/collections/cantorfora.js index c286bac7..84cad60e 100644 --- a/static/admin/config/collections/cantorfora.js +++ b/static/admin/config/collections/cantorfora.js @@ -1,4 +1,4 @@ -import { MarkdownProps, ImageProps } from "../props.js"; +import { MarkdownProps } from "../props.js"; import { DescriptionText, DraftBoolean, Title } from "./widgets.js"; const CantorforaCollection = { @@ -19,6 +19,12 @@ const CantorforaCollection = { frame: true, size: "half", }, + view_groups: [ + { + label: "Entwürfe", + field: "draft", + }, + ], summary_fields: ["title", "draft", "description"], sortable_fields: { fields: ["index", "title"], @@ -44,8 +50,8 @@ const CantorforaCollection = { { name: "image", label: "Titelbild", + widget: "image", default: "/media/image.webp", - ...ImageProps, required: true, }, { @@ -57,6 +63,7 @@ const CantorforaCollection = { { name: "body", label: "Text", + widget: "markdown", required: true, ...MarkdownProps, }, diff --git a/static/admin/config/collections/cantorpreis.js b/static/admin/config/collections/cantorpreis.js index 12694bf9..a05905fc 100644 --- a/static/admin/config/collections/cantorpreis.js +++ b/static/admin/config/collections/cantorpreis.js @@ -1,4 +1,4 @@ -import { MarkdownProps, ImageProps } from "../props.js"; +import { MarkdownProps } from "../props.js"; import { DescriptionText, DraftBoolean } from "./widgets.js"; const CantorpreisCollection = { @@ -45,8 +45,9 @@ const CantorpreisCollection = { { name: "image", label: "Bild", + widget: "image", default: "/media/image.webp", - ...ImageProps, + required: false, }, { name: "type", @@ -57,6 +58,7 @@ const CantorpreisCollection = { { name: "body", label: "Text", + widget: "markdown", required: false, ...MarkdownProps, }, diff --git a/static/admin/config/collections/chronikjahre.js b/static/admin/config/collections/chronikjahre.js index 9301d373..faed8d51 100644 --- a/static/admin/config/collections/chronikjahre.js +++ b/static/admin/config/collections/chronikjahre.js @@ -43,6 +43,7 @@ const ChronikjahreCollection = { name: "pretext", label: "Einleitung", hint: "Text für die Jahreszahl", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -63,6 +64,7 @@ const ChronikjahreCollection = { { name: "content", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -100,6 +102,7 @@ const ChronikjahreCollection = { name: "body", label: "Text", hint: "Erscheint zusätzlich zu den Kreativen Haufen", + widget: "markdown", required: false, ...MarkdownProps, }, diff --git a/static/admin/config/collections/chronikseiten.js b/static/admin/config/collections/chronikseiten.js index a36bb349..6e859ba2 100644 --- a/static/admin/config/collections/chronikseiten.js +++ b/static/admin/config/collections/chronikseiten.js @@ -48,6 +48,7 @@ const ChronikseitenCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, diff --git a/static/admin/config/collections/forms.js b/static/admin/config/collections/forms.js index 8fb0fdba..e7b5d8e5 100644 --- a/static/admin/config/collections/forms.js +++ b/static/admin/config/collections/forms.js @@ -55,6 +55,7 @@ const FormsCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, diff --git a/static/admin/config/collections/ganztag.js b/static/admin/config/collections/ganztag.js index 34f5bb5f..136ab286 100644 --- a/static/admin/config/collections/ganztag.js +++ b/static/admin/config/collections/ganztag.js @@ -1,4 +1,4 @@ -import { MarkdownProps, ImageProps } from "../props.js"; +import { MarkdownProps } from "../props.js"; import { Title, DescriptionText, DraftBoolean } from "./widgets.js"; const GanztagCollection = { @@ -27,8 +27,8 @@ const GanztagCollection = { { name: "image", label: "Titelbild", + widget: "image", default: "/media/ganztagsangebote/image.webp", - ...ImageProps, required: true, }, { @@ -82,6 +82,7 @@ const GanztagCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, diff --git a/static/admin/config/collections/index-pages.js b/static/admin/config/collections/index-pages.js index d472f097..346fad21 100644 --- a/static/admin/config/collections/index-pages.js +++ b/static/admin/config/collections/index-pages.js @@ -3,7 +3,6 @@ import { DateFormat, MarkdownProps, PatternEmail, - ImageProps } from "../props.js"; import { DescriptionText, EnableBoolean, Title } from "./widgets.js"; @@ -37,7 +36,8 @@ const IndexPagesCollection = { { name: "image", label: "Bild", - ...ImageProps, + widget: "image", + required: false, }, { name: "stats", @@ -75,6 +75,7 @@ const IndexPagesCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -90,6 +91,7 @@ const IndexPagesCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -105,6 +107,7 @@ const IndexPagesCollection = { { name: "content", label: "Inhalt", + widget: "markdown", required: true, ...MarkdownProps, }, @@ -128,6 +131,7 @@ const IndexPagesCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -269,6 +273,7 @@ const IndexPagesCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -284,6 +289,7 @@ const IndexPagesCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -296,7 +302,8 @@ const IndexPagesCollection = { { name: "image", label: "Bild", - ...ImageProps, + widget: "image", + required: false, }, { name: "quote", diff --git a/static/admin/config/collections/pages.js b/static/admin/config/collections/pages.js index 0477b6d3..d7271fcc 100644 --- a/static/admin/config/collections/pages.js +++ b/static/admin/config/collections/pages.js @@ -48,6 +48,7 @@ const PagesCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, diff --git a/static/admin/config/collections/projektwoche.js b/static/admin/config/collections/projektwoche.js index 2f883380..a5c1dee4 100644 --- a/static/admin/config/collections/projektwoche.js +++ b/static/admin/config/collections/projektwoche.js @@ -32,6 +32,7 @@ const ProjektwocheCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -60,6 +61,7 @@ const ProjektwocheCollection = { { name: "content", label: "Inhalt", + widget: "markdown", required: true, ...MarkdownProps, }, diff --git a/static/admin/config/collections/settings-collection.js b/static/admin/config/collections/settings-collection.js index 2f705901..0ea83e79 100644 --- a/static/admin/config/collections/settings-collection.js +++ b/static/admin/config/collections/settings-collection.js @@ -3,7 +3,6 @@ import { DateFormat, MarkdownProps, PatternEmail, - ImageProps } from "../props.js"; import { ButtonObject, @@ -41,6 +40,7 @@ const SettingsCollection = { { name: "text", label: "Text", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -90,7 +90,7 @@ const SettingsCollection = { { name: "bg_image", label: "Hintergrundbild", - ...ImageProps, + widget: "image", required: true, }, Title(false), @@ -136,7 +136,7 @@ const SettingsCollection = { { name: "image", label: "Grafik", - ...ImageProps, + widget: "image", required: true, }, ], @@ -153,6 +153,7 @@ const SettingsCollection = { { name: "content", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -174,7 +175,7 @@ const SettingsCollection = { { name: "image", label: "Hintergrundbild", - ...ImageProps, + widget: "image", required: true, }, { @@ -199,11 +200,13 @@ const SettingsCollection = { { name: "image", label: "Grafik", - ...ImageProps, + widget: "image", + required: false, }, { name: "content", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -225,6 +228,7 @@ const SettingsCollection = { { name: "content", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -265,13 +269,14 @@ const SettingsCollection = { { name: "bg_image", label: "Hintergrundbild", - ...ImageProps, + widget: "image", required: true, }, Title(false), { name: "content", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -299,11 +304,13 @@ const SettingsCollection = { { name: "image", label: "Bild", - ...ImageProps, + widget: "image", + required: false, }, { name: "content", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -333,7 +340,7 @@ const SettingsCollection = { { name: "image", label: "Grafik", - ...ImageProps, + widget: "image", required: true, }, ], @@ -353,12 +360,13 @@ const SettingsCollection = { { name: "image", label: "Titelbild", - ...ImageProps, + widget: "image", required: true, }, { name: "content", label: "Inhalt", + widget: "markdown", required: false, ...MarkdownProps, }, @@ -504,7 +512,7 @@ const SettingsCollection = { { name: "logo", label: "Logo", - ...ImageProps, + widget: "image", required: true, }, { @@ -571,13 +579,13 @@ const SettingsCollection = { { name: "preloader", label: "Logo", - ...ImageProps, + widget: "image", required: true, }, { name: "loader", label: "Ladeanimation", - ...ImageProps, + widget: "image", required: true, }, ], @@ -622,6 +630,7 @@ const SettingsCollection = { name: "copyright", label: "Copyright-Eintrag", hint: "Am Seitenende sichtbar", + widget: "markdown", required: true, ...MarkdownProps, }, diff --git a/static/admin/config/collections/superhaufen.js b/static/admin/config/collections/superhaufen.js index b7589262..0d9d9d5b 100644 --- a/static/admin/config/collections/superhaufen.js +++ b/static/admin/config/collections/superhaufen.js @@ -74,7 +74,8 @@ const SuperhaufenCollection = { { name: "content", label: "Inhalt", - required: false, + widget: "markdown", + required: true, ...MarkdownProps, }, { @@ -88,7 +89,8 @@ const SuperhaufenCollection = { { name: "content", label: "Inhalt", - required: false, + widget: "markdown", + required: true, ...MarkdownProps, }, ], diff --git a/static/admin/config/collections/wettbewerbe.js b/static/admin/config/collections/wettbewerbe.js index 3371e675..fb27f081 100644 --- a/static/admin/config/collections/wettbewerbe.js +++ b/static/admin/config/collections/wettbewerbe.js @@ -1,4 +1,4 @@ -import { MarkdownProps, ImageProps } from "../props.js"; +import { MarkdownProps } from "../props.js"; import { DescriptionText, DraftBoolean, Title } from "./widgets.js"; const WettbewerbeCollection = { @@ -26,7 +26,7 @@ const WettbewerbeCollection = { { name: "image", label: "Titelbild", - ...ImageProps, + widget: "image", required: true, default: "/media/image.webp", }, @@ -63,6 +63,7 @@ const WettbewerbeCollection = { { name: "body", label: "Inhalt", + widget: "markdown", required: true, ...MarkdownProps, }, diff --git a/static/admin/config/index.js b/static/admin/config/index.js index 1d92150d..d362236d 100644 --- a/static/admin/config/index.js +++ b/static/admin/config/index.js @@ -17,7 +17,6 @@ import { SuperhaufenCollection, WettbewerbeCollection, } from "./collections/index.js"; -import { GCGThemeDark, GCGThemeLight } from "./themes.js"; const config = { backend: { @@ -49,13 +48,6 @@ const config = { clean_accents: true, sanitize_replacement: "-", }, - theme: { - include_built_in_themes: false, - themes: [ - GCGThemeDark, - GCGThemeLight - ] - }, collections: [ SettingsCollection, IndexPagesCollection, diff --git a/static/admin/config/props.js b/static/admin/config/props.js index 20173a3d..c0488b8b 100644 --- a/static/admin/config/props.js +++ b/static/admin/config/props.js @@ -1,5 +1,4 @@ const MarkdownProps = { - widget: "markdown", toolbar_buttons: { main: [ "bold", @@ -75,12 +74,4 @@ const PatternEmail = { ], }; -const ImageProps = { - widget: "image", - required: false, - media_library: { - folder_support: true, - } -}; - -export { MarkdownProps, DateFormat, DataObject, PatternEmail, ImageProps }; +export { MarkdownProps, DateFormat, DataObject, PatternEmail }; diff --git a/static/admin/config/schulchronik.js b/static/admin/config/schulchronik.js index f47f2e67..9425cfe0 100644 --- a/static/admin/config/schulchronik.js +++ b/static/admin/config/schulchronik.js @@ -7,7 +7,6 @@ import { StatsCollection, SuperhaufenCollection, } from "./collections/index.js"; -import { GCGThemeDark, GCGThemeLight } from "./themes.js"; const config = { backend: { @@ -39,13 +38,6 @@ const config = { clean_accents: true, sanitize_replacement: "-", }, - theme: { - include_built_in_themes: false, - themes: [ - GCGThemeDark, - GCGThemeLight - ] - }, collections: [ ChronikjahreCollection, SuperhaufenCollection, diff --git a/static/admin/config/themes.js b/static/admin/config/themes.js deleted file mode 100644 index 3833404c..00000000 --- a/static/admin/config/themes.js +++ /dev/null @@ -1,25 +0,0 @@ -const GCGThemeDark = { - name: "GCG.Dark", - extends: "dark", - primary: { - main: "#ffbc3b", - contrastColor: "#4b4b4b", - }, - background: { - main: "#1a1a37", - dark: "#13132d", - }, -}; - -const GCGThemeLight = { - name: "GCG.Light", - extends: "light", - primary: { - main: "#1a1a37", - }, - background: { - dark: "#f1f3f5", - }, -}; - -export { GCGThemeDark, GCGThemeLight }; diff --git a/static/admin/index.html b/static/admin/index.html index b1773d39..e408d173 100644 --- a/static/admin/index.html +++ b/static/admin/index.html @@ -9,12 +9,12 @@ /> Static CMS - + +