Skip to content

Commit

Permalink
Merge pull request #5875 from layer5io/leecalcote/rename-page-and-red…
Browse files Browse the repository at this point in the history
…irect/kanvas

Refactor redirect paths for Kanvas and Meshmap
  • Loading branch information
leecalcote committed Sep 10, 2024
2 parents e4f9010 + f58bff5 commit c971a46
Show file tree
Hide file tree
Showing 676 changed files with 1,626 additions and 1,597 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
16 changes: 14 additions & 2 deletions gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
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
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ import ForkLift from "../../../../assets/images/app/hero/forklift.svg";
<div class="interviewee">
<span>Yash:</span>
<p>
"I remember introducing Meshery and Meshmap in my college event. It was an incredibly successful event, and I take great pride in being a part of a community that supports such innovative projects. The response from the attendees was overwhelming, and I am grateful for the hard work and dedication of all the contributors who played a pivotal role in making this project a resounding success. Their collective efforts truly deserve admiration and appreciation."
"I remember introducing Meshery and MeshMap in my college event. It was an incredibly successful event, and I take great pride in being a part of a community that supports such innovative projects. The response from the attendees was overwhelming, and I am grateful for the hard work and dedication of all the contributors who played a pivotal role in making this project a resounding success. Their collective efforts truly deserve admiration and appreciation."
</p>
<p>

Expand Down
2 changes: 1 addition & 1 deletion src/collections/events/devconf-2022-measure-smp/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ What types of service meshes are available? How do they contrast?

Learn how Meshery, a CNCF Project, multi-service mesh management plane implements the service mesh specifications, Service Mesh Performance (SMP) and Service Mesh Interface (SMI), to empower users to manage more than 10 service meshes simultaneously.

Understand how Meshery uses a catalog of Cloud Native Patterns to provide templates for best practice configurations and how you can design new patterns with the visual topology designer, MeshMap
Understand how Meshery uses a catalog of Cloud Native Patterns to provide templates for best practice configurations and how you can design new patterns with the visual topology designer, Kanvas

</p>

Expand Down
2 changes: 1 addition & 1 deletion src/collections/events/devops-and-docker-live/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ import { Link } from "gatsby" ;

Join host Bret Fisher and guests <Link to="/community/members/lee-calcote">Lee Calcote</Link> from Layer5 and <Link to="/community/members/nic-jackson">Nic Jackson</Link> from HashiCorp at <a href="https://www.linkedin.com/events/servicemeshfordocker-withmesher6977705316406730752/about/">DevOps and Docker Live Show</a> to see the <Link to="/docker-extension-meshery">Meshery Docker Extension</Link> in-action! Design and deploy your Docker Compose and Kubernetes apps on Docker Desktop or any remote cluster.

The Meshery extension transforms Docker Desktop into powerful cloud native infrastructure development environment in a box with Kubernetes and service mesh. Learn how to discover and model your cloud native deployments with <Link to="/cloud-native-management/meshmap">MeshMap</Link>. MeshMap enables GitOps integrated, visual composition of your cloud native infrastructure.
The Meshery extension transforms Docker Desktop into powerful cloud native infrastructure development environment in a box with Kubernetes and service mesh. Learn how to discover and model your cloud native deployments with <Link to="/cloud-native-management/kanvas">Kanvas</Link>. Kanvas enables GitOps integrated, visual composition of your cloud native infrastructure.

Can’t wait to get your hands on Docker Desktop for Meshery in the meantime? Sign up and learn all about the <Link to="/docker-extension-meshery">Meshery Docker Extension</Link> to make the most out of it.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Managing cloud native infrastructure becomes a nightmare with hundreds of distri
<li>Performance Management and Metrics Intro, how to run performance tests, interpret the results, and metrics from Grafana and Prometheus.</li>
<li>An introduction to service meshes, the concept of meshery adapters, provisioning of service meshes, sample applications and <Link to="/projects/service-mesh-interface-conformance">SMI</Link> conformance tests.</li>
<li><Link to="/cloud-native-management/meshery">Meshery</Link> Configurations: Application, Patterns, Filters, Pattern configurator, ingestion of K8s YAMLs, Docker-Compose apps, helm charts.</li>
<li>Introduction to <Link to="/cloud-native-management/meshmap">MeshMap</Link>, the visual topology for your cloud native infrastructure.</li>
<li>Introduction to <Link to="/cloud-native-management/kanvas">Kanvas</Link>, the visual topology for your cloud native infrastructure.</li>
<li><Link to="/programs/hacktoberfest">Hacktoberfest</Link> participation for newcomers in the community, how to get started, open issues and how to engage in the community.</li>
</ul>

Expand Down
Loading

0 comments on commit c971a46

Please sign in to comment.