From 2803b0e65a7786f97b89fa6e0dbfb56119f7bfba Mon Sep 17 00:00:00 2001
From: vishalvivekm <110674407+vishalvivekm@users.noreply.github.com>
Date: Sat, 20 May 2023 13:40:15 +0530
Subject: [PATCH 01/23] add-badges-and-fix-some-other-issues
Signed-off-by: vishalvivekm <110674407+vishalvivekm@users.noreply.github.com>
---
CONTRIBUTING.md | 3 ++
src/assets/images/docs/docs.svg | 11 ++++++
.../_member-profile-template/index.mdx | 3 ++
.../members/anita-ihuman/index.mdx | 1 +
.../members/gaurav-chadha/index.mdx | 1 +
.../members/vivek-vishal/index.mdx | 1 +
src/pages/community/members.js | 27 ++++++++++++++
.../Community/Handbook/recognition.js | 25 +++++++------
src/sections/Community/Member-single/index.js | 36 +++++++++++++++++++
9 files changed, 98 insertions(+), 10 deletions(-)
create mode 100644 src/assets/images/docs/docs.svg
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 815959f6d225..5e537be64427 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -351,6 +351,9 @@ Badges are a great way of highlighting the area of contribution by any given com
#### Possible Badges:
- Community
+- Docker Extension
+- Docs
+- Meshery Catalog
- Landscape
- ImageHub
- Meshery
diff --git a/src/assets/images/docs/docs.svg b/src/assets/images/docs/docs.svg
new file mode 100644
index 000000000000..fb1da368655a
--- /dev/null
+++ b/src/assets/images/docs/docs.svg
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/collections/members/_member-profile-template/index.mdx b/src/collections/members/_member-profile-template/index.mdx
index 683c0788549a..70da0b7ec566 100644
--- a/src/collections/members/_member-profile-template/index.mdx
+++ b/src/collections/members/_member-profile-template/index.mdx
@@ -20,6 +20,9 @@ badges: # List of badges that this member carries.
# - patterns
# - ui-ux
# - writing
+# - docker-extension
+# - meshery-catalog
+# - docs
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.
diff --git a/src/collections/members/anita-ihuman/index.mdx b/src/collections/members/anita-ihuman/index.mdx
index 7c9f62f8ecb2..a52a1f57d3a5 100644
--- a/src/collections/members/anita-ihuman/index.mdx
+++ b/src/collections/members/anita-ihuman/index.mdx
@@ -11,6 +11,7 @@ bio: I am a student of the university of port harcourt in Nigeria studying micro
blurb: Mesh Head
status: Active
meshmate: yes
+community_manager: yes
badges:
- community
published: true
diff --git a/src/collections/members/gaurav-chadha/index.mdx b/src/collections/members/gaurav-chadha/index.mdx
index e1b091719dde..056d204fddd4 100644
--- a/src/collections/members/gaurav-chadha/index.mdx
+++ b/src/collections/members/gaurav-chadha/index.mdx
@@ -13,5 +13,6 @@ 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: Active
meshmate: yes
+community_manager: yes
published: true
---
diff --git a/src/collections/members/vivek-vishal/index.mdx b/src/collections/members/vivek-vishal/index.mdx
index 17a4d55dc35e..6686087fd68e 100644
--- a/src/collections/members/vivek-vishal/index.mdx
+++ b/src/collections/members/vivek-vishal/index.mdx
@@ -10,5 +10,6 @@ bio: Vivek Vishal is a passionate CS undergrad from India who loves to explore n
status: Active
badges:
- community
+community_manager: yes
published: true
---
diff --git a/src/pages/community/members.js b/src/pages/community/members.js
index 6a958af86259..9be9c33a995c 100644
--- a/src/pages/community/members.js
+++ b/src/pages/community/members.js
@@ -23,6 +23,9 @@ import inactiveIcon from "../../assets/images/status/inactive.png";
import activeIcon from "../../assets/images/status/active.png";
import patternsIcon from "../../assets/images/service-mesh-patterns/service-mesh-pattern.svg";
import uiuxrIcon from "../../assets/images/uiuxr/uiuxr.svg";
+import docsIcon from "../../assets/images/docs/docs.svg";
+import dockerExtensionIcon from "../../assets/images/docker-extension/docker-extension-meshery-logo.svg";
+import mesheryCatalogIcon from "../../assets/images/meshery/meshery-catalog.svg";
/**
* Array containing a list of categories to be shown in the dropdown.
* The map function in the end wraps the label property with a component.
@@ -60,6 +63,14 @@ const options = [
icon: landscapeIcon,
className: "allOptions",
},
+ {
+ label: "Docker Extension",
+ value: "docker-extension",
+ color: theme.linkColor,
+ isFixed: true,
+ icon: dockerExtensionIcon,
+ className: "allOptions",
+ },
{
label: "Image Hub",
value: "image-hub",
@@ -68,6 +79,14 @@ const options = [
icon: hubIcon,
className: "allOptions",
},
+ {
+ label: "Docs",
+ value: "docs",
+ color: theme.linkColor,
+ isFixed: true,
+ icon: docsIcon,
+ className: "allOptions",
+ },
{
label: "Meshery",
value: "meshery",
@@ -76,6 +95,14 @@ const options = [
icon: mesheryIcon,
className: "allOptions",
},
+ {
+ label: "Meshery Catalog",
+ value: "meshery-catalog",
+ color: theme.linkColor,
+ isFixed: true,
+ icon: mesheryCatalogIcon,
+ className: "allOptions",
+ },
{
label: "Meshery Operator",
value: "meshery-operator",
diff --git a/src/sections/Community/Handbook/recognition.js b/src/sections/Community/Handbook/recognition.js
index f195ad608d20..b64f1e0e069a 100644
--- a/src/sections/Community/Handbook/recognition.js
+++ b/src/sections/Community/Handbook/recognition.js
@@ -17,7 +17,8 @@ import IntraPage from "../../../components/handbook-navigation/intra-page";
import uiuxrLogo from "../../../assets/images/uiuxr/uiuxr.svg";
import writersLogo from "../../../assets/images/writer-program/writer-program-badge.svg";
import meshmapLogo from "../../../assets/images/meshmap/icon-only/meshmap-icon.svg";
-import MesheryCatalog from "../../../assets/images/meshery/meshery-catalog.svg";
+import MesheryCatalogLogo from "../../../assets/images/meshery/meshery-catalog.svg";
+import DocsLogo from "../../../assets/images/docs/docs.svg";
const contents = [
{ id: 0, link: "#Profile Bages", text: "Profile Bages" },
{ id: 1, link: "#Membership", text: "Membership to GitHub" },
@@ -94,7 +95,7 @@ const RecognitionPage = () => {
- Community - awarded given to the community members who repeatedly engage in welcoming, encouraging, and supporting other Layer5 community members. Community members who earn this badge occasionally graduate to undertaking the Community Manager role.
+ Community - awarded community members who repeatedly engage in welcoming, encouraging, and supporting other Layer5 community members. Community members who earn this badge occasionally graduate to undertaking the Community Manager role.
@@ -102,12 +103,16 @@ const RecognitionPage = () => {
- Image Hub - awarded community members who make consistent and impactful contributions the Image Hub project in recognition and appreciation of their efforts.
+ Image Hub - awarded community members who make consistent and impactful contributions to the Image Hub project in recognition and appreciation of their efforts.
+
+
+ Docs - awarded community members who make consistent and impactful contributions to Meshery docs in recognition and appreciation of their efforts.
+
- Landscape - awarded community members who make consistent and impactful contributions to the have made impactful contributions to the layer5.io website.
+ Landscape - awarded community members who make consistent and impactful contributions to the layer5.io website.
@@ -115,23 +120,23 @@ const RecognitionPage = () => {
- Meshery Operator - awarded community members who make consistent and impactful contributions to the have made impactful contributions to Meshery Operator of the Meshery project in recognition and appreciation of their efforts.
+ Meshery Operator - awarded community members who make consistent and impactful contributions to Meshery Operator of the Meshery project in recognition and appreciation of their efforts.
-
- Meshery Catalog - awarded community members who make consistent and impactful contributions to the Meshery Catalog of meshery project in recognition and appreciation of their efforts.
+
+ Meshery Catalog - awarded community members who make consistent and impactful contributions to the Meshery Catalog of Meshery project in recognition and appreciation of their efforts.
- MeshMap - awarded community members who make consistent and impactful contributions the MeshMap project in recognition and appreciation of their efforts. Community members who earn this badge occasionally become a project maintainer.
+ MeshMap - awarded community members who make consistent and impactful contributions to the MeshMap project in recognition and appreciation of their efforts. Community members who earn this badge occasionally become a project maintainer.
- Nighthawk - awarded community members who make consistent and impactful contributions the NightHawk project in recognition and appreciation of their efforts. Community members who earn this badge occasionally become a project maintainer.
+ Nighthawk - awarded community members who make consistent and impactful contributions to the NightHawk project in recognition and appreciation of their efforts. Community members who earn this badge occasionally become a project maintainer.
- Patterns - awarded community members who make consistent and impactful contributions to the have made impactful contributions to Meshery Catalog and or the Service Mesh Patterns project in recognition and appreciation of their efforts.
+ Patterns - awarded community members who make consistent and impactful contributions to the Service Mesh Patterns project in recognition and appreciation of their efforts.
diff --git a/src/sections/Community/Member-single/index.js b/src/sections/Community/Member-single/index.js
index b25653e60a60..bb0bebf799e5 100644
--- a/src/sections/Community/Member-single/index.js
+++ b/src/sections/Community/Member-single/index.js
@@ -19,6 +19,9 @@ import imageHubLogo from "../../../assets/images/image-hub/layer5-image-hub.svg"
import communityLogo from "../../../assets/images/community/community-green.svg";
import uiuxrLogo from "../../../assets/images/uiuxr/uiuxr.svg";
import writerIcon from "../../../assets/images/writer-program/writer-program-badge.svg";
+import docsLogo from "../../../assets/images/docs/docs.svg";
+import mesheryCatalogLogo from "../../../assets/images/meshery/meshery-catalog.svg";
+import dockerExtensionLogo from "../../../assets/images/docker-extension/docker-extension-meshery-logo.svg";
import Button from "../../../reusecore/Button";
const MemberSingle = ({ frontmatter }) => {
@@ -125,6 +128,39 @@ const MemberSingle = ({ frontmatter }) => {
)}
+ {badges.includes("docs") && (
+
+
+
+
+
+ )}
+ {badges.includes("meshery-catalog") && (
+
+
+
+
+
+ )}
+ {badges.includes("docker-extension") && (
+
+
+
+
+
+ )}
{badges.includes("nighthawk") && (
From 930aef258390f8766c09cf817bd1a79e730f64e5 Mon Sep 17 00:00:00 2001
From: Gaurav Chadha
Date: Mon, 22 May 2023 00:58:13 +0530
Subject: [PATCH 02/23] add interactive animated cytoscape component
Signed-off-by: Gaurav Chadha
---
gatsby-node.js | 15 +++
package-lock.json | 109 ++++++++++++++++++
package.json | 3 +
.../Home/CloudNativeManagement/index.js | 2 +-
.../Meshmap-design/cytoscape-demo.style.js | 1 -
.../Meshmap/Meshmap-design/cytoscapeCanvas.js | 99 ++++++++++++++++
.../Meshmap-design/images/cytoNodes.js | 41 +++++++
.../Meshmap-design/meshmap-design-banner.js | 9 +-
8 files changed, 275 insertions(+), 4 deletions(-)
create mode 100644 src/sections/Meshmap/Meshmap-design/cytoscapeCanvas.js
create mode 100644 src/sections/Meshmap/Meshmap-design/images/cytoNodes.js
diff --git a/gatsby-node.js b/gatsby-node.js
index aeade5cbd294..7d33a66deca7 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -706,6 +706,21 @@ const createSectionPage = ({ envCreatePage, node }) => {
});
};
+exports.onCreateWebpackConfig = ({ actions, loaders, stage }) => {
+ if (stage === "build-html") {
+ actions.setWebpackConfig({
+ module: {
+ rules: [
+ {
+ test: /cookie/,
+ use: ["null-loader"],
+ },
+ ],
+ }
+ });
+ }
+};
+
exports.createSchemaCustomization = ({ actions }) => {
const { createTypes } = actions;
const typeDefs = `
diff --git a/package-lock.json b/package-lock.json
index 119d9ebb88d0..fa8595980e11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,6 +23,9 @@
"babel-preset-gatsby": "^2.22.0",
"caniuse-lite": "^1.0.30001435",
"cytoscape": "^3.23.0",
+ "cytoscape-compound-drag-and-drop": "^1.1.0",
+ "cytoscape-cose-bilkent": "^4.1.0",
+ "cytoscape-fcose": "^2.2.0",
"dedent": "^0.7.0",
"deepmerge": "^4.3.0",
"formik": "^2.2.9",
@@ -7919,6 +7922,14 @@
"node": ">= 0.10"
}
},
+ "node_modules/cose-base": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz",
+ "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==",
+ "dependencies": {
+ "layout-base": "^2.0.0"
+ }
+ },
"node_modules/cosmiconfig": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
@@ -8804,6 +8815,49 @@
"node": ">=0.10"
}
},
+ "node_modules/cytoscape-compound-drag-and-drop": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/cytoscape-compound-drag-and-drop/-/cytoscape-compound-drag-and-drop-1.1.0.tgz",
+ "integrity": "sha512-UIObjFbgh0FyVxNk2wInlhXhWDoR86n9gw34o7n8T3GYPR2d5yWVQsNYZrvPYZ0YQHdkUcZQetaUTE4zY/1olg==",
+ "peerDependencies": {
+ "cytoscape": "^3.4.0"
+ }
+ },
+ "node_modules/cytoscape-cose-bilkent": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz",
+ "integrity": "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==",
+ "dependencies": {
+ "cose-base": "^1.0.0"
+ },
+ "peerDependencies": {
+ "cytoscape": "^3.2.0"
+ }
+ },
+ "node_modules/cytoscape-cose-bilkent/node_modules/cose-base": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-1.0.3.tgz",
+ "integrity": "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==",
+ "dependencies": {
+ "layout-base": "^1.0.0"
+ }
+ },
+ "node_modules/cytoscape-cose-bilkent/node_modules/layout-base": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz",
+ "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg=="
+ },
+ "node_modules/cytoscape-fcose": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz",
+ "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==",
+ "dependencies": {
+ "cose-base": "^2.2.0"
+ },
+ "peerDependencies": {
+ "cytoscape": "^3.2.0"
+ }
+ },
"node_modules/d": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
@@ -16391,6 +16445,11 @@
"node": ">=8"
}
},
+ "node_modules/layout-base": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz",
+ "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg=="
+ },
"node_modules/levn": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -31305,6 +31364,14 @@
"vary": "^1"
}
},
+ "cose-base": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz",
+ "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==",
+ "requires": {
+ "layout-base": "^2.0.0"
+ }
+ },
"cosmiconfig": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
@@ -31983,6 +32050,43 @@
"lodash": "^4.17.21"
}
},
+ "cytoscape-compound-drag-and-drop": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/cytoscape-compound-drag-and-drop/-/cytoscape-compound-drag-and-drop-1.1.0.tgz",
+ "integrity": "sha512-UIObjFbgh0FyVxNk2wInlhXhWDoR86n9gw34o7n8T3GYPR2d5yWVQsNYZrvPYZ0YQHdkUcZQetaUTE4zY/1olg==",
+ "requires": {}
+ },
+ "cytoscape-cose-bilkent": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz",
+ "integrity": "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==",
+ "requires": {
+ "cose-base": "^1.0.0"
+ },
+ "dependencies": {
+ "cose-base": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-1.0.3.tgz",
+ "integrity": "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==",
+ "requires": {
+ "layout-base": "^1.0.0"
+ }
+ },
+ "layout-base": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz",
+ "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg=="
+ }
+ }
+ },
+ "cytoscape-fcose": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz",
+ "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==",
+ "requires": {
+ "cose-base": "^2.2.0"
+ }
+ },
"d": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
@@ -37567,6 +37671,11 @@
"package-json": "^6.3.0"
}
},
+ "layout-base": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz",
+ "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg=="
+ },
"levn": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
diff --git a/package.json b/package.json
index 3eeece553029..b21e7200c43d 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,9 @@
"babel-preset-gatsby": "^2.22.0",
"caniuse-lite": "^1.0.30001435",
"cytoscape": "^3.23.0",
+ "cytoscape-compound-drag-and-drop": "^1.1.0",
+ "cytoscape-cose-bilkent": "^4.1.0",
+ "cytoscape-fcose": "^2.2.0",
"dedent": "^0.7.0",
"deepmerge": "^4.3.0",
"formik": "^2.2.9",
diff --git a/src/sections/Home/CloudNativeManagement/index.js b/src/sections/Home/CloudNativeManagement/index.js
index 0814016b3f33..f371cd43a9b5 100644
--- a/src/sections/Home/CloudNativeManagement/index.js
+++ b/src/sections/Home/CloudNativeManagement/index.js
@@ -63,7 +63,7 @@ const BannerDefault = () => {
height="100%"
style={{ margin: "auto" }}
className="vidHero"
- />
+ ><>>
diff --git a/src/sections/Meshmap/Meshmap-design/cytoscape-demo.style.js b/src/sections/Meshmap/Meshmap-design/cytoscape-demo.style.js
index 47a00f4eb7ae..52fc48c148a8 100644
--- a/src/sections/Meshmap/Meshmap-design/cytoscape-demo.style.js
+++ b/src/sections/Meshmap/Meshmap-design/cytoscape-demo.style.js
@@ -4,7 +4,6 @@ const CytoscapeWrapper = styled.div`
.simple-react-cytoscape {
width: 40vw;
height: 50vh;
- border-style: dashed;
@media only screen and (max-width: 1000px) {
height: 40vh;
diff --git a/src/sections/Meshmap/Meshmap-design/cytoscapeCanvas.js b/src/sections/Meshmap/Meshmap-design/cytoscapeCanvas.js
new file mode 100644
index 000000000000..00d5cb2d8763
--- /dev/null
+++ b/src/sections/Meshmap/Meshmap-design/cytoscapeCanvas.js
@@ -0,0 +1,99 @@
+import React, { useEffect, useRef } from "react";
+import cytoscape from "cytoscape";
+import coseBilkent from "cytoscape-cose-bilkent";
+import CytoscapeWrapper from "./cytoscape-demo.style";
+import { k8sService, clusterRole } from "./images/cytoNodes";
+
+cytoscape.use(coseBilkent);
+
+const CytoscapeComponent = () => {
+ const cyRef = useRef(null);
+ useEffect(() => {
+ const cy = cytoscape({
+ container: cyRef.current,
+ elements: [
+ {
+ data: { id: "node1" },
+ position: { x: 100, y: 100 },
+ },
+ {
+ data: { id: "node2" },
+ position: { x: 200, y: 200 },
+ },
+ {
+ // edge 1-2
+ data: { id: "edge1", source: "node1", target: "node2" }
+ },
+ ],
+ style: [
+ {
+ selector: "node",
+ style: {
+ "background-image": clusterRole().svg,
+ width: clusterRole().width,
+ "background-color": "#326CE5",
+ height: clusterRole().height,
+ shape: "round-rectangle",
+ "label": "cluster-role",
+ color: "white",
+ "font-size": "5",
+ "text-halign": "center",
+ "text-valign": "bottom",
+ "text-margin-y": 3,
+ },
+ },
+ {
+ selector: "node[id=\"node2\"]",
+ style: {
+ "background-image": k8sService().svg,
+ width: k8sService().width,
+ height: k8sService().height,
+ shape: "round-triangle",
+ "background-fit": "contain",
+ "background-position-y": "4",
+ "label": "service",
+ color: "white",
+ "font-size": "5",
+ "text-halign": "center",
+ "text-valign": "bottom",
+ "text-margin-y": 3,
+ },
+ },
+ {
+ selector: "edge",
+ style: {
+ "line-color": "#ccc",
+ "width": "2px",
+ "target-arrow-color": "#000",
+ "target-arrow-shape": "triangle",
+ "target-arrow-fill": "filled",
+ "text-rotation": "autorotate",
+ "target-arrow-offset": "20px",
+ "text-margin-y": 5,
+ color: "white",
+ "font-size": "5",
+ label: "80/TCP",
+ },
+ },
+ ],
+ layout: {
+ name: "cose-bilkent",
+ animate: true,
+ animationDuration: 1000,
+ animationEasing: "ease-out",
+ fit: true,
+ },
+ });
+
+ return () => {
+ cy.destroy();
+ };
+ }, []);
+ return (
+
+
+
+ );
+};
+
+export default CytoscapeComponent;
diff --git a/src/sections/Meshmap/Meshmap-design/images/cytoNodes.js b/src/sections/Meshmap/Meshmap-design/images/cytoNodes.js
new file mode 100644
index 000000000000..2b9454191799
--- /dev/null
+++ b/src/sections/Meshmap/Meshmap-design/images/cytoNodes.js
@@ -0,0 +1,41 @@
+export const k8sService = () => {
+ const size = 32;
+ const width = size;
+ const height = size;
+
+ const svg = `
+
+
+
+
+
+ `;
+ return {
+ svg: "data:image/svg+xml;base64," + btoa(svg),
+ width,
+ height
+ };
+};
+
+export const clusterRole = () => {
+ const size = 30;
+ const width = size;
+ const height = size;
+ const svg = `
+
+
+
+
+ `;
+ return {
+ svg: "data:image/svg+xml;base64," + btoa(svg),
+ width,
+ height
+ };
+};
+
diff --git a/src/sections/Meshmap/Meshmap-design/meshmap-design-banner.js b/src/sections/Meshmap/Meshmap-design/meshmap-design-banner.js
index edcacb43fb5c..914dd99f8667 100644
--- a/src/sections/Meshmap/Meshmap-design/meshmap-design-banner.js
+++ b/src/sections/Meshmap/Meshmap-design/meshmap-design-banner.js
@@ -2,6 +2,10 @@ import React from "react";
import styled from "styled-components";
import { ReactComponent as BannerImage } from "./images/banner-image-colorMode.svg";
import { ReactComponent as CytoscapeImg } from "./images/cytoscape-colorMode.svg";
+import CytoscapeDemo from "./cytoscape-demo";
+import CytoscapeCanvas from "./cytoscape-demo";
+import Graph from "./cytoscapeCanvas";
+import CytoscapeComponent from "./cytoscapeCanvas";
const DesignBannerWrapper = styled.div`
@@ -155,8 +159,9 @@ const MeshmapDesignBanner = () => {
{/* Drag-and-drop your cloud native infrastructure using a pallete of thousands of versioned Kubernetes components. Say goodbye to YAML configurations.
*/}
-
- {/* */}
+ {/* */}
+ {/* */}
+
Experience context-aware design
From 2232cfbfb831b8a6e1bb1b41ae2f16e28e19b87f Mon Sep 17 00:00:00 2001
From: Gaurav Chadha <65453826+Chadha93@users.noreply.github.com>
Date: Mon, 22 May 2023 11:57:34 +0530
Subject: [PATCH 03/23] revert gatsby-node.js
Signed-off-by: Gaurav Chadha <65453826+Chadha93@users.noreply.github.com>
---
gatsby-node.js | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/gatsby-node.js b/gatsby-node.js
index 7d33a66deca7..aeade5cbd294 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -706,21 +706,6 @@ const createSectionPage = ({ envCreatePage, node }) => {
});
};
-exports.onCreateWebpackConfig = ({ actions, loaders, stage }) => {
- if (stage === "build-html") {
- actions.setWebpackConfig({
- module: {
- rules: [
- {
- test: /cookie/,
- use: ["null-loader"],
- },
- ],
- }
- });
- }
-};
-
exports.createSchemaCustomization = ({ actions }) => {
const { createTypes } = actions;
const typeDefs = `
From 7c190e45ae5aa226a7006b979313e5fdfae94913 Mon Sep 17 00:00:00 2001
From: vishalvivekm <110674407+vishalvivekm@users.noreply.github.com>
Date: Tue, 23 May 2023 15:40:07 +0530
Subject: [PATCH 04/23]
move-docs-badge-above-imageHub-and-revise-suggested-texts
Signed-off-by: vishalvivekm <110674407+vishalvivekm@users.noreply.github.com>
---
.../Community/Handbook/recognition.js | 33 +++++++++----------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/sections/Community/Handbook/recognition.js b/src/sections/Community/Handbook/recognition.js
index b64f1e0e069a..080d6c3e9d9c 100644
--- a/src/sections/Community/Handbook/recognition.js
+++ b/src/sections/Community/Handbook/recognition.js
@@ -95,60 +95,59 @@ const RecognitionPage = () => {
- Community - awarded community members who repeatedly engage in welcoming, encouraging, and supporting other Layer5 community members. Community members who earn this badge occasionally graduate to undertaking the Community Manager role.
+ Community - awarded to the community members who repeatedly engage in welcoming, encouraging, and supporting other Layer5 community members. Community members who earn this badge occasionally graduate to undertaking the Community Manager role.
- Docker Extension - awarded community members who make consistent and impactful contributions to the Docker Extension of meshery project in recognition and appreciation of their efforts.
+ Docker Extension - awarded to the community members who make consistent and impactful contributions to the Docker Extension of meshery project in recognition and appreciation of their efforts.
-
- Image Hub - awarded community members who make consistent and impactful contributions to the Image Hub project in recognition and appreciation of their efforts.
+
+ Docs - awarded to the community members who make consistent and impactful contributions to the Meshery docs in recognition and appreciation of their efforts.
-
-
- Docs - awarded community members who make consistent and impactful contributions to Meshery docs in recognition and appreciation of their efforts.
+
+ Image Hub - awarded to the community members who make consistent and impactful contributions to the Image Hub project in recognition and appreciation of their efforts.
- Landscape - awarded community members who make consistent and impactful contributions to the layer5.io website.
+ Landscape - awarded to the community members who make consistent and impactful contributions to the layer5.io website.
- Meshery - awarded community members who make consistent and impactful contributions to the Meshery project. Community members who earn this badge occasionally become a project maintainer.
+ Meshery - awarded to the community members who make consistent and impactful contributions to the Meshery project. Community members who earn this badge occasionally become a project maintainer.
- Meshery Operator - awarded community members who make consistent and impactful contributions to Meshery Operator of the Meshery project in recognition and appreciation of their efforts.
+ Meshery Operator - awarded to the community members who make consistent and impactful contributions to Meshery Operator of the Meshery project in recognition and appreciation of their efforts.
- Meshery Catalog - awarded community members who make consistent and impactful contributions to the Meshery Catalog of Meshery project in recognition and appreciation of their efforts.
+ Meshery Catalog - awarded to the community members who make consistent and impactful contributions to the Meshery Catalog of Meshery project in recognition and appreciation of their efforts.
- MeshMap - awarded community members who make consistent and impactful contributions to the MeshMap project in recognition and appreciation of their efforts. Community members who earn this badge occasionally become a project maintainer.
+ MeshMap - awarded to the community members who make consistent and impactful contributions to the MeshMap project in recognition and appreciation of their efforts. Community members who earn this badge occasionally become a project maintainer.
- Nighthawk - awarded community members who make consistent and impactful contributions to the NightHawk project in recognition and appreciation of their efforts. Community members who earn this badge occasionally become a project maintainer.
+ Nighthawk - awarded to the community members who make consistent and impactful contributions to the NightHawk project in recognition and appreciation of their efforts. Community members who earn this badge occasionally become a project maintainer.
- Patterns - awarded community members who make consistent and impactful contributions to the Service Mesh Patterns project in recognition and appreciation of their efforts.
+ Patterns - awarded to the community members who make consistent and impactful contributions to the Service Mesh Patterns project in recognition and appreciation of their efforts.
- Service Mesh Performance - awarded community members who make consistent and impactful contributions to the Service Mesh Performance project. Community members who earn this badge occasionally become a project maintainer.
+ Service Mesh Performance - awarded to the community members who make consistent and impactful contributions to the Service Mesh Performance project. Community members who earn this badge occasionally become a project maintainer.
- UI/UX - awarded community members who create or improve designs for visual aspects or user flow for any of the websites, flyers, promotions, Meshery UI, and so on in recognition and appreciation of their efforts.
+ UI/UX - awarded to the community members who create or improve designs for visual aspects or user flow for any of the websites, flyers, promotions, Meshery UI, and so on in recognition and appreciation of their efforts.
- Writer's Program - awarded community members who make with two or more published writings whether in article, blog post, project documentation or other form in recognition and appreciation of their efforts.
+ Writer's Program - awarded to the community members who make with two or more published writings whether in article, blog post, project documentation or other form in recognition and appreciation of their efforts.
From eb51a417a2b9189ddd0253c979c813c04bc47d2f Mon Sep 17 00:00:00 2001
From: niranjan-kurhade
Date: Wed, 24 May 2023 18:22:07 +0530
Subject: [PATCH 05/23] Fixed the dark mode colors of table in Service mesh
patterns page
Signed-off-by: niranjan-kurhade
---
src/components/service-mesh-patterns-Table/table.style.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/service-mesh-patterns-Table/table.style.js b/src/components/service-mesh-patterns-Table/table.style.js
index 600b272a5728..f1cd1830dc7a 100644
--- a/src/components/service-mesh-patterns-Table/table.style.js
+++ b/src/components/service-mesh-patterns-Table/table.style.js
@@ -17,7 +17,7 @@ export const TableWrapper = styled.div`
th{
- background:${(props) => props.theme.tertiaryColor};
+ background:#1e2117;
color:${(props) => props.theme.white};
padding:10px;
border-collapse:collapse;
@@ -52,7 +52,7 @@ export const TableWrapper = styled.div`
.table-header {
border-radius: 0 !important;
- background-color: ${(props) => props.theme.primaryColor};
+ background-color: #3c494f;
}
tbody{
From 170751de85af05c4efbdd869b8ac684c59404fa7 Mon Sep 17 00:00:00 2001
From: Senali
Date: Wed, 24 May 2023 21:56:09 +0530
Subject: [PATCH 06/23] Update optimized catalog images
Signed-off-by: Senali
---
src/assets/images/catalog/catalog-dark.svg | 1826 +++++++++---------
src/assets/images/catalog/catalog-light.svg | 1832 ++++++++++---------
2 files changed, 1893 insertions(+), 1765 deletions(-)
diff --git a/src/assets/images/catalog/catalog-dark.svg b/src/assets/images/catalog/catalog-dark.svg
index 849680e3c7cf..ce08b4054e44 100644
--- a/src/assets/images/catalog/catalog-dark.svg
+++ b/src/assets/images/catalog/catalog-dark.svg
@@ -1,893 +1,957 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
+
+
-
-
+
+
-
diff --git a/src/assets/images/catalog/catalog-light.svg b/src/assets/images/catalog/catalog-light.svg
index 7c07526892b1..0111a178bab2 100644
--- a/src/assets/images/catalog/catalog-light.svg
+++ b/src/assets/images/catalog/catalog-light.svg
@@ -1,904 +1,968 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
From 6e494823c1e81dce71156de35a7cfec47ecfa03f Mon Sep 17 00:00:00 2001
From: niranjan-kurhade
Date: Thu, 25 May 2023 15:52:47 +0530
Subject: [PATCH 07/23] background-color property removed from book cover image
---
src/collections/service-mesh-books/Book.style.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/collections/service-mesh-books/Book.style.js b/src/collections/service-mesh-books/Book.style.js
index c2da89097d12..9381f1554a90 100644
--- a/src/collections/service-mesh-books/Book.style.js
+++ b/src/collections/service-mesh-books/Book.style.js
@@ -24,7 +24,6 @@ export const BookWrapper = styled.div`
.card{
position: relative;
margin: 0.5rem 0 1rem 0;
- background-color: #fff;
-webkit-transition: -webkit-box-shadow .25s;
transition: -webkit-box-shadow .25s;
transition: box-shadow .25s;
From e71789af9a127dd8d69e3a553aa85a152e8d40c3 Mon Sep 17 00:00:00 2001
From: Vishrut Aggarwal
Date: Thu, 18 May 2023 17:21:51 +0530
Subject: [PATCH 08/23] fix: add word-wrap to terminal text and set max-width
Signed-off-by: Vishrut Aggarwal
Signed-off-by: niranjan-kurhade
---
src/components/Terminal/Terminal.style.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/Terminal/Terminal.style.js b/src/components/Terminal/Terminal.style.js
index ac22912fb6d4..e547b8db32b8 100644
--- a/src/components/Terminal/Terminal.style.js
+++ b/src/components/Terminal/Terminal.style.js
@@ -59,7 +59,6 @@ export const TerminalWrapper = styled.div`
background: var(--terminal-body-color);
border-radius: 0 0 var(--terminal-radius) var(--terminal-radius);
padding: 24px 32px;
-
@media (min-width: 768px) {
height: 525px;
}
@@ -80,16 +79,16 @@ export const TerminalWrapper = styled.div`
width: 0;
height: 0;
}
-
+
.code-wrapper {
- pre {
+ pre {
padding: 0;
margin: 0;
width: 100%;
height: 100%;
font-style: normal;
font-weight: normal;
- font-size: 12px;
+ font-size: 10px;
line-height: 27px;
white-space: pre-wrap;
color: ${props => props.theme.secondaryColor};
@@ -106,6 +105,9 @@ export const TerminalWrapper = styled.div`
color: var(--white);
}
+ wrap-word: normal;
+ max-width: 17rem;
+
@media (min-width: 768px){
font-size: 13.5px;
line-height: 26px;
From 47086c7b9673dbe85491354bdde64200821a4be4 Mon Sep 17 00:00:00 2001
From: Vishrut Aggarwal
Date: Fri, 19 May 2023 09:13:41 +0530
Subject: [PATCH 09/23] fix: reverted the font size to 12px in terminal
Signed-off-by: Vishrut Aggarwal
Signed-off-by: niranjan-kurhade
---
src/components/Terminal/Terminal.style.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/Terminal/Terminal.style.js b/src/components/Terminal/Terminal.style.js
index e547b8db32b8..53f36937b818 100644
--- a/src/components/Terminal/Terminal.style.js
+++ b/src/components/Terminal/Terminal.style.js
@@ -88,7 +88,7 @@ export const TerminalWrapper = styled.div`
height: 100%;
font-style: normal;
font-weight: normal;
- font-size: 10px;
+ font-size: 12px;
line-height: 27px;
white-space: pre-wrap;
color: ${props => props.theme.secondaryColor};
From 798ba822c6b2b4a928cd856ce6ee300eef81b2d7 Mon Sep 17 00:00:00 2001
From: Vishrut Aggarwal
Date: Tue, 23 May 2023 19:56:28 +0530
Subject: [PATCH 10/23] removed rigid values and added max-width on bigger
scope
Signed-off-by: Vishrut Aggarwal
Signed-off-by: niranjan-kurhade
---
src/components/Terminal/Terminal.style.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/Terminal/Terminal.style.js b/src/components/Terminal/Terminal.style.js
index 53f36937b818..216ee7cf762f 100644
--- a/src/components/Terminal/Terminal.style.js
+++ b/src/components/Terminal/Terminal.style.js
@@ -16,6 +16,7 @@ export const TerminalWrapper = styled.div`
--terminal-body-color: var(--gray-1);
width: 837px;
+ max-width: 90%;
.title-bar {
display: flex;
@@ -106,7 +107,6 @@ export const TerminalWrapper = styled.div`
}
wrap-word: normal;
- max-width: 17rem;
@media (min-width: 768px){
font-size: 13.5px;
From 170edf142218ade7bd1da2754642ab087c9c4c29 Mon Sep 17 00:00:00 2001
From: niranjan-kurhade
Date: Wed, 24 May 2023 18:22:07 +0530
Subject: [PATCH 11/23] Fixed the dark mode colors of table in Service mesh
patterns page
Signed-off-by: niranjan-kurhade
---
src/components/service-mesh-patterns-Table/table.style.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/service-mesh-patterns-Table/table.style.js b/src/components/service-mesh-patterns-Table/table.style.js
index 600b272a5728..f1cd1830dc7a 100644
--- a/src/components/service-mesh-patterns-Table/table.style.js
+++ b/src/components/service-mesh-patterns-Table/table.style.js
@@ -17,7 +17,7 @@ export const TableWrapper = styled.div`
th{
- background:${(props) => props.theme.tertiaryColor};
+ background:#1e2117;
color:${(props) => props.theme.white};
padding:10px;
border-collapse:collapse;
@@ -52,7 +52,7 @@ export const TableWrapper = styled.div`
.table-header {
border-radius: 0 !important;
- background-color: ${(props) => props.theme.primaryColor};
+ background-color: #3c494f;
}
tbody{
From 37b19aefe8cbe69168c510b5a085f824aacd671a Mon Sep 17 00:00:00 2001
From: niranjan-kurhade
Date: Thu, 25 May 2023 15:52:47 +0530
Subject: [PATCH 12/23] background-color property removed from book cover image
Signed-off-by: niranjan-kurhade
---
src/collections/service-mesh-books/Book.style.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/collections/service-mesh-books/Book.style.js b/src/collections/service-mesh-books/Book.style.js
index c2da89097d12..9381f1554a90 100644
--- a/src/collections/service-mesh-books/Book.style.js
+++ b/src/collections/service-mesh-books/Book.style.js
@@ -24,7 +24,6 @@ export const BookWrapper = styled.div`
.card{
position: relative;
margin: 0.5rem 0 1rem 0;
- background-color: #fff;
-webkit-transition: -webkit-box-shadow .25s;
transition: -webkit-box-shadow .25s;
transition: box-shadow .25s;
From 5e34f81c3768c10d6c875ef4124967652f8504d6 Mon Sep 17 00:00:00 2001
From: Senali
Date: Thu, 25 May 2023 20:52:43 +0530
Subject: [PATCH 13/23] Update catalog image
Signed-off-by: Senali
---
src/assets/images/catalog/catalog-dark.svg | 958 +------------------
src/assets/images/catalog/catalog-light.svg | 969 +-------------------
2 files changed, 2 insertions(+), 1925 deletions(-)
diff --git a/src/assets/images/catalog/catalog-dark.svg b/src/assets/images/catalog/catalog-dark.svg
index ce08b4054e44..dfa2bf82989d 100644
--- a/src/assets/images/catalog/catalog-dark.svg
+++ b/src/assets/images/catalog/catalog-dark.svg
@@ -1,957 +1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/assets/images/catalog/catalog-light.svg b/src/assets/images/catalog/catalog-light.svg
index 0111a178bab2..5504e26bc4a1 100644
--- a/src/assets/images/catalog/catalog-light.svg
+++ b/src/assets/images/catalog/catalog-light.svg
@@ -1,968 +1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
From 2c78ef219d9f5fc015d40fb8efede21a658923de Mon Sep 17 00:00:00 2001
From: Gaurav Chadha <65453826+Chadha93@users.noreply.github.com>
Date: Fri, 26 May 2023 02:25:49 +0530
Subject: [PATCH 14/23] Update package.json
Signed-off-by: Gaurav Chadha <65453826+Chadha93@users.noreply.github.com>
---
package.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/package.json b/package.json
index b21e7200c43d..5392f09f4b53 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,6 @@
"babel-preset-gatsby": "^2.22.0",
"caniuse-lite": "^1.0.30001435",
"cytoscape": "^3.23.0",
- "cytoscape-compound-drag-and-drop": "^1.1.0",
"cytoscape-cose-bilkent": "^4.1.0",
"cytoscape-fcose": "^2.2.0",
"dedent": "^0.7.0",
From 0a41c646e795518ea78fa5c8fe5c37abe82ed1c4 Mon Sep 17 00:00:00 2001
From: Gaurav Chadha <65453826+Chadha93@users.noreply.github.com>
Date: Fri, 26 May 2023 02:26:42 +0530
Subject: [PATCH 15/23] Update
src/sections/Meshmap/Meshmap-design/images/cytoNodes.js
Signed-off-by: Gaurav Chadha <65453826+Chadha93@users.noreply.github.com>
---
src/sections/Meshmap/Meshmap-design/images/cytoNodes.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sections/Meshmap/Meshmap-design/images/cytoNodes.js b/src/sections/Meshmap/Meshmap-design/images/cytoNodes.js
index 2b9454191799..990d2f055ad0 100644
--- a/src/sections/Meshmap/Meshmap-design/images/cytoNodes.js
+++ b/src/sections/Meshmap/Meshmap-design/images/cytoNodes.js
@@ -27,7 +27,7 @@ export const clusterRole = () => {
const width = size;
const height = size;
const svg = `
-
+
From 56dae2851c233ec24422ba270e5870135bae0c26 Mon Sep 17 00:00:00 2001
From: leecalcote
Date: Fri, 26 May 2023 00:51:33 +0000
Subject: [PATCH 16/23] [Docs] Generated documentation for Integration
Signed-off-by: l5io
---
src/collections/integrations/docker/index.mdx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/collections/integrations/docker/index.mdx b/src/collections/integrations/docker/index.mdx
index d18637795151..05e3eaecec3f 100644
--- a/src/collections/integrations/docker/index.mdx
+++ b/src/collections/integrations/docker/index.mdx
@@ -11,10 +11,11 @@ featureList: ["Scan your kubeconfigs and select your current Kubernetes environm
"Meshery Docker Extension extends Docker Desktop’s position as the cloud native developer’s go-to Kubernetes environment with easy access to the next layer of cloud native infrastructure: service meshes."
]
workingSlides: [
+ ../../../assets/images/docker-extension/docker-extension-meshery.png,
../_images/meshmap-visualizer.png,
../_images/meshmap-designer.png]
howItWorks: "Collaborative Infrastructure as Code"
-howItWorksDetails: "Meshery Docker Extension extends Docker Desktop’s position as the cloud native developer’s go-to Kubernetes environment with easy access to the next layer of cloud native infrastructure: service meshes."
+howItWorksDetails: "From the convenience of your Docker Desktop interface, connect Meshery with your Kubernetes cluster. Watch as MeshSync discovers all of your Kuberentes clusters. Visually design your Docker-based infrastructure. Choose from hundreds of ready-made design patterns using Meshery Catalog. Use our no-code designer, MeshMap, to collaboratively design and operate your infra."
published: true
---
From 5951ee787311f62d2708e313f53300fccf2660ba Mon Sep 17 00:00:00 2001
From: Darren Dsouza
Date: Fri, 26 May 2023 16:37:00 +0000
Subject: [PATCH 17/23] Added a new member card
Signed-off-by: Darren Dsouza
---
.gitpod.yml | 11 +++++++++++
src/collections/members/savio-dias/index.mdx | 12 ++++++++++++
.../members/savio-dias/saviodias.jpg | Bin 0 -> 134510 bytes
3 files changed, 23 insertions(+)
create mode 100644 .gitpod.yml
create mode 100644 src/collections/members/savio-dias/index.mdx
create mode 100644 src/collections/members/savio-dias/saviodias.jpg
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 000000000000..d634e4ab5fe8
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,11 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
+# and commit this file to your remote git repository to share the goodness with others.
+
+# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
+
+tasks:
+ - init: npm install && npm run build && make
+ command: npm run start
+
+
diff --git a/src/collections/members/savio-dias/index.mdx b/src/collections/members/savio-dias/index.mdx
new file mode 100644
index 000000000000..8bacc69df983
--- /dev/null
+++ b/src/collections/members/savio-dias/index.mdx
@@ -0,0 +1,12 @@
+---
+name: Savio Dias
+position: Contributor
+image_path: ./saviodias.jpg
+github: Savio629
+twitter: Savio_dias629
+linkedin: savio-dias-984b45198
+location: Navi-Mumbai, India
+bio: Hey there! I'm Savio Dias, a tech enthusiast with a great curiosity for exploring the endless possibilities of technology. As a student at FCRIT, Vashi, I discovered the world of open-source during my sophomore year and I've been hooked ever since. With a keen interest in UI/UX and a good foundation in the MERN stack, I'm always eager to expand my knowledge and dive into the dynamic realms of cloud-native technologies and APIs.My commitment to open-source stems from my belief in the power of collaborative learning and community-driven growth. I'm ready to embark on a coding adventure together! Let's connect and let our journey begin with a resounding "Link start" into the realm of technology.
+status: Active
+published: true
+---
\ No newline at end of file
diff --git a/src/collections/members/savio-dias/saviodias.jpg b/src/collections/members/savio-dias/saviodias.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8c99d2fd29a6c0b6452b7ca395d9019948dd9571
GIT binary patch
literal 134510
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