Skip to content

Commit

Permalink
Merge branch 'master' into newstore
Browse files Browse the repository at this point in the history
  • Loading branch information
Mayaleeeee authored Nov 2, 2023
2 parents 6f25429 + 53f8c8d commit 42ad548
Show file tree
Hide file tree
Showing 264 changed files with 8,110 additions and 1,930 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,24 @@
"doc",
"review"
]
},
{
"login": "captain-Akshay",
"name": "Akshay Sharma",
"avatar_url": "https://avatars.githubusercontent.com/u/59491379?v=4",
"profile": "https://github.com/captain-Akshay",
"contributions": [
"code"
]
},
{
"login": "yuvrxj-afk",
"name": "Yuvraj Singh Sisodiya",
"avatar_url": "https://avatars.githubusercontent.com/u/63532070?v=4",
"profile": "https://web-yuvrxj-afk.vercel.app/",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {
"browser": true,
"es6": true,
},
"extends": ["eslint:recommended", "plugin:react/recommended" , "plugin:cypress/recommended"],
"extends": ["eslint:recommended", "plugin:react/recommended", "plugin:cypress/recommended"],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly",
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/cypress-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Run tests
on:
push:
branches:
- master
pull_request:
types: [opened, reopened, synchronize, ready_for_review]

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: 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: Cypress Tests are running
run: node ./scripts/index.js && npx cypress run --component --spec $(node cypress-parallel.js ${{ matrix.containers }} 8)
16 changes: 0 additions & 16 deletions .github/workflows/deploy.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/lighthouse-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/
Expand Down Expand Up @@ -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 }}
20 changes: 17 additions & 3 deletions .github/workflows/regenerate-meetings-and-videos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/regenerate-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/validate-case-studies-structures.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ yarn.lock
meetings.json
.netlify
.env
cypress/screenshots
cypress/videos
47 changes: 41 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,24 @@

---

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-52-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)
<br/>
<p align="center">
<a href="https://github.com/asyncapi/website/graphs/contributors" alt="AsyncAPI GitHub website contributors">
<img src="https://img.shields.io/github/contributors/asyncapi/website?color=orange" />
</a>
<a href="https://github.com/asyncapi/website/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22" alt="Good First AsyncAPI issue">
<img src="https://img.shields.io/github/issues/asyncapi/website/good%20first%20issue.svg?color=%23DDDD00" />
</a>
<a href="https://asyncapi.slack.com/" alt="AsyncAPI Slack">
<img src="https://img.shields.io/badge/[email protected]?logo=slack&color=yellow" />
</a>
<a href="https://app.netlify.com/sites/asyncapi-website/deploys">
<img src="https://api.netlify.com/api/v1/badges/b2137407-b765-46c4-95b5-a72d9b1592ab/deploy-status" />
</a>
<a href="https://github.com/asyncapi/website" alt="AsyncAPI Apache License">
<img src="https://img.shields.io/github/license/asyncapi/website.svg" />
</a>
</p>

## Overview

Expand Down Expand Up @@ -140,7 +153,27 @@ This repository has the following structure:
└── tailwind.config.js # TailwindCSS configuration file
```

## Contributors
## Connect with AsyncAPI Community

<p align="left">
<a href="https://asyncapi.slack.com/" target="blank">
<img align="center" src="https://img.icons8.com/color/48/null/slack-new.png" alt="AsyncAPI Slack" height="30" width="40" />
</a>
<a href="https://twitter.com/asyncapispec" target="blank">
<img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/twitter.svg" alt="AsyncAPI Twitter" height="30" width="40" />
</a>
<a href="https://www.linkedin.com/company/asyncapi" target="blank">
<img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/linked-in-alt.svg" alt="AsyncAPI LinkedIn" height="30" width="40" />
</a>
<a href="https://www.youtube.com/c/asyncapi" target="blank">
<img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/youtube.svg" alt="AsyncAPI YouTube" height="30" width="40" />
</a>
<a href="https://www.twitch.tv/asyncapi" target="blank">
<img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/twitch.svg" alt="AsyncAPI Twitch" height="30" width="40" />
</a>
</p>

## AsyncAPI Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

Expand Down Expand Up @@ -216,6 +249,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/reachaadrika"><img src="https://avatars.githubusercontent.com/u/64789514?v=4?s=100" width="100px;" alt="Aadrika Bhargava"/><br /><sub><b>Aadrika Bhargava</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=reachaadrika" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vishvamsinh28"><img src="https://avatars.githubusercontent.com/u/90895835?v=4?s=100" width="100px;" alt="Vishvamsinh Vaghela"/><br /><sub><b>Vishvamsinh Vaghela</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=vishvamsinh28" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AnimeshKumar923"><img src="https://avatars.githubusercontent.com/u/99868037?v=4?s=100" width="100px;" alt="Animesh Kumar"/><br /><sub><b>Animesh Kumar</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=AnimeshKumar923" title="Documentation">📖</a> <a href="https://github.com/asyncapi/website/pulls?q=is%3Apr+reviewed-by%3AAnimeshKumar923" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/captain-Akshay"><img src="https://avatars.githubusercontent.com/u/59491379?v=4?s=100" width="100px;" alt="Akshay Sharma"/><br /><sub><b>Akshay Sharma</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=captain-Akshay" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://web-yuvrxj-afk.vercel.app/"><img src="https://avatars.githubusercontent.com/u/63532070?v=4?s=100" width="100px;" alt="Yuvraj Singh Sisodiya"/><br /><sub><b>Yuvraj Singh Sisodiya</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=yuvrxj-afk" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
10 changes: 7 additions & 3 deletions components/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ import eventsData from '../config/meetings.json';
import GoogleCalendarButton from './buttons/GoogleCalendarButton';
import Heading from './typography/Heading';
import { getEvents } from '../lib/staticHelpers';
import { useTranslation } from '../lib/i18n';

export default function Calendar({ className = '', size, text="text-left" }) {

const { t } = useTranslation('common');

const CALENDAR_URL =
'https://calendar.google.com/calendar/embed?src=c_q9tseiglomdsj6njuhvbpts11c%40group.calendar.google.com&ctz=UTC';
const eventsExist = eventsData.length > 0;
Expand All @@ -12,7 +16,7 @@ export default function Calendar({ className = '', size, text="text-left" }) {
className={`rounded-md border border-gray-200 overflow-hidden bg-white p-4`}
>
<Heading level="h2" typeStyle="heading-md-semibold">
Upcoming events
{t("calendar.title")}
</Heading>
<ul>
{getEvents(eventsData, size).map((event, index) => (
Expand Down Expand Up @@ -43,12 +47,12 @@ export default function Calendar({ className = '', size, text="text-left" }) {
<div className='pt-4' data-testid="Calendar-button">
<GoogleCalendarButton
href={CALENDAR_URL}
text="View Calendar"
text={t("calendar.viewCalendarBtn")}
/>
</div>
:
<div className="mt-2 text-gray-700">
There are no meetings scheduled for next few days.
{t("calendar.noMeetingsMessage")}
</div>
}
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/CaseStudyCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function CaseStudyCard({
<div className="pt-10 flex flex-wrap lg:grid lg:grid-cols-3 lg:gap-8 lg:text-center">
{studies.map((study, index) => (
<a key={index} href={`casestudies/${study.id}`}>
<div className="rounded-md border border-gray-200 overflow-hidden bg-white p-4 max-w-sm">
<div className="rounded-md border border-gray-200 overflow-hidden bg-white p-4 max-w-sm" data-testid="CaseStudyCard-main">
<span className="mr-2">
<img
className="m-auto h-16"
Expand Down
2 changes: 1 addition & 1 deletion components/Head.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function HeadComponent({
title = title ? `${title} | ${permTitle}` : permTitle;

//enable google analytics
if (typeof window !== 'undefined') {
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)
Expand Down
Loading

0 comments on commit 42ad548

Please sign in to comment.