Skip to content

Commit 71b84cc

Browse files
Cvr421Cvr421
authored
Merge branch 'master' into modifying_integration_container_mobileView
2 parents d48e2ee + 22c19fa commit 71b84cc

File tree

195 files changed

+3003
-493
lines changed

Some content is hidden

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

195 files changed

+3003
-493
lines changed

‎.desktop-lighthouserc.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
module.exports = {
2+
"ci": {
3+
"collect": {
4+
"settings": {
5+
"preset": "desktop"
6+
},
7+
"staticDistDir": "./public",
8+
"url": [
9+
"http://localhost/404/index.html?desktop",
10+
"http://localhost/?desktop",
11+
"http://localhost/company/about/index.html?desktop",
12+
"http://localhost/cloud-native-management/meshery/index.html?desktop",
13+
"http://localhost/cloud-native-management/meshmap/index.html?desktop",
14+
"http://localhost/learn/learning-paths/index.html?desktop",
15+
"http://localhost/learn/service-mesh-books/index.html?desktop",
16+
"http://localhost/learn/service-mesh-workshops/index.html?desktop",
17+
"http://localhost/learn/index.html?desktop",
18+
"http://localhost/blog/index.html?desktop",
19+
"http://localhost/resources/index.html?desktop",
20+
"http://localhost/careers/index.html?desktop",
21+
"http://localhost/community/members/index.html?desktop",
22+
"http://localhost/community/meshmates/index.html?desktop",
23+
"http://localhost/community/events/index.html?desktop",
24+
"http://localhost/community/newcomers/index.html?desktop",
25+
],
26+
},
27+
"assert": {
28+
"assertions": {
29+
"categories:performance": ["warn", {"minScore": .90}],
30+
"categories:accessibility": ["warn", {"minScore": .90}],
31+
"categories:best-practices": ["warn", {"minScore": .90}],
32+
"categories:seo": ["warn", {"minScore": .90}],
33+
}
34+
},
35+
"upload": {
36+
"target": "temporary-public-storage",
37+
},
38+
}
39+
};

‎.github/workflows/lighthouseci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,7 @@ jobs:
1616
node-version: 19
1717
- run: npm install && npm install -g @lhci/[email protected]
1818
- run: CI=false npm run build
19+
- run: lhci collect --config=.desktop-lighthouserc.js
20+
- run: lhci assert --config=.desktop-lighthouserc.js
21+
- run: lhci upload
1922
- run: lhci autorun

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ In the styled component, we find ".logo", add the `svg` element, and within that
278278
279279
## Changing images depending on the theme.
280280
281-
If possibe we wish to avoid using images dependent on the theme because we are required to use a conditional (which will cause a flicker of the image when the page is reloaded). If necessary, please use the following instructions.
281+
If possible we wish to avoid using images dependent on the theme because we are required to use a conditional (which will cause a flicker of the image when the page is reloaded). If necessary, please use the following instructions.
282282
283283
1. To change images or SVG as the image source, according to the theme, you have to import the hook `useStyledDarkMode` from the following [folder](https://github.com/layer5io/layer5/blob/master/src/theme/app/useStyledDarkMode.js), and then use the `isDark` value from `useStyledDarkMode` hook for the conditional.
284284

‎README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<a href="https://meshery.io">
3333
<img src=".github/assets/images/meshery/meshery-logo.svg" style="margin:10px;" width="125px" alt="Meshery - Cloud Native Management Plane" align="left" />
3434
</a>
35-
<a href="https://meshery.io">Meshery</a> is the open source, cloud native management plane that enables the adoption, operation, and management of Kubernetes, any service mesh, and their workloads.
35+
<a href="https://meshery.io">Meshery</a> is the collaborative cloud native manager that enables the adoption, operation, and management of Kubernetes and its workloads.
3636
<br /><br /><br/>
3737
</p>
3838
<br />
@@ -50,10 +50,10 @@
5050

5151

5252
<p style="clear:both;">
53-
<h2><a href="https://github.com/service-mesh-patterns">Service Mesh Pattern</a></h2>
54-
<a href="https://github.com/service-mesh-patterns"><img src=".github/assets/images/patterns/service-mesh-pattern.svg" style="float:left;margin:10px;" width="125px" alt="Service Mesh Pattern" align="left"/>
53+
<h2><a href="https://github.com/service-mesh-patterns">Cloud Native Patterns</a></h2>
54+
<a href="https://github.com/service-mesh-patterns"><img src=".github/assets/images/patterns/service-mesh-pattern.svg" style="float:left;margin:10px;" width="125px" alt="Cloud Native Patterns" align="left"/>
5555
</a>
56-
<a href="https://github.com/service-mesh-patterns">Service Mesh Patterns</a> help you get the most out of Linkerd, Consul, App Mesh, Istio, Kuma, Open Service Mesh, or <a href="https://layer5.io/service-mesh-landscape">any service mesh</a>, including those using Envoy and use of WebAssembly. Each pattern can be used as a template and is customizable.
56+
<a href="https://github.com/service-mesh-patterns">Cloud Native Patterns</a> help you get the most out of Kubernetes and every CNCF project. Each pattern can be used as a template and is customizable.
5757
<br /><br /><br />
5858
</p>
5959
<br />
@@ -71,15 +71,15 @@ The <a href="https://layer5.io/landscape">Service Mesh Landscape</a> is a compre
7171

7272

7373
<p style="clear:both;">
74-
<h2><a href="https://layer5.io/projects/service-mesh-performance">Service Mesh Performance</a></h2>
74+
<h2><a href="https://layer5.io/projects/service-mesh-performance">Cloud Native Performance</a></h2>
7575
<a href="https://layer5.io/projects/service-mesh-performance">
7676
<picture align="left">
7777
<source media="(prefers-color-scheme: dark)" srcset="src/assets/images/service-mesh-performance/stacked/smp-light-text.svg">
7878
<source media="(prefers-color-scheme: light)" srcset=".github/assets/images/smp-dark-text.svg">
7979
<img align="left" src="src/assets/images/service-mesh-performance/stacked/smp-light-text.svg" alt="Shows a dark SMP logo in light mode and a white logo in dark mode" width="125px" style="float:left;margin:10px;" />
8080
</picture>
8181
</a>
82-
The <a href="https://layer5.io/projects/service-mesh-performance">Service Mesh Performance</a> (SMP) is a vendor-neutral specification for capturing details of environment and infrastructure details, service mesh and its configuration, service/application details, and bundling of statistical analysis of results.
82+
The <a href="https://layer5.io/projects/service-mesh-performance">Cloud Native Performance</a> is a vendor-neutral specification for capturing details of environment and infrastructure details, cloud native infrastructure and its configuration, service/application details, and bundling of statistical analysis of results.
8383
<br /><br /><br />
8484
</p>
8585
<br />
@@ -116,7 +116,7 @@ Image Hub supports Envoy-based data planes. It is compatible with and can be dep
116116
style="float:left;margin:10px;" width="125px" height="100px"
117117
alt="Learn Layer5" align="left" />
118118
</a>
119-
<a href="https://github.com/layer5io/learn-layer5">Learn Layer5</a> is a sample application for learning how service meshes work which also provides <a href="https://layer5.io/smi">SMI Conformance testing</a>.
119+
<a href="https://github.com/layer5io/learn-layer5">Learn Layer5</a> is a sample application for learning how cloud native infrastructure works.
120120
<br /><br /><br />
121121
</p>
122122
<br />
@@ -140,7 +140,7 @@ alt="Service Mesh Interface Conformance" align="left" /></a>
140140
style="float:left;margin:10px;" width="125px"
141141
alt="Nighthawk" align="left" />
142142
</a>
143-
<a href="https://getnighthawk.dev/">Nighthawk</a> is a Layer 7 (HTTP/HTTPS/HTTP2) performance characterization tool. Nighthawk is Envoy’s load generator and is written in C++. Meshery integrates Nighthawk as one of (currently) three choices of load generator for characterizing and managing the performance of service meshes and their workloads.
143+
<a href="https://getnighthawk.dev/">Nighthawk</a> is a Layer 7 (HTTP/HTTPS/HTTP2) performance characterization tool. Nighthawk is Envoy’s load generator and is written in C++. Meshery integrates Nighthawk as one of (currently) three choices of load generator for characterizing and managing the performance of infrastructure and services.
144144
<br /><br /><br />
145145
</p>
146146

@@ -186,7 +186,7 @@ alt="Meshery Catalog" align="left" />
186186
<br />
187187
<ul>
188188
<li>Find us on Twitter: <a href="https://twitter.com/layer5">@layer5</a>, <a href="https://twitter.com/mesheryio">@mesheryio</a>, and <a href="https://twitter.com/smp_spec">@smp_spec</a>.</li>
189-
<li>Visit us on LinkedIn: <a href="https://www.linkedin.com/company/layer5">Layer5</a>, <a href="https://www.linkedin.com/showcase/meshery/">Meshery</a>, and <a href="https://www.linkedin.com/showcase/service-mesh-performance">Service Mesh Performance</a>.</li>
189+
<li>Visit us on LinkedIn: <a href="https://www.linkedin.com/company/layer5">Layer5</a>, <a href="https://www.linkedin.com/showcase/meshery/">Meshery</a>, and <a href="https://www.linkedin.com/showcase/service-mesh-performance">Cloud Native Performance</a>.</li>
190190
<li>Subscribe on <a href="http://youtube.com/Layer5io?sub_confirmation=1">Youtube</a>.</li>
191191
</ul>
192192

‎gatsby-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ module.exports = {
7272
overrides: {
7373
// or disable plugins
7474
inlineStyles: false,
75-
cleanupIDs: false,
75+
cleanupIds: false,
7676
}
7777
}
7878
},

‎package-lock.json

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

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@sideway/address": "^5.0.0",
3737
"@svgr/webpack": "^8.0.1",
3838
"axios": "^1.4.0",
39-
"babel-plugin-styled-components": "^2.0.7",
39+
"babel-plugin-styled-components": "^2.1.4",
4040
"babel-preset-gatsby": "^2.22.0",
4141
"cytoscape": "^3.23.0",
4242
"cytoscape-cose-bilkent": "^4.1.0",
@@ -61,7 +61,7 @@
6161
"gatsby-plugin-sitemap": "^5.25.0",
6262
"gatsby-plugin-styled-components": "^5.25.0",
6363
"gatsby-plugin-svgr": "^3.0.0-beta.0",
64-
"gatsby-redirect-from": "^0.5.0",
64+
"gatsby-redirect-from": "^1.0.5",
6565
"gatsby-source-filesystem": "^4.25.0",
6666
"gatsby-transformer-sharp": "^4.25.0",
6767
"gbimage-bridge": "^0.2.2",
@@ -103,7 +103,7 @@
103103
"devDependencies": {
104104
"@babel/cli": "^7.18.10",
105105
"@babel/core": "^7.22.9",
106-
"@babel/eslint-parser": "^7.21.3",
106+
"@babel/eslint-parser": "^7.22.9",
107107
"babel-plugin-module-resolver": "^5.0.0",
108108
"cpx": "^1.5.0",
109109
"cross-env": "^7.0.0",

‎src/assets/brand/catalog-brand-kit.zip

11.9 KB
Binary file not shown.

‎src/assets/discuss/html/footer.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
<h3 class="section-title"><a href="https://layer5.io/learn">RESOURCES</a></h3>
4444
<h5 class="footer-h5"><a href="https://layer5.io/learn/learning-paths">Learning Paths</a></h5>
4545
<h5 class="footer-h5"><a href="https://layer5.io/resources">Resource Library</a></h5>
46-
<h5 class="footer-h5"><a href="https://layer5.io/learn/service-mesh-books">Service Mesh Books</a></h5>
47-
<h5 class="footer-h5"><a href="https://layer5.io/learn/service-mesh-workshops">Service Mesh Workshops</a></h5>
46+
<h5 class="footer-h5"><a href="https://layer5.io/learn/service-mesh-books">Cloud Native Books</a></h5>
47+
<h5 class="footer-h5"><a href="https://layer5.io/learn/service-mesh-workshops">Cloud Native Workshops</a></h5>
4848
<h5 class="footer-h5"><a href="https://layer5.io/service-mesh-landscape#service-mesh-comaprison-matrix">Service Mesh Comparison</a></h5>
49-
<h5 class="footer-h5"><a href="https://layer5.io/learn/service-mesh-labs">Service Mesh Interactive Labs</a></h5>
49+
<h5 class="footer-h5"><a href="https://layer5.io/learn/service-mesh-labs">Cloud Native Interactive Labs</a></h5>
5050
</div>
5151
<div class="even-col footer-sections footer-community">
5252
<h3 class="section-title"><a href="https://layer5.io/community">COMMUNITY</a></h3>

‎src/assets/images/adventure-five/layer_five.png

220 KB
Loading

0 commit comments

Comments
 (0)