Merge branch 'asyncapi:master' into design-blog

asyncapi · Nov 3, 2023 · 3237df3 · 3237df3
2 parents a498ad7 + 53f8c8d
commit 3237df3
Show file tree

Hide file tree

Showing 25 changed files with 500 additions and 522 deletions.
diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml
@@ -9,19 +9,27 @@ 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
+
+      - name: Check package-lock version
+        uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
+        id: lockversion
+
+      - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
-
+          node-version: "${{ steps.lockversion.outputs.version }}"
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - 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/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
diff --git a/.github/workflows/lighthouse-ci.yml b/.github/workflows/lighthouse-ci.yml
@@ -39,7 +39,7 @@ jobs:
 
       - if: steps.should_run.outputs.shouldrun == 'true'
         name: Await Netlify Preview
-        uses: jakepartusch/wait-for-netlify-action@v1
+        uses: jakepartusch/wait-for-netlify-action@f1e137043864b9ab9034ae3a5adc1c108e3f1a48 #version 1.4 https://github.com/JakePartusch/wait-for-netlify-action/releases/tag/v1.4
         id: netlify
         with:
           site_name: asyncapi-website
@@ -48,7 +48,7 @@ jobs:
       - if: steps.should_run.outputs.shouldrun == 'true'
         name: Lighthouse Audit
         id: lighthouse_audit
-        uses: treosh/lighthouse-ci-action@9.3.0
+        uses: treosh/lighthouse-ci-action@03becbfc543944dd6e7534f7ff768abb8a296826 #version 10.1 https://github.com/treosh/lighthouse-ci-action/releases/tag/10.1.0
         with:
           urls: |
             https://deploy-preview-$PR_NUMBER--asyncapi-website.netlify.app/
@@ -87,9 +87,9 @@ jobs:
       - if: steps.should_run.outputs.shouldrun == 'true'
         name: LightHouse Statistic Comment
         id: lighthouse_statistic_comment
-        uses: marocchino/sticky-pull-request-comment@v2.2.0
+        uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd # version 2.8 https://github.com/marocchino/sticky-pull-request-comment/releases/tag/v2.8.0
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           number: ${{ github.event.pull_request.number }}
           header: lighthouse
           message: ${{ steps.lighthouse_score_report.outputs.comment }}
diff --git a/.github/workflows/regenerate-meetings-and-videos.yml b/.github/workflows/regenerate-meetings-and-videos.yml
@@ -18,13 +18,27 @@ jobs:
       runs-on: ubuntu-latest
       steps:
         - name: Checkout repository
-          uses: actions/checkout@v2
+          uses: actions/checkout@v3
+
+        - name: Check package-lock version
+          uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
+          id: lockversion
+
+        - name: Use Node.js
+          uses: actions/setup-node@v3
+          with:
+            node-version: "${{ steps.lockversion.outputs.version }}"
+            cache: 'npm'
+            cache-dependency-path: '**/package-lock.json'
+
         - name: Install dependencies
           run: npm install
+
         - name: Regenerate
           run: npm run generate:meetings && npm run generate:videos && npm run generate:dashboard
+
         - name: Create Pull Request with new meetings.json, newsroom-videos.json and dashboard.json version
-          uses: peter-evans/create-pull-request@v3
+          uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # use 4.2.4 https://github.com/peter-evans/create-pull-request/releases/tag/v4.2.4
           with:
             token: ${{ secrets.GH_TOKEN }}
             commit-message: 'chore: update meetings.json, newsrooom_videos.json and dashboard.json'
@@ -34,7 +48,7 @@ jobs:
             branch: update-meetings/${{ github.job }}
         - if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
           name: Report workflow run status to Slack
-          uses: 8398a7/action-slack@v3
+          uses: 8398a7/action-slack@fbd6aa58ba854a740e11a35d0df80cb5d12101d8 #using https://github.com/8398a7/action-slack/releases/tag/v3.15.1
           with:
             status: ${{ job.status }}
             fields: repo,action,workflow

diff --git a/.github/workflows/regenerate-tools.yml b/.github/workflows/regenerate-tools.yml
@@ -16,26 +16,37 @@ jobs:
       steps:
         - name: Checkout repository
           uses: actions/checkout@v3
-        - name: Use Node.js ${{ matrix.node-version }}
+
+        - name: Check package-lock version
+          uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
+          id: lockversion
+
+        - name: Use Node.js
           uses: actions/setup-node@v3
           with:
-            node-version: 16.x
+            node-version: "${{ steps.lockversion.outputs.version }}"
+            cache: 'npm'
+            cache-dependency-path: '**/package-lock.json'
+
         - name: Install dependencies
           run: npm install
+
         - name: Regenerate
           run: npm run generate:tools
+
         - name: Create Pull Request with new tools.json version
-          uses: peter-evans/create-pull-request@v4
+          uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # use 4.2.4 https://github.com/peter-evans/create-pull-request/releases/tag/v4.2.4
           with:
             token: ${{ secrets.GH_TOKEN }}
             commit-message: 'chore: update tools.json'
             committer: asyncapi-bot <[email protected]>
             author: asyncapi-bot <[email protected]>
             title: 'chore: update tools.json'
             branch: update-tools/${{ github.job }}
+
         - if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
           name: Report workflow run status to Slack
-          uses: 8398a7/action-slack@v3
+          uses: 8398a7/action-slack@fbd6aa58ba854a740e11a35d0df80cb5d12101d8 #using https://github.com/8398a7/action-slack/releases/tag/v3.15.1
           with:
             status: ${{ job.status }}
             fields: repo,action,workflow

diff --git a/.github/workflows/validate-case-studies-structures.yaml b/.github/workflows/validate-case-studies-structures.yaml
@@ -14,13 +14,16 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@af292f1e845a0377b596972698a8598734eb2796   # using https://github.com/tj-actions/changed-files/releases/tag/v40
         with:
           files: config/casestudies/*.yml
+
       - name: Install ajv and yaml
         run: npm install [email protected] [email protected] [email protected]
+
       - name: Run validation script
         uses: actions/github-script@v6
         with:

diff --git a/components/Head.js b/components/Head.js
@@ -30,7 +30,7 @@ export default function HeadComponent({
   title = title ? `${title} | ${permTitle}` : permTitle;
 
   //enable google analytics
-  if (typeof window !== 'undefined' && window.location.hostname === 'asyncapi.com') {
+  if (typeof window !== 'undefined' && window.location.hostname.includes('asyncapi.com')) {
     TagManager.initialize({gtmId: 'GTM-T58BTVQ'})
     ReactGA.initialize('UA-109278936-1')
     ReactGA.pageview(window.location.pathname + window.location.search)

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,17 +42,17 @@ export default function AnnouncementHero({ className = '', small = false, hideVi
           level="h3"
           typeStyle="heading-sm"
         >
-          Madrid Edition
+          Paris Edition
         </Heading>
         <Paragraph typeStyle="body-lg">
-          19th of October, 2023 | Madrid, Spain
+          8th of December, 2023 | Paris, France
         </Paragraph>
-        <AnnouncementRemainingDays dateTime={cfpDeadline} eventName="AACoT'23 Madrid Edition" />
+        <AnnouncementRemainingDays dateTime={cfpDeadline} eventName="the end of Call for Speakers" />
         <div className="mt-6 pb-2 space-x-2">
           <Button
-            href="https://docs.google.com/forms/d/e/1FAIpQLSdwqi27LpsIi8tKQoQBcUWDUJZi0be0cHpWnDtWhhHVn00hFA/viewform"
+            href="https://conference.asyncapi.com/venue/Paris"
             target="_blank"
-            text="Get Free Tickets"
+            text="Submit a Session"
             data-testid="AnnouncementHero-submit-session"
           />
         </div>

diff --git a/components/navigation/MenuBlocks.js b/components/navigation/MenuBlocks.js
@@ -20,11 +20,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
@@ -1,46 +1,4 @@
 [
-  {
-    "title": "Spec 3.0 Meeting",
-    "calLink": "https://www.google.com/calendar/event?eid=MHBhZDRzZ2M0OXFqbDJhaXRxcnUwNm9hcmMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/760",
-    "banner": "",
-    "date": "2023-07-05T16:00:00.000Z"
-  },
-  {
-    "title": "Spec 3.0 Meeting",
-    "calLink": "https://www.google.com/calendar/event?eid=aGdqYmk0NDdiMGE4cGo4NzFuaWxycjNiYmsgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/761",
-    "banner": "",
-    "date": "2023-07-19T16:00:00.000Z"
-  },
-  {
-    "title": "Spec 3.0 Docs Meeting",
-    "calLink": "https://www.google.com/calendar/event?eid=YmhiaTQxNDBicDA0NjgyZmk3M3ZocTJxbGcgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/774",
-    "banner": "",
-    "date": "2023-07-06T14:30:00.000Z"
-  },
-  {
-    "title": "Open Standards and Private Products: A DevRel's Dream or Nightmare",
-    "calLink": "https://www.google.com/calendar/event?eid=dHMzZ3Q0b2h2NDRuaTVrMTQ3cmsxYzk2bzAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/775",
-    "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",
-    "url": "https://github.com/asyncapi/community/issues/790",
-    "banner": "",
-    "date": "2023-07-20T14:30:00.000Z"
-  },
   {
     "title": "Spec 3.0 Docs Meeting",
     "calLink": "https://www.google.com/calendar/event?eid=cG9iOHNqZGlrbmg4cnUxanMzMTgyN3AxdnMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
@@ -62,13 +20,6 @@
     "banner": "https://user-images.githubusercontent.com/40604284/252807786-f93110e3-c344-4080-9c4f-9d32cb324680.png",
     "date": "2023-07-25T08:00:00.000Z"
   },
-  {
-    "title": "Design meeting",
-    "calLink": "https://www.google.com/calendar/event?eid=czVxbG5jZXV2MThxczJjczdhMmtxZzE1djAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/800",
-    "banner": "",
-    "date": "2023-07-18T08:00:00.000Z"
-  },
   {
     "title": "Community Meeting",
     "calLink": "https://www.google.com/calendar/event?eid=YmlybTZwODdmMzBnNGg0b3J1OWxmdnBxNmMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
@@ -159,5 +110,33 @@
     "url": "https://github.com/asyncapi/community/issues/895",
     "banner": "https://user-images.githubusercontent.com/40604284/271795643-615174df-3bc0-4e7f-b615-cabb6e701234.png",
     "date": "2023-10-05T13:00: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"
+  },
+  {
+    "title": "Community Meeting",
+    "calLink": "https://www.google.com/calendar/event?eid=ZGk3ZHJybXZhNmM3aWJzNWdzZWdtNTZjMHMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
+    "url": "https://github.com/asyncapi/community/issues/916",
+    "banner": "https://user-images.githubusercontent.com/40604284/277314120-f03a06ea-0820-462a-85af-18b1706ea5c6.png",
+    "date": "2023-10-31T16:00:00.000Z"
+  },
+  {
+    "title": "Community Meeting",
+    "calLink": "https://www.google.com/calendar/event?eid=b3BvZGhqN2xwZXFiMmtvOTQ1M2cwNGRlZTAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
+    "url": "https://github.com/asyncapi/community/issues/917",
+    "banner": "https://user-images.githubusercontent.com/40604284/277314352-f62224d8-03a9-46b2-94bf-13bfae6f973b.png",
+    "date": "2023-11-14T08:00:00.000Z"
+  },
+  {
+    "title": "Community Meeting",
+    "calLink": "https://www.google.com/calendar/event?eid=ODNjM2h0bGQ4dGhwcWd2Mmw2MWhkcGcycGcgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
+    "url": "https://github.com/asyncapi/community/issues/918",
+    "banner": "https://user-images.githubusercontent.com/40604284/277314435-ec985247-c575-4449-9f79-442b3077541a.png",
+    "date": "2023-11-28T16: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. 00:00 Waiting 57:12 Opening 1:26:07 Everything You Wish ...",
+    "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"
   }
 ]