Merge branch 'layer5io:master' into limit-enterprise-users

Author: Rajesh-Nagarajan-11

src/collections/events/2025/hacktoberfest-2025/index.mdx

@@ -24,8 +24,6 @@ import hacktoberfestTheme from "./hacktoberfest-meshery-theme.webp";
 
 <p>As in years past, Layer5 has a number of different projects and a variety of technologies for participants to choose from. For Hacktoberfest 2025, our theme will center on Designing with Meshery. <Link to="/cloud-native-management/meshery">Meshery</Link> is an extensible, self-service platform for collaborative infrastructure management. Be sure to understand the <Link to="/blog/meshery/comparing-meshery-models-and-meshery-designs">difference between Meshery Models and Meshery Designs</Link>. The Meshery project is looking for contributors to extend these models to support new cloud native infrastructure and their features.</p>
 
-<img src={hacktoberfestOpenArms} style="width: 750px; margin-right: 20px; float: left;"/>
-
 <p>
 Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects the easy way with Layer5 <Link to="/community/meshmates">MeshMates</Link> and Maintainers. Spend an hour with seasoned, open source maintainers and hack your way through. To get a head start, see our <Link to="/community/newcomers">Newcomers Resources</Link>. Get familiar with the Layer5 community through our <Link to="/community/handbook">Community Handbook</Link>.
 </p>
@@ -40,8 +38,9 @@ Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects t
   <img src={hacktoberfestBadge} style={{ width: '250px', flexShrink: '0', marginLeft: '-60px' ,marginRight: '100px', marginTop: '-50px' }} />
 </div>
 
-<h3 style={{marginBottom: '10px'}}>Event Details</h3>
+<img src={hacktoberfestOpenArms} style="display:block; justify-content:center; width: 750px; margin-right: auto;"/>
 
+<h3 style={{marginBottom: '10px'}}>Event Details</h3>
 
 <ul>
     <li><strong>DATE: </strong>October 3rd, 2025</li>
@@ -55,5 +54,3 @@ Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects t
     <li><Link to="/blog/open-source/ways-to-contribute-at-layer5">Code and Non-Code Contributing at Layer5</Link></li>
     <li><a href="https://github.com/issues?q=is%3Aopen%20is%3Aissue%20archived%3Afalse%20(org%3Alayer5io%20OR%20org%3Ameshery%20OR%20org%3Aservice-mesh-performance%20OR%20org%3Aservice-mesh-patterns%20OR%20org%3Alayer5labs%20OR%20org%3Ameshery-extensions)%20label%3Ahacktoberfest">Issues for Hacktoberfest</a></li>
 </ul>
-
-<img src={hacktoberfestTheme} style="width: fit-content;"/>

src/components/CookieConsent/index.js

@@ -8,7 +8,7 @@ import {
   Stack,
 } from "@mui/material";
 
-
+import { Link } from "gatsby";
 import Button from "../../reusecore/Button";
 import styled from "styled-components";
 
@@ -54,10 +54,11 @@ const CookieConsent = () => {
             <Typography variant="body2" >
                             We use cookies to enhance your browsing experience. By clicking
                             "Accept", you consent to our use of cookies. Read more in our{" "}
-              <a href="/company/legal/privacy" target="_blank" rel="noopener noreferrer">
+              <Link to="/company/legal/privacy" target="_self" rel="noopener noreferrer">
                                 Privacy Policy
-              </a>
-                            .
+              </Link> or visit our <Link to="/company/legal" target="_self" rel="noopener noreferrer">
+                                Trust Center
+              </Link>.
             </Typography>
 
             <Box display="flex" justifyContent="flex-end" gap={1}>

src/components/Pricing/PricingAddons/index.js

@@ -345,7 +345,8 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
                             if (targetSubAddon?.pricing && targetSubAddon.pricing[value]) {
                               const option = targetSubAddon.pricing[value];
                               const pricePerUser = isYearly ? option.yearlyPerUser : option.monthlyPerUser;
-                              const totalPrice = pricePerUser * option.learners;
+                              const multiplier = selectedSubAddOns["academy-practical"] ? 2 : 1;
+                              const totalPrice = pricePerUser * option.learners * multiplier;
                               const period = isYearly ? "/year" : "/month";
                               return `${option.learners} learners - ${formatPrice(totalPrice)}${period}`;
                             }
@@ -386,7 +387,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
                                           }
                                         }}
                                       >
-                                        {formatSliderPrice(option.yearlyPerUser / 12, currency)}<br/>{targetSubAddon.unitLabelSingular}/month
+                                        {formatSliderPrice((option.yearlyPerUser / 12) * (selectedSubAddOns["academy-practical"] ? 2 : 1), currency)}<br/>{targetSubAddon.unitLabelSingular}/month
                                       </Box>
                                     )}
                                   <Box
@@ -398,7 +399,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
                                         sm: "0.9rem",
                                       }
                                     }}>
-                                    {formatSliderPrice(isYearly ? option.yearlyPerUser : option.monthlyPerUser, currency)}<br/>{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
+                                    {formatSliderPrice((isYearly ? option.yearlyPerUser : option.monthlyPerUser) * (selectedSubAddOns["academy-practical"] ? 2 : 1), currency)}<br/>{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
                                   </Box>
                                 </Box>
                               ),