Skip to content

Commit 8e75615

Browse files
vr-varadvr-varad
authored
Merge branch 'master' into master
2 parents cd17389 + 7a3c35b commit 8e75615

21 files changed

Lines changed: 1875 additions & 178 deletions

File tree

‎package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@mui/icons-material": "^6.4.6",
4343
"@mui/material": "^5.15.11",
4444
"@react-icons/all-files": "^4.1.0",
45-
"@sistent/sistent": "^0.15.6",
45+
"@sistent/sistent": "^0.15.7",
4646
"@svgr/webpack": "^8.0.1",
4747
"@types/mui-datatables": "^4.3.12",
4848
"ajv": "^8.17.1",

‎src/assets/images/academy/academy.svg‎

Lines changed: 1 addition & 0 deletions
Loading

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,12 @@ export const PricingAddons = ({ isYearly = false, setIsYearly }) => {
144144
return (
145145
<SistentThemeProvider initialMode={isDark ? "dark" : "light"}>
146146
<CssBaseline>
147-
<Container maxWidth="md" sx={{ my: 2, px: 2 }}>
147+
<Container maxWidth="md" sx={{ my: 2, px: 2, overflow: "visible" }}>
148148
<PlanCardWrapper>
149149
<Card
150150
elevation={2}
151151
sx={{
152+
overflow: "visible",
152153
maxWidth: 600,
153154
mx: "auto",
154155
border: "1px solid",
@@ -410,18 +411,17 @@ export const PricingAddons = ({ isYearly = false, setIsYearly }) => {
410411
return targetSubAddon?.pricing?.map((option, index) => ({
411412
value: index,
412413
label: (
413-
<Box sx={{ textAlign: "center", fontSize: "1.25rem" }}>
414-
414+
<Box sx={{ textAlign: "center", fontSize: "1.25rem", fontWeight: "bold" }}>
415415
<Box>{option.learners === "2500+" ? "2,500+" : option.learners}</Box>
416-
<Box sx={{ color: "primary.main", mb: 1.5, fontSize: ".9rem" }}>
417-
{option.currency}{isYearly ? option.yearlyPerUser : option.monthlyPerUser}/{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
416+
<Box sx={{ color: "text.secondary", mb: 1.5, fontSize: ".9rem" }}>
417+
{option.currency}{isYearly ? option.yearlyPerUser : option.monthlyPerUser}<br />{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
418418
</Box>
419419
</Box>
420420
),
421421
})) || [];
422422
})()}
423423
/>
424-
<Box sx={{ display: "flex", my: 5, justifyContent: "space-between" }}>
424+
<Box sx={{ display: "flex", my: 8, justifyContent: "space-between" }}>
425425
<Typography variant="body2" sx={{ fontStyle: "italic", color: "text.secondary", fontFamily: "\"Qanelas Soft\", \"Open Sans\", sans-serif" }}>
426426
Looking for a plan larger than 2,500 learners? Great! <a href="/company/contact">Let us know</a>.
427427
</Typography>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const getAddOns = (theme) => [
3838
maxUnits: 5000,
3939
pricing: [
4040
{ learners: 250, monthlyPerUser: 1.29, yearlyPerUser: 1.05, currency: "$" },
41-
{ learners: 500, monthlyPerUser: 0.80, yearlyPerUser: 0.67, currency: "$" },
41+
{ learners: 500, monthlyPerUser: 0.84, yearlyPerUser: 0.67, currency: "$" },
4242
{ learners: 1000, monthlyPerUser: 0.49, yearlyPerUser: 0.49, currency: "$" },
4343
{ learners: 2500, monthlyPerUser: 0.44, yearlyPerUser: 0.44, currency: "$" },
4444
// { learners: "2500+", monthlyPerUser: "contact us", yearlyPerUser: "contact us", currency: "$" },

‎src/components/SistentNavigation/content.js‎

Lines changed: 61 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,69 +18,81 @@ export const content = [
1818
{ id: 11, link: "/projects/sistent/components/backdrop/guidance", text: "Backdrop" },
1919
{ id: 12, link: "/projects/sistent/components/backdrop/code", text: "Backdrop" },
2020

21-
{ id: 13, link: "/projects/sistent/components/box", text: "Box" },
22-
{ id: 14, link: "/projects/sistent/components/box/guidance", text: "Box" },
23-
{ id: 15, link: "/projects/sistent/components/box/code", text: "Box" },
21+
{ id: 13, link: "/projects/sistent/components/badge", text: "Badge" },
22+
{ id: 14, link: "/projects/sistent/components/badge/guidance", text: "Badge" },
23+
{ id: 15, link: "/projects/sistent/components/badge/code", text: "Badge" },
2424

25-
{ id: 16, link: "/projects/sistent/components/button", text: "Button" },
26-
{ id: 17, link: "/projects/sistent/components/button/guidance", text: "Button" },
27-
{ id: 18, link: "/projects/sistent/components/button/code", text: "Button" },
25+
{ id: 16, link: "/projects/sistent/components/box", text: "Box" },
26+
{ id: 17, link: "/projects/sistent/components/box/guidance", text: "Box" },
27+
{ id: 18, link: "/projects/sistent/components/box/code", text: "Box" },
2828

29-
{ id: 19, link: "/projects/sistent/components/button-group", text: "Button Group" },
30-
{ id: 20, link: "/projects/sistent/components/button-group/guidance", text: "Button Group" },
31-
{ id: 21, link: "/projects/sistent/components/button-group/code", text: "Button Group" },
29+
{ id: 19, link: "/projects/sistent/components/button", text: "Button" },
30+
{ id: 20, link: "/projects/sistent/components/button/guidance", text: "Button" },
31+
{ id: 21, link: "/projects/sistent/components/button/code", text: "Button" },
3232

33-
{ id: 22, link: "/projects/sistent/components/circularprogress", text: "Circular Progress" },
34-
{ id: 23, link: "/projects/sistent/components/circularprogress/guidance", text: "Circular Progress" },
35-
{ id: 24, link: "/projects/sistent/components/circularprogress/code", text: "Circular Progress" },
33+
{ id: 22, link: "/projects/sistent/components/button-group", text: "Button Group" },
34+
{ id: 23, link: "/projects/sistent/components/button-group/guidance", text: "Button Group" },
35+
{ id: 24, link: "/projects/sistent/components/button-group/code", text: "Button Group" },
3636

37-
{ id: 25, link: "/projects/sistent/components/container", text: "Container" },
38-
{ id: 26, link: "/projects/sistent/components/container/guidance", text: "Container" },
39-
{ id: 27, link: "/projects/sistent/components/container/code", text: "Container" },
37+
{ id: 25, link: "/projects/sistent/components/circularprogress", text: "Circular Progress" },
38+
{ id: 26, link: "/projects/sistent/components/circularprogress/guidance", text: "Circular Progress" },
39+
{ id: 27, link: "/projects/sistent/components/circularprogress/code", text: "Circular Progress" },
4040

41-
{ id: 28, link: "/projects/sistent/components/icons", text: "Icons" },
41+
{ id: 28, link: "/projects/sistent/components/container", text: "Container" },
42+
{ id: 29, link: "/projects/sistent/components/container/guidance", text: "Container" },
43+
{ id: 30, link: "/projects/sistent/components/container/code", text: "Container" },
4244

43-
{ id: 29, link: "/projects/sistent/components/link", text: "Link" },
44-
{ id: 30, link: "/projects/sistent/components/link/guidance", text: "Link" },
45-
{ id: 31, link: "/projects/sistent/components/link/code", text: "Link" },
45+
{ id: 31, link: "/projects/sistent/components/dialog", text: "Dialog" },
46+
{ id: 32, link: "/projects/sistent/components/dialog/guidance", text: "Dialog" },
47+
{ id: 33, link: "/projects/sistent/components/dialog/code", text: "Dialog" },
4648

47-
{ id: 32, link: "/projects/sistent/components/modal", text: "Modal" },
48-
{ id: 33, link: "/projects/sistent/components/modal/guidance", text: "Modal" },
49-
{ id: 34, link: "/projects/sistent/components/modal/code", text: "Modal" },
49+
{ id: 34, link: "/projects/sistent/components/icons", text: "Icons" },
5050

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" },
51+
{ id: 35, link: "/projects/sistent/components/link", text: "Link" },
52+
{ id: 36, link: "/projects/sistent/components/link/guidance", text: "Link" },
53+
{ id: 37, link: "/projects/sistent/components/link/code", text: "Link" },
5454

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" },
55+
{ id: 38, link: "/projects/sistent/components/modal", text: "Modal" },
56+
{ id: 39, link: "/projects/sistent/components/modal/guidance", text: "Modal" },
57+
{ id: 40, link: "/projects/sistent/components/modal/code", text: "Modal" },
5858

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" },
59+
{ id: 41, link: "/projects/sistent/components/pagination", text: "Pagination" },
60+
{ id: 42, link: "/projects/sistent/components/pagination/guidance", text: "Pagination" },
61+
{ id: 43, link: "/projects/sistent/components/pagination/code", text: "Pagination" },
6262

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" },
63+
{ id: 44, link: "/projects/sistent/components/paper", text: "Paper" },
64+
{ id: 45, link: "/projects/sistent/components/paper/guidance", text: "Paper" },
65+
{ id: 46, link: "/projects/sistent/components/paper/code", text: "Paper" },
6666

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" },
67+
{ id: 47, link: "/projects/sistent/components/popper", text: "Popper" },
68+
{ id: 48, link: "/projects/sistent/components/popper/guidance", text: "Popper" },
69+
{ id: 49, link: "/projects/sistent/components/popper/code", text: "Popper" },
7070

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" },
71+
{ id: 50, link: "/projects/sistent/components/select", text: "Select" },
72+
{ id: 51, link: "/projects/sistent/components/select/guidance", text: "Select" },
73+
{ id: 52, link: "/projects/sistent/components/select/code", text: "Select" },
7474

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" },
75+
{ id: 53, link: "/projects/sistent/components/switch", text: "Switch" },
76+
{ id: 54, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
77+
{ id: 55, link: "/projects/sistent/components/switch/code", text: "Switch" },
7878

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" },
79+
{ id: 56, link: "/projects/sistent/components/tabs", text: "Tabs" },
80+
{ id: 57, link: "/projects/sistent/components/tabs/guidance", text: "Tabs" },
81+
{ id: 58, link: "/projects/sistent/components/tabs/code", text: "Tabs" },
8282

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" },
83+
{ id: 59, link: "/projects/sistent/components/text-field", text: "Text Field" },
84+
{ id: 60, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
85+
{ id: 61, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
86+
87+
{ id: 62, link: "/projects/sistent/components/text-input", text: "Text Input" },
88+
{ id: 63, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
89+
{ id: 64, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
90+
91+
{ id: 63, link: "/projects/sistent/components/toolbar", text: "Toolbar" },
92+
{ id: 64, link: "/projects/sistent/components/toolbar/guidance", text: "Toolbar" },
93+
{ id: 65, link: "/projects/sistent/components/toolbar/code", text: "Toolbar" },
94+
95+
{ id: 66, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
96+
{ id: 67, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
97+
{ id: 68, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
8698
];

‎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>

‎src/sections/Pricing/generatePlans.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function generatePlans(data) {
1616
},
1717
"TeamDesigner": {
1818
tier: "Team Designer",
19-
featured: false,
19+
featured: true,
2020
monthlyprice: 16,
2121
yearlyprice: 164,
2222
byline: "Advanced collaboration for declarative DevOps",
@@ -35,7 +35,7 @@ function generatePlans(data) {
3535
},
3636
"Enterprise": {
3737
tier: "Enterprise",
38-
featured: true,
38+
featured: false,
3939
monthlyprice: 44,
4040
yearlyprice: 449,
4141
pricing_coming_soon: <img src={comingSoon} alt="Coming Soon" />,

‎src/sections/Projects/Project-grid/index.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import kanvas from "../../../assets/images/kanvas/icon-only/kanvas-icon-color.sv
2020
import catalog from "../../../assets/images/catalog-icon/catalog.svg";
2121
import sistent from "../../../assets/images/sistent/sistent-logo.svg";
2222
import SoSpecial from "../../Home/So-Special-Section";
23+
import academy from "../../../assets/images/academy/academy.svg";
2324

2425
const ProjectPage = () => {
2526
const { isDark } = useContext(ThemeManagerContext);
@@ -43,6 +44,13 @@ const ProjectPage = () => {
4344
<h5>Sistent</h5>
4445
</div>
4546
</Link>
47+
{/*TODD - The URL needs to be changed */}
48+
<Link to="https://cloud.layer5.io/academy" className="project__card academy">
49+
<div className="project__card-container project__card-container_one">
50+
<img src={academy} alt="Academy" />
51+
<h5>Academy</h5>
52+
</div>
53+
</Link>
4654
<Link to="/service-mesh-landscape" className="project__card one">
4755
<div className="project__card-container project__card-container_one">
4856
<img src={landscape} alt="Landscape" />

0 commit comments

Comments
 (0)