Merge branch 'master' into i18n-link

anshgoyalevil · Oct 21, 2023 · 8634178 · 8634178
2 parents fd6f146 + d16b2d7
commit 8634178
Show file tree

Hide file tree

Showing 17 changed files with 353 additions and 256 deletions.
diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml
@@ -9,19 +9,21 @@ on:
 jobs:
   cypress-run:
     runs-on: ubuntu-latest
-
+    strategy:
+      fail-fast: false
+      matrix:
+        containers: [0, 1, 2, 3, 4, 5, 6, 7]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-     
+
       - name: Use Node.js 16.x
         uses: actions/setup-node@v3
         with:
           node-version: 16.x
 
-
       - name: Install dependencies
         run: npm install
 
       - name: Cypress Tests are running
-        run : node  ./scripts/index.js && npm run test
+        run: node ./scripts/index.js && npx cypress run --component --spec $(node cypress-parallel.js ${{ matrix.containers }} 8)
diff --git a/components/campaigns/AnnoucementHero.js b/components/campaigns/AnnoucementHero.js
@@ -5,8 +5,7 @@ import Container from '../layout/Container'
 import AnnouncementRemainingDays from './AnnouncementRamainingDays'
 
 function shouldShowBanner(cfpDeadline) {
-  const currentDate = new Date(); // Get the current date
-  console.log(currentDate)
+  const currentDate = new Date(); // G et the current date
   const deadline = new Date(cfpDeadline); // Convert the cfpDeadline string to a Date object
 
   // Check if the current date is after the deadline
@@ -19,7 +18,7 @@ function shouldShowBanner(cfpDeadline) {
 export default function AnnouncementHero({ className = '', small = false, hideVideo = false }) {
   //return null;
 
-    const cfpDeadline = '2023-10-19T06:00:00Z'
+    const cfpDeadline = '2023-10-28T06:00:00Z'
     const showBanner = shouldShowBanner(cfpDeadline);
   if (!showBanner) return null;
 
@@ -43,15 +42,15 @@ export default function AnnouncementHero({ className = '', small = false, hideVi
           level="h3"
           typeStyle="heading-sm"
         >
-          Bangalore Edition
+          Paris Edition
         </Heading>
         <Paragraph typeStyle="body-lg">
-          30th of November, 2023 | Bangalore, India
+          8th of December, 2023 | Paris, France
         </Paragraph>
         <AnnouncementRemainingDays dateTime={cfpDeadline} eventName="the end of Call for Speakers" />
         <div className="mt-6 pb-2 space-x-2">
           <Button
-            href="https://conference.asyncapi.com/venue/Bangalore"
+            href="https://conference.asyncapi.com/venue/Paris"
             target="_blank"
             text="Submit a Session"
             data-testid="AnnouncementHero-submit-session"

diff --git a/components/navigation/MenuBlocks.js b/components/navigation/MenuBlocks.js
@@ -21,11 +21,11 @@ export default function MenuBlocks ({
                 <div className={`flex-shrink-0 flex items-center justify-center h-10 w-10 rounded-lg ${item.className ? item.className : 'border border-gray-800 bg-secondary-100'} text-gray-900 sm:h-12 sm:w-12 ${item.comingSoon && 'opacity-50'}`} data-testid="MenuBlock-icon">
                   <item.icon className="h-6 w-6" />
                 </div>
-                <div className="space-y-1">
+                <div className="space-y-1 whitespace-pre-line">
                   <Paragraph typeStyle="body-md" textColor="text-gray-900" fontWeight="font-semibold">
                     <span className={item.comingSoon && 'opacity-50'} >{ item.title }</span> { item.comingSoon && <Label text="Coming soon" /> } { item.beta && <Label text="Beta" /> }
                   </Paragraph>
-                  <Paragraph typeStyle="body-sm" className={item.comingSoon && 'opacity-50'}>
+                  <Paragraph typeStyle="body-sm" className={`${item.comingSoon && 'opacity-50'}`}>
                     {item.description}
                   </Paragraph>
                 </div>

diff --git a/components/navigation/NavBar.js b/components/navigation/NavBar.js
@@ -105,7 +105,7 @@ export default function NavBar({
   return (
     <div className={`bg-white ${className} z-50`}>
       <a href="#main-content" className="block md:inline-block absolute transform -translate-y-20 focus:translate-y-0 bg-gray-100 text-gray-700 p-5 text-md font-semibold" alt="Skip to main content">Skip to main content</a>
-      <div className="flex w-full justify-between items-center py-6 lg:justify-start lg:space-x-10">
+      <div className="flex w-full justify-between items-center py-6 lg:justify-start lg:space-x-10 whitespace-nowrap">
         {!hideLogo && (
           <div className="lg:w-auto lg:flex-1">
             <div className="flex" >

diff --git a/config/meetings.json b/config/meetings.json
@@ -13,13 +13,6 @@
     "banner": "https://user-images.githubusercontent.com/66913810/249772860-0b6c73a5-a740-4fac-a22d-2d95f823ae07.png",
     "date": "2023-07-13T09:00:00.000Z"
   },
-  {
-    "title": "Community Meeting",
-    "calLink": "https://www.google.com/calendar/event?eid=cmFudjRxMjVhazk1Y2FjbXA3Zm1pMWZyZjAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/784",
-    "banner": "https://user-images.githubusercontent.com/40604284/250981834-3418496b-d123-4e74-a7ff-082b4714c841.png",
-    "date": "2023-07-11T16:00:00.000Z"
-  },
   {
     "title": "Spec 3.0 Docs Meeting",
     "calLink": "https://www.google.com/calendar/event?eid=NzU0aGMxOWY5MmYyYzA3OTduazF0MWZqY2MgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
@@ -147,10 +140,10 @@
     "date": "2023-10-05T13:00:00.000Z"
   },
   {
-    "title": "Spec 3.0 Docs Meeting",
-    "calLink": "https://www.google.com/calendar/event?eid=ZmtxaWlxdjdtbThlbDU4djhtMmllaTliYjggY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/906",
-    "banner": "",
-    "date": "2023-10-19T14:30:00.000Z"
+    "title": "Community Meeting",
+    "calLink": "https://www.google.com/calendar/event?eid=Y3FhbWh0bzA5cTc5MnVscTJuZjIzMWg2MmsgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
+    "url": "https://github.com/asyncapi/community/issues/912",
+    "banner": "https://user-images.githubusercontent.com/40604284/275363125-696a5c41-81b2-4e0b-a485-f108a7f525f0.png",
+    "date": "2023-10-17T08:00:00.000Z"
   }
 ]
diff --git a/config/newsroom_videos.json b/config/newsroom_videos.json
@@ -1,4 +1,16 @@
 [
+  {
+    "image_url": "https://i.ytimg.com/vi/FN5eR1Zqh9c/hqdefault.jpg",
+    "title": "AsyncAPI Conf on Tour 2023 in Madrid",
+    "description": "AACoT'23 Madrid Edition streamed live from StageOne at SNGULAR.",
+    "videoId": "FN5eR1Zqh9c"
+  },
+  {
+    "image_url": "https://i.ytimg.com/vi/zSbv4ibqYds/hqdefault.jpg",
+    "title": "Community Meeting(October 17th, 2023)",
+    "description": "https://github.com/asyncapi/community/issues/912.",
+    "videoId": "zSbv4ibqYds"
+  },
   {
     "image_url": "https://i.ytimg.com/vi/KTnFoXY_evs/hqdefault.jpg",
     "title": "Hacktoberfest (October 6th, 2023)",
@@ -16,17 +28,5 @@
     "title": "Community meeting (September 19, 2023)",
     "description": "https://github.com/asyncapi/community/issues/874.",
     "videoId": "SfATYVwcSQk"
-  },
-  {
-    "image_url": "https://i.ytimg.com/vi/OYcOkQhwVNg/hqdefault.jpg",
-    "title": "Spec 3.0 meeting (September 6, 2023)",
-    "description": "https://github.com/asyncapi/community/issues/857.",
-    "videoId": "OYcOkQhwVNg"
-  },
-  {
-    "image_url": "https://i.ytimg.com/vi/b4KcouHm958/hqdefault.jpg",
-    "title": "Generator and new parser discussion (September 6, 2023)",
-    "description": "https://github.com/asyncapi/community/issues/865.",
-    "videoId": "b4KcouHm958"
   }
 ]
diff --git a/config/tools-automated.json b/config/tools-automated.json
@@ -72,41 +72,41 @@
         }
       },
       {
-        "title": "nestjs-asyncapi",
-        "description": "Utilize decorators to generate AsyncAPI document utilizing DTOs (similar to @nestjs/swagger) and a web UI.",
+        "title": "SIO-AsyncAPI",
+        "description": "This is code-first approach to generate AsyncAPI specification from Socket.IO server.",
         "links": {
-          "repoUrl": "https://github.com/flamewow/nestjs-asyncapi"
+          "websiteUrl": "https://github.com/daler-rahimov/sio-asyncapi",
+          "docsUrl": "https://github.com/daler-rahimov/sio-asyncapi",
+          "repoUrl": "https://github.com/daler-rahimov/sio-asyncapi"
         },
         "filters": {
-          "language": "Typescript",
+          "language": "Python",
           "technology": [
-            "Node.js",
-            "NestJS"
+            "Socket.IO",
+            "Flask"
           ],
           "categories": [
-            "code-first"
+            "code-first",
+            "api"
           ],
           "hasCommercial": false,
           "isAsyncAPIOwner": false
         }
       },
       {
-        "title": "SIO-AsyncAPI",
-        "description": "This is code-first approach to generate AsyncAPI specification from Socket.IO server.",
+        "title": "nestjs-asyncapi",
+        "description": "Utilize decorators to generate AsyncAPI document utilizing DTOs (similar to @nestjs/swagger) and a web UI.",
         "links": {
-          "websiteUrl": "https://github.com/daler-rahimov/sio-asyncapi",
-          "docsUrl": "https://github.com/daler-rahimov/sio-asyncapi",
-          "repoUrl": "https://github.com/daler-rahimov/sio-asyncapi"
+          "repoUrl": "https://github.com/flamewow/nestjs-asyncapi"
         },
         "filters": {
-          "language": "Python",
+          "language": "Typescript",
           "technology": [
-            "Socket.IO",
-            "Flask"
+            "Node.js",
+            "NestJS"
           ],
           "categories": [
-            "code-first",
-            "api"
+            "code-first"
           ],
           "hasCommercial": false,
           "isAsyncAPIOwner": false
@@ -143,6 +143,27 @@
           "isAsyncAPIOwner": false
         }
       },
+      {
+        "title": "AsyncAPI Modelina",
+        "description": "Generate payload models into Java, TypeScript, Go, etc, you name it, from AsyncAPI documents. This tool gives you full control over the models through high customization",
+        "links": {
+          "websiteUrl": "https://modelina.org",
+          "docsUrl": "https://github.com/asyncapi/modelina/tree/master/docs",
+          "repoUrl": "https://github.com/asyncapi/modelina"
+        },
+        "filters": {
+          "language": "TypeScript",
+          "technology": [
+            "React JS",
+            "Docker"
+          ],
+          "categories": [
+            "code-generator"
+          ],
+          "hasCommercial": false,
+          "isAsyncAPIOwner": true
+        }
+      },
       {
         "title": "Golang AsyncAPI Code Generator",
         "description": "Generate Go user and application boilerplate from AsyncAPI specifications. Can be called from `go generate` without requirements.\n",
@@ -399,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
         }
       }
     ]
@@ -576,6 +597,47 @@
   "AsyncAPI Generator Templates": {
     "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": "Java Spring Template",
+        "description": "Java Spring template for the AsyncAPI Generator",
+        "links": {
+          "repoUrl": "https://github.com/asyncapi/java-spring-template"
+        },
+        "filters": {
+          "language": [
+            "Java",
+            "javascript"
+          ],
+          "technology": [
+            "Springboot",
+            "Maven",
+            "Gradle"
+          ],
+          "categories": [
+            "generator-template"
+          ],
+          "hasCommercial": false,
+          "isAsyncAPIOwner": true
+        }
+      },
+      {
+        "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-ws-template"
+        },
+        "filters": {
+          "language": "javascript",
+          "technology": [
+            "Node.js"
+          ],
+          "categories": [
+            "generator-template"
+          ],
+          "hasCommercial": false,
+          "isAsyncAPIOwner": true
+        }
+      },
       {
         "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.",

diff --git a/config/tools-manual.json b/config/tools-manual.json
@@ -141,6 +141,19 @@
                     "technology": [".NET"],
                     "categories": ["code-first"]
                 }
+            },
+            {
+                "title": "FastStream",
+                "description": "A powerful and easy-to-use Python framework for building asynchronous services interacting with event streams such as Apache Kafka, RabbitMQ and NATS.",
+                "links": {
+                    "websiteUrl": "https://faststream.airt.ai",
+                    "repoUrl": "https://github.com/airtai/FastStream"
+                },
+                "filters": {
+                    "language": "Python",
+                    "categories": ["code-first", "framework"],
+                    "hasCommercial": false
+                }
             }
         ]
     },
@@ -404,6 +417,19 @@
                     "technology": ["Flask"],
                     "categories": ["framework"]
                 }
+            },
+            {
+                "title": "FastStream",
+                "description": "A powerful and easy-to-use Python framework for building asynchronous services interacting with event streams such as Apache Kafka, RabbitMQ and NATS.",
+                "links": {
+                    "websiteUrl": "https://faststream.airt.ai",
+                    "repoUrl": "https://github.com/airtai/FastStream"
+                },
+                "filters": {
+                    "language": "Python",
+                    "categories": ["code-first", "framework"],
+                    "hasCommercial": false
+                }
             }
         ]
     },

diff --git a/config/tools.json b/config/tools.json