Resolve submodule conflict for _includes/community

Author: Yashwanth1906

.github/workflows/ci.yml

@@ -64,7 +64,7 @@ jobs:
         run: yarn run test:coverage:all
 
       - name: Upload coverage report to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           name: ${{ env.CODECOV_UNIQUE_NAME }}

.github/workflows/issue.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Auto Label Issue
-        uses: Renato66/[email protected].0
+        uses: Renato66/[email protected].1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           ignore-comments: true

CONTRIBUTING-docs.md

@@ -64,6 +64,22 @@ After you have been assigned to an issue, fork the [json-schema-org/website](htt
 
 To propose modifications to our documentation that do not have an issue in the [documentation board](https://github.com/orgs/json-schema-org/projects/16), you can [create a GitHub issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-an-issue#creating-an-issue-from-a-repository) and use the *Documentation* template to describe the changes. After that, you can decide whether you want to work on the changes yourself or let someone else claim the issue. If you decide to work on the issue, assign it to yourself and commit the changes to a new branch. 
 
+## Add metadata to newly created markdown files
+Metadata helps organize content and maintain consistency across all pages in the documentation. It also provides key information about the file, such as its title, author, and the last updated date.
+
+When contributing to the documentation, it is essential to include metadata in every new markdown file. Metadata is critical for successfully building and rendering the file locally. Without it, the file may fail to render correctly or cause errors in the documentation system.
+
+### Example of metadata in a new markdown file
+Every new `.md` file should start with a YAML front matter block. Here's an example:
+---
+    title: "Your Page Title"
+    section: "docs"  # Can be used to categorize the content
+    date: "YYYY-MM-DD"  # Optional: Date when the page was created or last updated
+    author: "Your Name"  # Optional: Your name if you're the author
+    tags: ["tag1", "tag2"]  # Optional: Tags to categorize the page
+---
+To add the front matter metadata, copy and paste the example above at the top of your .md file and replace the details with the information of your document.
+
 ## Create a Pull Request
 
 To submit your work to review by the community, open a draft pull request to the `main` upstream branch, and add the issue your pull request solves. Add @json-schema-org/docs-team as a reviewer of your pull request, and let us know in the #documentation Slack channel your pull request is ready for review. 

README.md

@@ -20,15 +20,15 @@
 </p>
 
 # 👋 Welcome to the JSON Schema website
-This repository contains the sources of JSON Schema website:
+This repository contains the source code of the JSON Schema website:
 
-* It's powered by Next.js,
-* It uses Tailwind CSS framework,
-* It's build and deployed with Netlify.
+* Powered by Next.js,
+* Uses the Tailwind CSS framework,
+* Built and deployed with Netlify.
 
-## Setting up Project
+## Setting up the Project
 
-Please refer to the [INSTALLATION.md](./INSTALLATION.md) file for instructions on how to set up the project on your local machine.
+Please refer to [INSTALLATION.md](./INSTALLATION.md) for instructions on how to set up the project for local development.
 
 ## Project structure
 
@@ -37,41 +37,42 @@ This repository has the following structure:
 <!-- If you make any changes in the project structure, remember to update it. -->
 
 ```text
-  ├── .github                     # Definitions of GitHub workflows, pull request and issue templates
+  ├── .github                     # Definitions of GitHub workflows, pull request, and issue templates
   ├── components                  # Various generic components such as "Button", "Figure", etc.
-  ├── data                        # JSON Schema Implementations.
+  ├── data                        # JSON Schema implementations
   ├── styles                      # Various CSS files
-  ├── lib                         # Various JS code for preparing static data to render in pages
-  ├── pages                       # Website's pages source. It includes raw markdown files and React page templates.
+  ├── lib                         # Various JS code for preparing static data to render on pages
+  ├── pages                       # Website's pages source, including raw markdown files and React page templates
   │    ├── overview               # JSON Schema initiative docs
   │    ├── blog                   # Blog posts
   │    ├── learn                  # JSON Schema docs
   │    └── implementations        # Various pages to describe tools
-  ├── public                      # Data for site metadata and static blog such as images
+  ├── public                      # Data for site metadata and static assets such as images
   ├── next.config.js              # Next.js configuration file
 
 ```
 
 ## Contribute
-
 Here are some areas where you can contribute to the website:
-- Blogs posts
-- Case Studies
+
+- Blog posts
+- Case studies
 - Design
-- Documentation
+- Documentation improvements
 - Website enhancements
-- Add a new JSON Schema Implementation
+- Add a new JSON Schema implementation
 - JSON Schema Landscape
 
-To figure out a good first issue to work on, join our Slack workspace and visit the `#contribute` channel. This channel is specifically designed for onboarding and supporting new contributors.
+To identify good first issues to work on, join our Slack workspace and visit the `#contribute` channel. This channel is specifically designed for onboarding and supporting new contributors.
 
 You should also check out our [Contributing guidelines](./CONTRIBUTING.md).
 
 ### Contributors
 
-Thanks goes to these wonderful people who contributed to this website:
-<a href = "https://github.com/json-schema-org/website/graphs/contributors">
-  <img src = "https://contrib.rocks/image?repo=json-schema-org/website"/>
+Thanks to these wonderful people who contributed to this website:
+<br />
+<a href="https://github.com/json-schema-org/website/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=json-schema-org/website"/>
 </a>
 
 <sub>Made with [contributors-img](https://contrib.rocks).</sub>
@@ -83,19 +84,20 @@ Thanks goes to these wonderful people who contributed to this website:
 ### Backers
 
 **Thank you to all our backers!**
+
 [![Backers](https://opencollective.com/json-schema/backers.svg)](https://opencollective.com/json-schema/backers.svg?avatarHeight=90)
 
 ## Connect with the JSON Schema Community
 
 <p align="left">
-    <a href="https://json-schema.org/slack" target="blank" style="margin-right: 5px;"><img align="center" src="https://img.icons8.com/color/48/null/slack-new.png" alt="JSON Schema Slack" height="30" width="40" /></a>
-    <a href="https://x.com/jsonschema" target="blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/twitter.svg" alt="JSON Schema Twitter" height="30" width="40" /></a>
-    <a href="https://www.linkedin.com/company/jsonschema" target="blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/linked-in-alt.svg" alt="JSON Schema LinkedIn" height="30" width="40" /></a>
-    <a href="https://www.youtube.com/@JSONSchemaOrgOfficial" target="blank"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/youtube.svg" alt="JSON Schema YouTube" height="30" width="40" /></a>
+  <a href="https://json-schema.org/slack" target="_blank" style="margin-right: 5px;"><img align="center" src="https://img.icons8.com/color/48/null/slack-new.png" alt="JSON Schema Slack" height="30" width="auto" /></a>
+  <a href="https://twitter.com/jsonschema" target="_blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/twitter.svg" alt="JSON Schema Twitter" height="30" width="auto" /></a>
+  <a href="https://www.linkedin.com/company/jsonschema" target="_blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/linked-in-alt.svg" alt="JSON Schema LinkedIn" height="30" width="auto" /></a>
+  <a href="https://www.youtube.com/@JSONSchemaOrgOfficial" target="_blank"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/youtube.svg" alt="JSON Schema YouTube" height="30" width="auto" /></a>
 </p>
 
 ## Inspired by
-This document has been inspired by [AsyncAPI website README.md](https://github.com/asyncapi/website/blob/master/README.md).
+This document was inspired by [AsyncAPI website README.md](https://github.com/asyncapi/website/blob/master/README.md).
 
 ## License
-The contents of this repository are [licensed under](./LICENSE) either the BSD 3-clause license *or* the Academic Free License v3.0.
+The contents of this repository are licensed under either the BSD 3-clause license *or* the Academic Free License v3.0. See [LICENSE](./LICENSE).

_includes/community

@@ -0,0 +1,56 @@
+{
+  "contents": [
+    {
+      "title": "Written content",
+      "details": "Write guides, step-by-step tutorials, community documentation, JSON Schema blog posts, and beyond.",
+      "icon": "/img/ambassadors/illustrations/content.png"
+    },
+    {
+      "title": "Podcasts and Videos",
+      "details": "Produce educational videos, podcasts or livestreams speaking about JSON Schema.",
+      "icon": "/img/ambassadors/illustrations/video.png"
+    },
+    {
+      "title": "Give talks",
+      "details": "Speak at meetups and conferences; we’ll help with slides, abstract submissions, and travel budget.",
+      "icon": "/img/ambassadors/illustrations/speaker.png"
+    },
+    {
+      "title": "JSON Schema Contributions",
+      "details": "Collaborate with the JSON Schema community via diverse contributions and improvements.",
+      "icon": "/img/ambassadors/illustrations/contributing.png"
+    },
+    {
+      "title": "Ecosystem Impact",
+      "details": "Promote JSON Schema adoption in other ecosystems.",
+      "icon": "/img/ambassadors/illustrations/ecosystem.png"
+    },
+    {
+      "title": "Gather Case Studies",
+      "details": "Collaborate in the production of case-studies.",
+      "icon": "/img/ambassadors/illustrations/case-studies.png"
+    }
+  ],
+  "tokens": [
+    {
+      "emoji": "🗺️",
+      "title": "Travel",
+      "details": "Ambassadors are provided free entry to JSON conferences."
+    },
+    {
+      "emoji": "🌟",
+      "title": "Recognition",
+      "details": "Ambassadors receive community-wide recognition."
+    },
+    {
+      "emoji": "🎁",
+      "title": "Special Swags",
+      "details": "Community members recognize you by gifting you exclusive JSON Ambassador swag."
+    },
+    {
+      "emoji": "🧰",
+      "title": "Workshop Swags",
+      "details": "Ambassadors are gifted swag from JSON conferences and workshops."
+    }
+  ]
+}

data/ambassador_lists.json

@@ -0,0 +1 @@
+../_includes/community/programs/ambassadors/ambassadors.json

data/ambassadors.json

@@ -0,0 +1,106 @@
+import moment from 'moment-timezone';
+
+export async function fetchRemoteICalFile(url: string): Promise<string | null> {
+  try {
+    const response = await fetch(url, { method: 'GET', mode: 'no-cors' });
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
+    }
+    return await response.text();
+  } catch (error) {
+    console.error('Error fetching iCal file:', error);
+    return null;
+  }
+}
+
+export function printEventsForNextWeeks(icalData: { [x: string]: any }) {
+  const arrayDates = [];
+  if (!icalData) {
+    console.error('iCal data is empty or invalid.');
+    return;
+  }
+
+  // Calculate the range of dates for the next 12 weeks from today
+  const today = moment().startOf('day');
+  const nextTwelveWeeksEnd = moment().add(12, 'weeks').endOf('day');
+
+  // Loop through the events in the iCal data
+  for (const k in icalData) {
+    const event = icalData[k];
+
+    if (event.type === 'VEVENT') {
+      const title = event.summary;
+
+      const timezoneL = moment.tz.guess(); // Default to UTC if timezone information is not provided
+
+      const startDate = moment.tz(event.start, timezoneL);
+
+      // Complicated case - if an RRULE exists, handle multiple recurrences of the event.
+      if (event.rrule !== undefined) {
+        const dates = event.rrule.between(
+          today.toDate(),
+          nextTwelveWeeksEnd.toDate(),
+          true,
+        );
+
+        // Loop through the set of date entries to see which recurrences should be printed.
+        for (const date of dates) {
+          const startDate = moment.tz(date, timezoneL);
+          const eventtimezone = event.start.tz;
+          const owntimezone = moment.tz.guess();
+          const eventOffset = moment.tz(eventtimezone).utcOffset();
+          const localOffset = moment.tz(owntimezone).utcOffset();
+          const offsetDifference = localOffset - eventOffset;
+
+          // Check if the event falls within the next 4 weeks from today
+          if (startDate.isBetween(today, nextTwelveWeeksEnd, undefined, '[]')) {
+            const dateTimezone = moment.tz.zone(event.start.tz);
+            let offset;
+            if (dateTimezone && offsetDifference)
+              offset = offsetDifference - dateTimezone.utcOffset(date);
+
+            const newDate = moment(date).subtract(offset, 'minutes').toDate();
+
+            const start = moment(newDate);
+            const utcDate = start.utc();
+
+            const time = utcDate.format('MMMM Do YYYY, HH:mm');
+            const day = utcDate.format('D');
+            const parsedStartDate = utcDate.format('YYYY-MM-DD HH:mm:ss');
+            arrayDates.push({
+              title,
+              time,
+              day,
+              timezone: 'UTC',
+              parsedStartDate,
+            });
+          }
+        }
+      } else {
+        // Simple case - no recurrences, just print out the calendar event.
+        if (startDate.isBetween(today, nextTwelveWeeksEnd, undefined, '[]')) {
+          const utcDate = startDate.utc();
+
+          const time = utcDate.format('MMMM Do YYYY, HH:mm');
+          const day = utcDate.format('D');
+          const parsedStartDate = utcDate.format('YYYY-MM-DD HH:mm:ss');
+          arrayDates.push({
+            title,
+            time,
+            day,
+            timezone: 'UTC',
+            parsedStartDate,
+          });
+        }
+      }
+    }
+  }
+
+  arrayDates.sort(
+    (x, y) =>
+      new Date(x.parsedStartDate).getTime() -
+      new Date(y.parsedStartDate).getTime(),
+  );
+
+  return arrayDates;
+}

lib/calendarUtils.ts

@@ -26,7 +26,7 @@
     "node": "^20.0.0"
   },
   "dependencies": {
-    "@docsearch/react": "3.6.1",
+    "@docsearch/react": "3.8.0",
     "@types/jsonpath": "^0.2.4",
     "axios": "1.7.7",
     "babel-loader": "^9.1.3",
@@ -38,8 +38,8 @@
     "js-yaml": "^4.1.0",
     "jsonpath": "^1.1.1",
     "jszip": "^3.10.1",
-    "markdown-to-jsx": "^7.4.7",
-    "moment": "2.29.4",
+    "markdown-to-jsx": "^7.6.2",
+    "moment": "2.30.1",
     "next": "14.2.14",
     "next-sitemap": "^4.2.3",
     "next-themes": "^0.3.0",
@@ -49,17 +49,17 @@
     "react-syntax-highlighter": "^15.6.1",
     "react-text-truncate": "^0.19.0",
     "reading-time": "^1.5.0",
-    "slate": "^0.103.0",
+    "slate": "^0.110.2",
     "slate-react": "^0.108.0",
     "slugify": "^1.6.5",
     "yarn": "1.22.22",
     "zero-fill": "^2.2.4",
     "zustand": "^5.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2",
+    "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
-    "@cypress/code-coverage": "^3.13.2",
+    "@cypress/code-coverage": "^3.13.6",
     "@next/eslint-plugin-next": "^14.0.1",
     "@svgr/webpack": "^8.1.0",
     "@types/babel__core": "^7",
@@ -92,7 +92,7 @@
     "postcss": "^8.4.41",
     "prettier": "3.3.3",
     "tailwindcss": "^3.3.5",
-    "typescript": "5.2.2",
+    "typescript": "5.7.2",
     "webpack": "^5.94.0"
   },
   "babel": {