Skip to content

Commit 7a62af1

Browse files
authored
Merge branch 'master' into fix/double-slash-redirects
2 parents 6634f86 + 679cbc0 commit 7a62af1

File tree

12 files changed

+717
-71
lines changed

12 files changed

+717
-71
lines changed

.github/workflows/build-and-deploy-site.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fetch-depth: 1
1919

2020
# - name: Cache Gatsby .cache and public folders
21-
# uses: actions/cache@v4
21+
# uses: actions/cache@v5
2222
# id: gatsby-cache
2323
# with:
2424
# path: |
@@ -34,7 +34,7 @@ jobs:
3434
make build
3535
3636
- name: Deploy 🚀
37-
uses: JamesIves/github-pages-deploy-action@v4.7.4
37+
uses: JamesIves/github-pages-deploy-action@v4
3838
with:
3939
branch: site # The branch the action should deploy to.
4040
folder: public # The folder the action should deploy.

.github/workflows/feature-list.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818

1919
steps:
2020
- name: Checkout current repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222

2323
- name: Install Node.js
24-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v6
2525
with:
26-
node-version: 18
26+
node-version: 20
2727

2828
- name: Install dependencies
2929
run: |
@@ -40,7 +40,7 @@ jobs:
4040
4141
- name: Commit changes
4242
id: commit-changes
43-
uses: stefanzweifel/git-auto-commit-action@v5
43+
uses: stefanzweifel/git-auto-commit-action@v7
4444
with:
4545
commit_message: "Updated feature data from spreadsheet"
4646
file_pattern: ${{ env.FEATURES_FILE }}

.github/workflows/lighthouseci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
lighthouseci:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
16-
- uses: actions/setup-node@v4
15+
- uses: actions/checkout@v6
16+
- uses: actions/setup-node@v6
1717
with:
18-
node-version: 19
18+
node-version: 20
1919
- run: npm install --legacy-peer-deps && npm install -g @lhci/cli@0.11.x
2020
- run: CI=false npm run build
2121
- run: lhci collect --config=.desktop-lighthouserc.js

src/collections/members/aabid-sofi/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bio: Hi, I'm Aabid Sofi, a software engineer and web developer.
1010
I specialize in creating custom software and web applications that are both functional and visually appealing, with a focus on design, security, and performance. Highly passionate about cloud native and open source .
1111
badges:
1212
- kanvas
13-
status: Active
13+
status: Inactive
1414
published: true
1515
maintainer: yes
1616
---

src/components/Pricing/PlanCard/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ const PlanCard = ({ planData, isYearly, currency }) => {
2828
return (
2929
<PlanCardWrapper>
3030
<Container>
31-
<Row $Hcenter>
31+
<Row $Hcenter className="plan-card-row">
3232
{planData.map((x) => (
3333
// <Col $xl={4} $lg={2} $md={1} $sm={1} key={x.tier}>
34-
<Col key={x.tier}>
34+
<Col key={x.tier} className="plan-card-col">
3535
<div className={`${x.featured ? "featured" : ""} pricing-table`}>
3636

3737
{x.tier === "Personal" ? <div className="pricing-label">Free Forever</div> : null}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,16 @@ const PlanCardWrapper = styled.section`
256256
},
257257
}
258258
});
259+
.plan-card-row{
260+
@media (max-width: 1304px) {
261+
flex-wrap: wrap;
262+
}
263+
}
264+
.plan-card-col{
265+
@media (min-width: 768px) and (max-width: 1304px) {
266+
width: 50%;
267+
}
268+
}
259269
`;
260270

261271
export default PlanCardWrapper;

src/components/SistentNavigation/content.js

Lines changed: 62 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -61,81 +61,85 @@ export const content = [
6161
{ id: 44, link: "/projects/sistent/components/dialog/guidance", text: "Dialog" },
6262
{ id: 45, link: "/projects/sistent/components/dialog/code", text: "Dialog" },
6363

64-
{ id: 46, link: "/projects/sistent/components/formcontrollabel", text: "FormControlLabel" },
65-
{ id: 47, link: "/projects/sistent/components/formcontrollabel/guidance", text: "FormControlLabel" },
66-
{ id: 48, link: "/projects/sistent/components/formcontrollabel/code", text: "FormControlLabel" },
64+
{ id: 46, link: "/projects/sistent/components/divider", text: "Divider" },
65+
{ id: 47, link: "/projects/sistent/components/divider/guidance", text: "Divider" },
66+
{ id: 48, link: "/projects/sistent/components/divider/code", text: "Divider" },
6767

68-
{ id: 49, link: "/projects/sistent/components/grid", text: "Grid" },
69-
{ id: 50, link: "/projects/sistent/components/grid/guidance", text: "Grid" },
70-
{ id: 51, link: "/projects/sistent/components/grid/code", text: "Grid" },
68+
{ id: 49, link: "/projects/sistent/components/formcontrollabel", text: "FormControlLabel" },
69+
{ id: 50, link: "/projects/sistent/components/formcontrollabel/guidance", text: "FormControlLabel" },
70+
{ id: 51, link: "/projects/sistent/components/formcontrollabel/code", text: "FormControlLabel" },
7171

72-
{ id: 52, link: "/projects/sistent/components/iconbutton", text: "IconButton" },
73-
{ id: 53, link: "/projects/sistent/components/iconbutton/guidance", text: "IconButton" },
74-
{ id: 54, link: "/projects/sistent/components/iconbutton/code", text: "IconButton" },
72+
{ id: 52, link: "/projects/sistent/components/grid", text: "Grid" },
73+
{ id: 53, link: "/projects/sistent/components/grid/guidance", text: "Grid" },
74+
{ id: 54, link: "/projects/sistent/components/grid/code", text: "Grid" },
7575

76-
{ id: 55, link: "/projects/sistent/components/icons", text: "Icons" },
76+
{ id: 55, link: "/projects/sistent/components/iconbutton", text: "IconButton" },
77+
{ id: 56, link: "/projects/sistent/components/iconbutton/guidance", text: "IconButton" },
78+
{ id: 57, link: "/projects/sistent/components/iconbutton/code", text: "IconButton" },
7779

78-
{ id: 56, link: "/projects/sistent/components/link", text: "Link" },
79-
{ id: 57, link: "/projects/sistent/components/link/guidance", text: "Link" },
80-
{ id: 58, link: "/projects/sistent/components/link/code", text: "Link" },
80+
{ id: 58, link: "/projects/sistent/components/icons", text: "Icons" },
8181

82-
{ id: 59, link: "/projects/sistent/components/list", text: "List" },
83-
{ id: 60, link: "/projects/sistent/components/list/guidance", text: "List" },
84-
{ id: 61, link: "/projects/sistent/components/list/code", text: "List" },
82+
{ id: 59, link: "/projects/sistent/components/link", text: "Link" },
83+
{ id: 60, link: "/projects/sistent/components/link/guidance", text: "Link" },
84+
{ id: 61, link: "/projects/sistent/components/link/code", text: "Link" },
8585

86-
{ id: 62, link: "/projects/sistent/components/modal", text: "Modal" },
87-
{ id: 63, link: "/projects/sistent/components/modal/guidance", text: "Modal" },
88-
{ id: 64, link: "/projects/sistent/components/modal/code", text: "Modal" },
86+
{ id: 62, link: "/projects/sistent/components/list", text: "List" },
87+
{ id: 63, link: "/projects/sistent/components/list/guidance", text: "List" },
88+
{ id: 64, link: "/projects/sistent/components/list/code", text: "List" },
8989

90-
{ id: 65, link: "/projects/sistent/components/pagination", text: "Pagination" },
91-
{ id: 66, link: "/projects/sistent/components/pagination/guidance", text: "Pagination" },
92-
{ id: 67, link: "/projects/sistent/components/pagination/code", text: "Pagination" },
90+
{ id: 65, link: "/projects/sistent/components/modal", text: "Modal" },
91+
{ id: 66, link: "/projects/sistent/components/modal/guidance", text: "Modal" },
92+
{ id: 67, link: "/projects/sistent/components/modal/code", text: "Modal" },
9393

94-
{ id: 68, link: "/projects/sistent/components/paper", text: "Paper" },
95-
{ id: 69, link: "/projects/sistent/components/paper/guidance", text: "Paper" },
96-
{ id: 70, link: "/projects/sistent/components/paper/code", text: "Paper" },
94+
{ id: 68, link: "/projects/sistent/components/pagination", text: "Pagination" },
95+
{ id: 69, link: "/projects/sistent/components/pagination/guidance", text: "Pagination" },
96+
{ id: 70, link: "/projects/sistent/components/pagination/code", text: "Pagination" },
9797

98-
{ id: 71, link: "/projects/sistent/components/popper", text: "Popper" },
99-
{ id: 72, link: "/projects/sistent/components/popper/guidance", text: "Popper" },
100-
{ id: 73, link: "/projects/sistent/components/popper/code", text: "Popper" },
98+
{ id: 71, link: "/projects/sistent/components/paper", text: "Paper" },
99+
{ id: 72, link: "/projects/sistent/components/paper/guidance", text: "Paper" },
100+
{ id: 73, link: "/projects/sistent/components/paper/code", text: "Paper" },
101101

102-
{ id: 74, link: "/projects/sistent/components/radiogroup", text: "RadioGroup" },
103-
{ id: 75, link: "/projects/sistent/components/radiogroup/guidance", text: "RadioGroup" },
104-
{ id: 76, link: "/projects/sistent/components/radiogroup/code", text: "RadioGroup" },
102+
{ id: 74, link: "/projects/sistent/components/popper", text: "Popper" },
103+
{ id: 75, link: "/projects/sistent/components/popper/guidance", text: "Popper" },
104+
{ id: 76, link: "/projects/sistent/components/popper/code", text: "Popper" },
105105

106-
{ id: 77, link: "/projects/sistent/components/select", text: "Select" },
107-
{ id: 78, link: "/projects/sistent/components/select/guidance", text: "Select" },
108-
{ id: 79, link: "/projects/sistent/components/select/code", text: "Select" },
106+
{ id: 77, link: "/projects/sistent/components/radiogroup", text: "RadioGroup" },
107+
{ id: 78, link: "/projects/sistent/components/radiogroup/guidance", text: "RadioGroup" },
108+
{ id: 79, link: "/projects/sistent/components/radiogroup/code", text: "RadioGroup" },
109109

110-
{ id: 80, link: "/projects/sistent/components/stack", text: "Stack" },
111-
{ id: 81, link: "/projects/sistent/components/stack/guidance", text: "Stack" },
112-
{ id: 82, link: "/projects/sistent/components/stack/code", text: "Stack" },
110+
{ id: 80, link: "/projects/sistent/components/select", text: "Select" },
111+
{ id: 81, link: "/projects/sistent/components/select/guidance", text: "Select" },
112+
{ id: 82, link: "/projects/sistent/components/select/code", text: "Select" },
113113

114-
{ id: 83, link: "/projects/sistent/components/stepper", text: "Stepper" },
115-
{ id: 84, link: "/projects/sistent/components/stepper/guidance", text: "Stepper" },
116-
{ id: 85, link: "/projects/sistent/components/stepper/code", text: "Stepper" },
114+
{ id: 83, link: "/projects/sistent/components/stack", text: "Stack" },
115+
{ id: 84, link: "/projects/sistent/components/stack/guidance", text: "Stack" },
116+
{ id: 85, link: "/projects/sistent/components/stack/code", text: "Stack" },
117117

118-
{ id: 86, link: "/projects/sistent/components/switch", text: "Switch" },
119-
{ id: 87, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
120-
{ id: 88, link: "/projects/sistent/components/switch/code", text: "Switch" },
118+
{ id: 86, link: "/projects/sistent/components/stepper", text: "Stepper" },
119+
{ id: 87, link: "/projects/sistent/components/stepper/guidance", text: "Stepper" },
120+
{ id: 88, link: "/projects/sistent/components/stepper/code", text: "Stepper" },
121121

122-
{ id: 89, link: "/projects/sistent/components/tabs", text: "Tabs" },
123-
{ id: 90, link: "/projects/sistent/components/tabs/guidance", text: "Tabs" },
124-
{ id: 91, link: "/projects/sistent/components/tabs/code", text: "Tabs" },
122+
{ id: 89, link: "/projects/sistent/components/switch", text: "Switch" },
123+
{ id: 90, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
124+
{ id: 91, link: "/projects/sistent/components/switch/code", text: "Switch" },
125125

126-
{ id: 92, link: "/projects/sistent/components/text-field", text: "Text Field" },
127-
{ id: 93, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
128-
{ id: 94, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
126+
{ id: 92, link: "/projects/sistent/components/tabs", text: "Tabs" },
127+
{ id: 93, link: "/projects/sistent/components/tabs/guidance", text: "Tabs" },
128+
{ id: 94, link: "/projects/sistent/components/tabs/code", text: "Tabs" },
129129

130-
{ id: 95, link: "/projects/sistent/components/text-input", text: "Text Input" },
131-
{ id: 96, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
132-
{ id: 97, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
130+
{ id: 95, link: "/projects/sistent/components/text-field", text: "Text Field" },
131+
{ id: 96, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
132+
{ id: 97, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
133133

134-
{ id: 98, link: "/projects/sistent/components/toolbar", text: "Toolbar" },
135-
{ id: 99, link: "/projects/sistent/components/toolbar/guidance", text: "Toolbar" },
136-
{ id: 100, link: "/projects/sistent/components/toolbar/code", text: "Toolbar" },
134+
{ id: 98, link: "/projects/sistent/components/text-input", text: "Text Input" },
135+
{ id: 99, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
136+
{ id: 100, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
137137

138-
{ id: 101, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
139-
{ id: 102, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
140-
{ id: 103, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
138+
{ id: 101, link: "/projects/sistent/components/toolbar", text: "Toolbar" },
139+
{ id: 102, link: "/projects/sistent/components/toolbar/guidance", text: "Toolbar" },
140+
{ id: 103, link: "/projects/sistent/components/toolbar/code", text: "Toolbar" },
141+
142+
{ id: 104, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
143+
{ id: 105, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
144+
{ id: 106, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
141145
];

src/sections/Devrel-platform/content.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ const DevrelContent = () => {
335335
</h2>
336336
<ul className="caption">
337337
<li><b>Guided Learning Journeys:</b> Advance your cloud native skills through <a href="https://cloud.layer5.io/academy" target="_blank" rel="noopener noreferrer">Layer5 Academy</a>, offering structured paths that combine theory with hands-on labs.</li>
338-
<li><b>Interactive Challenges:</b> Strengthen your understanding in real-world scenarios with Academy challenges, powered by <a href="https://meshery.layer5.io/extension/meshmap" target="_blank" rel="noopener noreferrer">Meshery</a>.</li>
338+
<li><b>Interactive Challenges:</b> Strengthen your understanding in real-world scenarios with Academy challenges, powered by <a href="https://meshery.io/" target="_blank" rel="noopener noreferrer">Meshery</a>.</li>
339339
<li><b>Earn Recognition:</b> Achieve Layer5 Academy certifications and badges, and showcase them directly on your DevRel profile and leaderboards.</li>
340340
<li><b>Community Contribution:</b> Contribute new tutorials, challenges, and courses to Academy, growing your professional influence in the cloud-native ecosystem.</li>
341341
</ul>

src/sections/Projects/Sistent/components/content.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,14 @@ const componentsData = [
258258
url: "/projects/sistent/components/accordion",
259259
src: "/accordion",
260260
},
261+
{
262+
id: 34,
263+
name: "Divider",
264+
description:
265+
"The Divider component visually separates content with a thin line, helping to organize sections and improve scannability in lists and layouts.",
266+
url: "/projects/sistent/components/divider",
267+
src: "/divider",
268+
},
261269
];
262270

263271
module.exports = { componentsData };

0 commit comments

Comments
 (0)