Skip to content

Commit

Permalink
Merge branch 'master' into auto-year-detection
Browse files Browse the repository at this point in the history
  • Loading branch information
JeelRajodiya authored Mar 7, 2024
2 parents a7a486b + 3c8c08d commit de93669
Show file tree
Hide file tree
Showing 35 changed files with 461 additions and 304 deletions.
26 changes: 19 additions & 7 deletions components/FinancialSummary/ExpenseBreakdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,64 +18,76 @@ export default function ExpenseBreakdown() {
</div>
<div className="grid grid-cols-1 md:grid-cols-3 gap-10 mt-8 mx-3">

<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center">
<div className="text-darkGunMetal">
<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center transform transition-transform hover:scale-105 active:scale-90">
<a href='https://www.asyncapi.com/blog/beyond-boundaries' target= '_blank'>
<div className="text-darkGunMetal">
<div className="flex flex-col items-center">
<img src="/img/illustrations/MentorshipProgram.webp" alt="Mentorship Program" className="w-1/5 h-auto object-cover rounded-md m-1" />
<h2 className="text-2xl font-semibold my-2 text-center text-darkGunMetal">Mentorship Program</h2>
</div>
<p className="text-base text-center text-darkGunMetal">Our AsyncAPI Mentorship program offers paid guidance to develop valuable features, investing in tools and motivated individuals for community benefit.</p>
</div>
</a>
</div>

<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center">
<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center transform transition-transform hover:scale-105 active:scale-90">
<a href='https://github.com/orgs/asyncapi/discussions/541#discussioncomment-5462792' target='_blank'>
<div className="text-darkGunMetal">
<div className="flex flex-col items-center">
<img src="/img/illustrations/BountyProgram.webp" alt="Bounty Program" className="w-1/5 h-auto object-cover rounded-md m-1" />
<h2 className="text-2xl text-center font-semibold my-2 text-darkGunMetal">Bounty Program</h2>
</div>
<p className="text-base text-center text-darkGunMetal">Rewarding contributors regardless of affiliation or volunteer status. Free mentoring and support for newcomers to build portfolios and unlock tech prospects.</p>
</div>
</a>
</div>

<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center">
<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center transform transition-transform hover:scale-105 active:scale-90">
<a href='https://github.com/orgs/asyncapi/discussions/381' target='_blank'>
<div className="text-darkGunMetal">
<div className="flex flex-col items-center">
<img src="/img/illustrations/Events.webp" alt="Events" className="w-1/5 h-auto object-cover rounded-md m-1" />
<h2 className="text-2xl text-center font-semibold my-2 text-darkGunMetal">Events</h2>
</div>
<p className="text-base text-center text-darkGunMetal">Supporting AsyncAPI conferences incurs costs for services and travel arrangements. Your contributions facilitate event hosting and community growth.</p>
</div>
</a>
</div>

<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center">
<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center transform transition-transform hover:scale-105 active:scale-90">
<a href='https://www.store.asyncapi.com/collections/all-products' target='_blank'>
<div className="text-darkGunMetal">
<div className="flex flex-col items-center">
<img src="/img/illustrations/SwagStore.webp" alt="Swag Store" className="w-1/5 h-auto object-cover rounded-md m-1" />
<h2 className="text-2xl font-semibold my-2 text-center text-darkGunMetal">Swag Store</h2>
</div>
<p className="text-base text-center text-darkGunMetal">Creating a swag store for seamless distribution to contributors, mentees, ambassadors, and community members. Store profits can fund complimentary swag expenses.</p>
</div>
</a>
</div>

<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center">
<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center transform transition-transform hover:scale-105 active:scale-90">
<a href='https://github.com/orgs/asyncapi/discussions/515' target='_blank'>
<div className="text-darkGunMetal">
<div className="flex flex-col items-center">
<img src="/img/illustrations/Hiring.webp" alt="Hiring" className="w-1/5 h-auto object-cover rounded-md m-1" />
<h2 className="text-2xl font-semibold my-2 text-center text-darkGunMetal">Hiring</h2>
</div>
<p className="text-base text-center text-darkGunMetal">To support our community, we require full time commitment. Open Collective helps us hire for AsyncAPI. <a style={{ textDecoration: "underline" }} href="https://www.linkedin.com/in/v-thulisile-sibanda/" target='_blank'>Thulie</a> joined us as a community manager, with plans to expand our team.</p>
</div>
</a>
</div>

<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center">
<div className="bg-white rounded-md shadow-md p-4 flex flex-col items-center transform transition-transform hover:scale-105 active:scale-90">
<a href='https://github.com/orgs/asyncapi/discussions/295' target='_blank'>
<div className="text-darkGunMetal">
<div className="flex flex-col items-center">
<img src="/img/illustrations/Services.webp" alt="Services" className="w-1/5 h-auto object-cover rounded-md m-1" />
<h2 className="text-2xl font-semibold my-2 text-center text-darkGunMetal">Services</h2>
</div>
<p className="text-base text-center text-darkGunMetal">Occasionally, we must pay for services such as Zoom or Descript, as they are not available through specific Open Source support programs.</p>
</div>
</a>
</div>

</div>
Expand Down
5 changes: 0 additions & 5 deletions components/layout/BlogLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ import moment from 'moment';
import Head from '../Head';
import BlogContext from '../../context/BlogContext';
import TOC from '../TOC';
import NavBar from '../navigation/NavBar';
import Container from './Container';
import AuthorAvatars from '../AuthorAvatars';
import StickyNavbar from '../navigation/StickyNavbar';
import AnnouncementHero from '../campaigns/AnnoucementHero';

export default function BlogLayout({ post, children }) {
Expand All @@ -22,9 +20,6 @@ export default function BlogLayout({ post, children }) {

return (
<BlogContext.Provider value={{ post }}>
<StickyNavbar data-testid="BlogLayout-Navbar">
<NavBar className="max-w-screen-xl block px-4 sm:px-6 lg:px-8 mx-auto" />
</StickyNavbar>
<AnnouncementHero className="my-4 mx-8" />
<Container cssBreakingPoint="lg" flex flexReverse>
<TOC
Expand Down
5 changes: 0 additions & 5 deletions components/layout/DocsLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ import TOC from '../TOC';
import DocsNav from '../navigation/DocsNav';
import DocsMobileMenu from '../navigation/DocsMobileMenu';
import DocsButton from '../buttons/DocsButton';
import NavBar from '../navigation/NavBar';
import ArrowRight from '../icons/ArrowRight';
import Feedback from '../Feedback';
import StickyNavbar from '../navigation/StickyNavbar';
import Heading from '../typography/Heading';
import AnnouncementHero from '../campaigns/AnnoucementHero';
import { SearchButton, DOCS_INDEX_NAME } from '../AlgoliaSearch';
Expand Down Expand Up @@ -72,9 +70,6 @@ export default function DocsLayout({ post, navItems = {}, children }) {

return (
<DocsContext.Provider value={{ post, navItems }}>
<StickyNavbar>
<NavBar className="max-w-screen-xl block px-4 sm:px-6 lg:px-8 mx-auto" />
</StickyNavbar>
<div className="bg-white px-4 sm:px-6 lg:px-8 w-full xl:max-w-7xl xl:mx-auto">
{showMenu && (
<DocsMobileMenu
Expand Down
5 changes: 0 additions & 5 deletions components/layout/GenericLayout.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Head from '../Head';
import NavBar from '../navigation/NavBar';
import Container from './Container';
import AnnouncementHero from '../campaigns/AnnoucementHero';
import StickyNavbar from '../navigation/StickyNavbar';

export default function GenericLayout({
title,
Expand All @@ -20,9 +18,6 @@ export default function GenericLayout({
return (
<div data-testid="GenericLayout">
<Head title={title} description={description} image={image} />
<StickyNavbar>
<NavBar className="max-w-screen-xl block px-4 sm:px-6 lg:px-8 mx-auto" />
</StickyNavbar>
<Container wide={wide}>
<div data-testid="GenericLayout-banner">
<AnnouncementHero
Expand Down
5 changes: 0 additions & 5 deletions components/layout/GenericPostLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import { useRouter } from 'next/router'
import ErrorPage from 'next/error'
import Head from '../Head'
import GenericPostContext from '../../context/GenericPostContext'
import NavBar from '../navigation/NavBar'
import Container from './Container'
import AnnouncementHero from '../campaigns/AnnoucementHero'
import StickyNavbar from '../navigation/StickyNavbar'

export default function GenericPostLayout({ post, children }) {
if (!post) return <ErrorPage statusCode={404} />
Expand All @@ -18,9 +16,6 @@ export default function GenericPostLayout({ post, children }) {

return (
<GenericPostContext.Provider value={{ post }}>
<StickyNavbar>
<NavBar className="max-w-screen-xl block px-4 sm:px-6 lg:px-8 mx-auto" />
</StickyNavbar>
<AnnouncementHero className="text-center m-4" small={true} />
<Container>
<main
Expand Down
4 changes: 0 additions & 4 deletions components/layout/GenericWideLayout.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Head from '../Head'
import NavBar from '../navigation/NavBar'
import AnnouncementHero from '../campaigns/AnnoucementHero'
import Row from './Row'

Expand All @@ -18,9 +17,6 @@ export default function GenericWideLayout({
return (
<>
<Head title={title} description={description} image={image} />
<div className="sticky top-0 w-full bg-white border-b border-gray-300 z-50">
<NavBar className="max-w-screen-xl block px-4 sm:px-6 lg:px-8 mx-auto" />
</div>
<Row>
<AnnouncementHero className="text-center m-4" small={true} />
{children}
Expand Down
6 changes: 0 additions & 6 deletions components/layout/JobsLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import { useRouter } from 'next/router'
import ErrorPage from 'next/error'
import Head from '../Head'
import JobsContext from '../../context/JobsContext'
import NavBar from '../navigation/NavBar'
import Container from './Container'
import JobSummary from '../JobSummary'
import ApplyJobButton from '../buttons/ApplyJob'
import StickyNavbar from '../navigation/StickyNavbar'

export default function JobsLayout({ post, children }) {
if (!post) return <ErrorPage statusCode={404} />;
Expand All @@ -19,10 +17,6 @@ export default function JobsLayout({ post, children }) {

return (
<JobsContext.Provider value={{ post }}>
<StickyNavbar>
<NavBar className="max-w-screen-xl block px-4 sm:px-6 lg:px-8 mx-auto" />
</StickyNavbar>

<Container cssBreakingPoint="lg" flex flexReverse>
<div className="">
<JobSummary
Expand Down
2 changes: 1 addition & 1 deletion components/navigation/MobileNavMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function MobileNavMenu({ onClickClose = () => {} }) {
setOpen(menu);
}
return (
<div className="fixed top-0 z-60 inset-x-0 py-2 transition transform origin-top-right max-h-full lg:hidden overflow-y-scroll">
<div className="fixed top-0 z-60 inset-x-0 py-2 transition transform origin-top-right max-h-full lg:hidden overflow-y-auto">
<div className="rounded-lg shadow-lg">
<div className="rounded-lg shadow-xs bg-white divide-y-2 divide-gray-50">
<div className="pt-5 pb-6 px-5 space-y-6">
Expand Down
2 changes: 1 addition & 1 deletion components/navigation/NavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export default function NavBar({

<div className="flex flex-row items-center justify-content">
<SearchButton
className="flex items-center text-left space-x-2 p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out"
className="flex items-center text-left space-x-2 p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out mr-2"
aria-label="Open Search"
>
<IconLoupe />
Expand Down
10 changes: 10 additions & 0 deletions config/MAINTAINERS.json
Original file line number Diff line number Diff line change
Expand Up @@ -709,5 +709,15 @@
"repos": [
"website"
]
},
{
"name": "Viacheslav Turovskyi",
"github": "aeworxet",
"slack": "U01G3U01SVC",
"availableForHire": false,
"isTscMember": false,
"repos": [
"bundler"
]
}
]
Loading

0 comments on commit de93669

Please sign in to comment.