Skip to content

Commit

Permalink
Merge branch 'master' into edit-page
Browse files Browse the repository at this point in the history
Signed-off-by: Raj Aryan <75237697+8rxn@users.noreply.github.com>
  • Loading branch information
8rxn committed Jun 1, 2023
2 parents 86146db + 115bebb commit a2fbde2
Show file tree
Hide file tree
Showing 13 changed files with 1,120 additions and 3 deletions.
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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ image_path: ./ambreen.jpg
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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
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
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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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;
411 changes: 411 additions & 0 deletions src/components/Corner-popup/power-of-meshery-small.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a2fbde2

Please sign in to comment.