Merge branch 'master' into master

layer5io · Apr 26, 2024 · 91fa31b · 91fa31b
2 parents 5098117 + b0fa834
commit 91fa31b
Show file tree

Hide file tree

Showing 33 changed files with 2,663 additions and 1,807 deletions.
diff --git a/gatsby-node.js b/gatsby-node.js
@@ -48,7 +48,8 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
   createRedirect({ fromPath: "/labs", toPath: "/learn/service-mesh-labs", redirectInBrowser: true, isPermanent: true });
   createRedirect({ fromPath: "/meshery", toPath: "/cloud-native-management/meshery", redirectInBrowser: true, isPermanent: true });
   createRedirect({ fromPath: "/service-mesh-management/meshery", toPath: "/cloud-native-management/meshery", redirectInBrowser: true, isPermanent: true });
-  createRedirect({ fromPath: "/service-mesh-management/meshery/operating-service-meshes", toPath: "/cloud-native-management/meshery/operating-service-meshes", redirectInBrowser: true, isPermanent: true });
+  createRedirect({ fromPath: "/service-mesh-management/meshery/operating-service-meshes", toPath: "/cloud-native-management/meshery/operating-cloud-native-infra", redirectInBrowser: true, isPermanent: true });
+  createRedirect({ fromPath: "/cloud-native-management/meshery/operating-service-meshes", toPath: "/cloud-native-management/meshery/operating-cloud-native-infra", redirectInBrowser: true, isPermanent: true });
   createRedirect({ fromPath: "/service-mesh-management/meshery/getting-started", toPath: "/cloud-native-management/meshery/getting-started", redirectInBrowser: true, isPermanent: true });
   createRedirect({ fromPath: "/landscape", toPath: "/service-mesh-landscape", redirectInBrowser: true, isPermanent: true });
   createRedirect({ fromPath: "/events", toPath: "/community/events", redirectInBrowser: true, isPermanent: true });

diff --git a/...collections/events/making-the-cncf-landscape-interactive-with-meshery/index.mdx b/...collections/events/making-the-cncf-landscape-interactive-with-meshery/index.mdx
@@ -4,15 +4,18 @@ description: "Join the Kubesimplify livestream for an engaging livestream where
 date: 2024-05-01
 thumbnail: ./thumbnail.png
 darkthumbnail: ./thumbnail.png
-eurl: "https://www.youtube.com/@Layer5io"
+eurl: "https://www.youtube.com/watch?v=ujHe-4QP9og"
 type: Event
 published: true
 upcoming: true
 feature: false
 speakers: ["Lee Calcote", "Saiyam Pathak"]
 ---
 
-Join the Kubesimplify livestream for an engaging livestream where we dive into the dynamic world of the Cloud Native Computing Foundation (CNCF) Landscape and explore how Meshery, the collaborative cloud native manager, is revolutionizing it. In this session, we’ll demonstrate how Meshery not only simplifies the management of all Kubernetes-based infrastructure, but also makes the CNCF Landscape interactive, allowing for a more intuitive and hands-on experience.
+import Button from "../../../reusecore/Button";
+
+
+Join the Kubesimplify livestream on May 1st, 2024 at 11:00 AM CT / 09:30 PM IST and meet Lee Calcote (<a href="https://twitter.com/lcalcote">@lcalcote</a>) and Saiyam Pathak (<a href="https://twitter.com/SaiyamPathak">@SaiyamPathak</a>) for an engaging livestream where they will dive into the dynamic world of the Cloud Native Computing Foundation (CNCF) Landscape and explore how Meshery, the collaborative cloud native manager, is revolutionizing it. In this session, they’ll demonstrate how Meshery not only simplifies the management of all Kubernetes-based infrastructure, but also makes the CNCF Landscape interactive, allowing for a more intuitive and hands-on experience.
 
 Whether you’re a developer, an operator, or simply a cloud-native enthusiast, you’ll discover how Meshery’s powerful visualization and collaboration features can help you navigate the CNCF Landscape with ease. Get ready to learn about:
 - Meshery’s role in the CNCF ecosystem
@@ -23,4 +26,14 @@ Whether you’re a developer, an operator, or simply a cloud-native enthusiast,
 
 Don’t miss out on this opportunity to enhance your cloud-native journey with Meshery. Subscribe and set a reminder for our livestream to stay at the forefront of cloud-native technologies!
 
+<div class="flex-row">
+  <p>
+    Date: May 1st, 2024<br />
+    Time: 11:00 AM CT / 09:30 PM IST
+  </p>
+
+  <Button secondary title="Youtube Live" url="https://www.youtube.com/watch?v=ujHe-4QP9og" external={ true } style="margin-right: 1rem"/>
+  <Button secondary title="LinkedIn Live" url="https://www.linkedin.com/events/7187055610918572034/comments/" external={ true } />
+</div>
+
 
diff --git a/src/collections/members/ahmed-jamil/index.mdx b/src/collections/members/ahmed-jamil/index.mdx
@@ -8,6 +8,6 @@ linkedin: muhammad-ahmed-97578b1ab
 layer5: 93770230-940d-43eb-bd97-0a40bdd4ec5d
 location: Karachi, Pakistan
 bio: Hi! I'm Ahmed Jamil, an enthusiastic software engineer and undergraduate student diving deep into the world of open source and cloud-native technologies.
-status: Active
+status: Inactive
 published: true
 ---
diff --git a/src/collections/members/deepak-reddy/deepak-reddy.jpg b/src/collections/members/deepak-reddy/deepak-reddy.jpg
diff --git a/src/collections/members/deepak-reddy/index.mdx b/src/collections/members/deepak-reddy/index.mdx
@@ -0,0 +1,12 @@
+---
+name: Deepak Reddy
+position: Contributor
+image_path: ./deepak-reddy.jpg
+github: deepak4566 
+twitter: DeepakR95448261
+linkedin: deepak4566
+bio: Deepak is an tech enthusiast who loves to solve real world enginnering problems , he is an freelancer in ML and cloud enginnering where he solves problems like reducing latency ,downtime and designing backend architecture for organisations , he is also passionate about cloud native technologies and active contributor for kubernetes , layer5 . He is also tech youtuber where he discuss about production grade cloud projects which include cloud native ecosystem.
+badges:
+status: Active
+published: true
+---
diff --git a/src/collections/members/hiren-timbadiya/index.mdx b/src/collections/members/hiren-timbadiya/index.mdx
@@ -8,6 +8,6 @@ linkedin: hirentimbadiya74
 layer5: 01da757f-4fee-448e-9ba1-1bb655b2b05a
 location: Surat, India
 bio: "I am Hiren Timbadiya, I consider myself an inquisitive developer, constantly seeking to expand my knowledge in various technologies and delve into the boundless possibilities they offer. I am interested in DevOps technologies like kubernates, docker, service meshes, ci/cd, cloud and also enthusiastic about opensource. I am a highly motivated individual who is continuously learning and during my spare time, I love playing cricket and preparing a meal for myself."
-status: Active
+status: Inactive
 published: true
 ---
diff --git a/src/collections/members/saurabh soni/index.mdx b/src/collections/members/saurabh soni/index.mdx
@@ -10,6 +10,6 @@ location: Gwalior, Madhya Pradesh, India
 bio: "I'm a former Google Developer Students Club Lead and founded a community of 600+ people out of my passion for the people and the community, now I'm here to start my new journey at layer5."
 badges:
   - community
-status: Active
+status: Inactive
 published: true
 ---
diff --git a/src/collections/members/savio-dias/index.mdx b/src/collections/members/savio-dias/index.mdx
@@ -8,6 +8,6 @@ linkedin: savio-dias-984b45198
 layer5: c746f9e8-7b97-46a0-bcaa-780cf208bd9a
 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
+status: Inactive
 published: true
 ---
diff --git a/src/collections/members/uzair-shaikh/index.mdx b/src/collections/members/uzair-shaikh/index.mdx
@@ -13,6 +13,6 @@ badges:
   - meshery-operator
   - nighthawk
   - meshmap
-status: Active
+status: Inactive
 published: true
 ---
diff --git a/src/collections/members/vihas-makwana/index.mdx b/src/collections/members/vihas-makwana/index.mdx
@@ -10,6 +10,6 @@ location: Ahmedabad, India
 bio: I love to work on cloud-native software. I can basically work with anything - Server, UI, Databases, Distributed Systems etc. Enjoying my journey.
 badges:
 - community
-status: Active
+status: Inactive
 published: true
 ---
diff --git a/src/components/Call-To-Actions/CTA_Bottom/cta_bottom_categories.js b/src/components/Call-To-Actions/CTA_Bottom/cta_bottom_categories.js
@@ -1,5 +1,5 @@
 import img_source from "../../../assets/images/callout/callout.webp";
-import meshmap_icon from "../../../assets/images/meshmap/icon-only/meshmap-icon.webp";
+import meshmap_icon from "../../../assets/images/meshmap/meshmap-collaborate.webp";
 import docker from "../../../assets/images/docker-extension/docker-extension-meshery-logo.svg";
 
 export const Categories = {
@@ -15,8 +15,8 @@ export const Categories = {
   "MeshMap": {
     "Image": meshmap_icon,
     "Image_Alt": "MeshMap",
-    "Heading": "MeshMap is here!",
-    "Content": "Design your deployments the way you want. Drag-and-drop your cloud native infrastructure using a pallete of thousands of versioned Kubernetes components. Say goodbye to YAML configurations. Have your cloud native deployments automatically diagrammed. Deployments configured and modeled in Designer mode, can be deployed into your environment and managed using Visualizer. Discover a catalog of best practice cloud native patterns",
+    "Heading": "Get started with MeshMap!",
+    "Content": "Explore and understand your infrastructure at a glance with our powerful visualizer tool. Gain insights, track dependencies, and optimize performance effortlessly.",
     "Button_Text": "Try MeshMap now!",
     "Link": "/cloud-native-management/meshmap",
     "Link_external": false

diff --git a/src/components/Call-To-Actions/CTA_Bottom/index.js b/src/components/Call-To-Actions/CTA_Bottom/index.js
@@ -6,90 +6,43 @@ import { Categories } from "./cta_bottom_categories";
 
 const CTA_BottomWrapper = styled.div`
     display: flex;
-    flex: 0 0 100%;
+    flex-direction: row;
+    justify-content: space-between; 
+    align-items: center; 
     width: 98%;
     height: 16rem;
     margin: 2rem auto 1.5rem;
     box-shadow: 0px 0px 16px 4px rgba(0, 0, 0, 0.1);
     background: rgba(201, 252, 246, 0.3);
     border-radius: 0.5rem;
-
-    a {
-        display: block;
-    }
-
-    img {
-        object-fit: contain;
-        pointer-events: none;
-        border-radius: 0 0.5rem 0.5rem 0;
-        padding: 1rem;
-    }
+    overflow: hidden; 
 
     .cta-content {
         padding: 0.5rem 1.5rem;
-        display: flex;
-        flex: auto;
-        align-items: center;
-        height: 100%;
+        text-align: center;
+        max-width: calc(75% - 1rem); 
+        margin-right: 1rem; 
 
-        div {
-            flex: 0 0 75%;
+        h3 {
+            margin-bottom: 0.5rem; 
         }
 
         p {
             margin-top: 0.5rem;
         }
-        a {
-            text-align: center;
-            flex: 0 0 25%;
-        }
     }
 
-    @media screen and (max-width: 992px) and (min-width: 600px) {
-      height: auto;
-        button {
-            min-width: 6.5rem;
-        }
-        img{
-          width: 16rem;
-          height: 16rem;
-          align-self: center
-        }
+    img {
+      object-fit: cover; 
+      width: auto; 
+      max-width: 35%; 
+      padding: 1rem;
+      max-height: 100%; 
+      border-radius: 0 0.5rem 0.5rem 0; 
     }
 
-    @media screen and (max-width: 699px) {
-        display: block;
-        width: 18rem;
-        height: 18rem;
-        margin: 1.5rem auto;
-        border-radius: 0.25rem;
-
-        img {
-            width: 18rem;
-            height: 18rem;
-            position: absolute;
-            opacity: 0.35;
-            border-radius: 0.25rem;
-        }
-
-        .cta-content {
-            position: absolute;
-            height: 18rem;
-            display: block;
-            width: 18rem;
-            background: none;
-            padding: 4rem 1rem;
-            z-index: 1;
-            text-align: center;
-
-            p{
-              width: 100%;
-              white-space: nowrap;
-              overflow: hidden;
-              display: block;
-              text-overflow: ellipsis;
-            }
-        }
+    button {
+        width: fit-content; 
     }
 `;
 
@@ -100,31 +53,23 @@ const defaultURL = "https://slack.layer5.io";
 const CTA_Bottom = ({ alt, button_text, category, content, external_link, image, url, heading, ...props }) => {
   return (
     <CTA_BottomWrapper {...props}>
-      { category ? (
-        <>
-          <div className="cta-content">
-            <div>
-              <h3>{Categories[category]["Heading"]}</h3>
-              <p>{Categories[category]["Content"]}</p>
-            </div>
-            <Button primary title={Categories[category]["Button_Text"]} url={Categories[category]["Link"]} external={Categories[category]["Link_external"]} />
-          </div>
-          <img src={Categories[category]["Image"]} alt={Categories[category]["Image_Alt"]} />
-        </>
-      ) : (
-        <>
-          <div className="cta-content">
-            <div>
-              <h3>{heading ? heading : defaultHeading}</h3>
-              <p>{content ? content : defaultContent}</p>
-            </div>
-            <Button primary title={button_text ? button_text : "Join Us"} url={url ? url : defaultURL} external={external_link ? true : false} />
-          </div>
-          <img src={image ? image : image_src} alt={alt ? alt : "Alt Text"} />
-        </>
-      )}
+      <div className="cta-content">
+        { category ? (
+          <>
+            <h3>{Categories[category]["Heading"]}</h3>
+            <p>{Categories[category]["Content"]}</p>
+          </>
+        ) : (
+          <>
+            <h3>{heading ? heading : defaultHeading}</h3>
+            <p>{content ? content : defaultContent}</p>
+          </>
+        )}
+        <Button primary title={category ? Categories[category]["Button_Text"] : (button_text ? button_text : "Join Us")} url={category ? Categories[category]["Link"] : (url ? url : defaultURL)} external={category ? Categories[category]["Link_external"] : (external_link ? true : false)} />
+      </div>
+      <img src={category ? Categories[category]["Image"] : (image ? image : image_src)} alt={category ? Categories[category]["Image_Alt"] : (alt ? alt : "Alt Text")} />
     </CTA_BottomWrapper>
   );
 };
 
-export default CTA_Bottom;
+export default CTA_Bottom;
diff --git a/src/components/Learn-Components/Setup-Pre-Requisites/index.js b/src/components/Learn-Components/Setup-Pre-Requisites/index.js
@@ -36,7 +36,7 @@ const SetupPreReq = () => (
           <p>With 'mesheryctl', not only you can manage your service meshes, but also manage their workloads, measure their performance, verify conformance to service mesh standards.</p>
         </div>
       </a>
-      <a href="/cloud-native-management/meshery/operating-service-meshes" id="Manage Meshery"
+      <a href="/cloud-native-management/meshery/operating-cloud-native-infra" id="Manage Meshery"
         target="_blank"
       >
         <div className="card">

diff --git a/src/components/Learn-Components/TOC-Learning-Path/index.js b/src/components/Learn-Components/TOC-Learning-Path/index.js
@@ -8,7 +8,7 @@ import { IoIosArrowDropdownCircle } from "@react-icons/all-files/io/IoIosArrowDr
 const preReqSteps = [
   { name: "Set up", link: "/cloud-native-management/meshery" },
   { name: "Run Meshery",link: "/cloud-native-management/meshery/getting-started" },
-  { name: "Manage Meshery", link: "/cloud-native-management/meshery/operating-service-meshes" }
+  { name: "Manage Meshery", link: "/cloud-native-management/meshery/operating-cloud-native-infra" }
 ];
 
 const TOC = ({ coursesData }) => {

diff --git a/src/components/SistentNavigation/index.js b/src/components/SistentNavigation/index.js
@@ -59,7 +59,7 @@ const TOC = () => {
                 className="toc-sub-heading identity"
                 onClick={() => setExpandIdentity((prev) => !prev)}
               >
-                Idenitity
+                Identity
                 {expandIdenity ? <IoIosArrowUp /> : <IoIosArrowDown />}
               </li>
               {expandIdenity && (

diff --git a/src/components/handbook-navigation/intra-page.js b/src/components/handbook-navigation/intra-page.js
@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { Link } from "gatsby";
 import styled from "styled-components";
-import { link } from "joi";
 
 const JoinCommunityWrapper = styled.div`
   @media screen and (min-width: 751px) and (max-width: 1279px) {