Skip to content

Commit 054ae09

Browse files
authored
Merge branch 'master' into issue#6399
2 parents e2413b5 + d35e880 commit 054ae09

4 files changed

Lines changed: 44 additions & 24 deletions

File tree

src/assets/data/tutorials/index.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,24 @@ const data = [
156156
}
157157
]
158158
},
159+
{
160+
date: "Apr. 30, 2025",
161+
topic: "Meshery CLI",
162+
resources: {
163+
slides: "https://docs.google.com/presentation/d/1lRop7DAAMUBmuFdzZK25LdQrkLG08eVsXEaDrauP3S8/edit?usp=sharing",
164+
recording: "https://youtu.be/aNR_1h1Pisg"
165+
},
166+
presenters: [
167+
{
168+
link: "/community/members/aadhitya-amarendiran",
169+
name: "Aadhitya Amarendiran"
170+
},
171+
{
172+
link: "/community/members/matthieu-evrin",
173+
name: "Matthieu Evrin"
174+
},
175+
],
176+
},
159177
];
160178

161179
export default data;

src/sections/Community/Handbook/instructions.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,15 @@ const GitHubOrgMembership = () => {
7272
<a id="TemplateMessage">
7373
{" "}
7474
<h4>
75-
<strong>Template Message for Invitations</strong>
75+
<strong>Group Message for Invitations</strong>
7676
</h4>{" "}
7777
</a>
7878

7979
<p>
80-
When you identify a worthy contributor, send the following message in a group DM that includes
81-
the individual and other maintainers/appropriate members:
80+
When you identify a worthy contributor, send a message in a group DM that includes
81+
the individual and other maintainers/appropriate members: look in Community Managers'
82+
docs to see some examples.
8283
</p>
83-
<div className="message-template" style={{ marginBottom: "2rem" }}>
84-
<code>"Hi [name], a number of community members have noticed your recent efforts, which don't go unappreciated. You've been consistent with your engagement: both contributing yourself and providing helpful feedback to others here. As a token of recognition and to enable you to be even more impactful, we would also like to invite you to be a part of the Meshery GitHub organization. With your GitHub user as a member of the org, you may not only proudly display the Meshery badge on your user profile, but your user will also be empowered with issue triage/edit permissions org-wide. As you consider this, please know that accepting this invitation bears the responsibility of being a faithful steward of the community and representative of Layer5's values."</code>
85-
</div>
8684

8785
<a id="SendingInvitation">
8886
{" "}

src/sections/General/Footer/index.js

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ const Footer = ({ location }) => {
4343
"/programs",
4444
"/projects/",
4545
"/resources/",
46-
"/service-mesh-books/",
47-
"/service-mesh-labs/",
4846
"/service-mesh-workshops/",
4947
].some((check) => {
5048
returnPath = check;
@@ -112,11 +110,21 @@ const Footer = ({ location }) => {
112110
Docs
113111
</a>
114112
</li>
113+
<li>
114+
<a className="category-link" href="https://cloud.layer5.io/academy/overview">
115+
Academy
116+
</a>
117+
</li>
115118
<li>
116119
<Link className="category-link" to="/blog">
117120
Blog
118121
</Link>
119122
</li>
123+
<li>
124+
<a className="category-link" href="https://docs.layer5.io/videos">
125+
Videos
126+
</a>
127+
</li>
120128
<li>
121129
<Link className="category-link" to="/learn/learning-paths">
122130
Learning Paths
@@ -127,14 +135,6 @@ const Footer = ({ location }) => {
127135
Resource Library
128136
</Link>
129137
</li> */}
130-
<li>
131-
<Link
132-
className="category-link"
133-
to="/learn/service-mesh-books"
134-
>
135-
Service Mesh Books
136-
</Link>
137-
</li>
138138
<li>
139139
<Link
140140
className="category-link"
@@ -143,14 +143,6 @@ const Footer = ({ location }) => {
143143
Cloud Native Workshops
144144
</Link>
145145
</li>
146-
<li>
147-
<Link
148-
className="category-link"
149-
to="/service-mesh-landscape"
150-
>
151-
Service Mesh Comparison
152-
</Link>
153-
</li>
154146
{/* <li>
155147
<Link
156148
className="category-link"

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,18 @@ const Data = {
280280
sepLine: true,
281281
externalLink: true,
282282
},
283+
{
284+
name: "Academy",
285+
path: "https://cloud.layer5.io/academy/overview",
286+
sepLine: true,
287+
externalLink: true,
288+
},
289+
{
290+
name: "Videos",
291+
path: "https://docs.layer5.io/videos",
292+
sepLine: true,
293+
externalLink: true,
294+
},
283295
// {
284296
// name: "News",
285297
// path: "/news",

0 commit comments

Comments
 (0)