Skip to content

Commit b8d77e6

Browse files
Namanv0509Namanv0509
authored
Merge branch 'master' into fix/6856-sistent-copy-keeps-selection
2 parents 95e3243 + c4f538a commit b8d77e6

46 files changed

Lines changed: 1873 additions & 579 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ description: "Prepare for Hacktoberfest with Layer5 MeshMates and Maintainers. J
44
thumbnail: ./hacktoberfest-layer5-first-pr.webp
55
darkthumbnail: ./hacktoberfest-layer5-first-pr.webp
66
date: 2025-10-03
7-
#eurl: https://hacktoberfest.com
7+
eurl: https://youtube.com/live/1-oaEy0Pm5I?feature=share
88
type: Event
9-
speakers: [Ritesh Karankal, Naman Verma, Aabid Sofi, Darshan N]
9+
speakers: [Ritesh Karankal, Aabid Sofi, Yash Sharma, Eti Ijeoma, Darshan Narasimha]
1010
published: true
1111
upcoming: true
1212
register: true
1313
---
1414

1515
import { Link } from "gatsby" ;
16-
import hacktoberfestBadge from "./layer5-hacktoberfest25-badge.png";
16+
import hacktoberfestBadge from "./layer5-hacktoberfest2025-badge.png";
1717
import hacktoberfestFirstPR from "./hacktoberfest-layer5-first-pr.webp";
1818
import hacktoberfestOpenArms from "./hacktoberfest-layer5-open-arms.webp";
1919
import hacktoberfestTheme from "./hacktoberfest-meshery-theme.webp";

src/collections/events/2025/hacktoberfest-2025/layer5-hacktoberfest25-badge.png renamed to src/collections/events/2025/hacktoberfest-2025/layer5-hacktoberfest2025-badge.png

File renamed without changes.

‎src/collections/integrations/vault-secrets/icons/components/csi-secrets/icons/color/csi-secrets-color.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/collections/integrations/vault-secrets/icons/components/csi-secrets/icons/white/csi-secrets-white.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/collections/integrations/vault-secrets/index.mdx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,18 @@ components: [
6868
"colorIcon": "icons/components/vault-auth-global/icons/color/vault-auth-global-color.svg",
6969
"whiteIcon": "icons/components/vault-auth-global/icons/white/vault-auth-global-white.svg",
7070
"description": "",
71+
},
72+
{
73+
"name": "csi-secrets",
74+
"colorIcon": "icons/components/csi-secrets/icons/color/csi-secrets-color.svg",
75+
"whiteIcon": "icons/components/csi-secrets/icons/white/csi-secrets-white.svg",
76+
"description": "",
77+
},
78+
{
79+
"name": "csi-secrets",
80+
"colorIcon": "icons/components/csi-secrets/icons/color/csi-secrets-color.svg",
81+
"whiteIcon": "icons/components/csi-secrets/icons/white/csi-secrets-white.svg",
82+
"description": "",
7183
}]
7284
featureList: [
7385
"Automates secret syncing from Vault",

‎src/components/CookieConsent/index.js‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
2+
import React, { useEffect, useState } from "react";
3+
import {
4+
Snackbar,
5+
Typography,
6+
Box,
7+
Paper,
8+
Stack,
9+
} from "@mui/material";
10+
11+
12+
import Button from "../../reusecore/Button";
13+
import styled from "styled-components";
14+
15+
const StyledContainer = styled.div`
16+
.paper-container {
17+
background-color: ${props => props.theme.elevationColor};
18+
color: ${props => props.theme.text};
19+
}
20+
`;
21+
22+
23+
const CookieConsent = () => {
24+
const [open, setOpen] = useState(false);
25+
26+
useEffect(() => {
27+
const consent = localStorage.getItem("cookie_consent");
28+
if (!consent) {
29+
setOpen(true);
30+
}
31+
}, []);
32+
33+
const handleResponse = (response) => {
34+
localStorage.setItem("cookie_consent", response);
35+
setOpen(false);
36+
};
37+
38+
return (
39+
<Snackbar
40+
open={open}
41+
anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
42+
>
43+
<StyledContainer>
44+
<Paper
45+
elevation={6}
46+
sx={{
47+
p: 2,
48+
maxWidth: 620,
49+
borderRadius: 2,
50+
}}
51+
className="paper-container"
52+
>
53+
<Stack spacing={2}>
54+
<Typography variant="body2" >
55+
We use cookies to enhance your browsing experience. By clicking
56+
"Accept", you consent to our use of cookies. Read more in our{" "}
57+
<a href="/company/legal/privacy" target="_blank" rel="noopener noreferrer">
58+
Privacy Policy
59+
</a>
60+
.
61+
</Typography>
62+
63+
<Box display="flex" justifyContent="flex-end" gap={1}>
64+
<Button
65+
variant="outlined"
66+
size="small"
67+
$outlined
68+
onClick={() => handleResponse("declined")}
69+
>
70+
Decline
71+
</Button>
72+
<Button
73+
variant="contained"
74+
size="small"
75+
$secondary
76+
onClick={() => handleResponse("accepted")}
77+
>
78+
Accept
79+
</Button>
80+
</Box>
81+
</Stack>
82+
</Paper>
83+
</StyledContainer>
84+
</Snackbar>
85+
);
86+
};
87+
88+
export default CookieConsent;
89+

‎src/components/Pricing/PlanCard/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const PlanCard = ({ planData, isYearly, currency }) => {
5151

5252
<div className="price">
5353
<span className="price-amount">
54-
<sup>{getCurrencySymbol(currency)}</sup>
54+
<sup><strong>{getCurrencySymbol(currency)}</strong></sup>
5555
{isYearly
5656
? formatPrice(x.yearlyprice)
5757
: formatPrice(x.monthlyprice)}

‎src/components/Pricing/PricingAddons/index.js‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
143143
}));
144144
};
145145

146-
147146
const getPlanLinkForAcademy = () => {
148147
if (!selectedAddon || selectedAddon.id !== "academy") {
149148
return { link: "#", name: "Subscribe" };
@@ -189,7 +188,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
189188

190189
return {
191190
link: "#",
192-
name: "Subscribe For"
191+
name: "Subscribe"
193192
};
194193
};
195194

@@ -390,6 +389,18 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
390389
label: (
391390
<Box sx={{ textAlign: "center", fontSize: "1.25rem", fontWeight: "bold" }}>
392391
<Box>{option.learners === "2500+" ? "2,500+" : option.learners}</Box>
392+
{isYearly && (
393+
<Box
394+
sx={{
395+
fontSize: {
396+
xs: "0.75rem",
397+
sm: "0.9rem",
398+
}
399+
}}
400+
>
401+
{formatSliderPrice(option.yearlyPerUser / 12, currency)}<br/>{targetSubAddon.unitLabelSingular}/month
402+
</Box>
403+
)}
393404
<Box
394405
sx={{
395406
color: "text.secondary",
@@ -399,19 +410,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
399410
sm: "0.9rem",
400411
}
401412
}}>
402-
{formatSliderPrice(isYearly ? option.yearlyPerUser : option.monthlyPerUser, currency)}<br />{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
403-
{isYearly && (
404-
<Box
405-
sx={{
406-
fontSize: {
407-
xs: "0.7rem",
408-
sm: "0.7rem",
409-
}
410-
}}
411-
>
412-
{formatSliderPrice(option.yearlyPerUser / 12, currency)}/{targetSubAddon.unitLabelSingular}/month
413-
</Box>
414-
)}
413+
{formatSliderPrice(isYearly ? option.yearlyPerUser : option.monthlyPerUser, currency)}<br/>{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
415414
</Box>
416415
</Box>
417416
),
@@ -519,7 +518,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
519518
}
520519
return formatPrice(0);
521520
}
522-
})()}/{isYearly ? "yearly" : "monthly"}
521+
})()} /{isYearly ? "yearly" : "monthly"}
523522
</Typography>
524523
</Box>
525524

@@ -595,4 +594,4 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
595594
</CssBaseline>
596595
</SistentThemeProvider>
597596
);
598-
};
597+
};

‎src/components/Pricing/PricingAddons/pricingData.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ export const getAddOns = () => [
2020
unitLabelSingular: "learner",
2121
maxUnits: 5000,
2222
pricing: [
23-
{ learners: 250, monthlyPerUser: 1.10, yearlyPerUser: 11.22, currency: "$" },
24-
{ learners: 500, monthlyPerUser: 0.67, yearlyPerUser: 6.83, currency: "$" },
23+
{ learners: 250, monthlyPerUser: 1.08, yearlyPerUser: 10.81, currency: "$" },
24+
{ learners: 500, monthlyPerUser: 0.68, yearlyPerUser: 6.74, currency: "$" },
2525
{ learners: 1000, monthlyPerUser: 0.46, yearlyPerUser: 4.69, currency: "$" },
2626
{ learners: 2500, monthlyPerUser: 0.40, yearlyPerUser: 4.08, currency: "$" },
2727
// { learners: "2500+", monthlyPerUser: "contact us", yearlyPerUser: "contact us", currency: "$" },
@@ -45,8 +45,8 @@ export const getAddOns = () => [
4545
unitLabel: "learners",
4646
unitLabelSingular: "learner",
4747
pricing: [
48-
{ learners: 250, monthlyPerUser: 1.10, yearlyPerUser: 11.22, currency: "$" },
49-
{ learners: 500, monthlyPerUser: 0.67, yearlyPerUser: 6.83, currency: "$" },
48+
{ learners: 250, monthlyPerUser: 1.08, yearlyPerUser: 10.81, currency: "$" },
49+
{ learners: 500, monthlyPerUser: 0.68, yearlyPerUser: 6.74, currency: "$" },
5050
{ learners: 1000, monthlyPerUser: 0.46, yearlyPerUser: 4.69, currency: "$" },
5151
{ learners: 2500, monthlyPerUser: 0.40, yearlyPerUser: 4.08, currency: "$" },
5252
],

‎src/components/Pricing/PricingAddons/styles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export const boxStyles = {
251251
mt: 1
252252
},
253253
disclaimerSection: {
254-
my: 6,
254+
my: 10,
255255
mb: 2,
256256
justifyContent: "space-between"
257257
}

0 commit comments

Comments
 (0)