Skip to content

Commit c82e09d

Browse files
vr-varadvr-varad
authored
Merge branch 'master' into aryanshah/enhance_dialog_component
2 parents c8a93a9 + 369c9fa commit c82e09d

22 files changed

Lines changed: 2747 additions & 789 deletions

File tree

‎src/assets/images/sistent/placeholder/user.webp‎

2.02 KB
Loading

‎src/components/Pricing/PlanCard/planCard.style.js‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,29 @@ const PlanCardWrapper = styled.section`
233233
color: ${(props) => props.theme.text.light};
234234
border: 1px solid;
235235
border-color: ${(props) => props.theme.secondaryColor};
236-
236+
min-width: 40%;
237+
justify-content: flex-start;
238+
display: flex;
237239
}
238240
.addon-chip .MuiChip-icon {
239241
color: ${(props) => props.theme.secondaryColor};
242+
line-height: 1rem;
243+
}
244+
245+
.MuiTypography-root {
246+
font-family: "Qanelas Soft", "Open Sans", sans-serif;
240247
}
248+
.MuiSlider-root {
249+
"& .MuiSlider-mark": {
250+
fontSize: "12px",
251+
color: ${(props) => props.theme.text.light};
252+
},
253+
"& .MuiSlider-markLabel": {
254+
fontSize: "12px",
255+
color: ${(props) => props.theme.secondaryColor};
256+
},
257+
}
258+
});
241259
`;
242260

243261
export default PlanCardWrapper;

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

Lines changed: 425 additions & 483 deletions
Large diffs are not rendered by default.

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export const getAddOns = (theme) => [
2525
secondaryFill={theme?.palette?.background?.inverse || "#eee"}
2626
/>,
2727
unitLabel: "learners",
28+
unitLabelSingular: "learner",
2829
maxUnits: 5000,
2930
// features: ["Learning Paths", "Challenges", "Certifications", "Instructor Console"],
3031
subAddOns: [
@@ -33,6 +34,7 @@ export const getAddOns = (theme) => [
3334
name: "Theoretical Learning",
3435
description: "A comprehensive learning management system for creators and instructors on how to build, manage, and extend educational content like learning paths, challenges, and certifications.",
3536
unitLabel: "learners",
37+
unitLabelSingular: "learner",
3638
maxUnits: 5000,
3739
pricing: [
3840
{ learners: 250, monthlyPerUser: 1.29, yearlyPerUser: 1.05, currency: "$" },
@@ -57,6 +59,8 @@ export const getAddOns = (theme) => [
5759
name: "Practical Learning",
5860
description: "An inclusive, collaborative, hands-on learning environment with labs for students.",
5961
maxUnits: 5000,
62+
unitLabel: "learners",
63+
unitLabelSingular: "learner",
6064
pricing: [
6165
{ learners: 250, monthlyPerUser: 1.29, yearlyPerUser: 1.05, currency: "$" },
6266
{ learners: 500, monthlyPerUser: 0.80, yearlyPerUser: 0.67, currency: "$" },
@@ -84,7 +88,13 @@ export const getAddOns = (theme) => [
8488
yearlyPrice: 653, // ~15% discount for yearly
8589
icon: <Cloud sx={{ color: theme?.palette?.background?.inverse || "#FFFFFF" }} />,
8690
unitLabel: "servers",
91+
unitLabelSingular: "server",
8792
maxUnits: 50,
93+
pricing: [
94+
{ units: 1, monthlyPerUnit: 64, yearlyPerUnit: 54.40, currency: "$" },
95+
{ units: 25, monthlyPerUnit: 64, yearlyPerUnit: 54.40, currency: "$" },
96+
{ units: 50, monthlyPerUnit: 64, yearlyPerUnit: 54.40, currency: "$" },
97+
],
8898
features: ["Automated deployment", "Real-time monitoring", "Multi-cluster support", "Performance analytics"],
8999
},
90100
{
@@ -95,7 +105,13 @@ export const getAddOns = (theme) => [
95105
yearlyPrice: 15.30, // ~15% discount for yearly
96106
icon: <Group sx={{ color: theme?.palette?.background?.inverse || "#00B39F" }} />,
97107
unitLabel: "collaborators",
108+
unitLabelSingular: "collaborator",
98109
maxUnits: 200,
110+
pricing: [
111+
{ units: 1, monthlyPerUnit: 2, yearlyPerUnit: 1.70, currency: "$" },
112+
{ units: 100, monthlyPerUnit: 1.50, yearlyPerUnit: 1.275, currency: "$" },
113+
{ units: 200, monthlyPerUnit: 1.50, yearlyPerUnit: 1.275, currency: "$" },
114+
],
99115
features: ["Enhanced Security", "Guaranteed SLAs", "Conflict-Free Synchronization", "Real-Time Collaboration"],
100116
},
101117
];

‎src/components/SistentNavigation/content.js‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -45,41 +45,42 @@ export const content = [
4545
{ id: 31, link: "/projects/sistent/components/link/code", text: "Link" },
4646

4747
{ id: 32, link: "/projects/sistent/components/modal", text: "Modal" },
48-
{ id: 33, link: "/projects/sistent/components/modal/code", text: "Modal" },
48+
{ id: 33, link: "/projects/sistent/components/modal/guidance", text: "Modal" },
49+
{ id: 34, link: "/projects/sistent/components/modal/code", text: "Modal" },
4950

50-
{ id: 34, link: "/projects/sistent/components/pagination", text: "Pagination" },
51-
{ id: 35, link: "/projects/sistent/components/pagination/guidance", text: "Pagination" },
52-
{ id: 36, link: "/projects/sistent/components/pagination/code", text: "Pagination" },
51+
{ id: 35, link: "/projects/sistent/components/pagination", text: "Pagination" },
52+
{ id: 36, link: "/projects/sistent/components/pagination/guidance", text: "Pagination" },
53+
{ id: 37, link: "/projects/sistent/components/pagination/code", text: "Pagination" },
5354

54-
{ id: 37, link: "/projects/sistent/components/paper", text: "Paper" },
55-
{ id: 38, link: "/projects/sistent/components/paper/guidance", text: "Paper" },
56-
{ id: 39, link: "/projects/sistent/components/paper/code", text: "Paper" },
55+
{ id: 38, link: "/projects/sistent/components/paper", text: "Paper" },
56+
{ id: 39, link: "/projects/sistent/components/paper/guidance", text: "Paper" },
57+
{ id: 40, link: "/projects/sistent/components/paper/code", text: "Paper" },
5758

58-
{ id: 40, link: "/projects/sistent/components/popper", text: "Popper" },
59-
{ id: 41, link: "/projects/sistent/components/popper/guidance", text: "Popper" },
60-
{ id: 42, link: "/projects/sistent/components/popper/code", text: "Popper" },
59+
{ id: 41, link: "/projects/sistent/components/popper", text: "Popper" },
60+
{ id: 42, link: "/projects/sistent/components/popper/guidance", text: "Popper" },
61+
{ id: 43, link: "/projects/sistent/components/popper/code", text: "Popper" },
6162

62-
{ id: 43, link: "/projects/sistent/components/select", text: "Select" },
63-
{ id: 44, link: "/projects/sistent/components/select/guidance", text: "Select" },
64-
{ id: 45, link: "/projects/sistent/components/select/code", text: "Select" },
63+
{ id: 44, link: "/projects/sistent/components/select", text: "Select" },
64+
{ id: 45, link: "/projects/sistent/components/select/guidance", text: "Select" },
65+
{ id: 46, link: "/projects/sistent/components/select/code", text: "Select" },
6566

66-
{ id: 46, link: "/projects/sistent/components/switch", text: "Switch" },
67-
{ id: 47, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
68-
{ id: 48, link: "/projects/sistent/components/switch/code", text: "Switch" },
67+
{ id: 47, link: "/projects/sistent/components/switch", text: "Switch" },
68+
{ id: 48, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
69+
{ id: 49, link: "/projects/sistent/components/switch/code", text: "Switch" },
6970

70-
{ id: 49, link: "/projects/sistent/components/tabs", text: "Tabs" },
71-
{ id: 50, link: "/projects/sistent/components/tabs/guidance", text: "Tabs" },
72-
{ id: 51, link: "/projects/sistent/components/tabs/code", text: "Tabs" },
71+
{ id: 50, link: "/projects/sistent/components/tabs", text: "Tabs" },
72+
{ id: 51, link: "/projects/sistent/components/tabs/guidance", text: "Tabs" },
73+
{ id: 52, link: "/projects/sistent/components/tabs/code", text: "Tabs" },
7374

74-
{ id: 52, link: "/projects/sistent/components/text-field", text: "Text Field" },
75-
{ id: 53, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
76-
{ id: 54, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
75+
{ id: 53, link: "/projects/sistent/components/text-field", text: "Text Field" },
76+
{ id: 54, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
77+
{ id: 55, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
7778

78-
{ id: 55, link: "/projects/sistent/components/text-input", text: "Text Input" },
79-
{ id: 56, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
80-
{ id: 57, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
79+
{ id: 56, link: "/projects/sistent/components/text-input", text: "Text Input" },
80+
{ id: 57, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
81+
{ id: 58, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
8182

82-
{ id: 58, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
83-
{ id: 59, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
84-
{ id: 60, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
83+
{ id: 59, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
84+
{ id: 60, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
85+
{ id: 61, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
8586
];

‎src/sections/Community/Handbook/contributing.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ const contributingGuide = () => {
7070
To do this, you'll need to add a remote. An example of the
7171
command is given below:
7272
<div className="codes">
73-
<Code codeString="git remote add upstream https://github.com/layer5io/meshery.git " />
73+
<Code codeString="git remote add upstream https://github.com/layer5io/layer5.git " />
7474
</div>
75-
Here “meshery" is used as the example repo. Be sure to
75+
Here “layer5" is used as the example repo. Be sure to
7676
reference the actual repo you are contributing to.
7777
</span>
7878
</li>

‎src/sections/Community/Handbook/learn5.js‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ import IntraPage from "../../../components/handbook-navigation/intra-page";
88

99
const contents = [
1010
{
11-
id: 0, link: "#Learning",text: "Learning", },
12-
{ id: 1, link: "#Eventing", text: "Eventing" },
13-
{ id: 2, link: "#Blogging", text: "Blogging" },
11+
id: 0, link: "#Learning", text: "Learning",
12+
},
13+
{
14+
id: 1, link: "#Academy", text: "Academy",
15+
},
16+
{ id: 2, link: "#Eventing", text: "Eventing" },
17+
{ id: 3, link: "#Blogging", text: "Blogging" },
1418
];
1519

1620
const LearnLayer = () => {
@@ -42,6 +46,18 @@ const LearnLayer = () => {
4246
free for all.
4347
</p>
4448

49+
<a id="Academy">
50+
<h2>Layer5 Academy</h2>
51+
</a>
52+
<p>
53+
<a href="https://cloud.layer5.io/academy" target="_blank" rel="noopener noreferrer">
54+
Layer5 Academy
55+
</a>{" "}
56+
is a learning platform built into Layer5 Cloud. Get structured learning paths,
57+
interactive challenges, and professional certifications. Content spans beginner
58+
to advanced levels for both developers and organizations.
59+
</p>
60+
4561
<a id="Eventing">
4662
<h2>Sharing what you've learned at a technical event</h2>
4763
</a>

‎src/sections/Community/Handbook/projects.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,19 @@ const Maintainer = () => {
104104
(currently) three choices of load generators for
105105
characterizing and managing the performance of cloud native infrastructure (e.g. Kubernetes and Docker) and their services. <br />
106106
</p>
107+
<li>
108+
<h4>
109+
<a href="https://cloud.layer5.io/academy">
110+
Layer5 Academy :
111+
</a>
112+
</h4>{" "}
113+
</li>
114+
<p>
115+
Layer5 Academy is a learning platform built into Layer5 Cloud. It offers
116+
structured learning paths, interactive challenges, and professional
117+
certifications. Content spans beginner to advanced levels, helping both
118+
developers and organizations skill up in cloud native technologies. <br />
119+
</p>
107120
</ul>
108121
</p>
109122
<p>

‎src/sections/Devrel-platform/JourneySection.js‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -207,33 +207,10 @@ const JourneySection = () => {
207207
<Button
208208
$primary
209209
$external={true}
210-
title="Explore Layer5 Cloud"
210+
title="Start Your DevRel Journey With Layer5 Cloud"
211211
alt="Explore cloud"
212212
$url="https://cloud.layer5.io/"
213213
/>
214-
<Button
215-
$primary
216-
$external={true}
217-
title="Explore Kanvas"
218-
alt="Explore Meshery Playground"
219-
$url="https://kanvas.new/"
220-
/>
221-
<Button
222-
aria-label="Book a demo"
223-
$primary
224-
$external={true}
225-
title="Talk to team"
226-
alt="Book a demo"
227-
$url="https://calendar.google.com/calendar/appointments/schedules/AcZssZ3pmcApaDP4xd8hvG5fy8ylxuFxD3akIRc5vpWJ60q-HemQi80SFFAVftbiIsq9pgiA2o8yvU56?gv=true"
228-
/>
229-
<Button
230-
aria-label="Recognition program"
231-
$primary
232-
$external={true}
233-
title="Recogntion Program"
234-
alt="recogntion program"
235-
$url="https://badges.layer5.io"
236-
/>
237214
</div>
238215
</Container>
239216
</JourneySectionWrapper>

‎src/sections/Devrel-platform/content.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,9 @@ const DevrelContent = () => {
257257
<Row className="devrel">
258258
<Col $md={6} className="devrel-image">
259259
<div className="image-wrapper">
260-
<img src={IntegrationDesigner} />
260+
<a href="https://kanvas.new/" target="_blank" rel="noopener noreferrer">
261+
<img src={IntegrationDesigner} />
262+
</a>
261263
</div>
262264
</Col>
263265
<Col $md={6} className="devrel-detail">
@@ -321,7 +323,7 @@ const DevrelContent = () => {
321323
Recognition Program
322324
</h2>
323325
<ul className="caption">
324-
<li><b>Achievement Badges:</b> Earn badges for key milestones, like streaming logs from a Kubernetes Pod for the first time.</li>
326+
<li><b>Achievement <a href="https://badges.layer5.io">Badges</a>:</b> Earn badges for key milestones, like streaming logs from a Kubernetes Pod for the first time.</li>
325327
<li><b>Leaderboard Visibility:</b> Participate in challenges, compete on leaderboards, and stand out in the community.</li>
326328
<li><b>Featured Mentions:</b> Get recognized when your content becomes popular, with shoutouts from the project.</li>
327329
</ul>

0 commit comments

Comments
 (0)