Skip to content

Commit

Permalink
Merge branch '2022-01-release' of github.com:dalelane/website into 20…
Browse files Browse the repository at this point in the history
…22-01-release
  • Loading branch information
dalelane committed Jan 17, 2022
2 parents 180c18b + 065ff3b commit 513ddb1
Show file tree
Hide file tree
Showing 49 changed files with 2,965 additions and 108 deletions.
30 changes: 30 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,36 @@
"contributions": [
"doc"
]
},
{
"login": "mcturco",
"name": "Missy Turco",
"avatar_url": "https://github.com/avatars/u/60163079?v=4",
"profile": "https://melissaturco.com",
"contributions": [
"code",
"design",
"ideas",
"review"
]
},
{
"login": "ritik307",
"name": "Ritik Rawal",
"avatar_url": "https://github.com/avatars/u/22374829?v=4",
"profile": "https://ritik307.github.io/portfolio/",
"contributions": [
"code"
]
},
{
"login": "akshatnema",
"name": "Akshat Nema",
"avatar_url": "https://github.com/avatars/u/76521428?v=4",
"profile": "https://github.com/akshatnema",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/add-good-first-issue-labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#This workflow is centrally managed in https://github.com/asyncapi/.github/
#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo

#Purpose of this workflow is to enable anyone to label issue with 'Good First Issue' and 'area/*' with a single command.
name: Add 'Good First Issue' and 'area/*' labels # if proper comment added

on:
issue_comment:
types:
- created

jobs:
add-labels:
if: github.event.issue && github.event.issue.state != 'closed'
runs-on: ubuntu-latest
steps:
- name: Add label
if: contains(github.event.comment.body, '/good-first-issue') || contains(github.event.comment.body, '/gfi' )
uses: actions/github-script@v5
with:
github-token: ${{ secrets.GH_TOKEN }}
script: |
const areas = ['javascript', 'typescript', 'java' , 'go', 'docs', 'ci-cd', 'design'];
const values = context.payload.comment.body.split(" ");
switch(values[1]){
case 'ts':
values[1] = 'typescript';
break;
case 'js':
values[1] = 'javascript';
case 'markdown':
values[1] = 'docs';
}
if(values.length != 2 || !areas.includes(values[1])){
const message = `Hey @${context.payload.sender.login}, something is wrong with your command please use \`/help\` for help.`
await github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: message
})
} else {
//remove complexity and areas if there are any before adding new labels;
const currentLabels = (await github.rest.issues.listLabelsOnIssue({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
})).data.map(label => label.name);
const shouldBeRemoved = currentLabels.filter(label => (label.startsWith('area/') && !label.endsWith(values[1])));
shouldBeRemoved.forEach(label => {
github.rest.issues.deleteLabel({
owner: context.repo.owner,
repo: context.repo.repo,
name: label,
});
});
//add new labels
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['good first issue', `area/${values[1]}`]
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
#Purpose of this workflow is to enable anyone to label PR with `ready-to-merge` and `do-not-merge` labels to get stuff merged or blocked from merging
name: Add ready-to-merge or do-not-merge label # if proper comment added

on: issue_comment
on:
issue_comment:
types:
- created

jobs:
parse-comment-and-add-ready: # for handling cases when you want to mark as ready to merge
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automerge-for-humans-merging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ jobs:
GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
MERGE_LABELS: "!do-not-merge,ready-to-merge"
MERGE_METHOD: "squash"
MERGE_COMMIT_MESSAGE: "pull-request-title"
MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
MERGE_RETRIES: "20"
MERGE_RETRY_SLEEP: "30000"
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ jobs:
GITHUB_LOGIN: asyncapi-bot
MERGE_LABELS: ""
MERGE_METHOD: "squash"
MERGE_COMMIT_MESSAGE: "pull-request-title"
MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
MERGE_RETRIES: "20"
MERGE_RETRY_SLEEP: "30000"
28 changes: 23 additions & 5 deletions .github/workflows/help-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@

name: Create help comment

on: [issue_comment]
on:
issue_comment:
types:
- created

jobs:
create_help_comment:
if: github.event.issue.pull_request
create_help_comment_pr:
if: github.event.issue.pull_request && contains(github.event.comment.body, '/help')
runs-on: ubuntu-latest
steps:
- uses: actions-ecosystem/action-create-comment@v1
if: contains(github.event.comment.body, '/help')
with:
github_token: ${{ secrets.GH_TOKEN }}
body: |
Expand All @@ -22,4 +24,20 @@ jobs:
At the moment the following comments are supported in pull requests:
- `/ready-to-merge` or `/rtm` - This comment will trigger automerge of PR in case all required checks are green, approvals in place and do-not-merge label is not added
- `/do-not-merge` or `/dnm` - This comment will block automerging even if all conditions are met and ready-to-merge label is added
- `/do-not-merge` or `/dnm` - This comment will block automerging even if all conditions are met and ready-to-merge label is added
create_help_comment_issue:
if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/help') }}
runs-on: ubuntu-latest
steps:
- uses: actions-ecosystem/action-create-comment@v1
with:
github_token: ${{ secrets.GH_TOKEN }}
body: |
Hello, @${{ github.actor }}! 👋🏼
I'm Genie from the magic lamp. Looks like somebody needs a hand! 🆘
At the moment the following comments are supported in issues:
- `/good-first-issue {js | ts | java | go | docs | design | ci-cd} ` or `/gfi {js | ts | java | go | docs | design | ci-cd} ` - label an issue as a `good first issue`.
example: `/gfi js` or `/good-first-issue ci-cd`
6 changes: 4 additions & 2 deletions .github/workflows/if-nodejs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

release:
needs: test
name: Publish to NPM and GitHub
name: Publish to any of NPM, Github, and Docker Hub
runs-on: ubuntu-latest
steps:
- name: Set git to use LF #to once and for all finish neverending fight between Unix and Windows
Expand All @@ -68,11 +68,13 @@ jobs:
name: Install dependencies
run: npm install
- if: steps.packagejson.outputs.exists == 'true'
name: Release to NPM and GitHub
name: Publish to any of NPM, Github, and Docker Hub
id: release
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
GIT_AUTHOR_NAME: asyncapi-bot
GIT_AUTHOR_EMAIL: info@asyncapi.io
GIT_COMMITTER_NAME: asyncapi-bot
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
* @fmvilas @derberg @magicmatatjahu @github-actions[bot]

# All .md files
*.md @alequetzalli
*.md @alequetzalli @github-actions[bot]
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

---
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-16-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-19-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)

Expand Down Expand Up @@ -113,6 +113,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center"><a href="https://github.com/ceich"><img src="https://github.com/avatars/u/38611?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chris Eich</b></sub></a><br /><a href="https://github.com/asyncapi/website/pulls?q=is%3Apr+reviewed-by%3Aceich" title="Reviewed Pull Requests">👀</a></td>
<td align="center"><a href="https://github.com/hpatoio"><img src="https://github.com/avatars/u/249948?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simone Fumagalli</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=hpatoio" title="Documentation">📖</a></td>
<td align="center"><a href="https://melissaturco.com"><img src="https://github.com/avatars/u/60163079?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Missy Turco</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=mcturco" title="Code">💻</a> <a href="#design-mcturco" title="Design">🎨</a> <a href="#ideas-mcturco" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/asyncapi/website/pulls?q=is%3Apr+reviewed-by%3Amcturco" title="Reviewed Pull Requests">👀</a></td>
<td align="center"><a href="https://ritik307.github.io/portfolio/"><img src="https://github.com/avatars/u/22374829?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ritik Rawal</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=ritik307" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/akshatnema"><img src="https://github.com/avatars/u/76521428?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Akshat Nema</b></sub></a><br /><a href="https://github.com/asyncapi/website/commits?author=akshatnema" title="Code">💻</a></td>
</tr>
</table>

Expand Down
4 changes: 2 additions & 2 deletions components/DemoAnimation.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ export default function DemoAnimation({ className = '' }) {
{ (showDisplayName || showDisplayNameDescription) && renderEmail(() => setShowEmail(true)) }
</MacWindow>
</div>
<div className={`relative md:flex-1 md:ml-1 md:mb-0 transition-all duration-500 ease-in-out z-10`}>
<div className={`text-center mt-8 lg:mt-0 lg:absolute lg:left-0 lg:top-0 lg:right-0 lg:ml-48 lg:mr-8 ${showControls ? 'block' : 'hidden'}`}>
<div className={`relative md:flex-1 md:ml-6 md:mb-0 transition-all duration-500 ease-in-out z-10`}>
<div className={`md:text-left text-center mt-8 md:mt-0 lg:absolute lg:left-0 lg:top-0 lg:right-0 lg:ml-48 lg:mr-8 ${showControls ? 'block' : 'hidden'}`}>
<h3 className="text-primary-800 text-2xl font-bold md:text-2xl mb-4">
Play with it!
</h3>
Expand Down
37 changes: 21 additions & 16 deletions components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import IconYoutube from "./icons/YouTube"
import IconLinkedIn from "./icons/LinkedIn"
import NewsletterSubscribe from "./NewsletterSubscribe"
import Container from "./layout/Container"
import Link from "next/link"

export default function Footer() {
return (
Expand All @@ -16,24 +17,28 @@ export default function Footer() {
<div className="max-w-screen-xl mx-auto py-12 px-4 overflow-hidden sm:px-6 lg:px-8">
<nav className="-mx-5 -my-2 flex flex-wrap justify-center">
<div className="px-5 py-2">
<a href="/about" className="text-base leading-6 text-gray-500 hover:text-gray-900">
About
</a>
<div className="text-base leading-6 text-gray-500 hover:text-gray-900">
<Link href="/about" className="text-base leading-6 text-gray-500 hover:text-gray-900">
<a> About </a>
</Link>
</div>
</div>
<div className="px-5 py-2">
<a href="/blog" className="text-base leading-6 text-gray-500 hover:text-gray-900">
Blog
</a>
<div className="text-base leading-6 text-gray-500 hover:text-gray-900">
<Link href="/blog">
<a>Blog</a>
</Link>
</div>
</div>
<div className="px-5 py-2">
<a href="https://asyncapi.threadless.com" target="_blank" className="text-base leading-6 text-gray-500 hover:text-gray-900">
<a href="https://asyncapi.threadless.com" target="_blank" rel="noopener noreferrer" className="text-base leading-6 text-gray-500 hover:text-gray-900">
Shop
</a>
</div>
<div className="px-5 py-2">
<a href="/jobs" className="text-base leading-6 text-gray-500 hover:text-gray-900">
Jobs
</a>
<Link href="/jobs">
<a className="text-base leading-6 text-gray-500 hover:text-gray-900"> Jobs </a>
</Link>
</div>
<div className="px-5 py-2">
<a href="mailto:press@asyncapi.io" className="text-base leading-6 text-gray-500 hover:text-gray-900">
Expand All @@ -42,19 +47,19 @@ export default function Footer() {
</div>
</nav>
<div className="mt-8 flex justify-center">
<a href="https://twitter.com/AsyncAPISpec" target="_blank" className="text-gray-400 hover:text-blue-500">
<a href="https://twitter.com/AsyncAPISpec" target="_blank" rel="noopener noreferrer" className="text-gray-400 hover:text-blue-500">
<span className="sr-only">Twitter</span>
<IconTwitter className="h-6 w-6" />
</a>
<a href="https://github.com/asyncapi" target="_blank" className="ml-6 text-gray-400 hover:text-gray-500">
<a href="https://github.com/asyncapi" target="_blank" rel="noopener noreferrer" className="ml-6 text-gray-400 hover:text-gray-500">
<span className="sr-only">GitHub</span>
<IconGithub className="h-6 w-6" />
</a>
<a href="https://linkedin.com/company/asyncapi" target="_blank" className="ml-6 text-gray-400 hover:text-blue-500">
<a href="https://linkedin.com/company/asyncapi" rel="noopener noreferrer" target="_blank" className="ml-6 text-gray-400 hover:text-blue-500">
<span className="sr-only">LinkedIn</span>
<IconLinkedIn className="h-6 w-6" />
</a>
<a href="https://youtube.com/asyncapi" target="_blank" className="ml-6 text-gray-400 hover:text-red-600">
<a href="https://youtube.com/asyncapi" target="_blank" rel="noopener noreferrer" className="ml-6 text-gray-400 hover:text-red-600">
<span className="sr-only">YouTube</span>
<IconYoutube className="h-6 w-6" />
</a>
Expand All @@ -64,15 +69,15 @@ export default function Footer() {
Made with <span className="font-mono text-pink-500">:love:</span> by the AsyncAPI Initiative.
</p>
<p className="text-center text-base leading-6 text-gray-400 mt-4">
<a href="https://netlify.com" target="_blank">
<a href="https://netlify.com" target="_blank" rel="noopener noreferrer">
<img src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg" className="inline" />
</a>
</p>
<p className="text-center text-base leading-6 text-gray-400 mt-4">
Copyright &copy; AsyncAPI Project a Series of LF Projects, LLC.
</p>
<p className="text-center text-base leading-6 text-gray-400 mt-1">
For web site terms of use, trademark policy and general project policies please see <a href="https://lfprojects.org" className="text-gray-700 underline" target="_blank">https://lfprojects.org</a>
For web site terms of use, trademark policy and general project policies please see <a href="https://lfprojects.org" className="text-gray-700 underline" target="_blank" rel="noopener noreferrer">https://lfprojects.org</a>
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/Hero.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default function Hero({ className = '' }) {
<strong>industry standard</strong> for defining asynchronous APIs.
</h2>
<Button className="block md:inline-block" text="Read the docs" href="/docs/getting-started" icon={<ArrowRight className="-mb-1 h-5 w-5" />} />
<OpenInStudioButton text='Open Studio' />
<OpenInStudioButton text='Open Studio' className="md:ml-2" />
<p className="mt-4 text-xs text-gray-500">
Proud to be part of the {" "}
<a className="underline" href="https://www.linuxfoundation.org/">
Expand Down
Loading

0 comments on commit 513ddb1

Please sign in to comment.