Merge branch 'master' into ImageSpacingFix/krishnaShuk/6535

Author: vr-varad

.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"

.github/workflows/kanvas.yml

@@ -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/).

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

@@ -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-config.js

@@ -73,7 +73,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
     isPermanent: true,
   });
   createRedirect({
-    fromPath: "/learn/workshops",
+    fromPath: "/learn/service-mesh-workshops",
     toPath: "/learn/workshops",
     redirectInBrowser: true,
     isPermanent: true,
@@ -517,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 {
@@ -929,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;