Merge branch 'master' into add-rajesh-nagarajan-profile

Author: vr-varad

src/components/Pricing/PricingAddons/index.js

@@ -1,6 +1,6 @@
 /* eslint-disable indent */
 import React, { useState, useEffect } from "react";
-import { Box, Card, CardContent, CardHeader, Typography, FormControl, InputLabel, Select, MenuItem, Slider, Switch, FormControlLabel, Chip, Container, Link, Paper, SistentThemeProvider, CssBaseline, useTheme } from "@sistent/sistent";
+import { Box, Card, CardContent, CardHeader, Typography, FormControl, InputLabel, Select, MenuItem, Slider, Switch, FormControlLabel, Chip, Container, Paper, SistentThemeProvider, CssBaseline, useTheme } from "@sistent/sistent";
 import { Calculate, CheckCircle } from "@mui/icons-material";
 import { useStyledDarkMode } from "../../../theme/app/useStyledDarkMode";
 import { getAddOns } from "./pricingData";
@@ -10,7 +10,8 @@ import Button from "../../../reusecore/Button";
 
 export const PricingAddons = ({ isYearly = false, setIsYearly }) => {
   const [selectedAddon, setSelectedAddon] = useState(null);
-  const [quantity, setQuantity] = useState(1);
+  // const [quantity, setQuantity] = useState(1);
+  const quantity = 1;
   const [selectedSubAddOns, setSelectedSubAddOns] = useState({});
   const [totalPrice, setTotalPrice] = useState(0);
   const [quantityIndex, setQuantityIndex] = useState(0);

src/components/Pricing/PricingAddons/pricingData.js

@@ -3,12 +3,12 @@ import { Cloud, Group } from "@mui/icons-material";
 import AcademyIcon from "./AcademyIcon";
 
 
-const planLink = {
-  "Personal": "https://cloud.layer5.io/account/plans",
-  "Team Designer": "https://cloud.layer5.io/account/plans/upgrade?plan=49b77ce8-eeea-4ec4-adf3-48979a14b140",
-  "Team Operator": "https://cloud.layer5.io/account/plans/upgrade?plan=f7a5b2b5-b36b-421e-9211-f4dfb204e5b3",
-  "Enterprise": "https://cloud.layer5.io/account/plans/upgrade?plan=ad68ce59-8c5a-42b0-955c-9b2b2f7c98e3"
-};
+// const planLink = {
+//   "Personal": "https://cloud.layer5.io/account/plans",
+//   "Team Designer": "https://cloud.layer5.io/account/plans/upgrade?plan=49b77ce8-eeea-4ec4-adf3-48979a14b140",
+//   "Team Operator": "https://cloud.layer5.io/account/plans/upgrade?plan=f7a5b2b5-b36b-421e-9211-f4dfb204e5b3",
+//   "Enterprise": "https://cloud.layer5.io/account/plans/upgrade?plan=ad68ce59-8c5a-42b0-955c-9b2b2f7c98e3"
+// };
 
 
 // Academy add-ons have tiered pricing based on the number of learners

src/sections/Community/Handbook/learn5.js

@@ -57,6 +57,9 @@ const LearnLayer = () => {
               interactive challenges, and professional certifications. Content spans beginner
               to advanced levels for both developers and organizations.
             </p>
+            <p>
+              For more details, check out the <a href="https://docs.layer5.io/cloud/academy/" target="_blank" rel="noopener noreferrer">Academy documentation</a> and explore our <a href="https://github.com/orgs/layer5io/repositories?q=academy" target="_blank" rel="noopener noreferrer">GitHub collections</a>.
+            </p>
 
             <a id="Eventing">
               <h2>Sharing what you've learned at a technical event</h2>

src/sections/Community/Handbook/recognition.js

@@ -35,6 +35,7 @@ import ReviewRockstarLogo from "../../../assets/images/review-rockstar/review-ro
 import KanvasSnapshotLogo from "../../../assets/images/kanvas-snapshot/kanvas-snapshot.svg";
 import SistentContributorLogo from "../../../assets/images/sistent/badges/sistent-contributor.svg";
 import ContinuousContributorLogo from "../../../assets/images/continuous-contributor/continuous-contributor.svg";
+import AcademyLogo from "../../../assets/images/academy/academy.svg";
 
 const contents = [
   { id: 0, link: "#Profile Bages", text: "Profile Bages" },
@@ -187,6 +188,10 @@ const RecognitionPage = () => {
                 <img src={ServiceMeshPerformance} style={badgeStyle} />
                 <b>Cloud Native Performance</b> - awarded to the community members who make consistent and impactful contributions to the Cloud Native Performance project. Community members who earn this badge occasionally become a project maintainer.
               </li>
+              <li>
+                <img src={AcademyLogo} style={badgeStyle} />
+                <b>Academy</b> - awarded to the community members who make consistent and impactful contributions to the <Link to="https://cloud.layer5.io/academy/overview">Layer5 Academy</Link> project in recognition and appreciation of their efforts. Community members who earn this badge occasionally become a project maintainer.
+              </li>
               <li>
                 <img src={CommunityLogo} style={badgeStyle} />
                 <b>Community</b> - 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.

src/sections/Community/Handbook/repository.js

@@ -14,6 +14,7 @@ import servicemeshpattern from "../../../assets/images/service-mesh-patterns/ser
 import TocPagination from "../../../components/handbook-navigation/TocPagination";
 import IntraPage from "../../../components/handbook-navigation/intra-page";
 import Kanvas from "../../../assets/images/kanvas/icon-only/kanvas-icon-color.svg";
+import layer5AcademyIcon from "../../../assets/images/academy/academy.svg";
 
 import { Link } from "gatsby";
 
@@ -51,7 +52,7 @@ const Repository = () => {
 
             <p>
               Note that the Layer5 community spans <strong>six</strong> GitHub
-              organizations:
+              organizations and <strong>one</strong> multi-repository collection:
             </p>
 
             <ul className="project-org-list">
@@ -132,6 +133,16 @@ const Repository = () => {
                 </a>
                   - a collection of extensions and plugins that enhance Meshery's functionality.
               </li>
+              <li>
+                <a href="https://github.com/orgs/layer5io/repositories?q=academy">
+                  <img
+                    src={layer5AcademyIcon}
+                    alt="Layer5 Academy logo"
+                  />
+                  &nbsp; Layer5 Academy
+                </a>
+                  - a multi-repository learning platform with structured learning paths, practical challenges, badges and optional certificates, built with modular theme, content, and build repositories.
+              </li>
             </ul>
 
             <details className="invite-only">

src/sections/Pricing/SubscriptionToggle.js

@@ -1,6 +1,6 @@
 /* eslint-disable indent */
-import React, { useState, useEffect } from "react";
-import PricingWrapper from "./pricing.style";
+import React from "react";
+
 
 export const SubscriptionToggle = ({ isYearly = false, setIsYearly }) => {
   return (