Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/integrations columns #5868

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
186983c
initial commit
Npcodes1 Sep 5, 2024
e300b5f
fixed mobile integrations column
Npcodes1 Sep 7, 2024
f7b7de9
edited code per Layer5 request
Npcodes1 Sep 10, 2024
039a49c
update profiles
vishalvivekm Sep 5, 2024
d6eb5cf
[Docs] Generated documentation for Integration
MUzairS15 Sep 7, 2024
2c58308
chore: add client-side validation for email and pitcture url
vishalvivekm Sep 1, 2024
aca6806
chore: fix failing eslint checks
vishalvivekm Sep 1, 2024
3066abf
Update src/sections/Community/Web-based-from/index.js
vishalvivekm Sep 1, 2024
e96b621
Update src/sections/Community/Web-based-from/index.js
vishalvivekm Sep 1, 2024
2535905
Allows gif
vishalvivekm Sep 1, 2024
b1f85f0
update error message to include gif
vishalvivekm Sep 1, 2024
3628366
first draft
leecalcote Sep 7, 2024
d60db32
added images for clusterpedia
srujan0404 Aug 2, 2024
4af774b
links
leecalcote Sep 7, 2024
1dd7dda
through
leecalcote Sep 7, 2024
c404113
[Docs] Generated documentation for Integration
MUzairS15 Sep 8, 2024
e11009a
Refactor code for improved performance
leecalcote Sep 9, 2024
704eb98
removed commented out code
Npcodes1 Sep 13, 2024
a7645d6
removed commented code
Npcodes1 Sep 16, 2024
a031d10
removed commented code
Npcodes1 Sep 16, 2024
d90d6a8
signed off- removed commented code
Npcodes1 Sep 17, 2024
9e7ee4a
Add files via upload
Ashparshp Sep 9, 2024
b37b020
Refactor redirect paths for Kanvas and Meshmap
leecalcote Sep 10, 2024
b225a8c
update redirect
vishalvivekm Sep 10, 2024
73d1b8c
Refactor badges to use "kanvas" instead of "meshmap"
leecalcote Sep 10, 2024
6285316
Refactor code for improved performance
leecalcote Sep 10, 2024
914a13b
fix
vishalvivekm Sep 10, 2024
957ec10
rename meshmap -> kanvas for integrations
vishalvivekm Sep 10, 2024
8414e8e
in news
vishalvivekm Sep 10, 2024
31acc2e
in blog
vishalvivekm Sep 10, 2024
1a8a88a
complete
vishalvivekm Sep 10, 2024
f84d9be
rm image
vishalvivekm Sep 10, 2024
45a50b9
rm consul screenshots
vishalvivekm Sep 10, 2024
7f6c5f0
revert blog
vishalvivekm Sep 10, 2024
e61d370
revert news
vishalvivekm Sep 10, 2024
63a873b
revert
vishalvivekm Sep 10, 2024
13d745e
[Docs] Generated documentation for Integration
MUzairS15 Sep 11, 2024
23edbb3
[Docs] Generated documentation for Integration
MUzairS15 Sep 12, 2024
be05c4f
Update kanvas_banner.js
leecalcote Sep 12, 2024
6cc4fac
rename fallback images meshmap -> kanvas
vishalvivekm Sep 12, 2024
1fe4bb5
Mark Senthil Athiban's profile as inactive
Ashparshp Sep 12, 2024
a3759ad
[Docs] Generated documentation for Integration
MUzairS15 Sep 13, 2024
8e4592e
fix: resolve layout inconsistency in CTA_Bottom for mobile screens
yash37158 Sep 3, 2024
4e44b32
Refactor MeetTheMaintainer import path
leecalcote Sep 12, 2024
a775cf0
Refactor MeetTheMaintainer import path
leecalcote Sep 12, 2024
c44bfef
Refactor import path for MeetTheMaintainer component
leecalcote Sep 13, 2024
20ad6bb
Refactor import path for MeetTheMaintainer component
leecalcote Sep 13, 2024
c150cde
[Docs] Generated documentation for Integration
MUzairS15 Sep 15, 2024
5064eb5
Bump @babel/cli from 7.22.5 to 7.25.6
dependabot[bot] Sep 1, 2024
51f8835
Bump react-countdown from 2.3.5 to 2.3.6
dependabot[bot] Sep 1, 2024
1bf546b
Update meshmap.yml
leecalcote Sep 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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].8
uses: layer5labs/Kanvas[email protected].11
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
69 changes: 38 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
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
Loading
Loading