Skip to content

Commit

Permalink
Merge branch 'master' into text
Browse files Browse the repository at this point in the history
  • Loading branch information
AceTheCreator authored Apr 15, 2024
2 parents 3f245d3 + 90894ea commit 232fa5e
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/workflows/help-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
At the moment the following comments are supported in pull requests:

- \`/please-take-a-look\` or \`/ptal\` - This comment will add a comment to the PR asking for attention from the reviewrs who have not reviewed the PR yet.
- \`/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
- \`/autoupdate\` or \`/au\` - This comment will add \`autoupdate\` label to the PR and keeps your PR up-to-date to the target branch's future changes. Unless there is a merge conflict or it is a draft PR.`
Expand Down
54 changes: 54 additions & 0 deletions .github/workflows/please-take-a-look-command.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# This action 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

# It uses Github actions to listen for comments on issues and pull requests and
# if the comment contains /please-take-a-look or /ptal it will add a comment pinging
# the code-owners who are reviewers for PR

name: Please take a Look

on:
issue_comment:
types: [created]

jobs:
ping-for-attention:
if: >
github.event.issue.pull_request &&
github.event.issue.state != 'closed' &&
github.actor != 'asyncapi-bot' &&
(
contains(github.event.comment.body, '/please-take-a-look') ||
contains(github.event.comment.body, '/ptal') ||
contains(github.event.comment.body, '/PTAL')
)
runs-on: ubuntu-latest
steps:
- name: Check for Please Take a Look Command
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GH_TOKEN }}
script: |
const prDetailsUrl = context.payload.issue.pull_request.url;
const { data: pull } = await github.request(prDetailsUrl);
const reviewers = pull.requested_reviewers.map(reviewer => reviewer.login);
const { data: reviews } = await github.rest.pulls.listReviews({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.issue.number
});
const reviewersWhoHaveReviewed = reviews.map(review => review.user.login);
const reviewersWhoHaveNotReviewed = reviewers.filter(reviewer => !reviewersWhoHaveReviewed.includes(reviewer));
if (reviewersWhoHaveNotReviewed.length > 0) {
const comment = reviewersWhoHaveNotReviewed.filter(reviewer => reviewer !== 'asyncapi-bot-eve' ).map(reviewer => `@${reviewer}`).join(' ');
await github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `${comment} Please take a look at this PR. Thanks! :wave:`
});
}
10 changes: 10 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file provides an overview of code owners in this repository.

# Each line is a file pattern followed by one or more owners.
# The last matching pattern has the most precedence.
# For more details, read the following article on GitHub: https://help.github.com/articles/about-codeowners/.

# The default owners are automatically added as reviewers when you open a pull request unless different owners are specified in the file.
* @AceTheCreator @thulieblack @Mayaleeeee

README.md @AceTheCreator @thulieblack @Mayaleeeee
5 changes: 4 additions & 1 deletion components/Footer/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ function Footer() {
<div className="container">
<div className="w-full flex justify-between items-center p-4 sm:flex-col sm:gap-3">
<img src="/img/logo.png" alt="company logo" className="w-[150px]" />
<div className="sm:hidden">
{/* This div helps keep the text centered */}
</div>
<div className="mt-2 text-[14px] text-gray-100 underline">
<a
href="https://github.com/asyncapi/.github/blob/master/CODE_OF_CONDUCT.md"
Expand All @@ -35,7 +38,7 @@ function Footer() {
<div>
</div>
<div className="flex items-center justify-between sm:flex-col sm:items-start">
<div className="flex flex-col justify-between items-start gap-2 w-[284px] sm:items-center">
<div className="flex flex-col justify-between items-start gap-2 sm:items-center">
<div className="flex justify-between items-center gap-3">
{socials.map((social, index) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion components/Form/subscription.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function Subcription() {
<div className='mt-[106px] subscription container flex justify-center'>
<div className='w-[1024px] min-h-[253px] lg:py-10 lg:w-full flex flex-col items-center mt-[106px]'>
<h3 className='text-[32px] text-white lg:text-center'>
Subscribe for AACoT’23 updates!
Subscribe for AACoT’24 updates!
</h3>
<a href='https://www.asyncapi.com/newsletter' target='_blank' rel="noreferrer" className='sm:w-full'>
<Button
Expand Down
26 changes: 15 additions & 11 deletions components/Venue/venue.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,34 @@
/* eslint-disable react/no-unescaped-entities */
import React from 'react';
import Link from 'next/link';

function Venue({ className, city }) {
return (
<div>
<div style={{'--image-url': `url(${city.img})`}}
className='relative w-[300px] h-[400px] sm:w-[250px] sm:h-[350px] card-bg bg-[image:var(--image-url)] flex items-center justify-center p-4 cursor-pointer'>
<Link href={`/venue/${city.name}`}>
<div style={{'--image-url': `url(${city.img})`}}
className='relative w-[300px] h-[400px] sm:w-[250px] sm:h-[350px] card-bg bg-[image:var(--image-url)] flex items-center justify-center p-4 cursor-pointer'>
<div className='flex justify-between flex-col w-full h-full'>
<div className='flex justify-between items-center'>
<div><div className={`border text-white text-md rounded-lg p-1 text-center mt-2 ${city.cfp ? 'block': 'hidden' }`}>cfp is open</div></div>
<a href={city.map} target='_blank' className='w-8 h-8 bg-white rounded-xl flex items-center justify-center' rel="noreferrer">
<img src='/img/mapIcon.svg' className='w-6' />
</a>
<div className='flex items-center'>
{city.cfp? <div className='border text-white text-md rounded-lg p-1 text-center mt-2'>cfp is open</div> :null}
<button onClick={(e) => {
e.preventDefault()
window.open(city.map, '_blank', 'noopener')
}} className='w-8 h-8 bg-white rounded-xl flex items-center justify-center ml-auto'>
<img src='/img/mapIcon.svg' className='w-6' />
</button>
</div>
<div></div>
<div className='text-white'>
<div>
<span className='text-lg font-bold'>{city.country}, {city.name}</span>
</div>
<div className='flex items-center justify-between w-full'>
<div className='border border-gray-400 rounded-lg p-1 text-center mt-2'>{city.date}</div>
<div className='border border-gray-400 rounded-lg p-1 text-center mt-2'>{city.date}</div>
</div>
</div>
</div>
</div>
</div>
</div>
</Link>
);
}

Expand Down
5 changes: 4 additions & 1 deletion pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import About from '../components/About/about';
import TicketCards from '../components/Cards/ticketCards';
import Heading from '../components/Typography/heading';
import Paragraph from '../components/Typography/paragraph';

import Subcription from '../components/Form/subscription';
export default function Home() {
return (
<div>
Expand Down Expand Up @@ -46,6 +46,9 @@ export default function Home() {
<div id='sponsors' className='mt-20'>
<Sponsors imgs={['/img/apidays.png']} />
</div>
<div className='-mt-5'>
<Subcription/>
</div>
</div>
);
}

0 comments on commit 232fa5e

Please sign in to comment.