Merge branch 'main' into patch-1

Author: drewbrew

README.md

@@ -22,3 +22,7 @@ This opens a local server at `http://localhost:8080/` and watches for changes to
 # To Dos
 
 1. Replace autoprefixer and cssnano with lightningcss
+
+# Guidelines for Development
+
+1. While 11ty allows for shortcodes and other customizations, sticking with Liquid fundamentals is preferred for interoperability.

eleventy.config.js

@@ -1,13 +1,17 @@
 const path = require('path');
 
 const Image = require('@11ty/eleventy-img');
-const markdownIt = require("markdown-it");
 
 const setupCollections = require('./lib/collections');
+const setupSessions = require('./lib/sessions');
 const setupFeed = require('./lib/feed');
+const markdown = require('./lib/markdown');
+
+const { UTCDate } = require('@date-fns/utc');
 
 module.exports = (config) => {
   setupCollections(config);
+  //setupSessions(config);
   setupFeed(config);
 
   /*
@@ -43,7 +47,7 @@ module.exports = (config) => {
     sizes,
     classes = "") {
       let metadata = await Image(src, {
-        widths: [300, 600],
+        widths: [180, 300, 600],
         formats: ["webp"],
         outputDir,
         urlPath,
@@ -66,19 +70,26 @@ module.exports = (config) => {
     return Image.generateHTML(metadata, imageAttributes);
   });
 
+  config.addPairedShortcode("markdown", function(content = "") {
+    return markdown.render(content);
+  });
+
   /*
     Filters
   */
   config.addFilter("markdown", function(content = "") {
-    let markdown = markdownIt({
-      html: true,
-      breaks: true,
-      linkify: true
-    });
-
     return markdown.render(content);
   });
 
+  // https://www.11ty.dev/docs/dates/#dates-off-by-one-day
+  config.addFilter("utcDate", function(date) {
+    return new UTCDate(date);
+  });
+
+  config.addFilter("find", function find(collection = [], slug = "") {
+    return collection.find(item => item.fileSlug === slug);
+  });
+
   /*
     Misc configuration
   */
@@ -87,6 +98,8 @@ module.exports = (config) => {
     excerpt_separator: "<!-- excerpt -->"
   });
 
+  config.setLibrary("md", markdown);
+
   return {
     dir: {
       input: "src",
@@ -96,7 +109,6 @@ module.exports = (config) => {
 
     // Use Liquid for templating
     // https://www.11ty.dev/docs/languages/liquid/
-    htmlTemplateEngine: "liquid",
-    markdownTemplateEngine: "liquid"
+    htmlTemplateEngine: "liquid"
   }
 };

lib/markdown.js

@@ -0,0 +1,17 @@
+const markdownIt = require("markdown-it");
+const markdownItAnchor = require("markdown-it-anchor");
+
+const markdown = markdownIt({
+    html: true,
+    breaks: true,
+    linkify: true
+  })
+  .use(markdownItAnchor, {
+    // The level option defines the minimum level of headings to apply anchors to.
+    // 1 applies to all headings. 2 will apply to h2 and below, etc.
+    level: 1,
+    // The slugify option is a function that transforms the heading text into a URL fragment identifier.
+    slugify: markdownItAnchor.defaults.slugify
+});
+
+module.exports = markdown;

lib/sessions.js

@@ -0,0 +1,77 @@
+const fs = require('fs');
+const yaml = require('yaml');
+
+module.exports = function(config) {
+  config.addCollection("sessionsByDateAndTime", function(collectionApi) {
+    // Get all sessions
+    let sessions = collectionApi.getFilteredByGlob("src/_content/schedule/{tutorials,talks,sprints}/*.md");
+
+    // Read and parse manual.yaml
+    const manualContent = fs.readFileSync('src/_content/schedule/manual.yaml', 'utf8');
+    const manualData = yaml.parse(manualContent);
+
+    // Merge manual sessions with existing sessions
+    sessions = sessions.concat(manualData);
+
+    // Filter out hidden sessions
+    sessions = sessions.filter(session => !(session.data?.hidden || session.hidden));
+
+    // Manually set session URLs
+    /*
+    sessions = sessions.map(session => {
+      const sessionData = session.data || session;
+      if (sessionData.permalink) {
+        sessionData.url = sessionData.permalink;
+      } else {
+        sessionData.url = `/talks/${sessionData.slug}/`;
+      }
+
+      return session;
+    });
+    */
+
+    // Group sessions by date and time
+    const sessionsByDateAndTime = sessions.reduce((acc, session) => {
+      const sessionData = session.data || session;
+
+      let dateObj = new Date(sessionData.datetime);
+      let date = dateObj.toISOString().split('T')[0];
+      let start = dateObj.toISOString();
+      let end = sessionData.end_datetime;
+
+      if (!acc[date]) {
+        acc[date] = []
+      }
+
+      let slotKey = `${start}-${end}`;
+      let slot = acc[date].find(slot => `${slot.start}-${slot.end}` === slotKey);
+
+      if (!slot) {
+        slot = {
+          start: start,
+          end: end,
+          sessions: []
+        };
+        acc[date].push(slot);
+      }
+
+      slot.sessions.push(sessionData);
+
+      return acc;
+    }, {});
+
+    // Sort sessions by start date and then end date
+    for (let date in sessionsByDateAndTime) {
+      sessionsByDateAndTime[date].sort((a, b) => {
+        let startComparison = new Date(a.start) - new Date(b.start);
+        if (startComparison !== 0) {
+          return startComparison;
+        } else {
+          return new Date(a.end) - new Date(b.end);
+        }
+      });
+    }
+
+    return sessionsByDateAndTime;
+  });
+};