Skip to content

Commit 74b08ea

Browse files
Merge branch 'master' into update-kanvas-logos
2 parents c26cb81 + 9e5a9bc commit 74b08ea

221 files changed

Lines changed: 3732 additions & 4586 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.

.github/workflows/label-triggered.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
repo-token: ${{ secrets.GITHUB_TOKEN }}
3939
comment: "We are sending you an invitation to join the Layer5 GitHub Organization. :partying_face: <b>Welcome to the community! 🎉</b><br /><br />&nbsp;&nbsp;&nbsp;Be sure to :star: [star the projects](../stargazers), if you haven't already.<br />"
4040
env:
41-
INVITE_TOKEN: ${{ secrets.RELEASEDRAFTER_PAT }}
41+
INVITE_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
4242
- name: View context attributes
4343
uses: actions/github-script@master
4444
id: set-url

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v5
12+
- uses: actions/labeler@v6
1313
with:
1414
repo-token: "${{ secrets.GITHUB_TOKEN }}"

gatsby-node.js

Lines changed: 41 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ if (process.env.CI === "true") {
3636
if (page.path !== oldPage.path) {
3737
// Replace new page with old page
3838
deletePage(oldPage);
39-
page.slices = { ...DEFAULT_SLICES, ...(page.slices || {}) };
4039
createPage(page);
4140

4241
createRedirect({
@@ -52,59 +51,17 @@ if (process.env.CI === "true") {
5251

5352
const { loadRedirects } = require("./src/utils/redirects.js");
5453

55-
const DEFAULT_SLICES = {
56-
"site-header": "site-header",
57-
"site-footer": "site-footer",
58-
"cta-bottom": "cta-bottom",
59-
"cta-fullwidth": "cta-fullwidth",
60-
"cta-imageonly": "cta-imageonly",
61-
};
62-
6354
exports.createPages = async ({ actions, graphql, reporter }) => {
64-
const { createRedirect, createSlice } = actions;
55+
const { createRedirect } = actions;
6556
const redirects = loadRedirects();
6657
redirects.forEach(redirect => createRedirect(redirect)); // Handles all hardcoded ones dynamically
6758
// Create Pages
6859
const { createPage } = actions;
6960

70-
createSlice({
71-
id: "site-header",
72-
component: path.resolve("./src/slices/site-header.js"),
73-
});
74-
75-
createSlice({
76-
id: "site-footer",
77-
component: path.resolve("./src/slices/site-footer.js"),
78-
});
79-
80-
createSlice({
81-
id: "cta-bottom",
82-
component: path.resolve("./src/slices/cta-bottom.js"),
83-
});
84-
85-
createSlice({
86-
id: "cta-fullwidth",
87-
component: path.resolve("./src/slices/cta-fullwidth.js"),
88-
});
89-
90-
createSlice({
91-
id: "cta-imageonly",
92-
component: path.resolve("./src/slices/cta-imageonly.js"),
93-
});
94-
9561
const envCreatePage = (props) => {
96-
const pageConfig = { ...props };
97-
98-
if (isDevelopment) {
99-
pageConfig.defer = true;
100-
} else if (isProduction) {
101-
pageConfig.mode = "SSR";
102-
}
103-
pageConfig.slices = { ...DEFAULT_SLICES, ...(pageConfig.slices || {}) };
104-
10562
if (process.env.CI === "true") {
106-
const { path, matchPath, ...rest } = pageConfig;
107-
63+
const { path, matchPath, ...rest } = props;
64+
const isHandbookPage = path.startsWith("/community/handbook/");
10865
createRedirect({
10966
fromPath: `/${path}/`,
11067
toPath: `/${path}`,
@@ -113,12 +70,12 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
11370
});
11471

11572
return createPage({
116-
path: `${path}.html`,
73+
path: isHandbookPage ? path : `${path}.html`,
11774
matchPath: matchPath || path,
11875
...rest,
11976
});
12077
}
121-
return createPage(pageConfig);
78+
return createPage(props);
12279
};
12380

12481
const blogPostTemplate = path.resolve("src/templates/blog-single.js");
@@ -180,6 +137,9 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
180137
`
181138
: "";
182139

140+
const HandbookTemplate = path.resolve("src/templates/handbook-template.js");
141+
142+
183143
const res = await graphql(`
184144
{
185145
allPosts: allMdx(filter: { frontmatter: { published: { eq: true } } }) {
@@ -197,6 +157,19 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
197157
}
198158
}
199159
}
160+
handbookPages: allMdx(
161+
filter: { fields: { collection: { eq: "handbook" } } }
162+
) {
163+
nodes {
164+
fields {
165+
slug
166+
collection
167+
}
168+
internal {
169+
contentFilePath
170+
}
171+
}
172+
}
200173
blogTags: allMdx(
201174
filter: {
202175
fields: { collection: { eq: "blog" } }
@@ -296,6 +269,9 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
296269
const members = filterByCollection("members");
297270
const integrations = filterByCollection("integrations");
298271

272+
const handbook = res.data.handbookPages.nodes;
273+
274+
299275
const singleWorkshop = res.data.singleWorkshop.nodes;
300276
const labs = res.data.labs.nodes;
301277

@@ -457,6 +433,17 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
457433
});
458434
}
459435

436+
handbook.forEach((page) => {
437+
envCreatePage({
438+
path: page.fields.slug,
439+
component: `${HandbookTemplate}?__contentFilePath=${page.internal.contentFilePath}`,
440+
context: {
441+
slug: page.fields.slug,
442+
},
443+
});
444+
});
445+
446+
460447
programs.forEach((program) => {
461448
envCreatePage({
462449
path: `/programs/${program.frontmatter.programSlug}`,
@@ -555,7 +542,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
555542
});
556543

557544
const components = componentsData.map((component) => component.src.replace("/", ""));
558-
const createComponentPages = (envCreatePage, components) => {
545+
const createComponentPages = (createPage, components) => {
559546
const pageTypes = [
560547
{ suffix: "", file: "index.js" },
561548
{ suffix: "/guidance", file: "guidance.js" },
@@ -568,7 +555,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
568555
const componentPath = `./src/sections/Projects/Sistent/components/${name}/${file}`;
569556
if (fs.existsSync(path.resolve(componentPath))) {
570557
try {
571-
envCreatePage({
558+
createPage({
572559
path: pagePath,
573560
component: require.resolve(componentPath),
574561
});
@@ -582,7 +569,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
582569
});
583570
};
584571

585-
createComponentPages(envCreatePage, components);
572+
createComponentPages(createPage, components);
586573
};
587574

588575
// slug starts and ends with '/' so parts[0] and parts[-1] will be empty
@@ -713,6 +700,9 @@ exports.onCreateNode = ({ node, actions, getNode }) => {
713700
if (node.frontmatter.published)
714701
slug = `/community/members/${node.frontmatter.permalink ?? slugify(node.frontmatter.name)}`;
715702
break;
703+
case "handbook":
704+
slug = `/community/handbook/${slugify(node.frontmatter.title)}`;
705+
break;
716706
case "events":
717707
if (node.frontmatter.title)
718708
slug = `/community/events/${slugify(node.frontmatter.title)}`;

root-wrapper.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import React from "react";
22
import { MDXProvider } from "@mdx-js/react";
33
import Code from "./src/components/CodeBlock";
4-
import { Slice } from "gatsby";
4+
import CTA_ImageOnly from "./src/components/Call-To-Actions/CTA_ImageOnly";
5+
import CTA_FullWidth from "./src/components/Call-To-Actions/CTA_FullWidth";
6+
import CTA_Bottom from "./src/components/Call-To-Actions/CTA_Bottom";
57
import { ContextWrapper } from "./context-wrapper";
68

79
// Custom image component for better CLS scores
@@ -39,9 +41,9 @@ const components = {
3941
}
4042
},
4143
img: OptimizedImage,
42-
CTA_ImageOnly: (props) => <Slice alias="cta-imageonly" sliceContext={props} />, // slice to avoid page rebuilds on CTA tweaks
43-
CTA_FullWidth: (props) => <Slice alias="cta-fullwidth" sliceContext={props} />, // slice to avoid page rebuilds on CTA tweaks
44-
CTA_Bottom: (props) => <Slice alias="cta-bottom" sliceContext={props} />
44+
CTA_ImageOnly,
45+
CTA_FullWidth,
46+
CTA_Bottom
4547
};
4648

4749
export const wrapRootElement = ({ element }) => (

src/collections/blog/2022/2022-01-07-Recap-KubeCon-China-TAG-Network-talk/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ The majority of the more detailed activities occur in the CNCF Service Mesh Work
9393
alt="GetNighthawk"
9494
/>
9595

96-
<strong>Calcote and Owens packed a great deal of information in this talk. If you are passionate about Cloud Native Networking and Service Meshes, then this talk is definitely worth your time. Find the recording below. The <a href="/static/events/2021/kubecon-china-2021/cncf-tag-network-and-service-mesh-working-group-kubecon-china-2021-lee-calcote-ken-owens.pdf">presentation slides</a> are available.</strong>
96+
<strong>Calcote and Owens packed a great deal of information in this talk. If you are passionate about Cloud Native Networking and Service Meshes, then this talk is definitely worth your time. Find the recording below. The <a href="/events/2021/kubecon-china-2021/cncf-tag-network-and-service-mesh-working-group-kubecon-china-2021-lee-calcote-ken-owens.pdf">presentation slides</a> are available.</strong>
9797
<div className="iframe-container">
9898
<iframe src="https://www.youtube.com/embed/pUDm8Xx4RXg" loading="lazy" title="YouTube video player" frameBorder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen ></iframe>
9999
</div>

src/collections/events/2021/kubecon-china-2021/index.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Speakers:
4444
</li>
4545
</ul>
4646

47-
- <a href="/static/events/2021/kubecon-china-2021/solving-the-service-mesh-adopters-dilemma-anita-ihuman-kubecon-china-2021.pdf">Presentation Slides</a>
47+
- <a href="/events/2021/kubecon-china-2021/solving-the-service-mesh-adopters-dilemma-anita-ihuman-kubecon-china-2021.pdf">Presentation Slides</a>
4848

4949
<h2>
5050
<a href="https://kccncosschn21.sched.com/event/pcYk/cncf-tag-jie-zhang-re-jie-yuan-cncf-tag-network-and-service-mesh-working-group-lee-calcote-layer5-ed-warnicke-cisco-ken-owens-fiserv?iframe=no">
@@ -66,7 +66,7 @@ Speakers:
6666
<li>Ken Owens</li>
6767
</ul>
6868

69-
- <a href="/static/events/2021/cncf-tag-network-and-service-mesh-working-group-kubecon-china-2021-lee-calcote-ken-owens.pdf">Presentation Slides</a>
69+
- <a href="/events/2021/kubecon-china-2021/cncf-tag-network-and-service-mesh-working-group-kubecon-china-2021-lee-calcote-ken-owens.pdf">Presentation Slides</a>
7070

7171
<h2>Meshery Project Office Hours</h2>
7272

@@ -112,7 +112,7 @@ Speakers:
112112
<li>MeshMate <Link to="/community/members/anita-ihuman">Anita Ihuman</Link></li>
113113
</ul>
114114

115-
- <a href="/static/events/2021/kubecon-china-2021/solving-the-service-mesh-adopters-dilemma-anita-ihuman-kubecon-china-2021.pdf">Presentation Slides</a>
115+
- <a href="/events/2021/kubecon-china-2021/solving-the-service-mesh-adopters-dilemma-anita-ihuman-kubecon-china-2021.pdf">Presentation Slides</a>
116116

117117

118118
<h2><a href="https://kccncosschn21.sched.com/event/pcYk/cncf-tag-jie-zhang-re-jie-yuan-cncf-tag-network-and-service-mesh-working-group-lee-calcote-layer5-ed-warnicke-cisco-ken-owens-fiserv?iframe=no">CNCF TAG Network and Service Mesh Working Group</a></h2>
@@ -126,7 +126,7 @@ Speakers:
126126
<li>Ken Owens</li>
127127
</ul>
128128

129-
- <a href="/static/events/2021/kubecon-china-2021/cncf-tag-network-and-service-mesh-working-group-kubecon-china-2021-lee-calcote-ken-owens.pdf">Presentation Slides</a>
129+
- <a href="/events/2021/kubecon-china-2021/cncf-tag-network-and-service-mesh-working-group-kubecon-china-2021-lee-calcote-ken-owens.pdf">Presentation Slides</a>
130130

131131

132132
<h2>Meshery Project Office Hours</h2>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects t
1919
Resources:
2020
<ul>
2121
<li><Link to="https://www.youtube.com/watch?v=3dqFF_0FsTE">Watch the livestream recording</Link></li>
22-
<li><a href="/static/events/2022/hacktoberfest-2022/hacktoberfest-prep-easing-into-cncf-open-source-projects.pdf">Review the slides</a></li>
22+
<li><a href="/events/2022/hacktoberfest-2022/hacktoberfest-prep-easing-into-cncf-open-source-projects.pdf">Review the slides</a></li>
2323
</ul>
2424

src/collections/events/2023/hacktoberfest-2023-docker-ext/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Prepare for Hacktoberfest and ready yourself for contributing to <a to="https://
3333
<ul>
3434
<li><Link to="https://docs.google.com/spreadsheets/d/11KPLU9vVklgGn9NbluLegbfQAyBA5ZS58AhoA8_PCVI/edit#gid=0">Issues for Hacktoberfest</Link></li>
3535
<li><a href="https://www.youtube.com/watch?v=T7xLUqrnxtI">Recorded Livestream</a></li>
36-
<li><a href="/static/events/2023/hacktoberfest-2023-docker-ext/hacktoberfest-prep-easing-into-cncf-open-source-projects.pdf">Presentation Slides</a></li>
36+
<li><a href="/events/2023/hacktoberfest-2023-docker-ext/hacktoberfest-prep-easing-into-cncf-open-source-projects.pdf">Presentation Slides</a></li>
3737
</ul>
3838
Earn a Badge
3939
Earn a Hacktoberfest Contributor badge by contributing to Layer5 projects during this Hacktoberfest.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects t
3838
<li><Link to="/blog/open-source/ways-to-contribute-at-layer5">Code and Non-Code Contributing at Layer5</Link></li>
3939
<li><a href="https://github.com/issues?q=is%3Aopen+is%3Aissue+archived%3Afalse+org%3Alayer5io+org%3Ameshery+org%3Aservice-mesh-performance+org%3Aservice-mesh-patterns+label%3A%22hacktoberfest%22+">Issues for Hacktoberfest</a></li>
4040
<li><a href="https://www.youtube.com/watch?v=iKe52yMWWK4">Recorded Livestream</a></li>
41-
<li><a href="/static/events/2024/hacktoberfest-2024/hacktoberfest-prep-2024-extending-meshery-models.pdf">Presentation Slides</a></li>
41+
<li><a href="/events/2024/hacktoberfest-2024/hacktoberfest-prep-2024-extending-meshery-models.pdf">Presentation Slides</a></li>
4242
</ul>

0 commit comments

Comments
 (0)