Skip to content

Commit

Permalink
Merge branch 'master' into i18n-link
Browse files Browse the repository at this point in the history
  • Loading branch information
anshgoyalevil authored Dec 16, 2023
2 parents bf2a2d7 + b479507 commit 3920471
Show file tree
Hide file tree
Showing 24 changed files with 1,365 additions and 435 deletions.
5 changes: 2 additions & 3 deletions components/MDX.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ export function getMDXComponents() {
th: props => <th {...props} className={`${props.className || ''} px-6 py-3 border-b border-gray-200 bg-gray-100 text-left text-xs leading-4 font-medium font-body text-gray-900 uppercase tracking-wider`} />,
tr: props => <tr {...props} className={`${props.className || ''} bg-white`} />,
td: props => <td {...props} className={`${props.className || ''} px-6 py-4 border-b border-gray-200 text-sm leading-5 text-gray-700 tracking-tight`} />,
pre: props => <div {...props} className={`${props.className || ''} my-8`} />,
inlineCode: props => <code {...props} className={`${props.className || ''} px-1 py-0.5 bg-gray-200 text-gray-800 rounded font-mono text-sm`} />,
code: CodeComponent,
pre: props => CodeComponent(props.children.props),
code: props => <code {...props} className={`${props.className || ''} px-1 py-0.5 bg-gray-200 text-gray-800 rounded font-mono text-sm`} />,
hr: props => <hr {...props} className={`${props.className || ''} my-8`} />,
CodeBlock,
ChapterSuggestions,
Expand Down
2 changes: 1 addition & 1 deletion components/buttons/ScrollButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function ScrollButton(){

})
}
return <div className="fixed bottom-14 right-4 h-16 w-12 z-50">
return <div className="fixed bottom-14 right-4 h-16 w-12 z-40">
{backToTopButton &&(
<button className="rounded-full shadow-md bg-white " onClick={scrollUp}> <img src={scrollImage}/></button>
)}
Expand Down
2 changes: 1 addition & 1 deletion components/navigation/MobileNavMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Link from 'next/link';

export default function MobileNavMenu({ onClickClose = () => {} }) {
return (
<div className="fixed top-0 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-scroll">
<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
3 changes: 1 addition & 2 deletions components/navigation/NavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import LearningPanel from './LearningPanel'
import CommunityPanel from "./CommunityPanel"
import MobileNavMenu from './MobileNavMenu'
import otherItems from './otherItems'

import GithubButton from "../buttons/GithubButton"
import { SearchButton } from '../AlgoliaSearch';
import IconLoupe from '../icons/Loupe';
Expand Down Expand Up @@ -100,7 +99,7 @@ export default function NavBar({
useEffect(() => {
setMobileMenuOpen(false);
setOpen(null);
}, [asPath])
}, [asPath]);

return (
<div className={`bg-white ${className} z-50`}>
Expand Down
49 changes: 7 additions & 42 deletions config/meetings.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,4 @@
[
{
"title": "Spec 3.0 Docs Meeting",
"calLink": "https://www.google.com/calendar/event?eid=aHJwdnA1bzI1ajVjNzliZ2h2bm1nZnI3b3MgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/793",
"banner": "",
"date": "2023-08-31T14:30:00.000Z"
},
{
"title": "Spec 3.0 Meeting",
"calLink": "https://www.google.com/calendar/event?eid=NDEzM2E1ZGE5YWttYXVpYW9zbTl1cWM1YWMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/857",
"banner": "",
"date": "2023-09-06T16:00:00.000Z"
},
{
"title": "AsyncAPI spec v3 support in Diff",
"calLink": "https://www.google.com/calendar/event?eid=YnVvZWt1azlwcTQxNzZnNzNpZ2c3cjdmbzAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/858",
"banner": "",
"date": "2023-08-29T13:30:00.000Z"
},
{
"title": "Brainstorm on AsyncAPI Cheat Sheet Poster",
"calLink": "https://www.google.com/calendar/event?eid=bGx1dXBuc2x1a29mN3RzMmQzcGFjaWM4anMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/862",
"banner": "",
"date": "2023-09-06T09:00:00.000Z"
},
{
"title": "Generator and new parser discussion",
"calLink": "https://www.google.com/calendar/event?eid=bnI2ZHBsa2ZxMDM3bmw5anFtY21pbjF0amMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/865",
"banner": "",
"date": "2023-09-06T15:00:00.000Z"
},
{
"title": "Community Meeting",
"calLink": "https://www.google.com/calendar/event?eid=aTNsZXN2YzkwbWdyanBxdDgwY2RrbGxnMTggY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/868",
"banner": "https://user-images.githubusercontent.com/40604284/264583319-519e721e-3112-43ca-adab-d68bac288666.png",
"date": "2023-09-05T16:00:00.000Z"
},
{
"title": "Community Meeting",
"calLink": "https://www.google.com/calendar/event?eid=b3MydnJrN2VuMjNjY3J1Z2IycW9qMDFmZTQgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
Expand Down Expand Up @@ -122,5 +80,12 @@
"url": "https://github.com/asyncapi/community/issues/985",
"banner": "https://user-images.githubusercontent.com/40604284/288488243-e274e624-c5b3-4bff-b0ec-8c1929a24aae.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTEiLCJleHAiOjE3MDE4ODI2MTUsIm5iZiI6MTcwMTg4MjMxNSwicGF0aCI6Ii80MDYwNDI4NC8yODg0ODgyNDMtZTI3NGU2MjQtYzViMy00YmZmLWIwZWMtOGMxOTI5YTI0YWFlLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFJV05KWUFYNENTVkVINTNBJTJGMjAyMzEyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjMxMjA2VDE3MDUxNVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWUyMGYyNDE3Nzg4OGUyZGVmYjNlMDkxYzVkOWFkNjEwYjM4ZDI2YzZjZmUyYjRjMDliMDQ3YWJiNTVlNDI1MmQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.jYmY72ZRresQv1lMFeKwA49Wi6VkAozRpIHH4uE0J8g",
"date": "2023-12-14T18:00:00.000Z"
},
{
"title": "Quoi de neuf dans AsyncAPI v3 ? Découvrez le en live avec la migration du use-case Adeo",
"calLink": "https://www.google.com/calendar/event?eid=Nmk1dm8yZm10dWc0ZXI3MTNtczRhbWkzdTAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/988",
"banner": "https://user-images.githubusercontent.com/40604284/289498866-12bffa57-7db8-491f-917e-8e4f8f5b20a7.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTEiLCJleHAiOjE3MDIyODk0MDMsIm5iZiI6MTcwMjI4OTEwMywicGF0aCI6Ii80MDYwNDI4NC8yODk0OTg4NjYtMTJiZmZhNTctN2RiOC00OTFmLTkxN2UtOGU0ZjhmNWIyMGE3LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFJV05KWUFYNENTVkVINTNBJTJGMjAyMzEyMTElMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjMxMjExVDEwMDUwM1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTA4ZmVlODI0YzY4OTEwMTVkMWMxNzA3MzE5NGNkZDE4N2RmOTIzMWIwMTExNmQ2YzNiNjRhZGMwYWI5YmU2NjImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.4vALVenjnYGjuQYn4FAT5X3yYBJHi8-bKVpGMriehJc",
"date": "2023-12-14T10: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/-OsMet9h_dg/hqdefault.jpg",
"title": "3 Request/Reply Use Cases",
"description": "Explain Request/Reply use cases to me like I'm a 5 year old.",
"videoId": "-OsMet9h_dg"
},
{
"image_url": "https://i.ytimg.com/vi/WCK9_ZDv6K4/hqdefault.jpg",
"title": "Quoi de neuf dans AsyncAPI v3 ? Découvrez le en live avec la migration du use-case Adeo(14th Dece…",
"description": "Participez à ce live pour découvrir les nouveautés de la V3 et comment migrer une version 2 en version 3 sur un use-case de ...",
"videoId": "WCK9_ZDv6K4"
},
{
"image_url": "https://i.ytimg.com/vi/yOc_fI-i9C8/hqdefault.jpg",
"title": "Community Meeting(12th December)",
"description": "https://github.com/asyncapi/community/issues/979.",
"videoId": "yOc_fI-i9C8"
},
{
"image_url": "https://i.ytimg.com/vi/g6CPg77Lf5Q/hqdefault.jpg",
"title": "AsyncAPI Conf on Tour 2023 in Bangalore, India",
Expand All @@ -10,23 +28,5 @@
"title": "Community Meeting(November 28th, 2023)",
"description": "https://github.com/asyncapi/community/issues/918.",
"videoId": "p68PUXDMsks"
},
{
"image_url": "https://i.ytimg.com/vi/KDort611FNg/hqdefault.jpg",
"title": "Community Meeting(November 14th, 2023)",
"description": "https://github.com/asyncapi/community/issues/917.",
"videoId": "KDort611FNg"
},
{
"image_url": "https://i.ytimg.com/vi/YREb9wuYCOA/hqdefault.jpg",
"title": "AsyncAPI v3 announcement",
"description": "Join us live to learn about all the goodies that AsyncAPI v3 brings.",
"videoId": "YREb9wuYCOA"
},
{
"image_url": "https://i.ytimg.com/vi/Vm4ZKFb2PVE/hqdefault.jpg",
"title": "Community Meeting(October 31th, 2023)",
"description": "Powered by Restream https://restream.io https://github.com/asyncapi/community/issues/916.",
"videoId": "Vm4ZKFb2PVE"
}
]
62 changes: 31 additions & 31 deletions config/tools-automated.json
Original file line number Diff line number Diff line change
Expand Up @@ -420,41 +420,41 @@
"description": "The following is a list of tools that compare AsyncAPI documents.",
"toolsList": [
{
"title": "AsyncAPI Diff",
"description": "Diff is a library that compares two AsyncAPI Documents and provides information about the differences by pointing out explicitly information like breaking changes.",
"title": "jasyncapicmp",
"description": "Tool for comparing two AsyncAPI versions and evaluating compatibility.",
"links": {
"repoUrl": "https://github.com/asyncapi/diff"
"websiteUrl": "https://siom79.github.io/jasyncapicmp/",
"docsUrl": "https://github.com/siom79/jasyncapicmp",
"repoUrl": "https://github.com/siom79/jasyncapicmp"
},
"filters": {
"language": "TypeScript",
"language": "Java",
"technology": [
"TypeScript"
"Maven"
],
"categories": [
"compare-tool"
],
"hasCommercial": false,
"isAsyncAPIOwner": true
"isAsyncAPIOwner": false
}
},
{
"title": "jasyncapicmp",
"description": "Tool for comparing two AsyncAPI versions and evaluating compatibility.",
"title": "AsyncAPI Diff",
"description": "Diff is a library that compares two AsyncAPI Documents and provides information about the differences by pointing out explicitly information like breaking changes.",
"links": {
"websiteUrl": "https://siom79.github.io/jasyncapicmp/",
"docsUrl": "https://github.com/siom79/jasyncapicmp",
"repoUrl": "https://github.com/siom79/jasyncapicmp"
"repoUrl": "https://github.com/asyncapi/diff"
},
"filters": {
"language": "Java",
"language": "TypeScript",
"technology": [
"Maven"
"TypeScript"
],
"categories": [
"compare-tool"
],
"hasCommercial": false,
"isAsyncAPIOwner": false
"isAsyncAPIOwner": true
}
}
]
Expand Down Expand Up @@ -617,10 +617,10 @@
"description": "The following is a list of templates compatible with AsyncAPI Generator. You can use them to generate apps, clients or documentation from your AsyncAPI documents.",
"toolsList": [
{
"title": "Node.js Multiprotocol Template",
"description": "This template generates a server using your AsyncAPI document. It supports multiple different protocols, like Kafka or MQTT. It is designed in the way that generated code is a library and with it's API you can start the server, send messages or register a middleware for listening incoming messages. Runtime message validation included.",
"title": "Node.js Websockets Template",
"description": "Node.js WebSockets template for the AsyncAPI Generator. It showcases how from a single AsyncAPI document you can generate a server and a client at the same time.",
"links": {
"repoUrl": "https://github.com/asyncapi/nodejs-template"
"repoUrl": "https://github.com/asyncapi/nodejs-ws-template"
},
"filters": {
"language": "javascript",
Expand All @@ -635,15 +635,19 @@
}
},
{
"title": "Node.js Websockets Template",
"description": "Node.js WebSockets template for the AsyncAPI Generator. It showcases how from a single AsyncAPI document you can generate a server and a client at the same time.",
"title": "Java Spring Template",
"description": "Java Spring template for the AsyncAPI Generator",
"links": {
"repoUrl": "https://github.com/asyncapi/nodejs-ws-template"
"repoUrl": "https://github.com/asyncapi/java-spring-template"
},
"filters": {
"language": "javascript",
"language": [
"javascript"
],
"technology": [
"Node.js"
"Springboot",
"Maven",
"Gradle"
],
"categories": [
"generator-template"
Expand Down Expand Up @@ -671,19 +675,15 @@
}
},
{
"title": "Java Spring Template",
"description": "Java Spring template for the AsyncAPI Generator",
"title": "Node.js Multiprotocol Template",
"description": "This template generates a server using your AsyncAPI document. It supports multiple different protocols, like Kafka or MQTT. It is designed in the way that generated code is a library and with it's API you can start the server, send messages or register a middleware for listening incoming messages. Runtime message validation included.",
"links": {
"repoUrl": "https://github.com/asyncapi/java-spring-template"
"repoUrl": "https://github.com/asyncapi/nodejs-template"
},
"filters": {
"language": [
"javascript"
],
"language": "javascript",
"technology": [
"Springboot",
"Maven",
"Gradle"
"Node.js"
],
"categories": [
"generator-template"
Expand Down
14 changes: 8 additions & 6 deletions cypress/test/components/campaignTests/AnnouncementHero.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,28 @@ beforeEach(() => {
mount(<AnnouncementHero />);
});

// .skip should be removed once the AnnouncementHero component is rendered in the website
describe('AnnouncementHero Component', () => {
it('should render the component when the date is within the valid range', () => {
it.skip('should render the component when the date is within the valid range', () => {
const mockDate = new Date(2021, 10, 12).getTime();
cy.clock(mockDate);
cy.get('[data-testid="AnnouncementHero-main-div"]').should('exist');
});

//check if announcement rendered is small or large .
it('should render a small announcement when "small" prop is true', () => {
it.skip('should render a small announcement when "small" prop is true', () => {
mount(<AnnouncementHero small />);
cy.get('[data-testid="AnnouncementHero-main-div"]').should('have.class', 'mb-4');
});

it('should display the correct event information', () => {
it.skip('should display the correct event information', () => {
// Assert the event details
cy.get('[data-testid="Paragraph-test"]').should('exist');
cy.get('h2').should('exist');

});
it('should have a link and text for the button', () => {

it.skip('should have a link and text for the button', () => {
mount(<AnnouncementHero />);
cy.get('[data-testid="Button-link"]')
.should('have.attr', 'target', '_blank')
Expand All @@ -38,7 +40,7 @@ describe('AnnouncementHero Component', () => {
});

//check if announcement rendered is small or large .
it('should render a small announcement when "small" prop is true', () => {
it.skip('should render a small announcement when "small" prop is true', () => {
const mockDate = new Date('2023-05-01T00:00:00Z');
cy.clock(mockDate.getTime());

Expand All @@ -47,7 +49,7 @@ describe('AnnouncementHero Component', () => {
cy.get('[data-testid="AnnouncementHero-main-div"]').should('have.class', 'mb-4');
});

it('should render a large announcement when "small" prop is false', () => {
it.skip('should render a large announcement when "small" prop is false', () => {
const mockDate = new Date('2023-05-01T00:00:00Z');
cy.clock(mockDate.getTime());

Expand Down
11 changes: 6 additions & 5 deletions cypress/test/components/campaignTests/Banner.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import React from 'react';
import { mount } from '@cypress/react';
import Banner from '../../../../components/campaigns/Banner';

// .skip should be removed once the Banner component is rendered in the website with default functionalities
describe('Banner Component', () => {
it('should not render the banner when the date is not within the valid range', () => {
it.skip('should not render the banner when the date is not within the valid range', () => {
const today = new Date();
const [day, month, year] = [today.getUTCDate(), today.getUTCMonth(), today.getUTCFullYear()];
if (year > 2022 || month !== 10 || day < 6) {
Expand All @@ -17,21 +18,21 @@ describe('Banner Component', () => {
}
});

it('should render the banner when the date is within the valid range', () => {
it.skip('should render the banner when the date is within the valid range', () => {
const mockDate = new Date(2021, 10, 12).getTime();
cy.clock(mockDate);
mount(<Banner />);
cy.get('[data-testid="Banner-main-div"]').should('be.visible');
});

it('should display the correct message when the date is within the valid range', () => {
it.skip('should display the correct message when the date is within the valid range', () => {
const mockDate = new Date(2021, 10, 12).getTime();
cy.clock(mockDate);
mount(<Banner />);
cy.contains('.font-medium', 'AsyncAPI Conference 2022 has ended').should('be.visible');
});

it('should have a link to the recordings playlist', () => {
it.skip('should have a link to the recordings playlist', () => {
const mockDate = new Date(2021, 10, 12).getTime();
cy.clock(mockDate);
mount(<Banner />);
Expand All @@ -41,7 +42,7 @@ describe('Banner Component', () => {
.should('have.attr', 'rel', 'noopener noreferrer');
});

it('should have the max-w-screen-xl class in the div element', () => {
it.skip('should have the max-w-screen-xl class in the div element', () => {
const mockDate = new Date(2021, 10, 12).getTime();
cy.clock(mockDate);
mount(<Banner />);
Expand Down
Loading

0 comments on commit 3920471

Please sign in to comment.