Skip to content

Commit

Permalink
Merge branch 'master' into webp
Browse files Browse the repository at this point in the history
  • Loading branch information
Shivam-AfA committed Jun 4, 2023
2 parents b3243b2 + 1e81720 commit 1657ef2
Show file tree
Hide file tree
Showing 44 changed files with 1,323 additions and 127 deletions.
36 changes: 18 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -50,7 +50,7 @@
"gatsby-background-image": "^1.6.0",
"gatsby-cli": "^5.5.0",
"gatsby-plugin-anchor-links": "^1.2.1",
"gatsby-plugin-feed": "^4.24.0",
"gatsby-plugin-feed": "^4.25.0",
"gatsby-plugin-image": "^2.22.0",
"gatsby-plugin-loadable-components-ssr": "^4.3.2",
"gatsby-plugin-manifest": "^4.25.0",
Expand All @@ -60,7 +60,7 @@
"gatsby-plugin-robots-txt": "^1.7.1",
"gatsby-plugin-sharp": "^4.25.1",
"gatsby-plugin-sitemap": "^5.19.0",
"gatsby-plugin-styled-components": "^5.19.0",
"gatsby-plugin-styled-components": "^5.25.0",
"gatsby-plugin-svgr": "^3.0.0-beta.0",
"gatsby-redirect-from": "^0.5.0",
"gatsby-source-filesystem": "^4.25.0",
Expand Down
Binary file added src/assets/brand/brand-guide.pdf
Binary file not shown.
Binary file added src/assets/images/Brand-Guide/brand-guide.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/collections/events/maitainers-circle-2023/index.mdx
@@ -0,0 +1,14 @@
---
title: "May Maintainer's Circle 2023"
date: 2023-05-30
thumbnail: ./Maintainer-Circle.png
darkthumbnail: ./Maintainer-Circle.png
eurl: https://calendar.google.com/calendar/u/0/r?cid=linuxfoundation.org_o5avjlvt2cae9bq7a95emc4740@group.calendar.google.com
type: Event
published: true
upcoming: true
resource: true
speakers: ["Lee Calcote", "Nate Waddington"]
---

Join Lee Calcote and Nate Waddington in the upcoming Maintainer’s Circle special session and explore their insights, and experiences from their mentorship journey within the CNCF.
4 changes: 2 additions & 2 deletions src/collections/members/ambareen-azam/index.mdx
Expand Up @@ -5,8 +5,8 @@ image_path: ./ambreen.webp
github: Ambareen09
twitter: AzamAmbareen
linkedin: ambareen-azam
status: Active
status: Inactive
location: Kolkata, West Bengal, India
bio: I am a final-year Computer Science & Engineering undergrad. The concept of open source has always held a particular fascination for me, but the perceived complexity of its codebases had previously deterred me from delving deeper into its full potential. However, my recent discovery of the Layer5 community has allowed me to witness firsthand the true splendor of open source, as well as the invaluable benefits of community-driven learning and collaboration.My fervent enthusiasm for acquiring new technological skills serves as a driving force that motivates me to constantly seek out opportunities for personal and professional growth.
published: true
---
---
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/collections/members/avantika-jain/index.mdx
@@ -0,0 +1,11 @@
---
name: Avantika Jain
position: Contributor
image_path: ./avantika-jain.png
github: avantikajain289
linkedin: avantikaj
location: Delhi, India
bio: I’m a New Delhi-based designer with a passion for problem-solving through qualitative UX research methodologies and iterative UI design. With a background in graphic design, UX research, UI design, and an understanding of frontend development, I am excited to create meaningful solution-oriented design, and collaborate with people and companies looking to make a positive impact in our communities. I am thrilled to be a part of open source and their contributions to design and technology.
status: Active
published: true
---
4 changes: 4 additions & 0 deletions src/collections/resources/Resources.style.js
Expand Up @@ -7,6 +7,10 @@ export const ResourcesWrapper = styled.div`
top: -10px;
}
table{
color: ${props => props.theme.primaryColor};
}
div.fact {
display: flex;
flex-direction: column;
Expand Down
2 changes: 1 addition & 1 deletion src/components/CommonForm/events.js
Expand Up @@ -23,7 +23,7 @@ const EventForm = ({ form, title, submit_title, submit_body }) => {

useEffect(() => {
if (submit) {
axios.post("https://hook.us1.make.com/x4crqi16j8wfhctosk8y47fj6gknyvvh", {
axios.post("https://hook.us1.make.com/s4jo47a8ydq6uk7gg16wuukgr4l52p8c", {
memberFormOne,
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/CommonForm/index.js
Expand Up @@ -45,7 +45,7 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {

useEffect(() => {
if (submit) {
axios.post("https://hook.us1.make.com/x4crqi16j8wfhctosk8y47fj6gknyvvh", {
axios.post("https://hook.us1.make.com/s4jo47a8ydq6uk7gg16wuukgr4l52p8c", {
memberFormOne,
});
}
Expand Down Expand Up @@ -137,7 +137,7 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
{validateRole && <p style={{ margin: "0px", color: "red", fontSize: "12px" }}>{errorRole}</p>}
<div role="group" className="formRight" aria-labelledby="select">
<Field as="select" name="role">
<option selected hidden>Select your role</option>
<option defaultValue hidden>Select your role</option>
<option value="Architect">Architect</option>
<option value="Business Operations">Business Operations</option>
<option value="Developer">Developer</option>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContactForm/index.js
Expand Up @@ -12,7 +12,7 @@ const ContactForm = () => {
useEffect(() => {
if (submit) {
// Webhook to handle all event forms and all signup forms, except for the community member form.
axios.post("https://hook.us1.make.com/x4crqi16j8wfhctosk8y47fj6gknyvvh", {
axios.post("https://hook.us1.make.com/s4jo47a8ydq6uk7gg16wuukgr4l52p8c", {
memberFormOne,
});
window.scrollTo(0, 700);
Expand Down
1 change: 1 addition & 0 deletions src/components/Corner-popup/closeIcon.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions src/components/Corner-popup/index.js
@@ -0,0 +1,39 @@
import React, { useState, useEffect } from "react";
import Button from "../../reusecore/Button";
import closeIcon from "./closeIcon.svg";
import popupImage from "./power-of-meshery.svg";
import popupImageSmall from "./power-of-meshery-small.svg";
import CornerPopupWrapper from "./popup.style";

const CornerPopup = () => {
const [showPopup, setShowPopup] = useState(false);

useEffect(() => {
if (!localStorage.getItem("showPopup")) {
setTimeout(() => {
setShowPopup(true);
}, 8000);
localStorage.setItem("showPopup", true);
} else setShowPopup(false);
},[]);

return (
showPopup &&
<CornerPopupWrapper>
<div>
<div className="popup">
<div className="popup-inner">
<img className="close-btn" src={closeIcon} onClick={() => setShowPopup(false)} />
<a href="https://play.meshery.io/">
<img className="popup-image" src={popupImage} />
<img className="popup-image-small" src={popupImageSmall} />
</a>
<Button primary className="explore-playground-button" title="Explore Meshery Playground" url="https://play.meshery.io/" />
</div>
</div>
</div>
</CornerPopupWrapper>
);
};

export default CornerPopup;
60 changes: 60 additions & 0 deletions src/components/Corner-popup/popup.style.js
@@ -0,0 +1,60 @@
import styled from "styled-components";

const CornerPopupWrapper = styled.div`
.popup {
position: fixed;
bottom: 0;
right: 0;
margin: 0 1rem 1rem 0;
max-width: 30%;
max-height: 40%;
/* 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%;
}
}
.popup-inner {
position: relative;
width: 100%;
max-width: 25rem;
background-color: transparent;
display: flex;
flex-direction: column;
justify-content: center;
gap: 1rem;
align-items: center;
}
.close-btn {
position: absolute;
top: 0;
right: 0;
width: 8%;
cursor: pointer;
}
.popup-image{
box-shadow: 0 0 30px rgba(0,211,169, 0.6);
@media only screen and (max-width: 767px) {
display: none;
}
}
.popup-image-small{
box-shadow: 0 0 30px rgba(0,211,169, 0.6);
@media only screen and (min-width: 767px) {
display: none;
}
}
.explore-playground-button {
min-width: 140px;
}
`;

export default CornerPopupWrapper;

0 comments on commit 1657ef2

Please sign in to comment.