Skip to content

Commit

Permalink
Refactor badges to use "kanvas" instead of "meshmap"
Browse files Browse the repository at this point in the history
Signed-off-by: Lee Calcote <[email protected]>
  • Loading branch information
leecalcote committed Sep 10, 2024
1 parent 4f20383 commit d307cf0
Show file tree
Hide file tree
Showing 322 changed files with 570 additions and 570 deletions.
2 changes: 1 addition & 1 deletion .desktop-lighthouserc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**/*"
10 changes: 5 additions & 5 deletions .github/workflows/meshmap.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: MeshMap Screenshot Service
name: Kanvas Screenshot Service
'on':
pull_request_target:
types:
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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]
uses: layer5labs/Kanvas[email protected]
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
mesheryToken: ${{ secrets.MESHERY_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .lighthouserc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
44 changes: 22 additions & 22 deletions src/assets/data/faq/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
],
},
Expand All @@ -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.",
],
},
{
Expand Down Expand Up @@ -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."
]
},
Expand All @@ -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.",
]
},

Expand Down
2 changes: 1 addition & 1 deletion src/assets/discuss/html/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h5 class="footer-h5"><a href="https://layer5.io/community/handbook/writing-prog
</div>
<div class="odd-col footer-sections footer-projects">
<h3 class="section-title"><a href="https://layer5.io/projects">SOLUTIONS</a></h3>
<h5 class="footer-h5"><a href="https://layer5.io/cloud-native-management/meshmap">MeshMap</a></h5>
<h5 class="footer-h5"><a href="https://layer5.io/cloud-native-management/kanvas">Kanvas</a></h5>
<h5 class="footer-h5"><a href="https://layer5.io/cloud-native-management/meshery">Meshery</a></h5>
<h5 class="footer-h5"><a href="https://layer5.io/projects/nighthawk">Nighthawk</a></h5>
<h5 class="footer-h5"><a href="https://layer5.io/docker-extension-meshery">Docker Extension</a></h5>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions src/collections/integrations/wordpress-operator/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ featureList: [
"Ongoing synchronization of Kubernetes configuration and changes across any number of clusters."
]
workingSlides: [
../_images/meshmap-visualizer.png,
../_images/meshmap-designer.png
../_images/kanvas-visualizer.png,
../_images/kanvas-designer.png
]
howItWorks: "Collaborative Infrastructure as Design"
howItWorksDetails: "Collaboratively manage infrastructure with your coworkers synchronously sharing the same designs."
Expand Down
2 changes: 1 addition & 1 deletion src/collections/members/_member-profile-template/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ badges: # List of badges that this member carries.
# - docker-extension
# - meshery-catalog
# - docs
# - meshmap
# - kanvas
blurb: # (Currently not used) Member's tagline, if they have one (a short quip or phrase)
status: # [Active | Inactive]
maintainer: # [no | yes] Designates whether this member is a project maintainer or not.
Expand Down
2 changes: 1 addition & 1 deletion src/collections/members/aabid-sofi/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ location: Srinagar, Jammu & Kashmir, India
bio: Hi, I'm Aabid Sofi, a software engineer and web developer.
I specialize in creating custom software and web applications that are both functional and visually appealing, with a focus on design, security, and performance. Highly passionate about cloud native and open source .
badges:
- meshmap
- kanvas
status: Active
published: true
---
2 changes: 1 addition & 1 deletion src/collections/members/abhishek-kumar/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layer5: efbdda42-67a0-4cb8-a968-4ef321eb6369
badges:
- meshery
- nighthawk
- meshmap
- kanvas
location: New Delhi, India
bio: I am an undergrad student from Delhi who loves to work on different open-source projects and their development. Thanks to all
open source organisations that has groomed me with providing better knowledge and practical implementation of every problem. Have been part of open source orgs like Checkstyle Java, Codeforcause org and Layer5 Meshery that has taught me 90% I know.
Expand Down
2 changes: 1 addition & 1 deletion src/collections/members/akshay-sharma/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layer5: 51f49d2c-0050-4bdb-9bce-fdddcb4742be
location: West Bengal, India
bio: "Hi,I like to code!"
badges:
- meshmap
- kanvas
status: Inactive
published: true
---
2 changes: 1 addition & 1 deletion src/collections/members/gaurav-chadha/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ badges:
- landscape
- meshery
- community
- meshmap
- kanvas
location: Delhi, India
bio: "I am an undergraduate student at IP University majoring in Computer Science and Engineering. I am passionate about open-source, web development, software engineering, and UX/UI designing. My working principle is learning and sharing knowledge. Apart from coding, I love to cook Indian and Italian food as well. Yoga and workout are also in my daily routine."
status: Inactive
Expand Down
2 changes: 1 addition & 1 deletion src/collections/members/harkirat/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ He is a FullStack Web Developer & is passionate about Open Source & DevOps.
He is Open to collaborate on Projects and Believes in Learning By Doing."
badges:
- meshery
- meshmap
- kanvas
status: Inactive
published: true
---
2 changes: 1 addition & 1 deletion src/collections/members/pranav-singh/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ badges:
- meshery
- meshery-operator
- nighthawk
- meshmap
- kanvas
status: Inactive
published: true
---
2 changes: 1 addition & 1 deletion src/collections/members/senali-dilumika/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ location: Colombo, Sri Lanka
bio: Hi, I possess a strong passion for software development. Contributing to Layer5 has been an amazing experience. Collaboration is an excellent way to learn and grow within the tech community. I'm constantly learning new things due to my curiosity and interest in exploring new things.
badges:
- docs
- meshmap
- kanvas
- meshery-catalog
status: Inactive
published: true
Expand Down
2 changes: 1 addition & 1 deletion src/collections/members/shivam-sood/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ bio: "Shivam is an aspiring software engineer, currently graduating from Nationa
status: Inactive
published: true
badges:
- meshmap
- kanvas
- landscape
---
2 changes: 1 addition & 1 deletion src/collections/members/usman-siddique/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ status: Inactive
location: Lahore, Pakistan
bio: Hello, I am a software developer who specializes in MERN stack development. I am passionate about technology and its impact on the world. My love of coding began during my student years, and I quickly became involved in the tech community, eager to learn and share my skills.Throughout my career, I have remained committed to working with the tech community, and I am particularly enthusiastic about open source software. As a result, I joined the Layer 5 community and continue to thrive here, collaborating with other developers and contributing to open source projects.
badges:
- meshmap
- kanvas
published: true
---
2 changes: 1 addition & 1 deletion src/collections/members/uzair-shaikh/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ badges:
- meshery
- meshery-operator
- nighthawk
- meshmap
- kanvas
status: Active
published: true
---
2 changes: 1 addition & 1 deletion src/collections/members/yash-sharma/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bio: "Hi there! I'm an enthusiastic technology lover who's always on the lookout
badges:
- meshery
- meshery-catalog
- meshmap
- kanvas
status: Active
meshmate: yes
published: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ resource: true
import { ResourcesWrapper } from "../../../Resources.style.js";
import picture1 from "./Picture1.webp";
import ClusterImg from "./multi-cluster-kubernetes-management-with-meshery.webp";
import MeshmapDesigner from "./MeshmapDesigner.webp"
import MeshmapVisualizer from "./MeshmapVisualizer.webp"
import KanvasDesigner from "./KanvasDesigner.webp"
import KanvasVisualizer from "./KanvasVisualizer.webp"

<ResourcesWrapper>

Expand Down Expand Up @@ -121,13 +121,13 @@ In this article, we'll talk about Kubernetes, its benefits, and the best ways fo
<p> Kubernetes is an open-source system for automating the deployment, scaling, and management of containerized applications. Kubernetes was made by Google, and the Cloud Native Computing Foundation now takes care of it.
</p>

<h3>Kubernetes Cluster Visualization and Designing using MeshMap</h3>
<p> MeshMap has been developed for visualizing and managing kubernetes clusters. You can learn more about MeshMap <a href="https://layer5.io/cloud-native-management/meshmap">here</a>
<h3>Kubernetes Cluster Visualization and Designing using Kanvas</h3>
<p> Kanvas has been developed for visualizing and managing kubernetes clusters. You can learn more about Kanvas <a href="https://layer5.io/cloud-native-management/kanvas">here</a>
</p>
<p>Users can drag-and-drop your cloud native infrastructure using a palette of thousands of versioned Kubernetes components. Integrate advanced performance analysis into your pipeline.</p>
<img src = {MeshmapDesigner} class="image-center" alt="Kubernetes Architecture" />
<img src = {KanvasDesigner} class="image-center" alt="Kubernetes Architecture" />
<p>Users can deploy their designs, apply patterns, manage and operate their deployments in real-time bringing all the Kubernetes clusters under a common point of management. Interactively connect to terminal sessions or initiate and search log streams from your containers.</p>
<img src = {MeshmapVisualizer} class="image-center" alt="Kubernetes Architecture" />
<img src = {KanvasVisualizer} class="image-center" alt="Kubernetes Architecture" />

<h3> Set Resource Requests & Limits</h3>

Expand Down
Loading

0 comments on commit d307cf0

Please sign in to comment.