Skip to content

Commit 155a1c4

Browse files
sandramscsandramsc
authored
Merge branch 'layer5io:master' into contributing/sandramsc/4932
2 parents 9b41463 + c5a3caf commit 155a1c4

File tree

9 files changed

+59
-88
lines changed

9 files changed

+59
-88
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ alt="Nighthawk" align="left" />
147147

148148

149149
<p style="clear:both;">
150-
<h2><a href="https://layer5.io/catalog">Meshery Catalog</a></h2>
150+
<h2><a href="https://meshery.layer5.io/catalog">Meshery Catalog</a></h2>
151151
<a href="">
152152
<img src=".github/assets/images/catalog/catalog.svg"
153153
style="float:left;margin:10px;" width="125px"

‎src/pages/catalog.js renamed to ‎src/pages/cloud-native-management/catalog.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
22

3-
import SEO from "../components/seo";
4-
import CatalogPage from "../sections/Cloud-Native-Catalog";
3+
import SEO from "../../components/seo";
4+
import CatalogPage from "../../sections/Cloud-Native-Catalog";
55

66
const Catalog = () => {
77
return (
@@ -13,6 +13,6 @@ const Catalog = () => {
1313
export default Catalog;
1414
export const Head = () => {
1515
return <SEO title="Cloud Native Catalog"
16-
description="The Cloud Native Catalog, easily import any catalog item into Meshery."
16+
description="The Kubernetes and Cloud Native Catalog. Build, share, innovate with CNCF project-curated best practices."
1717
image="/images/meshery-logo-dark-text.webp" />;
1818
};

‎src/sections/Community/Handbook/projects.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ const Maintainer = () => {
169169
</p>
170170
<li>
171171
<h4>
172-
<a href="https://layer5.io/catalog">
172+
<a href="https://layer5.io/cloud-native-management/catalog">
173173
Meshery Catalog :
174174
</a>
175175
</h4>{" "}

‎src/sections/Company/About/index.js

+8-21
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,19 @@ const About = () => {
3232
<div className="about-text text-one">
3333
<h1>About Us</h1>
3434
<p>
35-
We embrace <i>developer</i>-defined infrastructure. We
36-
empower developers to change how they write applications,
37-
support <i>operators</i> in rethinking how they run modern
38-
infrastructure, and enable <i>product owners</i> to regain
39-
full-control over their product portfolio.
40-
</p>
41-
<p>
42-
Our cloud native application and infrastructure management
43-
software enables organizations to expect more from their
44-
infrastructure.
35+
At Layer5, we champion <i>developer-defined</i> infrastructure, giving engineers the power to reshape application delivery. We empower operators in reimagining how they manage modern infrastructure: collaboratively.
4536
</p>
4637
<div className="head-images-mobile">
4738
<img src={FiveIcon} alt="About Layer5" />
4839
</div>
4940
<p className="section-title">We are enablers.</p>
5041
<p>
51-
At Layer5, we believe collaboration enables innovation, and
52-
infrastructure enables collaboration. We help organizations
53-
look at their infrastructure differently, asking it "what
54-
have you done for me lately?". Our suite of multi-mesh,
55-
multi-cloud infrastructure management products — all with
56-
open source projects at their core — underpin each of our
57-
offerings.{" "}
42+
We believe innovation is furthered by collaboration and that collaboration is enabled by infrastructure. Layer5 encourages organizations to view their infrastructure through a fresh lens, constantly asking, "What
43+
have you done for me lately?" Our suite of multi-cluster, multi-cloud infrastructure management products, with open source projects at their core, form the bedrock of our offerings.
44+
45+
Our cloud native application and infrastructure management
46+
software enables organizations to expect more from their
47+
infrastructure.
5848
</p>
5949
{/* <p>As stewards of industry, we enable organizations of all sizes, from well-known brands to ambitious start-ups to rely on our solutions to provision, secure, connect, and run their business-critical applications.</p> */}
6050
</div>
@@ -91,10 +81,7 @@ const About = () => {
9181
</div>
9282
<p className="section-title">We are principled.</p>
9383
<p>
94-
We are proud of the inclusive and kind work environment we
95-
have built. We support each other as we work to solve
96-
important problems. We take our work seriously, and we do it
97-
with integrity and in alignment with our core principles.
84+
We are proud of the inclusive and kind community and work environment we have built. We support each other as we work to solve important problems. We take our work seriously, and execute with integrity and in alignment with our core principles of paying it forward, challenging ourselves and those around to be and to do better.
9885
</p>
9986
</div>
10087
</Col>

‎src/sections/General/Navigation/utility/menu-items.js

+38-58
Original file line numberDiff line numberDiff line change
@@ -83,30 +83,23 @@ const Data = {
8383
name: "Products",
8484
path: "/projects",
8585
subItems: [
86-
// {
87-
// name: "Image Hub",
88-
// path: "/projects/image-hub",
89-
// sepLine: true
90-
// },
91-
{
92-
name: "MeshMap",
93-
path: "/cloud-native-management/meshmap",
94-
sepLine: true
95-
},
96-
{
97-
name: "---",
98-
// path: "/cloud-native-management/meshmap",
99-
100-
},
10186
{
10287
name: "Meshery",
10388
path: "/cloud-native-management/meshery",
10489
sepLine: true
10590
},
91+
{
92+
name: "MeshMap",
93+
path: "/cloud-native-management/meshmap",
94+
},
95+
// {
96+
// name: "---",
97+
// // path: "/cloud-native-management/meshmap",
98+
99+
// },
106100
{
107101
name: "Catalog",
108-
path: "/catalog",
109-
externalLink: true
102+
path: "/cloud-native-management/catalog",
110103
},
111104
{
112105
name: "Docker Extension",
@@ -115,39 +108,15 @@ const Data = {
115108
{
116109
name: "Playground",
117110
path: "/cloud-native-management/playground",
118-
externalLink: true
119-
},
120-
{
121-
name: "Nighthawk",
122-
path: "/projects/nighthawk",
123-
sepLine: true
124-
},
125-
{
126-
name: "Service Mesh",
127-
path: "/service-mesh-landscape",
128-
sepLine: true
129-
},
130-
{
131-
name: "Patterns",
132-
path: "/learn/service-mesh-books/service-mesh-patterns",
133-
},
134-
// {
135-
// name: "Interface",
136-
// path: "/projects/service-mesh-interface-conformance",
137-
// },
138-
{
139-
name: "Landscape",
140-
path: "/service-mesh-landscape",
141-
},
142-
{
143-
name: "Cloud Native Performance",
144-
path: "/projects/cloud-native-performance",
145-
sepLine: true
146111
},
147112
],
148113
actionItems: [
149114
{
150-
actionName: "All projects",
115+
actionName: "Pricing",
116+
actionLink: "/pricing",
117+
},
118+
{
119+
actionName: "Open source projects",
151120
actionLink: "/projects",
152121
},
153122
// {
@@ -165,8 +134,8 @@ const Data = {
165134
// }
166135
},
167136
{
168-
name: "Pricing",
169-
path: "/pricing"
137+
name: "Integrations",
138+
path: "/cloud-native-management/meshery/integrations"
170139
},
171140
// {
172141
// name: "Learn",
@@ -222,6 +191,11 @@ const Data = {
222191
name: "Community",
223192
path: "/community",
224193
subItems: [
194+
{
195+
name: "Open Source Projects",
196+
path: "/projects",
197+
sepLine: true
198+
},
225199
{
226200
name: "Handbook",
227201
path: "/community/handbook",
@@ -232,6 +206,10 @@ const Data = {
232206
path: "/community/members",
233207
sepLine: true
234208
},
209+
{
210+
name: "Newcomers",
211+
path: "/community/newcomers",
212+
},
235213
{
236214
name: "MeshMates",
237215
path: "/community/meshmates",
@@ -247,9 +225,13 @@ const Data = {
247225
},
248226
],
249227
actionItems: [
228+
// {
229+
// actionName: "Newcomer's journey",
230+
// actionLink: "/community/newcomers",
231+
// },
250232
{
251-
actionName: "Newcomer's journey",
252-
actionLink: "/community/newcomers",
233+
actionName: "Discussion forum",
234+
actionLink: "https://discuss.layer5.io",
253235
},
254236
{
255237
actionName: "Open source internships",
@@ -281,10 +263,15 @@ const Data = {
281263
// path: "/news",
282264
// sepLine: true
283265
// },
266+
{
267+
name: "Learn",
268+
path: "/learn",
269+
sepLine: true
270+
},
284271
{
285272
name: "Books",
286273
path: "/learn/service-mesh-books",
287-
sepLine: true
274+
288275
},
289276
// {
290277
// name: "Forum",
@@ -295,17 +282,14 @@ const Data = {
295282
{
296283
name: "Workshops",
297284
path: "/learn/service-mesh-workshops",
298-
sepLine: true
299285
},
300286
{
301287
name: "Learning Paths",
302288
path: "/learn/learning-paths",
303-
sepLine: true
304289
},
305290
{
306291
name: "Interactive Labs",
307292
path: "/learn/service-mesh-labs",
308-
sepLine: true
309293
},
310294
],
311295
actionItems: [
@@ -321,10 +305,6 @@ const Data = {
321305
actionName: "Recent announcements",
322306
actionLink: "/blog/category/announcements"
323307
},
324-
{
325-
actionName: "Join the discussion",
326-
actionLink: "https://discuss.layer5.io",
327-
},
328308
],
329309
// div1: {
330310
// src: img1,

‎src/sections/Home/Projects-home/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const Projects = () => {
8181
</Link>
8282
</Col>
8383
<Col sm={12} md={6} lg={3}>
84-
<Link className="project-card" to="/catalog">
84+
<Link className="project-card" to="/cloud-native-management/catalog">
8585
<div className="project__block__inner">
8686
{/* <StaticImage src={catalogLogo} alt="Meshery Catalog" height={40} /> */}
8787
<CatalogLogo height="40px" width="auto" style={{ margin: "10px auto", minHeight: "40px" }} />

‎src/sections/Meshery/Features-Col/data/index.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ const LifecycleFeature = () => {
3030
className: "--on",
3131
},
3232
{
33-
content: "Use known cloud native ",
33+
content: "Share and use known cloud native patterns",
34+
className: "--on",
35+
},
36+
{
37+
content: "Multi-player collaboration",
3438
className: "--on",
3539
},
3640
// {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ const ProjectPage = () => {
109109
<h5> Cloud Native Patterns</h5>
110110
</div>
111111
</Link>
112-
<Link to="/catalog" className="project__card ten">
112+
<Link to="/cloud-native-management/catalog" className="project__card ten">
113113
<div className="project__card-container project__card-container_nighthawk">
114114
<img src={catalog} alt="Catalog" />
115115
<h5>Catalog</h5>

‎src/sections/gitops/SnapshotPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const SnapshotPage = () => {
2121
<TextColumn>
2222
<Heading>Visual insights in every pull request</Heading>
2323
<Description>
24-
Test your Kubernetes cluster and service mesh implementation for conformance with the SMI specification
24+
Verify your workload designs and Kubernetes cluster configurations prior to accepting and merging pull requests.
2525
</Description>
2626
<Button primary className="learn-more-btn" title="INSTALL" url="https://meshery.layer5.io/connect/github/new"/>
2727
</TextColumn>

0 commit comments

Comments
 (0)