resolved merge conflicts in src/collections/blog/2024/03-10-demystify…

…ing-open-source

.desktop-lighthouserc.js

@@ -10,7 +10,7 @@ module.exports = {
         "http://localhost/?desktop",
         "http://localhost/company/about/index.html?desktop",
          "http://localhost/cloud-native-management/meshery/index.html?desktop",
-         "http://localhost/cloud-native-management/meshmap/index.html?desktop",
+         "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",

.github/labeler.yml

@@ -93,7 +93,7 @@ project/meshery:
 - changed-files:
   - any-glob-to-any-file:
     - "src/collections/integrations/**/*"
-project/meshmap:
+project/kanvas:
 - changed-files:
   - any-glob-to-any-file:
-    - "src/sections/Meshmap/**/*"
+    - "src/sections/Kanvas/**/*"

.github/workflows/meshmap.yml

@@ -1,4 +1,4 @@
-name: MeshMap Screenshot Service
+name: Kanvas Screenshot Service
 'on':
   pull_request_target:
     types:
@@ -14,7 +14,7 @@ name: MeshMap Screenshot Service
     outputs:
       resource_url:
         description: The URL of the generated resource.
-        value: ${{ jobs.MeshMapScreenshot.outputs.resource_url }}
+        value: ${{ jobs.KanvasScreenshot.outputs.resource_url }}
 permissions:
   actions: read
   contents: write
@@ -23,7 +23,7 @@ permissions:
   pull-requests: write
   id-token: write
 jobs:
-  MeshMapScreenshot:
+  KanvasScreenshot:
     runs-on: ubuntu-latest
     outputs:
       resource_url: ${{ steps.test_result.outputs.resource_url }}
@@ -36,9 +36,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: action
-          repository: layer5labs/meshmap-snapshot
+          repository: layer5labs/kanvas-snapshot
       - id: test_result
-        uses: layer5labs/MeshMap[email protected].8
+        uses: layer5labs/Kanvas[email protected].11
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           mesheryToken: ${{ secrets.MESHERY_TOKEN }}

.lighthouserc.js

@@ -8,7 +8,7 @@ module.exports = {
           "http://localhost",
           "http://localhost/company/about/index.html",
           "http://localhost/cloud-native-management/meshery/index.html",
-          "http://localhost/cloud-native-management/meshmap/index.html",
+          "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",

CONTRIBUTING.md

@@ -227,7 +227,7 @@ OR
 
 - SVG or image uses transparent sections that change with the background color to work with either theme.
 
-[Example of SVG file with transparent sections](https://github.com/layer5io/layer5/blob/master/src/assets/images/meshmap/icon-only/meshmap-icon.svg)
+[Example of SVG file with transparent sections](https://github.com/layer5io/layer5/blob/master/src/assets/images/kanvas/icon-only/kanvas-icon.svg)
 
 [Example of image file with transparent sections](https://github.com/layer5io/layer5/blob/master/src/assets/images/app/projects/meshery-logo-light.webp)
 
@@ -331,7 +331,7 @@ If possible we wish to avoid using images dependent on the theme because we are
 
 1. To change images or SVG as the image source, according to the theme, you have to import the hook `useStyledDarkMode` from the following [folder](https://github.com/layer5io/layer5/blob/master/src/theme/app/useStyledDarkMode.js), and then use the `isDark` value from `useStyledDarkMode` hook for the conditional.
 
-For example, you can view the code for [this file](https://github.com/layer5io/layer5/blob/master/src/sections/Meshmap/Meshmap-collaborate/meshmap-collaborate-banner.js).
+For example, you can view the code for [this file](https://github.com/layer5io/layer5/blob/master/src/sections/Kanvas/Kanvas-collaborate/kanvas-collaborate-banner.js).
 
 Here are the relevant parts of the code:
 
@@ -403,7 +403,7 @@ Badges are a great way of highlighting the area of contribution by any given com
 - <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/docker-extension/docker-extension-meshery-logo.svg" width="25px" height="25px"/> Docker Extension
 - <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/docs/docs.svg" width="25px" height="25px"/> Docs
 - <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/meshery/meshery-catalog.svg" width="25px" height="25px"/> Meshery Catalog
-- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/meshmap/icon-only/meshmap-icon.svg" width="25px" height="25px"/> MeshMap
+- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/kanvas/icon-only/kanvas-icon.svg" width="25px" height="25px"/> Kanvas
 - <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/landscape/layer5_landscape_green.svg" width="25px" height="25px"/> Landscape
 - <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/image-hub/layer5-image-hub.svg" width="25px" height="25px"/> ImageHub
 - <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/meshery/icon-only/meshery-logo-light.svg" width="25px" height="25px"/> Meshery

README.md

@@ -39,11 +39,11 @@
 
 
 <p style="clear:both;">
-<h2><a href="https://layer5.io/meshmap">MeshMap</a></h2>
-<a href="https://layer5.io/meshmap">
-  <img src="src/assets/images/meshmap/meshmap-color-icon.svg" alt="MeshMap logo" width="125px" style="margin:10px;" align="left" />
+<h2><a href="https://layer5.io/kanvas">Kanvas</a></h2>
+<a href="https://layer5.io/kanvas">
+  <img src="src/assets/images/kanvas/kanvas-color-icon.svg" alt="Kanvas logo" width="125px" style="margin:10px;" align="left" />
 </a>
-<a href="https://layer5.io/meshmap">MeshMap</a> is an end-to-end management platform, here to help teams understand problems, deploy designs, apply patterns, manage and operate your deployments and services in real-time.
+<a href="https://layer5.io/kanvas">Kanvas</a> is an end-to-end management platform, here to help teams understand problems, deploy designs, apply patterns, manage and operate your deployments and services in real-time.
 <br /><br /><br/>
 </p>
 <br />

gatsby-node.js

@@ -284,15 +284,27 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
     redirectInBrowser: true,
     isPermanent: true,
   });
+  createRedirect({
+    fromPath: "/kanvas",
+    toPath: "/cloud-native-management/kanvas",
+    redirectInBrowser: true,
+    isPermanent: true,
+  });
+  createRedirect({
+    fromPath: "/cloud-native-management/meshmap",
+    toPath: "/cloud-native-management/kanvas",
+    redirectInBrowser: true,
+    isPermanent: true,
+  });
   createRedirect({
     fromPath: "/meshmap",
-    toPath: "/cloud-native-management/meshmap",
+    toPath: "/cloud-native-management/kanvas",
     redirectInBrowser: true,
     isPermanent: true,
   });
   createRedirect({
     fromPath: "/go/meshmap",
-    toPath: "/cloud-native-management/meshmap",
+    toPath: "/cloud-native-management/kanvas",
     redirectInBrowser: true,
     isPermanent: true,
   });

package.json

@@ -83,7 +83,7 @@
     "react": "^17.0.2",
     "react-accessible-accordion": "^5.0.0",
     "react-copy-to-clipboard": "^5.1.0",
-    "react-countdown": "^2.3.5",
+    "react-countdown": "^2.3.6",
     "react-countup": "^6.1.1",
     "react-debounce-input": "^3.3.0",
     "react-dom": "^17.0.2",
@@ -111,7 +111,7 @@
     "url": "^0.11.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.18.10",
+    "@babel/cli": "^7.25.6",
     "@babel/core": "^7.22.9",
     "@babel/eslint-parser": "^7.22.15",
     "babel-plugin-module-resolver": "^5.0.0",

src/assets/data/faq/index.js

@@ -107,10 +107,10 @@ const data = {
       ],
     },
     {
-      question: "Can I deploy Meshery / MeshMap on-premises?",
+      question: "Can I deploy Meshery / Kanvas on-premises?",
       category: "Meshery",
       answer: [
-        "Yes, Meshery, MeshMap, and Layer5 Cloud can be deployed on-premises in minutes using Helm charts.",
+        "Yes, Meshery, Kanvas, and Layer5 Cloud can be deployed on-premises in minutes using Helm charts.",
         "With a small number of manual steps, air-gapped deployments to run Meshery without internet access is also supported.",
       ],
     },
@@ -125,18 +125,18 @@ const data = {
       question: "Is it possible to migrate from managed Layer5 Cloud to self-hosted Layer5 Cloud on-premises?",
       category: "Meshery",
       answer: [
-        "Yes, Meshery, MeshMap, and Layer5 Cloud can be deployed on-premises in minutes using Helm charts.",
+        "Yes, Meshery, Kanvas, and Layer5 Cloud can be deployed on-premises in minutes using Helm charts.",
         "A one-time export of your data can be requested as you transition from managed Layer5 Cloud to self-hosted Layer5 Cloud.",
         "With a small number of manual steps, air-gapped deployments to run Meshery without internet access is also supported.",
 
       ],
     },
     {
-      question: `What is the difference between MeshMap and the Cloud Native Playground?`,
+      question: `What is the difference between Kanvas and the Cloud Native Playground?`,
       category: "Meshery",
       answer: [
-        "The Cloud Native Playground (aka Meshery Playground) is a managed instance of Meshery that offers a sandbox environment in which half of MeshMap<sup>BETA</sup>&nbsp;functionality is enabled (Designer mode) and the other half of MeshMap<sup>BETA</sup> functionality is disabled (Visualizer mode).",
-        "The sandbox environment is not connected to an active Kuberentes cluster, and as such, specific actions within MeshMap Designer are also disabled. Meshery and MeshMap are feature-rich, sophisticated management applications for cloud native infrastructure. To access their full set of capabilities, simply deploy your own copy of Meshery into the environment of your choosing.",
+        "The Cloud Native Playground (aka Meshery Playground) is a managed instance of Meshery that offers a sandbox environment in which half of Kanvas<sup>BETA</sup>&nbsp;functionality is enabled (Designer mode) and the other half of Kanvas<sup>BETA</sup> functionality is disabled (Visualizer mode).",
+        "The sandbox environment is not connected to an active Kuberentes cluster, and as such, specific actions within Kanvas Designer are also disabled. Meshery and Kanvas are feature-rich, sophisticated management applications for cloud native infrastructure. To access their full set of capabilities, simply deploy your own copy of Meshery into the environment of your choosing.",
       ],
     },    
     {
@@ -181,13 +181,13 @@ const data = {
       ],
     },
     {
-      question: "Is MeshMap cloud or a self-hosted solution?",
-      category: "MeshMap",
-      link: "https://layer5.io/cloud-native-management/meshmap",
+      question: "Is Kanvas cloud or a self-hosted solution?",
+      category: "Kanvas",
+      link: "https://layer5.io/cloud-native-management/kanvas",
       linktext: "Learn More",
       answer: [
-        "Yes, MeshMap is available both as a hosted solution and is also deployable on-premises as a self-hosted solution.",
-        "MeshMap can be self-hosted to keep your designs and applications internal to your premises. You can also choose to have MeshMap hosted as SaaS solution offered by Layer5.",
+        "Yes, Kanvas is available both as a hosted solution and is also deployable on-premises as a self-hosted solution.",
+        "Kanvas can be self-hosted to keep your designs and applications internal to your premises. You can also choose to have Kanvas hosted as SaaS solution offered by Layer5.",
         "Whether self-hosted or hosted by Layer5, we are here to support you."
       ]
     },
@@ -201,23 +201,23 @@ const data = {
       ]
     },
     {
-      question: "How can I try out MeshMap?",
-      category: "MeshMap",
-      link: "https://layer5.io/cloud-native-management/meshmap",
-      linktext: "MeshMap Beta",
+      question: "How can I try out Kanvas?",
+      category: "Kanvas",
+      link: "https://layer5.io/cloud-native-management/kanvas",
+      linktext: "Kanvas Beta",
       answer: [
-       "MeshMap is available in beta today. Signup for MeshMap beta access and use MeshMap for free.",
+       "Kanvas is available in beta today. Signup for Kanvas beta access and use Kanvas for free.",
        "Your request for early access will be processeed as quicky as possible but due to the large influx of program participation requests, it may take some time before system access is granted. In the meantime to help you familiarize with Meshery, the maintainers team will send you additional information about the early access program."
       ]
     },
     {
-      question: "What is MeshMap early access program?",
-      category: "MeshMap",
-      link: "https://layer5.io/cloud-native-management/meshmap",
-      linktext: "MeshMap Beta",
+      question: "What is Kanvas early access program?",
+      category: "Kanvas",
+      link: "https://layer5.io/cloud-native-management/kanvas",
+      linktext: "Kanvas Beta",
       answer: [
-        "MeshMap is cloud native collaboration tool for managing your infrastructure and applications. MeshMap has two modes: Visualizer for operating your actively running Kubernetes clusters and Designer for configuring your Kubernetes clusters and creating your creating your application deployments.",
-       "MeshMap is in beta mode and you can ask for early access to try it out.",
+        "Kanvas is cloud native collaboration tool for managing your infrastructure and applications. Kanvas has two modes: Visualizer for operating your actively running Kubernetes clusters and Designer for configuring your Kubernetes clusters and creating your creating your application deployments.",
+       "Kanvas is in beta mode and you can ask for early access to try it out.",
       ]
     },