Resolved latest merge conflicts

Signed-off-by: Aviral Asthana <[email protected]>

.github/ISSUE_TEMPLATE/chore_task.md

@@ -1,28 +1,22 @@
 ---
 name: 🧹Chore or task
 about: Identify a necessary task to be addressed.
-title: ""
-labels: "kind/chore"
-assignees: ""
+title: ''
+labels: 'kind/chore'
+assignees: ''
 ---
-
 ### Current Behavior
-
 <!-- A brief description of what the current circumstance is. -->
 
 ### Desired Situation
-
 <!-- A brief description of the necessary action to take. -->
 
 ---
-
 <img src="https://raw.githubusercontent.com/layer5io/layer5/master/.github/assets/images/layer5/5-light-small.svg" width="24px" align="left" /><h2>Contributor Resources and <a href="https://layer5.io/community/handbook">Handbook</a></h2>
 
 The layer5.io website uses Gatsby, React, and GitHub Pages. Site content is found under the [`master` branch](https://github.com/layer5io/layer5/tree/master).
-
 - 📚 See [contributing instructions](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md).
 - 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
-
 - 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](https://slack.layer5.io).
 
 <img src="https://raw.githubusercontent.com/layer5io/layer5/master/.github/assets/images/buttons/community.webp" height="22px" align="left" />Join the Layer5 Community by submitting your [community member form](https://layer5.io/newcomer).

src/collections/events/hacktoberfest-2022/index.mdx → src/collections/events/2022/hacktoberfest-2022/index.mdx

@@ -1,32 +1,31 @@
----
-title: "Hacktoberfest Prep: Easing into CNCF Open Source Projects"
-description: "Gear up for Hacktoberfest! Discover the impact of small changes on a project's scalability. Join Layer5's MeshMates and Maintainers to contribute effortlessly to CNCF projects."
-thumbnail: ./hacktoberfest22.webp
-darkthumbnail: ./hacktoberfest22.webp
-date: 2022-09-30
-eurl: /community/calendar
-type: Event
-speakers: ["Gaurav Chadha", "Nikhil Ladha", "Anita Ihuman", "Harshit Dandriyal", "Alexis Abakasanga", "Abhishek Kumar", "Ashish Tiwari"]
-published: true
-upcoming: false
-register: false
----
-
-
-import hacktoberfestprepslides from "./hacktoberfest-prep-easing-into-cncf-open-source-projects_compressed.pdf";
-
-<p>
-<Link to="/programs/hacktoberfest">Hacktoberfest</Link> is just around the corner. You'd be surprised to know how small changes can make a big impact on a project. The more a project scales, the easier it is for small errors to live within it. You can make a real difference by fixing these relatively easier issues and continue to grow from there.
-</p>
-
-<p>
-Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects the easy way with Layer5 <Link to="/community/meshmates">MeshMates</Link> and Maintainers. Spend an hour with seasoned, open source maintainers and hack your way through. To get a head start, see our <Link to="/community/newcomers">Newcomers Resources</Link>. Get familiar with the Layer5 community through our <Link to="/community/handbook">Community Handbook</Link>.
-</p>
-
-<p> 
-Resources:
-<ul>
-    <li><Link to="https://www.youtube.com/watch?v=3dqFF_0FsTE">Watch the livestream recording</Link></li>
-    <li><Link to={hacktoberfestprepslides}>Review the slides</Link></li>
-</ul>
-</p>
+---
+title: "Hacktoberfest Prep: Easing into CNCF Open Source Projects"
+description: "Gear up for Hacktoberfest! Discover the impact of small changes on a project's scalability. Join Layer5's MeshMates and Maintainers to contribute effortlessly to CNCF projects."
+thumbnail: ./hacktoberfest22.webp
+darkthumbnail: ./hacktoberfest22.webp
+date: 2022-09-30
+eurl: /community/calendar
+type: Event
+speakers: ["Gaurav Chadha", "Nikhil Ladha", "Anita Ihuman", "Harshit Dandriyal", "Alexis Abakasanga", "Abhishek Kumar", "Ashish Tiwari"]
+published: true
+upcoming: false
+register: false
+---
+
+import { Link } from "gatsby" ;
+import hacktoberfestprepslides from "./hacktoberfest-prep-easing-into-cncf-open-source-projects.pdf";
+
+<p>
+<Link to="/programs/hacktoberfest">Hacktoberfest</Link> is just around the corner. You'd be surprised to know how small changes can make a big impact on a project. The more a project scales, the easier it is for small errors to live within it. You can make a real difference by fixing these relatively easier issues and continue to grow from there.
+</p>
+
+<p>
+Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects the easy way with Layer5 <Link to="/community/meshmates">MeshMates</Link> and Maintainers. Spend an hour with seasoned, open source maintainers and hack your way through. To get a head start, see our <Link to="/community/newcomers">Newcomers Resources</Link>. Get familiar with the Layer5 community through our <Link to="/community/handbook">Community Handbook</Link>.
+</p>
+
+<p> Resources:</p>
+<ul>
+    <li><Link to="https://www.youtube.com/watch?v=3dqFF_0FsTE">Watch the livestream recording</Link></li>
+    <li><Link to={hacktoberfestprepslides}>Review the slides</Link></li>
+</ul>
+

src/collections/events/hacktoberfest-2023/index.mdx → src/collections/events/2023/hacktoberfest-2023/index.mdx

@@ -1,44 +1,43 @@
----
-title: "Hacktoberfest Prep 2023: Easing into CNCF Open Source Projects"
-description: "Prepare for Hacktoberfest with Layer5 MeshMates and Maintainers. Join seasoned open source maintainers, hack through easy issues, and grow your skills. Discover Newcomers Resources and explore the Layer5 Community Handbook."
-thumbnail: ./hacktoberfest2023.png
-darkthumbnail: ./hacktoberfest2023.png
-date: 2023-09-29
-eurl: /community/calendar
-type: Event
-speakers: ["Gaurav Chadha", "Pranav Singh", "Uzair Shaikh", "Yash Sharma", "Anita Ihuman", "Saurabh Soni", "Ritik Saxena", "Senali Dilumika", "Sudhanshu Dasgupta", "Rex Joshua Ibegbu"]
-published: true
-upcoming: false
-register: false
----
-
-import { Link } from "gatsby" ;
-import hacktoberfestprepslides from "./hacktoberfest-prep-easing-into-cncf-open-source-projects.pdf";
-import hacktoberfestBadge from "./hacktoberfest-contributor.png";
-
-<p>
-<Link to="/programs/hacktoberfest">Hacktoberfest</Link> is just around the corner. You'd be surprised to know how small changes can make a big impact on a project. The more a project scales, the easier it is for small errors to live within it. You can make a real difference by fixing these relatively easier issues and continue to grow from there.
-</p>
-
-<p>
-Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects the easy way with Layer5 <Link to="/community/meshmates">MeshMates</Link> and Maintainers. Spend an hour with seasoned, open source maintainers and hack your way through. To get a head start, see our <Link to="/community/newcomers">Newcomers Resources</Link>. Get familiar with the Layer5 community through our <Link to="/community/handbook">Community Handbook</Link>.
-</p>
-
-<ul>
-    <li><strong>DATE:</strong> September 29, 2023</li>
-    <li><strong>TIME:</strong> 10:00 AM CT | 8:30 PM IST</li>
-    <li><strong>MEET:</strong> <a href="https://meet.layer5.io/community"> Zoom</a></li>
-</ul>
-
-<p>
-    Resources:
-    <ul>
-    <li><Link to="https://docs.google.com/spreadsheets/d/11KPLU9vVklgGn9NbluLegbfQAyBA5ZS58AhoA8_PCVI/edit#gid=0">Issues for Hacktoberfest</Link></li>
-    <li><a href="https://www.youtube.com/watch?v=T7xLUqrnxtI">Recorded Livestream</a></li>
-    <li><a href={hacktoberfestprepslides}>Presentation Slides</a></li>
-    </ul>
-</p>
-
-<p>Earn a Badge </p> 
-<p>Earn a Hacktoberfest Contributor badge by contributing to Layer5 projects during this Hacktoberfest.</p>
+---
+title: "Hacktoberfest Prep 2023: Easing into CNCF Open Source Projects"
+description: "Prepare for Hacktoberfest with Layer5 MeshMates and Maintainers. Join seasoned open source maintainers, hack through easy issues, and grow your skills. Discover Newcomers Resources and explore the Layer5 Community Handbook."
+thumbnail: ./hacktoberfest2023.png
+darkthumbnail: ./hacktoberfest2023.png
+date: 2023-09-29
+eurl: /community/calendar
+type: Event
+speakers: ["Gaurav Chadha", "Pranav Singh", "Uzair Shaikh", "Yash Sharma", "Anita Ihuman", "Saurabh Soni", "Ritik Saxena", "Senali Dilumika", "Sudhanshu Dasgupta", "Rex Joshua Ibegbu"]
+published: true
+upcoming: false
+register: false
+---
+
+import { Link } from "gatsby" ;
+import hacktoberfestprepslides from "./hacktoberfest-prep-easing-into-cncf-open-source-projects.pdf";
+import hacktoberfestBadge from "./hacktoberfest-contributor.png";
+
+<p>
+<Link to="/programs/hacktoberfest">Hacktoberfest</Link> is just around the corner. You'd be surprised to know how small changes can make a big impact on a project. The more a project scales, the easier it is for small errors to live within it. You can make a real difference by fixing these relatively easier issues and continue to grow from there.
+</p>
+
+<p>
+Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects the easy way with Layer5 <Link to="/community/meshmates">MeshMates</Link> and Maintainers. Spend an hour with seasoned, open source maintainers and hack your way through. To get a head start, see our <Link to="/community/newcomers">Newcomers Resources</Link>. Get familiar with the Layer5 community through our <Link to="/community/handbook">Community Handbook</Link>.
+</p>
+
+<ul>
+    <li><strong>DATE:</strong> September 29, 2023</li>
+    <li><strong>TIME:</strong> 10:00 AM CT | 8:30 PM IST</li>
+    <li><strong>MEET:</strong> <a href="https://meet.layer5.io/community"> Zoom</a></li>
+</ul>
+
+<p> Resources:</p>
+    <ul>
+    <li><Link to="https://docs.google.com/spreadsheets/d/11KPLU9vVklgGn9NbluLegbfQAyBA5ZS58AhoA8_PCVI/edit#gid=0">Issues for Hacktoberfest</Link></li>
+    <li><a href="https://www.youtube.com/watch?v=T7xLUqrnxtI">Recorded Livestream</a></li>
+    <li><a href={hacktoberfestprepslides}>Presentation Slides</a></li>
+    </ul>
+
+
+<p>Earn a Badge </p> 
+<p>Earn a Hacktoberfest Contributor badge by contributing to Layer5 projects during this Hacktoberfest.</p>
 <img src={hacktoberfestBadge} style="width: 250px"/>

src/collections/events/2024/kubecon-EU-2024/index.mdx

@@ -1,24 +1,24 @@
----
-title: "KubeCon + CloudNativeCon EU Paris, France 2024"
-description: "CNCF Tag Network and Service mesh Working Group Deep Dive"
-date: 2024-03-19
-thumbnail: ./kubeconEU2024.png
-darkthumbnail: ./kubeconEU2024.png
-eurl: https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/
-type: Event
-published: true
-upcoming: true
-feature: true
-speakers: ["Lee Calcote", "Nic Jackson", "Zack Butcher", "Zhonghu Xu"]
-
----
-import Button from "../../../../reusecore/Button";
-
-Join Layer5 at KubeCon + CloudNativeCon EU Paris, France 2024!
-
-
-<p>
-Join the Meshery project at KubeCon Europe 2024 from 19th March to 22nd March, 2024 and get introduced to the cloud native management plane and its open source maintainers.
-</p>
-
-<Button secondary title="KubeCon EU 2024 CNCF TAG Network Slide" url="/cncf-tag-network/KubeCon-EU-2024-CNCF-TAG-Network.pdf" external={ true } />
+---
+title: "KubeCon + CloudNativeCon EU Paris, France 2024"
+description: "CNCF Tag Network and Service mesh Working Group Deep Dive"
+date: 2024-03-19
+thumbnail: ./kubeconEU2024.png
+darkthumbnail: ./kubeconEU2024.png
+eurl: https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/
+type: Event
+published: true
+upcoming: false
+feature: true
+speakers: ["Lee Calcote", "Nic Jackson", "Zack Butcher", "Zhonghu Xu"]
+
+---
+import Button from "../../../../reusecore/Button";
+
+Join Layer5 at KubeCon + CloudNativeCon EU Paris, France 2024!
+
+
+<p>
+Join the Meshery project at KubeCon Europe 2024 from 19th March to 22nd March, 2024 and get introduced to the cloud native management plane and its open source maintainers.
+</p>
+
+<Button secondary title="KubeCon EU 2024 CNCF TAG Network Slide" url="/cncf-tag-network/KubeCon-EU-2024-CNCF-TAG-Network.pdf" external={ true } />