Skip to content

Commit

Permalink
Merge branch 'master' into gatsby-v5-migration
Browse files Browse the repository at this point in the history
Signed-off-by: Randy Lau <[email protected]>
  • Loading branch information
randychilau committed Sep 11, 2023
2 parents 8b41085 + 3f93e5c commit dd155a7
Show file tree
Hide file tree
Showing 21 changed files with 91 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ title: "Unlocking the Power of WebAssembly in Service Mesh Management"
subtitle: "Layer5 and Intel Collaboration"
date: 2023-09-05 10:30:05 -0530
author: Lee Calcote
thumbnail: "../../../../assets/images/partners/intel-colorMode.svg"
thumbnail: "../../../../assets/images/partners/intel-grey.svg"
darkthumbnail: "../../../../assets/images/partners/intel_white.svg"

category: "Partners"
description: "This is a short summary of my blog post. This text will show in the blog's list view and in community newsletters."
tags:
Expand Down Expand Up @@ -108,4 +109,4 @@ Stay tuned for more exciting updates in the world of service mesh management wit
- [Get Started with Meshery](https://meshery.io/get-started)
- [Try Meshery in the Cloud Native Playground](https://play.meshery.io)

</BlogWrapper>
</BlogWrapper>
4 changes: 2 additions & 2 deletions src/collections/members/ananya-gautam/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ linkedin: ananya-gautam-7342b4201
layer5: 04079145-d65d-4d0f-a40e-533d358bea83
location: Bikaner, Rajasthan.
bio: I am a Birla Institute of Technology and Science, Pilani University senior. My journey involves hands-on learning and practical application of technology. With active contributions to Layer5, I'm committed to advancing its projects. Feel free to connect with me for tech discussions—I'm always eager to connect with fellow enthusiasts and contribute meaningfully.
status: Active
status: Inactive
published: true
---
---
Binary file not shown.
12 changes: 12 additions & 0 deletions src/collections/members/aritra-majumder/index.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Aritra Majumder
position: Contributor
image_path: ./aritra-majumder.webp
github: Aritra8438
linkedin: aritra-majumder-juee23
layer5: 1b462fee-7808-4a79-a504-9c4e986f32b9
location: Kolkata, West Bengal, India
bio: "Hi, I'm Aritra, currently pursuing Master's in Computer science at Chennai Mathematical Institute. I'm also a software (backend-focused) developer and open-source enthusiast.I'm currently a Google Summer of Code '23 contributor at Mathesar. Besides development, I love mathematics, soccer and anime."
status: Active
published: true
---
15 changes: 15 additions & 0 deletions src/collections/members/prem-kumar/index.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: Prem Kumar
position: Contributor
image_path: ./prem-kumar.webp
github: Modern-artist
twitter: Modern_a_r_t
linkedin: modernartist
layer5: 167d8552-85f4-4b19-9bd7-9eedfa4c2029
location: Jamshedpur, India
bio: Hello, I'm Prem Kumar, a versatile UI/UX designer and full-stack web developer. With a strong passion for crafting immersive digital experiences, I specialize in creating visually stunning interfaces that seamlessly merge aesthetics with functionality. My expertise in front-end and back-end development ensures that my designs come to life with flawless execution. I'm committed to delivering exceptional results that surpass client expectations, driven by my unwavering dedication to creating intuitive and engaging user journeys.
badges:
- ui-ux
status: Active
published: true
---
Binary file not shown.
14 changes: 0 additions & 14 deletions src/collections/members/suhail-khan/index.mdx

This file was deleted.

Binary file not shown.
13 changes: 13 additions & 0 deletions src/collections/members/vaibhav-malik/index.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
name: Vaibhav Malik
position: Contributor
image_path: ./vaibhav-malik.webp
github: VaibhavMalik4187
linkedin: vaibhavmalik4187
layer5: 495185a6-7aa4-4c66-a7ff-2e5e7e7c9768
location: India
bio: "Hi, I am an ardent advocate of open-source initiatives, presently engrossed in the realms of DevOps and Backend development. I have had the privilege of participating as a mentee in the Google Summer of Code (GSoC) program under the aegis of Inkscape for two consecutive years. Moreover, during the recent summer term, I undertook an internship at Sprinklr, situated in Gurgaon, where I assumed the role of a Product Engineer.
I hold a distinct inclination towards C and C++, considering them as my primary programming preferences. Should you require any assistance in embarking upon open-source contributions, please do not hesitate to reach out to me. Your inquiries are most welcome."
status: Active
published: true
---
Binary file not shown.
10 changes: 3 additions & 7 deletions src/components/Corner-popup/closeIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/Corner-popup/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import Button from "../../reusecore/Button";
import { ReactComponent as CloseIcon } from "./closeIcon.svg";
import popupImageSmall from "./power-of-meshery-small.svg";
import popupImageSmall from "./power-of-meshery-small.png";
import CornerPopupWrapper from "./popup.style";

const CornerPopup = () => {
Expand All @@ -28,7 +28,7 @@ const CornerPopup = () => {
<a href="https://play.meshery.io/">
<img className="popup-image" src={popupImageSmall} />
</a>
<Button $primary className="explore-playground-button" title="Explore Meshery Playground" $url="https://play.meshery.io/" $external={true}/>
<Button $primary className="explore-playground-button" title="Access Playground" $url="https://play.meshery.io/" $external={true}/>
</div>
</div>
</div>
Expand Down
30 changes: 17 additions & 13 deletions src/components/Corner-popup/popup.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,45 @@ const CornerPopupWrapper = styled.div`
bottom: 0;
right: 0;
margin: 0 2rem 3rem 0;
max-width: 30%;
max-height: 40%;
width: 100%;
width: 26rem;
/* background-color: ${props => props.theme.blackToWhite}; */
background-color: transparent;
z-index: 9999;
display: flex;
justify-content: center;
align-items: center;
/* box-shadow: rgba(0, 0, 0, 0.4) 0px 2px 10px; */
@media only screen and (max-width: 1000px) {
max-width: 40%;
max-height: 40%;
max-width: 22rem;
}
@media only screen and (max-width: 640px) {
width: 20rem;
max-width: 55%;
}
}
.popup-inner {
position: relative;
width: 100%;
max-width: 30rem;
background-color: ${props => props.theme.blackToWhite};
display: flex;
flex-direction: column;
justify-content: center;
gap: 1rem;
gap: 0.75rem;
align-items: center;
padding: 7%;
padding: 1rem;
border: 1px solid #00d3a9;
border-radius: 5%;
box-shadow: 0 0 30px rgba(0,211,169, 0.6);
@media only screen and (max-width: 640px) {
padding: 0.5rem;
gap: 0.375rem;
}
}
.close-btn {
position: absolute;
top: 0;
right: 0;
/* width: 8%; */
top: 0rem;
right: 0rem;
cursor: pointer;
}
.popup-image{
Expand All @@ -57,15 +61,15 @@ const CornerPopupWrapper = styled.div`
.explore-playground-button {
min-width: 140px;
@media only screen and (max-width: 422px) {
font-size: 0.9rem;
font-size: 0.75rem;
min-width: 100px;
}
}
svg {
.closeIcon_svg__cls-1{
stop-color: ${props => props.theme.whiteToBlack};
fill: ${props => props.theme.whiteToBlack};
}
}
`;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/pages/community/handbook/community-roles.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ const ContributorJourney = () => {
};
export default ContributorJourney;
export const Head = () => {
return <SEO title="Contributor Journey" description="Description of the different roles in the Layer5 community" />;
};
return <SEO title="Community Roles" description="Description of the different roles in the Layer5 community" />;
};
2 changes: 1 addition & 1 deletion src/pages/community/handbook/faq.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ const Faq = () => {
};
export default Faq;
export const Head = () => {
return <SEO title="FAQ" description="Frequently Asked Questions" />;
return <SEO title="FAQ" description="General Frequently Asked Questions" />;
};
10 changes: 5 additions & 5 deletions src/sections/General/Navigation/utility/menu-items.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ const Data = {
name: "Solutions",
path: "/cloud-native-management/meshmap",
subItems: [
// {
// name: "Image Hub",
// path: "/projects/image-hub",
// sepLine: true
// },
{
name: "Developer-defined Infrastructure",
path: "/cloud-native-management/meshmap",
sepLine: true
},
{
name: "Cloud Native Deployments by Diagram",
path: "/cloud-native-management/meshmap/design",
sepLine: true
},
{
name: "Kubernetes Multi-cluster Operation",
path: "/cloud-native-management/meshmap/visualize",
sepLine: true
},
{
name: "Collaborative GitOps",
path: "/cloud-native-management/meshmap/collaborate",
sepLine: true
},
{
name: "GitOps with Cloud Native Insights",
path: "/cloud-native-management/gitops",
sepLine: true
},
],
actionItems: [
Expand Down
4 changes: 2 additions & 2 deletions src/sections/subscribe/subscribe.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const subscribe = ({ msg = "Stay meshy" }) => {
<SubscribeWrapper>
<div className="parentcard">
<form name="contactform" method="post" action="https://calcotestudios.us15.list-manage.com/subscribe/post?u=6b50be5aea3dfe1fd4c041d80&amp;id=6bb65defeb">
<Row>
<Row $Vcenter>
<Col $md={6}>
<SectionTitle className="section-title" $UniWidth="100%">
<SectionTitle className="section-title" UniWidth="100%">
<h2><span className="meshy">{msg}</span> and subscribe!</h2>
</SectionTitle>
</Col>
Expand Down
11 changes: 10 additions & 1 deletion src/sections/subscribe/subscribe.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const SubscribeWrapper = styled.div`
}
#mc-embedded-subscribe{
margin: 1.5rem 0.3125rem 0;
margin: 1.5625rem 0.3125rem 0;
background: linear-gradient(123deg, #00b39f 60%, #00b39f 100%);
}
#mc-embedded-subscribe:hover{
Expand Down Expand Up @@ -101,8 +101,17 @@ const SubscribeWrapper = styled.div`
margin:1.5625rem 0;
width:100%;
}
.email-cont{
justify-content:center;
display:flex;
align-items:center;
}
#mc-embedded-subscribe{
margin: 0 0.3125rem;
}
.email-cont div{
padding:0;
width:50%;
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/templates/blog-single.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const query = graphql`query BlogsBySlug($slug: String!) {
frontmatter {
title
subtitle
description
date(formatString: "MMMM Do, YYYY")
author
category
Expand Down Expand Up @@ -62,5 +63,5 @@ export default BlogSinglePage;


export const Head = ({ data }) => {
return <SEO title={data.mdx.frontmatter.title} image={data.mdx.frontmatter.thumbnail.publicURL} />;
return <SEO title={data.mdx.frontmatter.title} image={data.mdx.frontmatter.thumbnail.publicURL} description={data.mdx.frontmatter.description} />;
};
3 changes: 2 additions & 1 deletion src/templates/resource-single.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const query = graphql`query ResourcesBySlug($slug: String!) {
author
category
tags
description
thumbnail {
childImageSharp {
gatsbyImageData(width: 500, layout: CONSTRAINED)
Expand Down Expand Up @@ -54,5 +55,5 @@ const ResourceSinglePage = ({ data }) => {
export default ResourceSinglePage;

export const Head = ({ data }) => {
return <SEO title={data.mdx.frontmatter.title} image={data.mdx.frontmatter.thumbnail.publicURL} />;
return <SEO title={data.mdx.frontmatter.title} image={data.mdx.frontmatter.thumbnail.publicURL} description={data.mdx.frontmatter.description}/>;
};

0 comments on commit dd155a7

Please sign in to comment.