Skip to content

Commit

Permalink
Merge branch 'master' into feat/add-testing-framework
Browse files Browse the repository at this point in the history
  • Loading branch information
AceTheCreator authored Sep 16, 2024
2 parents 4498898 + af3aadc commit e5ba790
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions config/city-lists.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"name": "Online",
"country": " Edition",
"date": "30th October 2024",
"cfpdate":"Not announced yet",
"description": "Join us for the AsyncAPI Online Conference Edition as the community unites across the globe to share experiences, collaborate, and foster meaningful connections.",
"img": "/img/testMic.png",
"address": "AsyncAPI Youtube Channel",
Expand All @@ -20,6 +21,7 @@
"name": "Helsinki",
"country": "Finland",
"date": "May 29 2024",
"cfpdate":"Not announced yet",
"description": "Join us in Helsinki for the AsyncAPI Conference, where we will explore all things AsyncAPI and connect physical and digital worlds. Get excited as we delve into sustainable APIs for the Era of AI, Data Platforms, and Quantum Computing!.",
"img": "/img/finland.webp",
"address": "Pikku-Finlandia, Helsinki, Karamzininranta 4, 00100 Helsinki, Finland",
Expand All @@ -35,6 +37,7 @@
"name": "London",
"country": "UK",
"date": "September 18, 2024",
"cfpdate":"Not announced yet",
"description": "Join us in London for AsyncAPI Conference and learn how to speak fluent API! Let's taco about messaging and have a fiesta you will remember!",
"img": "/img/london.gif",
"address": "155 Bishopsgate, London EC2M 3YD",
Expand All @@ -50,6 +53,7 @@
"name": "Paris",
"country": "France",
"date": "December 3-5, 2024",
"cfpdate":"September 20, 2024",
"description": "Join us at apidays Paris for the AsyncAPI Conference and experience the art of API perfection! Let's craft a symphony of messaging and celebrate tech in style!",
"img": "https://media1.giphy.com/media/v1.Y2lkPTc5MGI3NjExd24yenR4djEyZzRoeDA0ZmEyb3Y1c2F4NWVmbG13NmZwYWNhZzdnNiZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9Zw/Tuy3QxNZF1cxG/giphy.gif",
"address": "CNIT (Centre des Nouvelles Industries et Technologies), Paris 2 Place de la Défense, 92092 Puteaux",
Expand Down
2 changes: 1 addition & 1 deletion pages/venue/[id].js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function Venue({ city }) {
className='border border-x-0 border-b-0 border-t-[#333] py-28 container flex flex-col justify-center items-center '
>
{city.cfp ? <div className='w-[1090px] lg:w-full'>
<Guidelines talkDeadLine={(city.name=='Online' && CFPdata.CallEndDate) || city.date} virtual={city.name=='Online'} name={city.name} cfp={city.cfp}/>
<Guidelines talkDeadLine={(city.name=='Online' && CFPdata.CallEndDate) || city.cfpdate} virtual={city.name=='Online'} name={city.name} cfp={city.cfp}/>
</div> : <div className='w-[1130px] lg:w-full'>
<Agenda city={city} />
</div>}
Expand Down

0 comments on commit e5ba790

Please sign in to comment.