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
ashmit-coder authored Oct 29, 2024
2 parents e0a84c3 + 1f8a0ee commit fae85c8
Show file tree
Hide file tree
Showing 26 changed files with 239 additions and 72 deletions.
3 changes: 1 addition & 2 deletions components/About/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ function About() {
</div>
<div className='w-[600px] ml-10 lg:ml-0 lg:w-full lg:text-center'>
<div className='flex items-center lg:justify-center'>
<div className='w-[40px] h-[3px] bg-blue-400' />
<div className='ml-4 text-lg sm:text-sm text-white font-semi-bold'>About The Event</div>
<div className='text-lg sm:text-sm text-white font-semi-bold border-b-2 border-blue-400 mb-1'>About The Event</div>
</div>
<Heading typeStyle='heading-md' className='text-gradient lg:mt-10'>
AACoT'24
Expand Down
4 changes: 2 additions & 2 deletions components/Dropdown/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function Dropdown({ active, items, setOptions, setOptions2 }) {
aria-labelledby='menu-button'
tabindex='-1'
>
<div className='' role='none'>
<div className='rounded-md gradient-bg' role='none'>
{items &&
items.map((item) => {
return (
Expand All @@ -71,7 +71,7 @@ function Dropdown({ active, items, setOptions, setOptions2 }) {
setOptions2(item.lists);
setShow(false);
}}
className={`text-gray-700 block p-4 text-md hover:text-white cursor-pointer navbg`}
className={`block p-4 text-md text-white cursor-pointer hover:bg-black/10`}
role='menuitem'
tabindex='-1'
id='menu-item-0'
Expand Down
2 changes: 1 addition & 1 deletion components/Tickets/ticketCards.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ function TicketCards({ className, city }) {
);
}

export default TicketCards;
export default TicketCards;
1 change: 1 addition & 0 deletions components/Venue/venue.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function Venue({ className, city }) {
}} className='w-8 h-8 bg-white rounded-xl flex items-center justify-center ml-auto'>
<Image src='/img/mapIcon.svg' alt='Map Icon' width={24} height={24} />
</button>
<div></div>
</div>
<div></div>
<div className='text-white'>
Expand Down
8 changes: 5 additions & 3 deletions config/city-lists.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"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.webp",
"address": "AsyncAPI Youtube Channel",
"map": "https://www.youtube.com/@AsyncAPI",
"address": "AsyncAPI YouTube Channel",
"map": "https://www.youtube.com/live/F9wHxd-v2f0?si=PT8BuAUKNmoLHRiM",
"sponsors": [
"/img/apidays.png"
],
Expand Down Expand Up @@ -46,7 +46,9 @@
],
"ticket": "https://ticket.apidays.global/event/apidays-london-2024/869eca20-bfb6-4103-b8bb-d0348932e940/",
"isFree": true,
"ended": true
"ended": true,
"recordings":"https://youtube.com/playlist?list=PLbi1gRlP7pig77jJD2ER9wfTxPSzBrLW5&si=YPmjUsj5mU6FpLhB",
"playlist":"https://www.youtube.com/embed/videoseries?si=92z0xOVroBuDUvMR&amp;list=PLbi1gRlP7pig77jJD2ER9wfTxPSzBrLW5"
},
{
"name": "Paris",
Expand Down
5 changes: 5 additions & 0 deletions config/links.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@
"title": "London Slides",
"ref": "https://drive.google.com/drive/folders/1PsIZSsQmsvSILZ83f9L-2ErV-pXM6PQf?usp=drive_link",
"target": "_blank"
},
{
"title": "London Talks",
"ref": "https://youtube.com/playlist?list=PLbi1gRlP7pig77jJD2ER9wfTxPSzBrLW5&si=YPmjUsj5mU6FpLhB",
"target": "_blank"
}


Expand Down
Loading

0 comments on commit fae85c8

Please sign in to comment.