Skip to content

Commit 68260b2

Browse files
GitWizzzGitWizzz
authored
Merge branch 'master' into fix/privacy-overlay
2 parents 2d19c3e + 41ac263 commit 68260b2

10 files changed

Lines changed: 851 additions & 76 deletions

File tree

‎src/collections/integrations/k8s-config-connector/index.mdx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,12 +2678,6 @@ components: [
26782678
"colorIcon": "icons/components/billing-account/icons/color/billing-account-color.svg",
26792679
"whiteIcon": "icons/components/billing-account/icons/white/billing-account-white.svg",
26802680
"description": "",
2681-
},
2682-
{
2683-
"name": "iam-deny-policy",
2684-
"colorIcon": "icons/components/iam-deny-policy/icons/color/iam-deny-policy-color.svg",
2685-
"whiteIcon": "icons/components/iam-deny-policy/icons/white/iam-deny-policy-white.svg",
2686-
"description": "",
26872681
}]
26882682
featureList: [
26892683
"Provides a wide range of cloud services",

‎src/components/Pricing/PricingAddons/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
350350
const totalPrice = pricePerUser * option.learners * multiplier;
351351
const period = isYearly ? "/year" : "/month";
352352
return `${option.learners} learners - ${formatPrice(totalPrice)}${period}`;
353-
}
353+
}
354354
return "";
355355
}}
356356
max={(() => {
@@ -574,4 +574,4 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
574574
</CssBaseline>
575575
</SistentThemeProvider>
576576
);
577-
};
577+
};

‎src/components/SistentNavigation/content.js‎

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -57,61 +57,68 @@ export const content = [
5757
{ id: 38, link: "/projects/sistent/components/grid/guidance", text: "Grid" },
5858
{ id: 39, link: "/projects/sistent/components/grid/code", text: "Grid" },
5959

60-
{ id: 40, link: "/projects/sistent/components/icons", text: "Icons" },
60+
{ id: 40, link: "/projects/sistent/components/iconbutton", text: "IconButton" },
61+
{ id: 41, link: "/projects/sistent/components/iconbutton/guidance", text: "IconButton" },
62+
{ id: 42, link: "/projects/sistent/components/iconbutton/code", text: "IconButton" },
6163

62-
{ id: 41, link: "/projects/sistent/components/link", text: "Link" },
63-
{ id: 42, link: "/projects/sistent/components/link/guidance", text: "Link" },
64-
{ id: 43, link: "/projects/sistent/components/link/code", text: "Link" },
64+
{ id: 43, link: "/projects/sistent/components/icons", text: "Icons" },
6565

66-
{ id: 44, link: "/projects/sistent/components/list", text: "List" },
67-
{ id: 45, link: "/projects/sistent/components/list/guidance", text: "List" },
68-
{ id: 46, link: "/projects/sistent/components/list/code", text: "List" },
66+
{ id: 44, link: "/projects/sistent/components/link", text: "Link" },
67+
{ id: 45, link: "/projects/sistent/components/link/guidance", text: "Link" },
68+
{ id: 46, link: "/projects/sistent/components/link/code", text: "Link" },
6969

70-
{ id: 47, link: "/projects/sistent/components/modal", text: "Modal" },
71-
{ id: 48, link: "/projects/sistent/components/modal/guidance", text: "Modal" },
72-
{ id: 49, link: "/projects/sistent/components/modal/code", text: "Modal" },
70+
{ id: 47, link: "/projects/sistent/components/list", text: "List" },
71+
{ id: 48, link: "/projects/sistent/components/list/guidance", text: "List" },
72+
{ id: 49, link: "/projects/sistent/components/list/code", text: "List" },
7373

74-
{ id: 50, link: "/projects/sistent/components/pagination", text: "Pagination" },
75-
{ id: 51, link: "/projects/sistent/components/pagination/guidance", text: "Pagination" },
76-
{ id: 52, link: "/projects/sistent/components/pagination/code", text: "Pagination" },
74+
{ id: 50, link: "/projects/sistent/components/modal", text: "Modal" },
75+
{ id: 51, link: "/projects/sistent/components/modal/guidance", text: "Modal" },
76+
{ id: 52, link: "/projects/sistent/components/modal/code", text: "Modal" },
7777

78-
{ id: 53, link: "/projects/sistent/components/paper", text: "Paper" },
79-
{ id: 54, link: "/projects/sistent/components/paper/guidance", text: "Paper" },
80-
{ id: 55, link: "/projects/sistent/components/paper/code", text: "Paper" },
78+
{ id: 53, link: "/projects/sistent/components/pagination", text: "Pagination" },
79+
{ id: 54, link: "/projects/sistent/components/pagination/guidance", text: "Pagination" },
80+
{ id: 55, link: "/projects/sistent/components/pagination/code", text: "Pagination" },
8181

82-
{ id: 56, link: "/projects/sistent/components/popper", text: "Popper" },
83-
{ id: 57, link: "/projects/sistent/components/popper/guidance", text: "Popper" },
84-
{ id: 58, link: "/projects/sistent/components/popper/code", text: "Popper" },
82+
{ id: 56, link: "/projects/sistent/components/paper", text: "Paper" },
83+
{ id: 57, link: "/projects/sistent/components/paper/guidance", text: "Paper" },
84+
{ id: 58, link: "/projects/sistent/components/paper/code", text: "Paper" },
8585

86-
{ id: 59, link: "/projects/sistent/components/radiogroup", text: "RadioGroup" },
87-
{ id: 60, link: "/projects/sistent/components/radiogroup/guidance", text: "RadioGroup" },
88-
{ id: 61, link: "/projects/sistent/components/radiogroup/code", text: "RadioGroup" },
86+
{ id: 59, link: "/projects/sistent/components/popper", text: "Popper" },
87+
{ id: 60, link: "/projects/sistent/components/popper/guidance", text: "Popper" },
88+
{ id: 61, link: "/projects/sistent/components/popper/code", text: "Popper" },
8989

90-
{ id: 62, link: "/projects/sistent/components/select", text: "Select" },
91-
{ id: 63, link: "/projects/sistent/components/select/guidance", text: "Select" },
92-
{ id: 64, link: "/projects/sistent/components/select/code", text: "Select" },
90+
{ id: 62, link: "/projects/sistent/components/radiogroup", text: "RadioGroup" },
91+
{ id: 63, link: "/projects/sistent/components/radiogroup/guidance", text: "RadioGroup" },
92+
{ id: 64, link: "/projects/sistent/components/radiogroup/code", text: "RadioGroup" },
9393

94-
{ id: 65, link: "/projects/sistent/components/switch", text: "Switch" },
95-
{ id: 66, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
96-
{ id: 67, link: "/projects/sistent/components/switch/code", text: "Switch" },
94+
{ id: 65, link: "/projects/sistent/components/select", text: "Select" },
95+
{ id: 66, link: "/projects/sistent/components/select/guidance", text: "Select" },
96+
{ id: 67, link: "/projects/sistent/components/select/code", text: "Select" },
9797

98-
{ id: 68, link: "/projects/sistent/components/tabs", text: "Tabs" },
99-
{ id: 69, link: "/projects/sistent/components/tabs/guidance", text: "Tabs" },
100-
{ id: 70, link: "/projects/sistent/components/tabs/code", text: "Tabs" },
98+
{ id: 68, link: "/projects/sistent/components/switch", text: "Switch" },
99+
{ id: 69, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
100+
{ id: 70, link: "/projects/sistent/components/switch/code", text: "Switch" },
101101

102-
{ id: 71, link: "/projects/sistent/components/text-field", text: "Text Field" },
103-
{ id: 72, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
104-
{ id: 73, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
102+
{ id: 71, link: "/projects/sistent/components/tabs", text: "Tabs" },
103+
{ id: 72, link: "/projects/sistent/components/tabs/guidance", text: "Tabs" },
104+
{ id: 73, link: "/projects/sistent/components/tabs/code", text: "Tabs" },
105+
106+
{ id: 74, link: "/projects/sistent/components/text-field", text: "Text Field" },
107+
{ id: 75, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
108+
{ id: 76, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
109+
110+
{ id: 77, link: "/projects/sistent/components/text-input", text: "Text Input" },
111+
{ id: 78, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
112+
{ id: 79, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
113+
114+
{ id: 80, link: "/projects/sistent/components/toolbar", text: "Toolbar" },
115+
{ id: 81, link: "/projects/sistent/components/toolbar/guidance", text: "Toolbar" },
116+
{ id: 82, link: "/projects/sistent/components/toolbar/code", text: "Toolbar" },
117+
118+
{ id: 83, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
119+
{ id: 84, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
120+
{ id: 85, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
105121

106-
{ id: 74, link: "/projects/sistent/components/text-input", text: "Text Input" },
107-
{ id: 75, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
108-
{ id: 76, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
109122

110-
{ id: 77, link: "/projects/sistent/components/toolbar", text: "Toolbar" },
111-
{ id: 78, link: "/projects/sistent/components/toolbar/guidance", text: "Toolbar" },
112-
{ id: 79, link: "/projects/sistent/components/toolbar/code", text: "Toolbar" },
113123

114-
{ id: 80, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
115-
{ id: 81, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
116-
{ id: 82, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
117124
];

‎src/sections/Partners/partner.style.js‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@ const PartnerWrapper = styled.section`
238238
.moreInfo-div{
239239
height:0;
240240
overflow: hidden;
241-
transition: all 0.5s ease-in-out;
242-
241+
transition: all 0.5s ease-in-out;
243242
}
244243
.moreInfo-div-active{
245244
height: 34rem;
@@ -343,6 +342,13 @@ const PartnerWrapper = styled.section`
343342
flex-direction:column;
344343
width:90%;
345344
}
345+
.anchor h2 {
346+
text-align: left;
347+
letter-spacing: normal;
348+
word-spacing: normal;
349+
font-size: 2rem;
350+
line-height: 1.3;
351+
}
346352
.partner-container{
347353
.partner-container-body{
348354
width:100%;
@@ -443,6 +449,13 @@ const PartnerWrapper = styled.section`
443449
flex-direction: column;
444450
width: 100%;
445451
}
452+
.anchor h2{
453+
text-align: left;
454+
letter-spacing: normal;
455+
word-spacing: normal;
456+
font-size: 2rem;
457+
line-height: 1.3;
458+
}
446459
.mobview{
447460
width: 100%;
448461
}
@@ -483,6 +496,13 @@ const PartnerWrapper = styled.section`
483496
.mobview{
484497
width: 100%;
485498
}
499+
.anchor h2{
500+
text-align: left;
501+
letter-spacing: normal;
502+
word-spacing: normal;
503+
font-size: 2rem;
504+
line-height: 1.3;
505+
}
486506
.acc-cont{
487507
display: flex;
488508
flex-direction: column;
@@ -532,6 +552,13 @@ const PartnerWrapper = styled.section`
532552
max-width: unset;
533553
width: 100%;
534554
}
555+
.anchor h2 {
556+
text-align: left;
557+
letter-spacing: normal;
558+
word-spacing: normal;
559+
font-size: 2rem;
560+
line-height: 1.3;
561+
}
535562
.moreInfo-div-active{
536563
height: 70rem;
537564
display: flex;

‎src/sections/Partners/partners.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@ export const partners = [
3636
imageLink: partner2,
3737
imageRoute: "https://layer5.io/programs/gsoc",
3838
moreInfo: "Google Summer of Code is a global program focused on bringing more student developers into open source software development. Students work with an open source organization on a 3 month programming project during their break from school. Learn more about our mentoring",
39-
}, {
40-
name: "University of Engineering & Management Jaipur",
41-
desc: "We have officially partnered with the University of Engineering & Management (UEM), Jaipur. We thank the faculty of UEM Jaipur for partnering with us. As part of the partnership program we have a wide variety of interns from the university participating in our open source projects. The interns have the opportunity to work on a variety of cloud native technologies.Based on the area of their individual interest they can choose the technologies they want to learn or sharpen their skills. Learn more about Layer5's internships",
42-
//link: "/careers/internships",
43-
type: "academic",
44-
imageLink: partner3,
45-
partnerId: "uem",
46-
//imageRoute: "https://uem.edu.in/blog/what-is-open-source/",
47-
moreInfo: "We have officially partnered with the University of Engineering & Management (UEM), Jaipur. We thank the faculty of UEM Jaipur for partnering with us. As part of the partnership program we have a wide variety of interns from the university participating in our open source projects. The interns have the opportunity to work on a variety of cloud native technologies.Based on the area of their individual interest they can choose the technologies they want to learn or sharpen their skills. Learn more about Layer5's internships",
4839
}, {
4940
name: "Citrix",
5041
desc: "Citrix ADC is an application delivery and load balancing solution that provides a high-quality user experience for your web, traditional, and cloud-native applications regardless of where they are hosted. It comes in a wide variety of form factors and deployment options without locking you into a single cloud. Pooled capacity licensing enables the movement of capacity among cloud deployments.",

‎src/sections/Pricing/feature_data.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
"teamOperator": "x",
190190
"enterprise": "x"
191191
},
192-
"docs": ""
192+
"docs": "https://docs.meshery.io/guides/infrastructure-management/registering-a-connection#infrastructure-discovery"
193193
},
194194
{
195195
"theme": "",
@@ -221,7 +221,7 @@
221221
"teamOperator": "x",
222222
"enterprise": "x"
223223
},
224-
"docs": ""
224+
"docs": "https://docs.layer5.io/cloud/spaces/environments/"
225225
},
226226
{
227227
"theme": "",
@@ -253,7 +253,7 @@
253253
"teamOperator": "x",
254254
"enterprise": "x"
255255
},
256-
"docs": "https://docs.layer5.io/kanvas/operator/operator-views/"
256+
"docs": "https://docs.layer5.io/cloud/catalog/metrics/"
257257
},
258258
{
259259
"theme": "",
@@ -269,7 +269,7 @@
269269
"teamOperator": "x",
270270
"enterprise": "x"
271271
},
272-
"docs": ""
272+
"docs": "https://docs.layer5.io/kanvas/operator/views/#managing-views"
273273
},
274274
{
275275
"theme": "",
@@ -285,7 +285,7 @@
285285
"teamOperator": "x",
286286
"enterprise": "x"
287287
},
288-
"docs": "https://docs.layer5.io/kanvas/operator/operator-views/#5-export-a-view"
288+
"docs": "https://docs.layer5.io/kanvas/operator/views/#5-export-a-view"
289289
},
290290
{
291291
"theme": "",
@@ -301,7 +301,7 @@
301301
"teamOperator": "x",
302302
"enterprise": "x"
303303
},
304-
"docs": "https://docs.layer5.io/kanvas/operator/operator-views/#3-share-a-view"
304+
"docs": "https://docs.layer5.io/kanvas/operator/views/#3-share-a-view"
305305
},
306306
{
307307
"theme": "",
@@ -317,7 +317,7 @@
317317
"teamOperator": "x",
318318
"enterprise": "x"
319319
},
320-
"docs": ""
320+
"docs": "https://docs.layer5.io/kanvas/operator/#understanding-log-streamer"
321321
},
322322
{
323323
"theme": "",
@@ -333,7 +333,7 @@
333333
"teamOperator": "x",
334334
"enterprise": "x"
335335
},
336-
"docs": ""
336+
"docs": "https://docs.meshery.io/installation/kubernetes"
337337
},
338338
{
339339
"theme": "",
@@ -349,7 +349,7 @@
349349
"teamOperator": "x",
350350
"enterprise": "x"
351351
},
352-
"docs": ""
352+
"docs": "https://docs.meshery.io/concepts/architecture/meshsync#meshsync-1"
353353
},
354354
{
355355
"theme": "",
@@ -765,7 +765,7 @@
765765
"teamOperator": "x",
766766
"enterprise": "x"
767767
},
768-
"docs": ""
768+
"docs": "https://docs.layer5.io/cloud/spaces/workspaces/"
769769
},
770770
{
771771
"theme": "",
@@ -797,7 +797,7 @@
797797
"teamOperator": "x",
798798
"enterprise": "x"
799799
},
800-
"docs": ""
800+
"docs": "https://docs.layer5.io/cloud/spaces/managing-workspaces/"
801801
},
802802
{
803803
"theme": "",
@@ -813,7 +813,7 @@
813813
"teamOperator": "x",
814814
"enterprise": "x"
815815
},
816-
"docs": ""
816+
"docs": "https://docs.layer5.io/cloud/tutorials/sharing-a-workspace/"
817817
},
818818
{
819819
"theme": "",
@@ -829,7 +829,7 @@
829829
"teamOperator": "",
830830
"enterprise": "x"
831831
},
832-
"docs": ""
832+
"docs": "https://docs.layer5.io/cloud/github-actions/"
833833
},
834834
{
835835
"theme": "",
@@ -925,7 +925,7 @@
925925
"teamOperator": "x",
926926
"enterprise": "x"
927927
},
928-
"docs": ""
928+
"docs": "https://docs.layer5.io/cloud/catalog/exploring-the-catalog/"
929929
},
930930
{
931931
"theme": "",

‎src/sections/Projects/Sistent/components/content.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,13 @@ const componentsData = [
216216
"url": "/projects/sistent/components/chip",
217217
"src": "/chip",
218218
},
219+
{
220+
id: 29,
221+
name: "IconButton",
222+
description: "IconButton provides an interactive button component that displays only an icon, ideal for compact UIs where space is limited and actions are easily recognizable through iconography.",
223+
url: "/projects/sistent/components/iconbutton",
224+
src: "/iconbutton",
225+
},
219226
];
220227

221228
module.exports = { componentsData };

0 commit comments

Comments
 (0)