Skip to content

Commit e2acba5

Browse files
ARYANSHAH1567ARYANSHAH1567
committed
Merge branch 'aryanshah/fix_input_text_section' of https://github.com/ARYANSHAH1567/layer5 into aryanshah/fix_input_text_section
2 parents de5108e + 12b54e9 commit e2acba5

File tree

233 files changed

+3019
-669
lines changed

Some content is hidden

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

233 files changed

+3019
-669
lines changed

‎.github/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ area/learn:
5151
- "src/components/Learn-Components/**/*"
5252
- "src/collections/service-mesh-books/**/*"
5353
- "src/collections/service-mesh-learn/**/*"
54-
- "src/collections/service-mesh-workshops/**/*"
54+
- "src/collections/workshops/**/*"
5555
- "src/templates/book-*.js"
5656
- "src/templates/course-*.js"
5757
- "src/templates/lab-*.js"

‎content-learn/mastering-meshery/introduction-to-meshery/meshery/interpreting-meshery-designs.mdx

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ Let's explore a few of these categories.
9393
1. **Triangles**:
9494

9595
<img
96+
class="image-design-icons"
9697
src={Triangles}
9798
align="center"
9899
width="25%"
@@ -105,9 +106,10 @@ Let's explore a few of these categories.
105106
- **Examples**: API Service, Service.
106107

107108

108-
1. **Rectangles**:
109+
2. **Rectangles**:
109110

110111
<img
112+
class="image-design-icons"
111113
src={Rectangles}
112114
align="center"
113115
width="25%"
@@ -121,9 +123,10 @@ Let's explore a few of these categories.
121123

122124
- **Examples**: Namespace, Node, Pod, ReplicaSet, DaemonSet, Horizontal Pod Autoscaler.
123125

124-
1. **User Icons**:
126+
3. **User Icons**:
125127

126128
<img
129+
class="image-design-icons"
127130
src={Users}
128131
align="center"
129132
width="25%"
@@ -135,9 +138,10 @@ Let's explore a few of these categories.
135138

136139
- **Examples**: ClusterRole, Role, Service Account etc.
137140

138-
1. **Cylinders**:
141+
4. **Cylinders**:
139142

140143
<img
144+
class="image-design-icons"
141145
src={Cylinders}
142146
align="center"
143147
width="25%"
@@ -163,6 +167,7 @@ Note that users have the flexibility to **customize** these arrow styles to suit
163167
**Edge Relationships**
164168

165169
<img
170+
class="image-design-icons"
166171
src={DashedArrows}
167172
align="center"
168173
width="25%"
@@ -173,6 +178,7 @@ These are used to indicate traffic flow and relationships between components. Th
173178
**Annotations**
174179

175180
<img
181+
class="image-design-icons"
176182
src={AnnotationArrow}
177183
align="center"
178184
width="25%"
@@ -185,6 +191,7 @@ These are used to denote annotations or static connections between components. T
185191
1. **Edge-Network Relationship**: Represented by a dashed arrow with **port/network protocol**.
186192

187193
<img
194+
class="image-design-icons"
188195
src={NetworkEdgeRelationship}
189196
align="center"
190197
width="50%"
@@ -205,6 +212,7 @@ These are used to denote annotations or static connections between components. T
205212
The intermediary component (such as a RoleBinding) connects the two, defining how permissions are assigned. For example, a dashed arrow from a `Role` to a `ServiceAccount` with a `RoleBinding` in the middle shows the connection established by the RoleBinding, which links the specific role to the service account and grants the appropriate permissions.
206213

207214
<img
215+
class="image-design-icons"
208216
src={EdgePermissions}
209217
align="center"
210218
width="50%"
@@ -213,7 +221,8 @@ The intermediary component (such as a RoleBinding) connects the two, defining ho
213221
**Creating Edge-Permission Relationships Between Components**
214222

215223
<a href={edgePermissionGif}>
216-
<img src={edgePermissionGif} width="100%" align="center" />
224+
<img src={edgePermissionGif} width="100%" align="center"
225+
/>
217226
</a>
218227

219228

@@ -227,20 +236,17 @@ Meshery extends and offers support for numerous [integrations](https://docs.mesh
227236
In Meshery, these integrated components are distinctly represented by their specific logos as icons and various shapes. These components can be found in `Components` in the dock.
228237

229238
<img
239+
class="image-design-icons"
230240
src={Integrations}
231241
align="center"
232242
width="50%"
233-
style={{
234-
marginTop: '20px',
235-
marginBottom: '20px',
236-
}}
237243
/>
238244
<h5 class="chapter-sub-heading">_Example of integration components in Meshery_</h5>
239245

240246
Below is a Meshery Design with AWS Components.
241247

242248
<MesheryDesignEmbed
243-
style={{ border: "1px solid #eee" }}
249+
style={{ border: "1px solid #eee" , margin: "15px 0px 15px 0px"}}
244250
embedId="embedded-design-79d1f362-39b3-46f2-b658-42a16984f88e"
245251
embedScriptSrc="/embed-test/embedded-design-awscomplex.js"
246252
/>
@@ -271,14 +277,15 @@ Annotations can be created using Meshery's Diagramming tools found in the dock a
271277
1. **Images**: Images can be added to the design to represent components, logos, or any visual aid that supports understanding the architecture.
272278

273279
<a href={AnnotationExampleGif}>
274-
<img src={AnnotationExampleGif} width="100%" align="center" />
280+
<img src={AnnotationExampleGif} width="100%" align="center"
281+
/>
275282
</a>
276283

277284

278285
The design below includes annotations such as sections, images, arrows, and various shapes.
279286

280287
<MesheryDesignEmbed
281-
style={{ border: "1px solid #eee" }}
288+
style={{ border: "1px solid #eee" , margin: "15px 0px 15px 0px"}}
282289
embedId="embedded-design-a83f0098-2f91-4275-b075-c8676e842804"
283290
embedScriptSrc="/embed-test/embedded-design-annotations-example.js"
284291
/>
@@ -292,14 +299,16 @@ While default shapes, colors, and icons are provided for components and annotati
292299
**Customizing Kubernetes Components**
293300

294301
<a href={CustomizeKubernetesGif}>
295-
<img src={CustomizeKubernetesGif} width="100%" align="center" />
302+
<img src={CustomizeKubernetesGif} width="100%" align="center"
303+
/>
296304
</a>
297305

298306

299307
**Creating and Customizing Arrow Annotations**
300308

301309
<a href={CreateAnnotationGif}>
302-
<img src={CreateAnnotationGif} width="100%" align="center" />
310+
<img src={CreateAnnotationGif} width="100%" align="center"
311+
/>
303312
</a>
304313

305314

‎gatsby-config.js

Lines changed: 99 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,28 @@ module.exports = {
1313
},
1414
flags: {
1515
FAST_DEV: true,
16-
PARALLEL_SOURCING: true
16+
PARALLEL_SOURCING: true,
1717
},
1818
trailingSlash: "never",
1919
plugins: [
20+
{
21+
resolve: "gatsby-plugin-netlify",
22+
options: {
23+
headers: {
24+
"/*": [
25+
"X-Frame-Options: SAMEORIGIN",
26+
"Content-Security-Policy: frame-ancestors 'self'",
27+
],
28+
},
29+
mergeSecurityHeaders: true,
30+
mergeCachingHeaders: true,
31+
},
32+
},
2033
{
2134
resolve: "gatsby-plugin-webpack-bundle-analyser-v2",
2235
options: {
23-
disable: true
24-
}
36+
disable: true,
37+
},
2538
},
2639
{
2740
resolve: "gatsby-plugin-sitemap",
@@ -41,10 +54,8 @@ module.exports = {
4154
}
4255
}
4356
`,
44-
resolvePages: ({
45-
allSitePage: { nodes: allPages },
46-
}) => {
47-
return allPages.map(page => {
57+
resolvePages: ({ allSitePage: { nodes: allPages } }) => {
58+
return allPages.map((page) => {
4859
return { ...page };
4960
});
5061
},
@@ -73,8 +84,8 @@ module.exports = {
7384
// or disable plugins
7485
inlineStyles: false,
7586
cleanupIds: false,
76-
}
77-
}
87+
},
88+
},
7889
},
7990
],
8091
},
@@ -287,7 +298,71 @@ module.exports = {
287298
},
288299
{
289300
serialize: ({ query: { site, allPosts } }) => {
290-
return allPosts.nodes.map(node => {
301+
return allPosts.nodes.map((node) => {
302+
return Object.assign({}, node.frontmatter, {
303+
title: node.frontmatter.title,
304+
author: node.frontmatter.author,
305+
description:
306+
node.frontmatter.description || node.frontmatter.subtitle,
307+
date: node.frontmatter.date,
308+
url: site.siteMetadata.siteUrl + node.fields.slug,
309+
guid: site.siteMetadata.siteUrl + node.fields.slug,
310+
enclosure: node.frontmatter.thumbnail && {
311+
url:
312+
site.siteMetadata.siteUrl +
313+
node.frontmatter.thumbnail.publicURL,
314+
},
315+
custom_elements: [
316+
{ "content:encoded": node.html },
317+
{ "content:type": node.frontmatter.type },
318+
{ "content:category": node.frontmatter.category },
319+
{ "content:tags": node.frontmatter.tags?.join(", ") || "" },
320+
],
321+
});
322+
});
323+
},
324+
query: `{
325+
allPosts: allMdx(
326+
sort: {frontmatter: {date: DESC}}
327+
filter: {
328+
fields: {collection: {in: ["blog", "resources", "news", "events"]}},
329+
frontmatter: {
330+
published: { eq: true }
331+
category: { in: ["Meshery", "Announcements", "Events"] }
332+
tags: { in: ["Community", "Meshery", "mesheryctl"] }
333+
}
334+
}
335+
limit: 30
336+
) {
337+
nodes {
338+
body
339+
html
340+
frontmatter {
341+
title
342+
author
343+
description
344+
subtitle
345+
date(formatString: "MMM DD YYYY")
346+
type
347+
category
348+
thumbnail {
349+
publicURL
350+
}
351+
tags
352+
}
353+
fields {
354+
collection
355+
slug
356+
}
357+
}
358+
}
359+
}`,
360+
output: "/meshery-community-feed.xml",
361+
title: "Meshery RSSFeed",
362+
},
363+
{
364+
serialize: ({ query: { site, allPosts } }) => {
365+
return allPosts.nodes.map((node) => {
291366
return Object.assign({}, node.frontmatter, {
292367
title: node.frontmatter.title,
293368
author: node.frontmatter.author,
@@ -296,7 +371,9 @@ module.exports = {
296371
url: site.siteMetadata.siteUrl + node.fields.slug,
297372
guid: site.siteMetadata.siteUrl + node.fields.slug,
298373
enclosure: node.frontmatter.thumbnail && {
299-
url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
374+
url:
375+
site.siteMetadata.siteUrl +
376+
node.frontmatter.thumbnail.publicURL,
300377
},
301378
custom_elements: [{ "content:encoded": node.html }],
302379
});
@@ -328,11 +405,11 @@ module.exports = {
328405
}
329406
}`,
330407
output: "/blog/feed.xml",
331-
title: "Layer5 Blog"
408+
title: "Layer5 Blog",
332409
},
333410
{
334411
serialize: ({ query: { site, allPosts } }) => {
335-
return allPosts.nodes.map(node => {
412+
return allPosts.nodes.map((node) => {
336413
return Object.assign({}, node.frontmatter, {
337414
title: node.frontmatter.title,
338415
author: node.frontmatter.author,
@@ -341,7 +418,9 @@ module.exports = {
341418
url: site.siteMetadata.siteUrl + node.fields.slug,
342419
guid: site.siteMetadata.siteUrl + node.fields.slug,
343420
enclosure: node.frontmatter.thumbnail && {
344-
url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
421+
url:
422+
site.siteMetadata.siteUrl +
423+
node.frontmatter.thumbnail.publicURL,
345424
},
346425
custom_elements: [{ "content:encoded": node.html }],
347426
});
@@ -373,7 +452,7 @@ module.exports = {
373452
}
374453
}`,
375454
output: "/events/feed.xml",
376-
title: "Layer5 Events"
455+
title: "Layer5 Events",
377456
},
378457
],
379458
},
@@ -455,8 +534,8 @@ module.exports = {
455534
{
456535
resolve: "gatsby-source-filesystem",
457536
options: {
458-
path: `${__dirname}/src/collections/service-mesh-workshops`,
459-
name: "service-mesh-workshops",
537+
path: `${__dirname}/src/collections/workshops`,
538+
name: "workshops",
460539
},
461540
},
462541
{
@@ -514,8 +593,8 @@ module.exports = {
514593
options: {
515594
defaults: {
516595
placeholder: "blurred",
517-
}
518-
}
596+
},
597+
},
519598
},
520599
{
521600
resolve: "gatsby-transformer-sharp",
@@ -547,10 +626,9 @@ module.exports = {
547626
host: "https://layer5.io",
548627
sitemap: "https://layer5.io/sitemap-index.xml",
549628
policy: [{ userAgent: "*", allow: "/" }],
550-
}
629+
},
551630
},
552631
"gatsby-plugin-meta-redirect",
553632
// make sure this is always the last one
554633
],
555-
556634
};

‎gatsby-node.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
7373
isPermanent: true,
7474
});
7575
createRedirect({
76-
fromPath: "/learn/workshops",
77-
toPath: "/learn/service-mesh-workshops",
76+
fromPath: "/learn/service-mesh-workshops",
77+
toPath: "/learn/workshops",
7878
redirectInBrowser: true,
7979
isPermanent: true,
8080
});
@@ -517,7 +517,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
517517
}
518518
}
519519
singleWorkshop: allMdx(
520-
filter: { fields: { collection: { eq: "service-mesh-workshops" } } }
520+
filter: { fields: { collection: { eq: "workshops" } } }
521521
) {
522522
nodes {
523523
fields {
@@ -929,7 +929,7 @@ exports.onCreateNode = ({ node, actions, getNode }) => {
929929
slug = `/company/${collection}/${slugify(node.frontmatter.title)}`;
930930
break;
931931
case "service-mesh-books":
932-
case "service-mesh-workshops":
932+
case "workshops":
933933
case "service-mesh-labs":
934934
slug = `/learn/${collection}/${slugify(node.frontmatter.title)}`;
935935
break;

0 commit comments

Comments
 (0)