Merge branch 'master' into huzfm/mobile-responsive

Author: vr-varad

.desktop-lighthouserc.js

@@ -13,7 +13,7 @@ module.exports = {
          "http://localhost/cloud-native-management/kanvas/index.html?desktop",
          "http://localhost/learn/learning-paths/index.html?desktop",
          "http://localhost/learn/service-mesh-books/index.html?desktop",
-         "http://localhost/learn/service-mesh-workshops/index.html?desktop",
+         "http://localhost/learn/workshops/index.html?desktop",
          "http://localhost/learn/index.html?desktop",
          "http://localhost/blog/index.html?desktop",
          "http://localhost/resources/index.html?desktop",

.github/labeler.yml

@@ -51,7 +51,7 @@ area/learn:
     - "src/components/Learn-Components/**/*"
     - "src/collections/service-mesh-books/**/*"
     - "src/collections/service-mesh-learn/**/*"
-    - "src/collections/service-mesh-workshops/**/*"
+    - "src/collections/workshops/**/*"
     - "src/templates/book-*.js"
     - "src/templates/course-*.js"
     - "src/templates/lab-*.js"

.lighthouserc.js

@@ -11,7 +11,7 @@ module.exports = {
           "http://localhost/cloud-native-management/kanvas/index.html",
           "http://localhost/learn/learning-paths/index.html",
           "http://localhost/learn/service-mesh-books/index.html",
-          "http://localhost/learn/service-mesh-workshops/index.html",
+          "http://localhost/learn/workshops/index.html",
           "http://localhost/learn/index.html",
           "http://localhost/blog/index.html",
           "http://localhost/resources/index.html",

README.md

@@ -59,17 +59,6 @@
 <br />
 
 
-<p style="clear:both;">
-<h2><a href="https://layer5.io/landscape">Service Mesh Landscape</a></h2>
-<a href="https://layer5.io/landscape"><img src=".github/assets/images/buttons/landscape.webp"  
-style="float:left;margin:10px;" width="125px"
-alt="Service Mesh Landscape Ecosystem" align="left"/></a>
-The <a href="https://layer5.io/landscape">Service Mesh Landscape</a> is a comprehensive collection of prominent service mesh projects and offerings laid out in contrast to one another.
-<br /><br /><br />
-</p>
-<br />
-
-
 <p style="clear:both;">
 <h2><a href="https://layer5.io/projects/cloud-native-performance">Cloud Native Performance</a></h2>
 <a href="https://layer5.io/projects/cloud-native-performance">
@@ -91,7 +80,7 @@ The <a href="https://layer5.io/projects/cloud-native-performance">Cloud Native P
 style="float:left;margin:10px;" width="125px"
 alt="Image Hub" align="left" /></a>
 <a href="https://layer5.io/projects/image-hub">Image Hub</a> is a demo application which runs on <a href="https://docs.meshery.io/service-meshes/adapters/consul">Consul</a> and facilitates exploring WebAssembly modules used as Envoy Filters.
-Image Hub supports Envoy-based data planes. It is compatible with and can be deployed on Istio and Consul service meshes.
+Image Hub supports Envoy-based data planes. It is compatible with and can be deployed on Istio and Consul.
 <br /><br /><br />
 </p>
 <br />
@@ -121,18 +110,6 @@ alt="Learn Layer5" align="left" />
 </p>
 <br />
 
-
-<!-- <p style="clear:both;">
-<h2><a href="https://layer5.io/smi">Service Mesh Interface Conformance </a></h2>
-<a href="https://layer5.io/smi"><img src=".github/assets/images/smi-conformance/checklist.svg"
-style="float:left;margin:10px;" width="125px"
-alt="Service Mesh Interface Conformance" align="left" /></a>
-<a href="https://layer5.io/smi">SMI Conformance</a> includes all service mesh projects participating in the Service Mesh Interface specification. It is an easy-to-use, service mesh and SMI-specific tool to give service mesh projects and users a suite of repeatable conformance tests.
-<br /><br /><br />
-</p>
-<br />
- -->
-
 <p style="clear:both;">
 <h2><a href="https://layer5.io/projects/nighthawk">Nighthawk</a></h2>
 <a href="https://getnighthawk.dev/">

content-learn/mastering-kubernetes-for-engineers/ambassador-edge-stack-api-gateway-with-meshery/index.mdx

@@ -1,7 +1,7 @@
 ---
 docType: "Course"
 title: "Course"
-description: "This course will guide you through the process of deploying and visualizing Edge Stack components with Meshery. You will learn how to install and configure the Ambassador API Gateway and explore its integration with Meshery. Additionally, you will gain hands-on experience with two popular service meshes, Istio and Linkerd. By the end of this course, you will have a solid understanding of Edge Stack deployment and be able to leverage Meshery for managing your API gateway and service mesh configurations."
+description: "This course will guide you through the process of deploying and visualizing Edge Stack components with Meshery. You will learn how to install and configure the Ambassador API Gateway and explore its integration with Meshery. Additionally, you will gain hands-on experience with Istio and Linkerd. By the end of this course, you will have a solid understanding of Edge Stack deployment and be able to leverage Meshery for managing your API gateway and infrastructure configurations."
 videos: 0
 lectures: 4
 courseTitle: "Ambassador Edge Stack API Gateway with Meshery"

content-learn/mastering-meshery/introduction-to-meshery/meshery/creating-designs.mdx

@@ -19,7 +19,7 @@ import importDesignImage from "../../../../src/assets/images/learning-path/creat
 import configuringImportedDesignImage from "../../../../src/assets/images/learning-path/creating-designs/configuring-imported-design.png";
 import mesheryHelmChartImage from "../../../../src/assets/images/learning-path/creating-designs/meshery-helm-chart.png";
 import cloneDesignImage from "../../../../src/assets/images/learning-path/creating-designs/clone-design.png";
-import listOfDesignsImage from "../../../../src/assets/images/learning-path/creating-designs/list-of-designs.png";
+import renderedDesign from "../../../../src/assets/images/learning-path/creating-designs/rendered-design.png";
 import catalogImage from "../../../../src/assets/images/learning-path/creating-designs/catalog.png";
 import openInPlaygroundImage from "../../../../src/assets/images/learning-path/creating-designs/open-in-playground.png";
 import { ChapterStyle } from "../../../../src/components/Learn-Components/Chapters-Style/chapters.style.js";
@@ -117,15 +117,13 @@ When working with Kanvas, you can effortlessly integrate various design files to
 
 2. Enter a name for the design in the **Design File Name** field.
 
-3. Choose the appropriate **Design Type** for the file you want to import (Helm Chart, Kubernetes, Manifest, etc).
-
-4. Select your preferred import method: either **URL** or **File Upload**.
+3. Select your preferred import method: either **URL** or **File Upload**.
 
 <a href={configuringImportedDesignImage}>
   <img src={configuringImportedDesignImage} width="100%" align="center" />
 </a>
 
-5. **Example:** Use the Meshery Server Helm chart at [Meshery Helm Chart](https://meshery.github.io/meshery.io/charts/meshery-v0.7.48.tgz).
+4. **Example:** Use the Meshery Server Helm chart at [Meshery Helm Chart](https://meshery.github.io/meshery.io/charts/meshery-v0.7.48.tgz).
 
 <a href={mesheryHelmChartImage}>
   <img src={mesheryHelmChartImage} width="100%" align="center" />
@@ -139,7 +137,7 @@ When working with Kanvas, you can effortlessly integrate various design files to
 
 1. Switch to Kanvas Designer mode, if not already in it. 
 
-2. In the left navigation panel, click the **“Catalog”** menu tab.
+2. From the canvas, click the **“Start From Template”** tab.
 
 3. Select a design from the list that appears in the panel.
 
@@ -151,12 +149,12 @@ When working with Kanvas, you can effortlessly integrate various design files to
 
 5. Click **“clone”** and a copy of the design will appear on your Kanvas canvas. You can then configure the design to suit your purposes.
 
-6. Find your newly cloned design in the list of designs in the left navigation panel.
-
-<a href={listOfDesignsImage}>
-  <img src={listOfDesignsImage} width="100%" align="center" />
+<a href={renderedDesign}>
+  <img src={renderedDesign} width="100%" align="center" />
 </a>
 
+6. Find your newly cloned design in the list of designs in your workspace.
+
 <h2 class="chapter-sub-heading">Github Integrations</h2>
 
 Integrating your GitHub account with Meshery unlocks the ability to import files as designs directly from your repositories, enhancing your collaboration and version control processes. This integration allows you to streamline your workflow, ensuring that your design infrastructure is always up-to-date and aligned with your source code. To get started with integrating GitHub into Meshery, follow the comprehensive guide available [here](https://docs.layer5.io/cloud/getting-started/github-integration/).

gatsby-config.js

@@ -13,15 +13,28 @@ module.exports = {
   },
   flags: {
     FAST_DEV: true,
-    PARALLEL_SOURCING: true
+    PARALLEL_SOURCING: true,
   },
   trailingSlash: "never",
   plugins: [
+    {
+      resolve: "gatsby-plugin-netlify",
+      options: {
+        headers: {
+          "/*": [
+            "X-Frame-Options: SAMEORIGIN",
+            "Content-Security-Policy: frame-ancestors 'self'",
+          ],
+        },
+        mergeSecurityHeaders: true,
+        mergeCachingHeaders: true,
+      },
+    },
     {
       resolve: "gatsby-plugin-webpack-bundle-analyser-v2",
       options: {
-        disable: true
-      }
+        disable: true,
+      },
     },
     {
       resolve: "gatsby-plugin-sitemap",
@@ -41,10 +54,8 @@ module.exports = {
           }
         }
       `,
-        resolvePages: ({
-          allSitePage: { nodes: allPages },
-        }) => {
-          return allPages.map(page => {
+        resolvePages: ({ allSitePage: { nodes: allPages } }) => {
+          return allPages.map((page) => {
             return { ...page };
           });
         },
@@ -73,8 +84,8 @@ module.exports = {
                   // or disable plugins
                   inlineStyles: false,
                   cleanupIds: false,
-                }
-              }
+                },
+              },
             },
           ],
         },
@@ -287,7 +298,71 @@ module.exports = {
           },
           {
             serialize: ({ query: { site, allPosts } }) => {
-              return allPosts.nodes.map(node => {
+              return allPosts.nodes.map((node) => {
+                return Object.assign({}, node.frontmatter, {
+                  title: node.frontmatter.title,
+                  author: node.frontmatter.author,
+                  description:
+                    node.frontmatter.description || node.frontmatter.subtitle,
+                  date: node.frontmatter.date,
+                  url: site.siteMetadata.siteUrl + node.fields.slug,
+                  guid: site.siteMetadata.siteUrl + node.fields.slug,
+                  enclosure: node.frontmatter.thumbnail && {
+                    url:
+                      site.siteMetadata.siteUrl +
+                      node.frontmatter.thumbnail.publicURL,
+                  },
+                  custom_elements: [
+                    { "content:encoded": node.html },
+                    { "content:type": node.frontmatter.type },
+                    { "content:category": node.frontmatter.category },
+                    { "content:tags": node.frontmatter.tags?.join(", ") || "" },
+                  ],
+                });
+              });
+            },
+            query: `{
+  allPosts: allMdx(
+    sort: {frontmatter: {date: DESC}}
+    filter: {
+      fields: {collection: {in: ["blog", "resources", "news", "events"]}}, 
+      frontmatter: {
+      published: { eq: true }
+      category: { in: ["Meshery", "Announcements", "Events"] }
+      tags: { in: ["Community", "Meshery", "mesheryctl"] }
+    }
+    }
+    limit: 30
+  ) {
+    nodes {
+      body
+      html
+      frontmatter {
+        title
+        author
+        description
+        subtitle
+        date(formatString: "MMM DD YYYY")
+        type
+        category
+        thumbnail {
+          publicURL
+        }
+        tags
+      }
+      fields {
+        collection
+        slug
+      }
+    }
+  }
+}`,
+            output: "/meshery-community-feed.xml",
+            title: "Meshery RSSFeed",
+          },
+          {
+            serialize: ({ query: { site, allPosts } }) => {
+              return allPosts.nodes.map((node) => {
                 return Object.assign({}, node.frontmatter, {
                   title: node.frontmatter.title,
                   author: node.frontmatter.author,
@@ -296,7 +371,9 @@ module.exports = {
                   url: site.siteMetadata.siteUrl + node.fields.slug,
                   guid: site.siteMetadata.siteUrl + node.fields.slug,
                   enclosure: node.frontmatter.thumbnail && {
-                    url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
+                    url:
+                      site.siteMetadata.siteUrl +
+                      node.frontmatter.thumbnail.publicURL,
                   },
                   custom_elements: [{ "content:encoded": node.html }],
                 });
@@ -328,11 +405,11 @@ module.exports = {
   }
 }`,
             output: "/blog/feed.xml",
-            title: "Layer5 Blog"
+            title: "Layer5 Blog",
           },
           {
             serialize: ({ query: { site, allPosts } }) => {
-              return allPosts.nodes.map(node => {
+              return allPosts.nodes.map((node) => {
                 return Object.assign({}, node.frontmatter, {
                   title: node.frontmatter.title,
                   author: node.frontmatter.author,
@@ -341,7 +418,9 @@ module.exports = {
                   url: site.siteMetadata.siteUrl + node.fields.slug,
                   guid: site.siteMetadata.siteUrl + node.fields.slug,
                   enclosure: node.frontmatter.thumbnail && {
-                    url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
+                    url:
+                      site.siteMetadata.siteUrl +
+                      node.frontmatter.thumbnail.publicURL,
                   },
                   custom_elements: [{ "content:encoded": node.html }],
                 });
@@ -373,7 +452,7 @@ module.exports = {
   }
 }`,
             output: "/events/feed.xml",
-            title: "Layer5 Events"
+            title: "Layer5 Events",
           },
         ],
       },
@@ -455,8 +534,8 @@ module.exports = {
     {
       resolve: "gatsby-source-filesystem",
       options: {
-        path: `${__dirname}/src/collections/service-mesh-workshops`,
-        name: "service-mesh-workshops",
+        path: `${__dirname}/src/collections/workshops`,
+        name: "workshops",
       },
     },
     {
@@ -514,8 +593,8 @@ module.exports = {
       options: {
         defaults: {
           placeholder: "blurred",
-        }
-      }
+        },
+      },
     },
     {
       resolve: "gatsby-transformer-sharp",
@@ -547,10 +626,9 @@ module.exports = {
         host: "https://layer5.io",
         sitemap: "https://layer5.io/sitemap-index.xml",
         policy: [{ userAgent: "*", allow: "/" }],
-      }
+      },
     },
     "gatsby-plugin-meta-redirect",
     // make sure this is always the last one
   ],
-
 };

gatsby-node.js

@@ -72,9 +72,15 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
     redirectInBrowser: true,
     isPermanent: true,
   });
+  createRedirect({
+    fromPath: "/learn/service-mesh-workshops",
+    toPath: "/learn/workshops",
+    redirectInBrowser: true,
+    isPermanent: true,
+  });
   createRedirect({
     fromPath: "/workshops",
-    toPath: "/learn/service-mesh-workshops",
+    toPath: "/learn/workshops",
     redirectInBrowser: true,
     isPermanent: true,
   });
@@ -511,7 +517,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
         }
       }
       singleWorkshop: allMdx(
-        filter: { fields: { collection: { eq: "service-mesh-workshops" } } }
+        filter: { fields: { collection: { eq: "workshops" } } }
       ) {
         nodes {
           fields {
@@ -923,7 +929,7 @@ exports.onCreateNode = ({ node, actions, getNode }) => {
           slug = `/company/${collection}/${slugify(node.frontmatter.title)}`;
           break;
         case "service-mesh-books":
-        case "service-mesh-workshops":
+        case "workshops":
         case "service-mesh-labs":
           slug = `/learn/${collection}/${slugify(node.frontmatter.title)}`;
           break;