From e06db40278fc984c6103fafae8e0b38aa1a14050 Mon Sep 17 00:00:00 2001
From: Denys Konovalov <kontakt@denyskon.de>
Date: Fri, 23 Dec 2022 13:02:17 +0100
Subject: [PATCH 1/3] WIP

---
 static/admin-new/config.yml | 83 ++-----------------------------------
 static/admin-new/index.html | 44 ++++++++++++++++++--
 2 files changed, 45 insertions(+), 82 deletions(-)

diff --git a/static/admin-new/config.yml b/static/admin-new/config.yml
index afc01f36..376cb622 100644
--- a/static/admin-new/config.yml
+++ b/static/admin-new/config.yml
@@ -243,7 +243,7 @@ collections:
                   - {label: "Titel", name: "name", widget: "string"}
                   - {label: "Link", name: "URL", widget: "string"}
           - label: "Sprachen"
-            name: "Languages"
+            name: "languages"
             widget: "object"
             collapsed: true
             fields:
@@ -352,26 +352,6 @@ collections:
           - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false}
           - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
           - {label: "Metabeschreibung", name: "description", widget: "text", required: false}
-      - name: "impressum"
-        label: "Impressum"
-        file: "content/german/impressum/index.md"
-        fields:
-          - {label: "Titel", name: "title", widget: "string"}
-          - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false}
-          - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
-          - {label: "Type", name: "type", widget: "hidden", default: "pages"}
-          - {label: "Type", name: "layout", widget: "hidden", default: "single.html"}
-          - {label: "Text", name: "body", widget: "markdown"}
-      - name: "datenschutz"
-        label: "Datenschutz"
-        file: "content/german/datenschutz/index.md"
-        fields:
-          - {label: "Titel", name: "title", widget: "string"}
-          - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false}
-          - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
-          - {label: "Type", name: "type", widget: "hidden", default: "pages"}
-          - {label: "Type", name: "layout", widget: "hidden", default: "single.html"}
-          - {label: "Text", name: "body", widget: "markdown"}
       - name: "wettbewerbe-index"
         label: "Wettbewerbe"
         file: "content/german/wettbewerbe/_index.md"
@@ -388,39 +368,6 @@ collections:
           - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false}
           - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
           - {label: "Metabeschreibung", name: "description", widget: "text", required: false}
-      - name: "schuelervertretung-index"
-        label: "Schülervertretung"
-        file: "content/german/schuelervertretung/index.md"
-        fields:
-          - {label: "Titel", name: "title", widget: "string"}
-          - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false}
-          - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
-          - {label: "Metabeschreibung", name: "description", widget: "text", required: false}
-          - {label: "Type", name: "type", widget: "hidden", default: "pages"}
-          - {label: "Type", name: "layout", widget: "hidden", default: "single.html"}
-          - {label: "Text", name: "body", widget: "markdown", required: false}
-      - name: "schuelerrat-geschaeftsordnung"
-        label: "Geschäftsordnung der Schülervertretung"
-        file: "content/german/schuelervertretung/geschaeftsordnung.md"
-        fields:
-          - {label: "Titel", name: "title", widget: "string"}
-          - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false}
-          - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
-          - {label: "Metabeschreibung", name: "description", widget: "text", required: false}
-          - {label: "Type", name: "type", widget: "hidden", default: "pages"}
-          - {label: "Type", name: "layout", widget: "hidden", default: "single.html"}
-          - {label: "Text", name: "body", widget: "markdown", required: false}
-      - name: "bibo"
-        label: "Schulbibliothek"
-        file: "content/german/bibo/index.md"
-        fields:
-          - {label: "Titel", name: "title", widget: "string"}
-          - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false}
-          - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
-          - {label: "Metabeschreibung", name: "description", widget: "text", required: false}
-          - {label: "Type", name: "type", widget: "hidden", default: "pages"}
-          - {label: "Type", name: "layout", widget: "hidden", default: "single.html"}
-          - {label: "Text", name: "body", widget: "markdown", required: false}
       - name: "abiturienten"
         label: "Abiturienten"
         file: "content/german/abiturienten/_index.md"
@@ -439,28 +386,6 @@ collections:
           - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
           - {label: "Metabeschreibung", name: "description", widget: "text", required: false}
           - {label: "Text", name: "body", widget: "markdown", required: false}
-      - name: "elternvertretung-index"
-        label: "Elternvertretung"
-        file: "content/german/elternvertretung/index.md"
-        fields:
-          - {label: "Titel", name: "title", widget: "string"}
-          - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false}
-          - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
-          - {label: "Metabeschreibung", name: "description", widget: "text", required: false}
-          - {label: "Type", name: "type", widget: "hidden", default: "pages"}
-          - {label: "Type", name: "layout", widget: "hidden", default: "single.html"}
-          - {label: "Text", name: "body", widget: "markdown", required: false}
-      - name: "jia-index"
-        label: "Junior-Ingenieur-Akademie"
-        file: "content/german/jia/index.md"
-        fields:
-          - {label: "Titel", name: "title", widget: "string"}
-          - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false}
-          - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"}
-          - {label: "Metabeschreibung", name: "description", widget: "text", required: false}
-          - {label: "Type", name: "type", widget: "hidden", default: "pages"}
-          - {label: "Type", name: "layout", widget: "hidden", default: "single.html"}
-          - {label: "Text", name: "body", widget: "markdown", required: false}
   - name: "pages"
     icon: "page"
     label: "Zusatzseiten"
@@ -480,7 +405,7 @@ collections:
       - {label: "Layout", name: "layout", widget: "hidden", default: "single.html"}
       - label: "Aliase"
         name: "aliases"
-        widget: "string"
+        widget: "categories"
         required: false
       - {label: "Text", name: "body", widget: "markdown", required: false}
   - name: "author" 
@@ -552,12 +477,12 @@ collections:
         name: "categories"
         widget: "list"
         required: false
-        field: {label: "Kategorie", name: "category", widget: "string"}
+        field: {label: "Kategorie", name: "category", widget: "array"}
       - label: "Tags"
         name: "tags"
         widget: "list"
         required: false
-        field: {label: "Tag", name: "tag", widget: "string"}
+        field: {label: "Tag", name: "tag", widget: "array"}
       - {label: "Type", name: "type", widget: "hidden", default: "post"}
       - {label: "Text", name: "body", widget: "markdown"}
   - name: "forms"
diff --git a/static/admin-new/index.html b/static/admin-new/index.html
index 3e8c405c..77a87ebf 100644
--- a/static/admin-new/index.html
+++ b/static/admin-new/index.html
@@ -39,7 +39,7 @@
       CMS.registerShortcode('gallery', {
         label: 'Gallery',
         openTag: '{{< ',
-        closeTag: ' >}}',
+        closeTag: ' />}}',
         separator: ' ',
         toProps: args => {
           if (args.length > 0) {
@@ -66,8 +66,8 @@
         },
         preview: ({ dir }) => {
           return h('div', {"className": "row", "style": { border: "1px solid #ccc", borderRadius: "16px", padding: "10px" }},
-          h('b', {}, "Gallerie-Ordner: "),
-          h('span', {}, dir));
+          h('b', {"style": { marginRight: "5px" }}, "Gallerie-Ordner:"),
+          h('code', {}, dir));
         },
       });
       CMS.registerShortcode('load-photoswipe', {
@@ -87,6 +87,44 @@
           
         },
       });
+      
+    </script>
+    <script>
+      const CategoriesControl = ({ label, value, field, onChange }) => {
+        const separator = useMemo(() => field.separator ?? ', ', [field.separator]);
+    
+        const handleChange = useCallback((e) => {
+          onChange(e.target.value.split(separator).map(e => e.trim()));
+        }, [separator, onChange]);
+    
+        return h('div', {}, 
+          h('label', { for: 'inputId' }, label),
+          h('input', {
+            id: 'inputId',
+            type: 'text',
+            value: value ? value.join(separator) : '',
+            onChange: this.handleChange,
+          })
+        );
+      };
+    
+      const CategoriesPreview = ({ value }) => {
+        return h(
+          'ul',
+          {},
+          value.map(function (val, index) {
+            return h('li', { key: index }, val);
+          }),
+        );
+      };
+    
+      const schema = {
+        properties: {
+          separator: { type: 'string' },
+        },
+      };
+    
+      CMS.registerWidget('categories', CategoriesControl, CategoriesPreview, schema);
     </script>
     <script>
 CMS.registerPreviewStyle("https://cantorgymnasium.de/plugins/bootstrap/bootstrap.min.css");

From 80b22186b8bfd6c89df29902eaf28418e2bf75c5 Mon Sep 17 00:00:00 2001
From: Denys Konovalov <kontakt@denyskon.de>
Date: Mon, 26 Dec 2022 18:01:34 +0100
Subject: [PATCH 2/3] fb change

---
 config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.yml b/config.yml
index 540153ea..833d481f 100644
--- a/config.yml
+++ b/config.yml
@@ -53,7 +53,7 @@ params:
       link: https://instagram.com/cantor.news
     - title: Facebook
       icon: fa-brands fa-facebook
-      link: https://facebook.com/gcg.cantor.news
+      link: https://facebook.com/cantor.news
   preloader:
     enable: true
     preloader: media/logo.png

From 24a52086e8dbd235ebb9a200e7baa085112f9a68 Mon Sep 17 00:00:00 2001
From: Denys Konovalov <kontakt@denyskon.de>
Date: Mon, 26 Dec 2022 18:02:30 +0100
Subject: [PATCH 3/3] cms fix

---
 static/admin-new/config.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/static/admin-new/config.yml b/static/admin-new/config.yml
index 376cb622..3ee9db6d 100644
--- a/static/admin-new/config.yml
+++ b/static/admin-new/config.yml
@@ -460,6 +460,14 @@ collections:
      preview: true
     media_folder: '/static/media/blog'
     public_folder: '/media/blog'
+    view_groups:
+      - label: Drafts
+        field: draft
+    sortable_fields:
+      fields: ['date', 'title']
+      default:
+        field: date
+        direction: Descending
     fields:
       - {label: "Titel", name: "title", widget: "string"}
       - {label: "Datum", name: "date", widget: "datetime", date_format: "dd/MM/yyyy", time_format: false}
@@ -643,4 +651,3 @@ collections:
       - {label: "Mehrere Bilder", name: "few", widget: "boolean", default: false, required: false}
       - {label: "Type", name: "type", widget: "hidden", default: "abiturienten"}
       - {label: "Text", name: "body", widget: "markdown"}
-