Skip to content

Commit

Permalink
Merge branch 'master' into lighthouseradical
Browse files Browse the repository at this point in the history
  • Loading branch information
akshatnema authored May 3, 2023
2 parents e9bb343 + e6945b1 commit 772feab
Show file tree
Hide file tree
Showing 9 changed files with 120 additions and 92 deletions.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,16 @@
"contributions": [
"code"
]
},
{
"login": "Olaleye-Blessing",
"name": "Olaleye Blessing",
"avatar_url": "https://avatars.githubusercontent.com/u/70102539?v=4",
"profile": "https://www.blessingolaleye.xyz/",
"contributions": [
"code",
"a11y"
]
}
],
"contributorsPerLine": 7,
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
---

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-40-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-41-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

[![Netlify Status](https://api.netlify.com/api/v1/badges/b2137407-b765-46c4-95b5-a72d9b1592ab/deploy-status)](https://app.netlify.com/sites/asyncapi-website/deploys)
Expand Down Expand Up @@ -200,6 +200,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://bhaswatiroy.github.io/Bhaswati-Roy-Portfolio/"><img src="https://avatars.githubusercontent.com/u/78029145?v=4?s=100" width="100px;" alt="Bhaswati Roy "/><br /><sub><b>Bhaswati Roy </b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=BhaswatiRoy" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.behance.net/muibudeenaisha"><img src="https://avatars.githubusercontent.com/u/105395613?v=4?s=100" width="100px;" alt="AISHAT MUIBUDEEN"/><br /><sub><b>AISHAT MUIBUDEEN</b></sub></a><br /><a href="#design-Mayaleeeee" title="Design">🎨</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://nawedali.tech"><img src="https://avatars.githubusercontent.com/u/83456083?v=4?s=100" width="100px;" alt="Nawed Ali"/><br /><sub><b>Nawed Ali</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=nawed2611" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.blessingolaleye.xyz/"><img src="https://avatars.githubusercontent.com/u/70102539?v=4?s=100" width="100px;" alt="Olaleye Blessing"/><br /><sub><b>Olaleye Blessing</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=Olaleye-Blessing" title="Code">💻</a> <a href="#a11y-Olaleye-Blessing" title="Accessibility">️️️️♿️</a></td>
</tr>
</tbody>
</table>
Expand Down
17 changes: 17 additions & 0 deletions components/icons/NavItemDropdown.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const NavItemDropdown = () => (
<span className="inline-block">
<svg
className="text-gray-400 h-5 w-5 group-hover:text-gray-500 group-focus:text-gray-500 transition ease-in-out duration-150"
fill="currentColor"
viewBox="0 0 20 20"
>
<path
fillRule="evenodd"
d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
clipRule="evenodd"
/>
</svg>
</span>
);

export default NavItemDropdown;
43 changes: 24 additions & 19 deletions components/navigation/NavItem.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import Link from 'next/link'
import { useRouter } from 'next/router';
import NavItemDropdown from './../icons/NavItemDropdown';

export default function NavItem ({
text,
href,
route='',
target = '_self',
onClick = () => {},
onMouseEnter = () => {},
Expand All @@ -21,24 +22,28 @@ export default function NavItem ({
)
}

// dom attributes common to both button and link
const attrs = {
onClick,
onMouseEnter,
className: `${className} group inline-flex items-center space-x-2 font-body text-base leading-6 font-semibold hover:text-gray-900 focus:outline-none focus:text-gray-900 tracking-heading transition ease-in-out duration-150`
}

if(href) {
return (
<Link href={href}>
<a {...attrs} className={`${attrs.className} ${router.pathname.startsWith(href) ? "text-black" :"text-gray-700"}`} target={target}>
<span>{text}</span>
{hasDropdown && <NavItemDropdown />}
</a>
</Link>
)
}

return (
<button type="button" onClick={href ? undefined : onClick} onMouseEnter={onMouseEnter} className={`${className} group text-gray-700 inline-flex items-center space-x-2 text-base leading-6 font-semibold hover:text-gray-900 focus:outline-none focus:text-gray-900 tracking-heading transition ease-in-out duration-150`}>
{href ? (
<Link href={href}>
<a target={target} rel="noopener noreferrer" className={`${className} font-body text-base leading-6 font-semibold text-gray-700 hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 ${router.pathname.startsWith(href) ? "text-black" :"text-gray-700"}`}>
{text}
</a>
</Link>
) : (
<span className={`${router.pathname.startsWith(route) ? "text-black" :"text-gray-700"}`}>{text}</span>
)}
{hasDropdown && (
<div className='inline-block'>
<svg className="text-gray-400 h-5 w-5 group-hover:text-gray-500 group-focus:text-gray-500 transition ease-in-out duration-150" fill="currentColor" viewBox="0 0 20 20">
<path fillRule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clipRule="evenodd" />
</svg>
</div>
)}
<button type="button" {...attrs} className={`${attrs.className} text-gray-700`}>
<span>{text}</span>
{hasDropdown && <NavItemDropdown />}
</button>
)
}
}
19 changes: 7 additions & 12 deletions config/meetings.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
[
{
"title": "Design planning meeting",
"calLink": "https://www.google.com/calendar/event?eid=bjlhNGg1OTRpZmQ0Mm42Zjg2a25kbGlyOWcgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/563",
"date": "2023-01-16T16:00:00.000Z"
},
{
"title": "Spec 3.0 Meeting",
"calLink": "https://www.google.com/calendar/event?eid=azF2Z2pxdm0wMDlkOGFrZ2ZiNnRvYzczajggY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/564",
"date": "2023-01-18T16:00:00.000Z"
},
{
"title": "Community Meeting",
"calLink": "https://www.google.com/calendar/event?eid=dms5aDV0NDNoZnFpa3Q4YnRjM3Bzc3Jvb2MgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
Expand Down Expand Up @@ -153,5 +141,12 @@
"url": "https://github.com/asyncapi/community/issues/688",
"banner": "https://user-images.githubusercontent.com/40604284/233369404-38892fbe-7082-4492-8aed-0a97ee8df011.png",
"date": "2023-05-02T08:00:00.000Z"
},
{
"title": "AsyncAPI x Google Season of Doc's 2023",
"calLink": "https://www.google.com/calendar/event?eid=Yzdyb2F1c3RjOXVvcTh2NXFiZGpyNjgzN3MgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/692",
"banner": "https://user-images.githubusercontent.com/66913810/234268392-10a4c02d-60e6-46ec-abcc-74c5aa6088dd.png",
"date": "2023-05-09T16:00:00.000Z"
}
]
36 changes: 18 additions & 18 deletions config/newsroom_videos.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
[
{
"image_url": "https://i.ytimg.com/vi/Z8lnRHL-lCM/hqdefault.jpg",
"title": "Community meeting (May 2nd 2023)",
"description": "https://github.com/asyncapi/community/issues/688.",
"videoId": "Z8lnRHL-lCM"
},
{
"image_url": "https://i.ytimg.com/vi/WcmH9ySIX9o/hqdefault.jpg",
"title": "Tackling Interoperability Challenges In Open-Source",
"description": "Interoperability refers to the ability of different systems and software applications to communicate and exchange data seamlessly.",
"videoId": "WcmH9ySIX9o"
},
{
"image_url": "https://i.ytimg.com/vi/82xkJmn-bAc/hqdefault.jpg",
"title": "Spec 3.0 meeting (April 26th 2023)",
"description": "https://github.com/asyncapi/community/issues/670.",
"videoId": "82xkJmn-bAc"
},
{
"image_url": "https://i.ytimg.com/vi/0CPWCJv4nho/hqdefault.jpg",
"title": "Community Meeting (April 18th 2023)",
Expand All @@ -10,23 +28,5 @@
"title": "Adding support for non-JSON schemas (April 18th 2023)",
"description": "https://github.com/asyncapi/community/issues/668.",
"videoId": "JFPERXh2ZUY"
},
{
"image_url": "https://i.ytimg.com/vi/hN6aE3Ebn08/hqdefault.jpg",
"title": "Spec 3.0 meeting (April 13th 2023)",
"description": "https://github.com/asyncapi/community/issues/649.",
"videoId": "hN6aE3Ebn08"
},
{
"image_url": "https://i.ytimg.com/vi/O4TQWBEaXy0/hqdefault.jpg",
"title": "Spec 3.0 meeting (March 29th 2023)",
"description": "https://github.com/asyncapi/community/issues/640.",
"videoId": "O4TQWBEaXy0"
},
{
"image_url": "https://i.ytimg.com/vi/tKYyL_DiLds/hqdefault.jpg",
"title": "Community Meeting (March 21th 2023)",
"description": "https://github.com/asyncapi/community/issues/640.",
"videoId": "tKYyL_DiLds"
}
]
68 changes: 34 additions & 34 deletions dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,6 @@
],
"score": 25.053033341156514
},
{
"id": "PR_kwDOB5hCo85FYPwk",
"isPR": true,
"isAssigned": false,
"title": "feat!: extend bundling to create another schemas without $id",
"author": "derberg",
"resourcePath": "/asyncapi/spec-json-schemas/pull/298",
"repo": "asyncapi/spec-json-schemas",
"labels": [],
"score": 22.399617922442182
},
{
"id": "I_kwDOBW5R_c5Pi3rO",
"isPR": false,
Expand All @@ -41,7 +30,7 @@
"color": "0D67D3"
}
],
"score": 22.112443333692923
"score": 22.399617922442182
},
{
"id": "MDU6SXNzdWU5OTMxODc5ODM=",
Expand Down Expand Up @@ -84,7 +73,7 @@
"color": "a2eeef"
}
],
"score": 18.091999091203302
"score": 18.37917367995256
},
{
"id": "I_kwDOBGu-185CELGB",
Expand All @@ -97,6 +86,17 @@
"labels": [],
"score": 18.091999091203302
},
{
"id": "PR_kwDODCuNRs4r1oNL",
"isPR": true,
"isAssigned": false,
"title": "docs: proposed set of bindings for AWS - SNS and SQS",
"author": "iancooper",
"resourcePath": "/asyncapi/bindings/pull/84",
"repo": "asyncapi/bindings",
"labels": [],
"score": 17.517649913704783
},
{
"id": "MDU6SXNzdWU4MzM2NTY1ODc=",
"isPR": false,
Expand Down Expand Up @@ -174,18 +174,33 @@
"score": 15.220253203710714
},
{
"id": "PR_kwDODyzcIc5NDHYS",
"id": "PR_kwDOE8Qh385L_vbE",
"isPR": true,
"isAssigned": false,
"title": "ci: new github action which logs all the reactions in prs and issues",
"author": "14Richa",
"resourcePath": "/asyncapi/.github/pull/220",
"repo": "asyncapi/.github",
"title": "feat: add basic C++ support",
"author": "jonaslagoni",
"resourcePath": "/asyncapi/modelina/pull/1156",
"repo": "asyncapi/modelina",
"labels": [],
"score": 14.933078614961456
"score": 15.220253203710714
}
],
"goodFirstIssues": [
{
"id": "I_kwDOBW5R_c5kbYkc",
"title": "[📑 Docs]: improve adeo case study",
"isAssigned": false,
"resourcePath": "/asyncapi/website/issues/1615",
"repo": "asyncapi/website",
"author": "derberg",
"area": "Unknown",
"labels": [
{
"name": "📑 docs",
"color": "E50E99"
}
]
},
{
"id": "I_kwDOBW5R_c5jSPTM",
"title": "filter section is overflowing for small screen in dashboard section",
Expand Down Expand Up @@ -678,21 +693,6 @@
}
]
},
{
"id": "I_kwDOFDnrNc5M4GpA",
"title": "Help validate Windows installer publishing",
"isAssigned": false,
"resourcePath": "/asyncapi/cli/issues/302",
"repo": "asyncapi/cli",
"author": "derberg",
"area": "ci-cd",
"labels": [
{
"name": "enhancement",
"color": "a2eeef"
}
]
},
{
"id": "I_kwDOCoBobc5KYpv0",
"title": "Document how to fix randomly failing tests during development",
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"swiper": "^8.3.2",
"tailwind-merge": "^1.3.0",
"tailwindcss": "^3.1.4",
"yaml": "^2.1.3",
"yaml": "^2.2.2",
"@slack/web-api": "^6.5.1"
},
"devDependencies": {
Expand Down

0 comments on commit 772feab

Please sign in to comment.