chore: replace timeFormat with new syntax time_format

mattboll · mattboll · commit dd40999b000b · 2025-11-17T17:44:14.000+01:00
diff --git a/site/static/admin/config.yml b/site/static/admin/config.yml
@@ -16,8 +16,6 @@ backend:
   # name: git-gateway
   # branch: main
 
-
-
 media_folder: "site/static/img" # Folder where user uploaded files should go
 public_folder: "img"
 
@@ -29,55 +27,97 @@ collections: # A list of collections the CMS should be able to edit
     path: "{{slug}}/index" # Each document is inside a folder with the slug name.
     create: true # Allow users to create new documents in this collection
     fields: # The fields each document in this collection have
-      - {label: "Title", name: "title", widget: "string"}
-      - {label: "Author", name: "author", widget: "string"}
-      - {label: "Publish Date", name: "date", widget: "datetime", format: "YYYY-MM-DD", timeFormat: false}
-      - {label: "Expiry Date", name: "expirydate", widget: "datetime", format: "YYYY-MM-DD", timeFormat: false, required: false, default: ''}
-      - {label: "Body", name: "body", widget: "markdown"}
-      - {label: "Draft", name: "draft", widget: "boolean", default: true}
-      - {label: "Tags", name: "tipstags", widget: "list"}
+      - { label: "Title", name: "title", widget: "string" }
+      - { label: "Author", name: "author", widget: "string" }
+      - {
+          label: "Publish Date",
+          name: "date",
+          widget: "datetime",
+          format: "YYYY-MM-DD",
+          time_format: false,
+        }
+      - {
+          label: "Expiry Date",
+          name: "expirydate",
+          widget: "datetime",
+          format: "YYYY-MM-DD",
+          time_format: false,
+          required: false,
+          default: "",
+        }
+      - { label: "Body", name: "body", widget: "markdown" }
+      - { label: "Draft", name: "draft", widget: "boolean", default: true }
+      - { label: "Tags", name: "tipstags", widget: "list" }
   - name: "post" # Used in routes, ie.: /admin/collections/:slug/edit
     label: "Post" # Used in the UI, ie.: "New Post"
     folder: "site/content/blog" # The path to the folder where the documents are stored
     media_folder: "."
     path: "{{slug}}/index" # Each document is inside a folder with the slug name.
     create: true # Allow users to create new documents in this collection
     fields: # The fields each document in this collection have
-      - {label: "Title", name: "title", widget: "string"}
-      - {label: "Author", name: "author", widget: "string"}
-      - {label: "Url", name: "url", widget: "string"}
-      - {label: "Aliases", name: "aliases", widget: "string"}
-      - {label: "Publish Date", name: "date", widget: "datetime", format: "YYYY-MM-DD", timeFormat: false}
-      - {label: "Expiry Date", name: "expirydate", widget: "datetime", format: "YYYY-MM-DD", timeFormat: false, required: false, default: ''}
-      - {label: "Image", name: "cover", widget: "image", required: false}
-      - {label: "Body", name: "body", widget: "markdown"}
-      - {label: "Draft", name: "draft", widget: "boolean", default: true}
-      - {label: "Tags", name: "tags", widget: "list"}
+      - { label: "Title", name: "title", widget: "string" }
+      - { label: "Author", name: "author", widget: "string" }
+      - { label: "Url", name: "url", widget: "string" }
+      - { label: "Aliases", name: "aliases", widget: "string" }
+      - {
+          label: "Publish Date",
+          name: "date",
+          widget: "datetime",
+          format: "YYYY-MM-DD",
+          time_format: false,
+        }
+      - {
+          label: "Expiry Date",
+          name: "expirydate",
+          widget: "datetime",
+          format: "YYYY-MM-DD",
+          time_format: false,
+          required: false,
+          default: "",
+        }
+      - { label: "Image", name: "cover", widget: "image", required: false }
+      - { label: "Body", name: "body", widget: "markdown" }
+      - { label: "Draft", name: "draft", widget: "boolean", default: true }
+      - { label: "Tags", name: "tags", widget: "list" }
   - name: "work" # Used in routes, ie.: /admin/collections/:slug/edit
     label: "Work" # Used in the UI, ie.: "New Post"
     folder: "site/content/work" # The path to the folder where the documents are stored
     media_folder: "."
     path: "{{slug}}/index" # Each document is inside a folder with the slug name.
     create: true # Allow users to create new documents in this collection
     fields: # The fields each document in this collection have
-      - {label: "Title", name: "title", widget: "string"}
-      - {label: "Weight", name: "weight", widget: "number", required: false}
-      - {label: "Url", name: "url", widget: "string"}
-      - {label: "Publish Date", name: "date", widget: "datetime", format: "YYYY-MM-DD", timeFormat: false}
-      - {label: "Expiry Date", name: "expirydate", widget: "datetime", format: "YYYY-MM-DD", timeFormat: false, required: false, default: ''}
-      - {label: "Image", name: "cover", widget: "image", required: false}
-      - {label: "Body", name: "body", widget: "markdown"}
-      - {label: "Draft", name: "draft", widget: "boolean", default: true}
-      - {label: "Tags", name: "tags", widget: "list"}
+      - { label: "Title", name: "title", widget: "string" }
+      - { label: "Weight", name: "weight", widget: "number", required: false }
+      - { label: "Url", name: "url", widget: "string" }
+      - {
+          label: "Publish Date",
+          name: "date",
+          widget: "datetime",
+          format: "YYYY-MM-DD",
+          time_format: false,
+        }
+      - {
+          label: "Expiry Date",
+          name: "expirydate",
+          widget: "datetime",
+          format: "YYYY-MM-DD",
+          time_format: false,
+          required: false,
+          default: "",
+        }
+      - { label: "Image", name: "cover", widget: "image", required: false }
+      - { label: "Body", name: "body", widget: "markdown" }
+      - { label: "Draft", name: "draft", widget: "boolean", default: true }
+      - { label: "Tags", name: "tags", widget: "list" }
   - name: "home"
     label: "Home"
     files:
       - file: "site/content/_index.html"
         label: "Home Page"
         name: "home"
         fields:
-          - {label: Title, name: title, widget: string}
-          - {label: Body, name: body, widget: text}
+          - { label: Title, name: title, widget: string }
+          - { label: Body, name: body, widget: text }
   - name: "team"
     label: "Team  settings"
     media_folder: "/site/content/team"
@@ -92,17 +132,37 @@ collections: # A list of collections the CMS should be able to edit
             name: team
             widget: list
             fields:
-              - {label: Name, name: name, widget: string}
-              - {label: Title, name: title, widget: string}
-              - {label: Description, name: description, widget: string, required: false}
-              - {label: Github, name: github, widget: string, required: false}
-              - {label: Gitlab, name: gitlab, widget: string, required: false}
-              - {label: Linkedin, name: linkedin, widget: string, required: false}
-              - {label: Malt, name: malt, widget: string, required: false}
-              - {label: Mastodon, name: mastodon, widget: string, required: false}
-              - {label: Photo, name: photo, widget: "image", required: false}
-              - {label: Steam, name: steam, widget: string, required: false}
-              - {label: Twitter, name: twitter, widget: string, required: false}
+              - { label: Name, name: name, widget: string }
+              - { label: Title, name: title, widget: string }
+              - {
+                  label: Description,
+                  name: description,
+                  widget: string,
+                  required: false,
+                }
+              - { label: Github, name: github, widget: string, required: false }
+              - { label: Gitlab, name: gitlab, widget: string, required: false }
+              - {
+                  label: Linkedin,
+                  name: linkedin,
+                  widget: string,
+                  required: false,
+                }
+              - { label: Malt, name: malt, widget: string, required: false }
+              - {
+                  label: Mastodon,
+                  name: mastodon,
+                  widget: string,
+                  required: false,
+                }
+              - { label: Photo, name: photo, widget: "image", required: false }
+              - { label: Steam, name: steam, widget: string, required: false }
+              - {
+                  label: Twitter,
+                  name: twitter,
+                  widget: string,
+                  required: false,
+                }
   - name: "site_settings"
     label: "Site Settings"
     files:
@@ -115,21 +175,31 @@ collections: # A list of collections the CMS should be able to edit
             name: cloud
             widget: list
             fields:
-              - {label: Text, name: text, widget: string}
-              - {label: Poids, name: weight, widget: number}
-              - {label: Réassurance, name: label, widget: string}
+              - { label: Text, name: text, widget: string }
+              - { label: Poids, name: weight, widget: number }
+              - { label: Réassurance, name: label, widget: string }
       - file: "site/data/menu.json"
         label: Menu
         name: menu
         fields:
-          - {label: Links, name: links, widget: list, fields: [{label: Name, name: name, widget: string}, {label: Id, name: id, widget: string}, {label: Url, name: url, widget: string}]}
+          - {
+              label: Links,
+              name: links,
+              widget: list,
+              fields:
+                [
+                  { label: Name, name: name, widget: string },
+                  { label: Id, name: id, widget: string },
+                  { label: Url, name: url, widget: string },
+                ],
+            }
       - file: "site/hugo.toml"
         label: Hugo Config
         name: config
         editor:
           preview: false
         fields:
-          - {label: Site Title, name: title, widget: string}
+          - { label: Site Title, name: title, widget: string }
           - label: Params
             name: params
             widget: object
diff --git a/src/js/cms.js b/src/js/cms.js
@@ -14,74 +14,72 @@ CMS.registerPreviewTemplate("home", HomePreview);
 CMS.registerPreviewTemplate("post", PostPreview);
 CMS.registerPreviewTemplate("footer", FooterPreview);
 
-
 CMS.registerEditorComponent({
-    // Internal id of the component
-    id: "lightbox-image",
-    // Visible label
-    label: "Lightbox Image",
-    // Fields the user need to fill out when adding an instance of the component
-    fields: [
-        {
-            name: "title",
-            label: "Title",
-            widget: "string"
-        },
-        {
-            name: "group",
-            label: "Group",
-            widget: "string"
-        },
-        {
-            name: "image",
-            label: "Image",
-            widget: "image"
-        },
-    ],
-    // Regex pattern used to search for instances of this block in the markdown document.
-    // Patterns are run in a multiline environment (against the entire markdown document),
-    // and so generally should make use of the multiline flag (`m`). If you need to capture
-    // newlines in your capturing groups, you can either use something like
-    // `([\S\s]*)`, or you can additionally enable the "dot all" flag (`s`),
-    // which will cause `(.*)` to match newlines as well.
-    //
-    // Additionally, it's recommended that you use non-greedy capturing groups (e.g.
-    // `(.*?)` vs `(.*)`), especially if matching against newline characters.
-    pattern: /^-![(.*)]\((.*?) (.*?)\)$/ms,
-    // Given a RegExp Match object
-    // (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/match#return_value),
-    // return an object with one property for each field defined in `fields`.
-    //
-    // This is used to populate the custom widget in the markdown editor in the CMS.
-    fromBlock: function (match) {
-        return {
-            title: match[1],
-            image: match[2],
-            group: match[3]
-        };
+  // Internal id of the component
+  id: "lightbox-image",
+  // Visible label
+  label: "Lightbox Image",
+  // Fields the user need to fill out when adding an instance of the component
+  fields: [
+    {
+      name: "title",
+      label: "Title",
+      widget: "string",
+    },
+    {
+      name: "group",
+      label: "Group",
+      widget: "string",
+    },
+    {
+      name: "image",
+      label: "Image",
+      widget: "image",
     },
-    // Given an object with one property for each field defined in `fields`,
-    // return the string you wish to be inserted into your markdown.
-    //
-    // This is used to serialize the data from the custom widget to the
-    // markdown document
-    toBlock: function (data) {
-        return `
+  ],
+  // Regex pattern used to search for instances of this block in the markdown document.
+  // Patterns are run in a multiline environment (against the entire markdown document),
+  // and so generally should make use of the multiline flag (`m`). If you need to capture
+  // newlines in your capturing groups, you can either use something like
+  // `([\S\s]*)`, or you can additionally enable the "dot all" flag (`s`),
+  // which will cause `(.*)` to match newlines as well.
+  //
+  // Additionally, it's recommended that you use non-greedy capturing groups (e.g.
+  // `(.*?)` vs `(.*)`), especially if matching against newline characters.
+  pattern: /^-![(.*)]\((.*?) (.*?)\)$/ms,
+  // Given a RegExp Match object
+  // (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/match#return_value),
+  // return an object with one property for each field defined in `fields`.
+  //
+  // This is used to populate the custom widget in the markdown editor in the CMS.
+  fromBlock: function (match) {
+    return {
+      title: match[1],
+      image: match[2],
+      group: match[3],
+    };
+  },
+  // Given an object with one property for each field defined in `fields`,
+  // return the string you wish to be inserted into your markdown.
+  //
+  // This is used to serialize the data from the custom widget to the
+  // markdown document
+  toBlock: function (data) {
+    return `
 <a style="display: inline" href="${data.image}" data-lightbox="${data.group}" title="${data.title}">
   <img class="medium" src="${data.image}" alt="${data.title}">
 </a>
 `;
-    },
-    // Preview output for this component. Can either be a string or a React component
-    // (component gives better render performance)
-    toPreview: function (data) {
-        return `
+  },
+  // Preview output for this component. Can either be a string or a React component
+  // (component gives better render performance)
+  toPreview: function (data) {
+    return `
 <a style="display: inline" href="${data.image}" data-lightbox="${data.group}" title="${data.title}">
   <img class="medium" src="${data.image}" alt="${data.title}">
 </a>
 `;
-    }
+  },
 });
 
-
 CMS.init();
