From c6cc30a2c5ec72a44d45b8bc58739b0e90b25c60 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Wed, 3 May 2023 02:27:32 +0200 Subject: [PATCH 1/3] chore: update meetings.json and newsrooom_videos.json (#1622) --- config/newsroom_videos.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/newsroom_videos.json b/config/newsroom_videos.json index 5d5d3cf4ee2b..c9ee119a21bb 100644 --- a/config/newsroom_videos.json +++ b/config/newsroom_videos.json @@ -1,4 +1,10 @@ [ + { + "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", @@ -22,11 +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" } ] \ No newline at end of file From e6945b1285da7eeec23cf6af4e476a1c0cba67a8 Mon Sep 17 00:00:00 2001 From: Olaleye Blessing Date: Wed, 3 May 2023 17:46:01 +0100 Subject: [PATCH 2/3] fix: remove nested anchor tag inside button tag (#1621) Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> --- components/icons/NavItemDropdown.js | 17 ++++++++++++ components/navigation/NavItem.js | 43 ++++++++++++++++------------- 2 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 components/icons/NavItemDropdown.js diff --git a/components/icons/NavItemDropdown.js b/components/icons/NavItemDropdown.js new file mode 100644 index 000000000000..0147f0c661f3 --- /dev/null +++ b/components/icons/NavItemDropdown.js @@ -0,0 +1,17 @@ +const NavItemDropdown = () => ( + + + + + +); + +export default NavItemDropdown; diff --git a/components/navigation/NavItem.js b/components/navigation/NavItem.js index 3eb42b0bcc61..8e4ee9e99122 100644 --- a/components/navigation/NavItem.js +++ b/components/navigation/NavItem.js @@ -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 = () => {}, @@ -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 ( + + + {text} + {hasDropdown && } + + + ) + } + return ( - ) -} \ No newline at end of file +} From 4e9fd70728173ed4c90efa6f373e4ebfb44ad12d Mon Sep 17 00:00:00 2001 From: Lukasz Gornicki Date: Wed, 3 May 2023 18:54:57 +0200 Subject: [PATCH 3/3] chore: make lighthouse check more radical (#1610) Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> --- .github/workflows/lighthouse-ci.yml | 38 ++++++++++++++++++++++++----- .github/workflows/lighthouserc.json | 4 ++- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lighthouse-ci.yml b/.github/workflows/lighthouse-ci.yml index 65d5b45fbc4e..137d2fb77e8e 100644 --- a/.github/workflows/lighthouse-ci.yml +++ b/.github/workflows/lighthouse-ci.yml @@ -10,19 +10,43 @@ jobs: lighthouse-ci: name: Lighthouse CI runs-on: ubuntu-latest - if: "github.repository == 'asyncapi/website' && github.event.pull_request.draft == false &&!((github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'ci: update global workflows')) || (github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'chore(release):')) || (github.actor == 'allcontributors' && startsWith(github.event.pull_request.title, 'docs: add')))" steps: - - uses: actions/checkout@v3 + - if: > + !github.event.pull_request.draft && !( + (github.actor == 'asyncapi-bot' && ( + startsWith(github.event.pull_request.title, 'ci: update global workflows') || + startsWith(github.event.pull_request.title, 'chore: update code of conduct') || + startsWith(github.event.pull_request.title, 'ci: update global contribution guide') || + startsWith(github.event.pull_request.title, 'ci: update workflows for go projects') || + startsWith(github.event.pull_request.title, 'ci: update workflows for nodejs projects') || + startsWith(github.event.pull_request.title, 'ci: update release-related workflows for nodejs projects') || + startsWith(github.event.pull_request.title, 'ci: update semantic release config file') || + startsWith(github.event.pull_request.title, 'ci: update generic workflows') || + startsWith(github.event.pull_request.title, 'ci: update workflows for docker-based projects') || + startsWith(github.event.pull_request.title, 'chore(release):') + )) || + (github.actor == 'allcontributors[bot]' && + startsWith(github.event.pull_request.title, 'docs: add') + ) + ) + id: should_run + name: Should Run + run: echo "::set-output name=shouldrun::true" + + - if: steps.should_run.outputs.shouldrun == 'true' + uses: actions/checkout@v3 - - name: Await Netlify Preview + - if: steps.should_run.outputs.shouldrun == 'true' + name: Await Netlify Preview uses: jakepartusch/wait-for-netlify-action@v1 id: netlify with: site_name: asyncapi-website max_timeout: 600 - - name: Lighthouse Audit + - if: steps.should_run.outputs.shouldrun == 'true' + name: Lighthouse Audit id: lighthouse_audit uses: treosh/lighthouse-ci-action@9.3.0 with: @@ -34,7 +58,8 @@ jobs: env: PR_NUMBER: ${{ github.event.pull_request.number}} - - name: Lighthouse Score Report + - if: steps.should_run.outputs.shouldrun == 'true' + name: Lighthouse Score Report id: lighthouse_score_report uses: actions/github-script@v6 with: @@ -59,7 +84,8 @@ jobs: ].join('\n') core.setOutput("comment", comment); - - name: LightHouse Statistic Comment + - if: steps.should_run.outputs.shouldrun == 'true' + name: LightHouse Statistic Comment id: lighthouse_statistic_comment uses: marocchino/sticky-pull-request-comment@v2.2.0 with: diff --git a/.github/workflows/lighthouserc.json b/.github/workflows/lighthouserc.json index fe53683665ff..b1a3b6642d9a 100644 --- a/.github/workflows/lighthouserc.json +++ b/.github/workflows/lighthouserc.json @@ -2,7 +2,9 @@ "ci": { "assert": { "assertions": { - "categories:accessibility": ["error", {"minScore": 0.70}] + "categories:accessibility": ["error", {"minScore": 0.98}], + "categories:best-practices": ["error", {"minScore": 1.00}], + "categories:seo": ["error", {"minScore": 1.00}] } }, "collect": {