Skip to content

Commit 07e42b5

Browse files
SplinterSwordSplinterSword
authored
Merge branch 'master' into addMenu
Signed-off-by: Sparsh Jain <[email protected]>
2 parents dc7b087 + 5176139 commit 07e42b5

File tree

6 files changed

+107
-78
lines changed

6 files changed

+107
-78
lines changed

‎.github/assets/images/Layer5Academy/academy.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,17 @@ alt="Meshery Catalog" align="left" />
134134
<br /><br /><br />
135135
</p>
136136

137+
<!-- Layer 5 academy -->
138+
<p style="clear:both;">
139+
<h2><a href="https://cloud.layer5.io/academy">Layer5 Academy</a></h2>
140+
<a href="https://cloud.layer5.io/academy">
141+
<img src=".github/assets/images/Layer5Academy/academy.svg" style="margin:10px;" width="125px" alt="Layer5 Academy" align="left" />
142+
</a>
143+
<a href="https://cloud.layer5.io/academy">Layer5 Academy</a> Layer5 Academy is a learning platform built into Layer5 Cloud. It offers structured learning paths, interactive challenges, and professional certifications. Content spans beginner to advanced levels, helping both developers and organizations skill up in cloud native technologies.
144+
<br /><br /><br/>
145+
</p>
146+
<br />
147+
137148
<p style="clear:both;">
138149
<h1><a name="contributing"></a><a name="community"></a> <a href="https://layer5.io/community">Community</a> and <a href="https://layer5.io/community/handbook">Contributions</a></h1>
139150
<p> We warmly welcome all contributors! Our projects are community-built and each welcomes open collaboration. As you get started, please review this project's <a href="https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md">contributing guidelines</a>. Whether you are a user or code contributor and whether you're opening an <a href="/../../issues">issue</a> or a <a href="/../../pulls">pull request</a>, know that any form of your engagement is considered contribution and is appreciated. Contributors are expected to adhere to the <a href="https://github.com/cncf/foundation/blob/master/code-of-conduct.md">CNCF Code of Conduct</a>.

‎src/components/SistentNavigation/content.js‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -80,51 +80,54 @@ export const content = [
8080
{ id: 58, link: "/projects/sistent/components/menu/code", text: "Menu" },
8181

8282
{ id: 59, link: "/projects/sistent/components/modal", text: "Modal" },
83-
{ id: 59, link: "/projects/sistent/components/modal/guidance", text: "Modal" },
84-
{ id: 60, link: "/projects/sistent/components/modal/code", text: "Modal" },
83+
{ id: 60, link: "/projects/sistent/components/modal/guidance", text: "Modal" },
84+
{ id: 61, link: "/projects/sistent/components/modal/code", text: "Modal" },
8585

86-
{ id: 61, link: "/projects/sistent/components/pagination", text: "Pagination" },
87-
{ id: 62, link: "/projects/sistent/components/pagination/guidance", text: "Pagination" },
88-
{ id: 63, link: "/projects/sistent/components/pagination/code", text: "Pagination" },
86+
{ id: 62, link: "/projects/sistent/components/pagination", text: "Pagination" },
87+
{ id: 63, link: "/projects/sistent/components/pagination/guidance", text: "Pagination" },
88+
{ id: 64, link: "/projects/sistent/components/pagination/code", text: "Pagination" },
8989

90-
{ id: 64, link: "/projects/sistent/components/paper", text: "Paper" },
91-
{ id: 65, link: "/projects/sistent/components/paper/guidance", text: "Paper" },
92-
{ id: 66, link: "/projects/sistent/components/paper/code", text: "Paper" },
90+
{ id: 65, link: "/projects/sistent/components/paper", text: "Paper" },
91+
{ id: 66, link: "/projects/sistent/components/paper/guidance", text: "Paper" },
92+
{ id: 67, link: "/projects/sistent/components/paper/code", text: "Paper" },
9393

94-
{ id: 67, link: "/projects/sistent/components/popper", text: "Popper" },
95-
{ id: 68, link: "/projects/sistent/components/popper/guidance", text: "Popper" },
96-
{ id: 69, link: "/projects/sistent/components/popper/code", text: "Popper" },
94+
{ id: 68, link: "/projects/sistent/components/popper", text: "Popper" },
95+
{ id: 69, link: "/projects/sistent/components/popper/guidance", text: "Popper" },
96+
{ id: 70, link: "/projects/sistent/components/popper/code", text: "Popper" },
9797

98-
{ id: 70, link: "/projects/sistent/components/radiogroup", text: "RadioGroup" },
99-
{ id: 78, link: "/projects/sistent/components/radiogroup/guidance", text: "RadioGroup" },
100-
{ id: 79, link: "/projects/sistent/components/radiogroup/code", text: "RadioGroup" },
98+
{ id: 71, link: "/projects/sistent/components/radiogroup", text: "RadioGroup" },
99+
{ id: 72, link: "/projects/sistent/components/radiogroup/guidance", text: "RadioGroup" },
100+
{ id: 73, link: "/projects/sistent/components/radiogroup/code", text: "RadioGroup" },
101101

102-
{ id: 80, link: "/projects/sistent/components/select", text: "Select" },
103-
{ id: 81, link: "/projects/sistent/components/select/guidance", text: "Select" },
104-
{ id: 82, link: "/projects/sistent/components/select/code", text: "Select" },
102+
{ id: 74, link: "/projects/sistent/components/select", text: "Select" },
103+
{ id: 75, link: "/projects/sistent/components/select/guidance", text: "Select" },
104+
{ id: 76, link: "/projects/sistent/components/select/code", text: "Select" },
105105

106-
{ id: 83, link: "/projects/sistent/components/switch", text: "Switch" },
107-
{ id: 84, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
108-
{ id: 85, link: "/projects/sistent/components/switch/code", text: "Switch" },
106+
{ id: 77, link: "/projects/sistent/components/stepper", text: "Stepper" },
107+
{ id: 78, link: "/projects/sistent/components/stepper/guidance", text: "Stepper" },
108+
{ id: 79, link: "/projects/sistent/components/stepper/code", text: "Stepper" },
109109

110-
{ id: 86, link: "/projects/sistent/components/tabs", text: "Tabs" },
111-
{ id: 87, link: "/projects/sistent/components/tabs/guidance", text: "Tabs" },
112-
{ id: 88, link: "/projects/sistent/components/tabs/code", text: "Tabs" },
110+
{ id: 80, link: "/projects/sistent/components/switch", text: "Switch" },
111+
{ id: 81, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
112+
{ id: 82, link: "/projects/sistent/components/switch/code", text: "Switch" },
113113

114-
{ id: 89, link: "/projects/sistent/components/text-field", text: "Text Field" },
115-
{ id: 90, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
116-
{ id: 91, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
114+
{ id: 83, link: "/projects/sistent/components/tabs", text: "Tabs" },
115+
{ id: 84, link: "/projects/sistent/components/tabs/guidance", text: "Tabs" },
116+
{ id: 85, link: "/projects/sistent/components/tabs/code", text: "Tabs" },
117117

118-
{ id: 92, link: "/projects/sistent/components/text-input", text: "Text Input" },
119-
{ id: 93, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
120-
{ id: 94, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
118+
{ id: 86, link: "/projects/sistent/components/text-field", text: "Text Field" },
119+
{ id: 87, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
120+
{ id: 88, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
121121

122-
{ id: 95, link: "/projects/sistent/components/toolbar", text: "Toolbar" },
123-
{ id: 96, link: "/projects/sistent/components/toolbar/guidance", text: "Toolbar" },
124-
{ id: 97, link: "/projects/sistent/components/toolbar/code", text: "Toolbar" },
122+
{ id: 89, link: "/projects/sistent/components/text-input", text: "Text Input" },
123+
{ id: 90, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
124+
{ id: 91, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
125+
126+
{ id: 92, link: "/projects/sistent/components/toolbar", text: "Toolbar" },
127+
{ id: 93, link: "/projects/sistent/components/toolbar/guidance", text: "Toolbar" },
128+
{ id: 94, link: "/projects/sistent/components/toolbar/code", text: "Toolbar" },
125129

126130
{ id: 95, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
127131
{ id: 96, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
128132
{ id: 97, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
129-
130133
];

‎src/sections/General/Navigation/index.js‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ const Navigation = () => {
168168
const [userData, setUserData] = useState(null);
169169
const dropDownRef = useRef();
170170
const navWrapRef = useRef();
171+
const accountDropdownRef = useRef();
172+
171173
function getCookieValue(cookieName) {
172174
const cookies = document.cookie.split(";");
173175

@@ -254,6 +256,18 @@ const Navigation = () => {
254256
closeDropDown();
255257
};
256258

259+
useEffect(() => {
260+
if (!dropDown) return;
261+
262+
const handleClickOutside = (e) => {
263+
if (!accountDropdownRef.current?.contains(e.target)) {
264+
setDropDown(false);
265+
}
266+
};
267+
268+
document.addEventListener("mousedown", handleClickOutside);
269+
return () => document.removeEventListener("mousedown", handleClickOutside);
270+
}, [dropDown]);
257271
return (
258272
<NavigationWrap
259273
className={`nav-block ${scroll ? "scrolled" : ""}`}
@@ -327,7 +341,11 @@ const Navigation = () => {
327341
changeDropdownState();
328342
closeDropDown();
329343
}}
330-
className={subItems.sepLine ? "mobile-sub-menu-item" : "mobile-nested-menu"}
344+
className={
345+
subItems.sepLine
346+
? "mobile-sub-menu-item"
347+
: "mobile-nested-menu"
348+
}
331349
activeClassName="nav-link-active"
332350
>
333351
{subItems.name}
@@ -337,8 +355,8 @@ const Navigation = () => {
337355
);
338356
})}
339357
{menu.actionItems !== undefined &&
340-
menu.actionItems.map((actionItem, index) => (
341-
(actionItem.actionName === "Join the discussion" ?
358+
menu.actionItems.map((actionItem, index) =>
359+
actionItem.actionName === "Join the discussion" ? (
342360
<a
343361
key={index}
344362
href={actionItem.actionLink}
@@ -351,10 +369,12 @@ const Navigation = () => {
351369
}}
352370
>
353371
<span className="readmore-btn">
354-
{actionItem.actionName} <IoIosArrowRoundForward />
372+
{actionItem.actionName}{" "}
373+
<IoIosArrowRoundForward />
355374
</span>
356375
</a>
357-
: <Link
376+
) : (
377+
<Link
358378
key={index}
359379
to={actionItem.actionLink}
360380
partiallyActive={true}
@@ -365,12 +385,12 @@ const Navigation = () => {
365385
}}
366386
>
367387
<span className="readmore-btn">
368-
{actionItem.actionName} <IoIosArrowRoundForward />
388+
{actionItem.actionName}{" "}
389+
<IoIosArrowRoundForward />
369390
</span>
370391
</Link>
371392
)
372-
))
373-
}
393+
)}
374394
</ul>
375395
</li>
376396
))}
@@ -412,7 +432,7 @@ const Navigation = () => {
412432
</div>
413433
<div className="meshery-cta">
414434
{userData ? (
415-
<div className="dropDown">
435+
<div className="dropDown" ref={accountDropdownRef}>
416436
<button
417437
className="avatar-container"
418438
style={{

‎src/sections/Kanvas/FeaturesSection/Collaborate/CollaboratorFeatures.js‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,33 +36,35 @@ export default function CollaboratorFeatures({ features }) {
3636
<img src={cursorOverArrow ? LinkArrow : LinkArrowDark} alt="Learn more" style={{ maxWidth: "15%" }} className={cursorOverArrow ? "arrow-enter" : "arrow"} />
3737
</div>
3838
</div>
39-
<div className="g-grid-container contentContainer" id="add-border">
39+
</Link>
40+
<div className="g-grid-container contentContainer" id="add-border">
41+
<Link to="/cloud-native-management/kanvas/collaborate">
4042
<div className="diagram scroll hideInMobile">
4143
<CollaboratorFeaturesDiagram activeExampleIndex={activeExampleIndex} />
4244
</div>
43-
<ul className="features collaborator-features">
44-
{features.map((feature, index) => (
45-
<li className="collaborator-feature-slide" key={index}>
46-
<Feature
47-
{...feature}
48-
onInViewStatusChanged={(state) => {
49-
const newStatusArray = [...viewportStatus];
50-
newStatusArray[index] = state;
51-
setViewportStatus(newStatusArray);
52-
// Calculate the first element in focus, set that as
53-
// our new activeExampleIndex. If it's been updated
54-
// notify the subscriber.
55-
const newExampleIndex = newStatusArray.lastIndexOf(true);
56-
if (activeExampleIndex !== newExampleIndex && newExampleIndex !== -1) {
57-
setActiveExampleIndex(newExampleIndex);
58-
}
59-
}}
60-
/>
61-
</li>
62-
))}
63-
</ul>
64-
</div>
65-
</Link>
45+
</Link>
46+
<ul className="features collaborator-features">
47+
{features.map((feature, index) => (
48+
<li className="collaborator-feature-slide" key={index}>
49+
<Feature
50+
{...feature}
51+
onInViewStatusChanged={(state) => {
52+
const newStatusArray = [...viewportStatus];
53+
newStatusArray[index] = state;
54+
setViewportStatus(newStatusArray);
55+
// Calculate the first element in focus, set that as
56+
// our new activeExampleIndex. If it's been updated
57+
// notify the subscriber.
58+
const newExampleIndex = newStatusArray.lastIndexOf(true);
59+
if (activeExampleIndex !== newExampleIndex && newExampleIndex !== -1) {
60+
setActiveExampleIndex(newExampleIndex);
61+
}
62+
}}
63+
/>
64+
</li>
65+
))}
66+
</ul>
67+
</div>
6668
</div>
6769
</Container>
6870
</CollaboratorFeaturesWrapper>

‎src/sections/Kanvas/FeaturesSection/Collaborate/CollaboratorFeatures.style.js‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,6 @@ const CollaboratorFeaturesWrapper = styled.section`
149149
}
150150
}
151151
152-
.collaborator-trigger-container {
153-
&:hover {
154-
.fixed {
155-
background: #EBC017;
156-
}
157-
#add-border {
158-
border-color: #EBC017;
159-
}
160-
}
161-
}
162-
163152
.fixed {
164153
top: 6rem;
165154
font-weight: 300;
@@ -172,14 +161,17 @@ const CollaboratorFeaturesWrapper = styled.section`
172161
@media (max-width: 912px) {
173162
top: 5rem;
174163
}
164+
&:hover{
165+
background: #00d3a9;
166+
}
175167
}
176168
177169
#add-border {
178170
border-color: #00b39f;
179171
border-style: solid;
180172
border-width: 0px 2px 2px 2px;
181173
box-shadow: 0px 6px 5px 0px rgb(0 0 0 / 25%);
182-
transition: all 250ms cubic-bezier(0.25, 0.46, 0.45, 0.94) 0s;
174+
transition: ease-in-out;
183175
}
184176
185177
.hideInMobile{

0 commit comments

Comments
 (0)