Skip to content

Commit

Permalink
Merge branch 'master' into fix/carousel-scroll
Browse files Browse the repository at this point in the history
  • Loading branch information
toffee-k21 authored Oct 16, 2024
2 parents 1e788e7 + eb89216 commit c5f53ac
Show file tree
Hide file tree
Showing 12 changed files with 843 additions and 1,734 deletions.
4 changes: 2 additions & 2 deletions components/Agenda/agenda.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function Agenda({ city }) {
</div>
{talk.speaker && typeof talk.speaker === 'number' ? <div className='flex items-center lg:mt-4'>
<div className='w-[94px] h-[94px]'>
<Image src={city.speakers[talk.speaker - 1].img} alt={city.speakers[talk.speaker -1].name} width={0} height={0} className='object-cover rounded-full w-[100%] h-[100%]' />
<Image src={city.speakers[talk.speaker - 1].img} alt={city.speakers[talk.speaker -1].name} className='object-cover rounded-full' height={'100%'} width={'100%'} />
</div>
<div className='ml-4 w-[300px] sm:w-[250px]'>
<Heading typeStyle='heading-sm-semibold' className='text-white'>
Expand All @@ -58,7 +58,7 @@ function Agenda({ city }) {
{talk.speaker.map((speak, i) => <div key={i} className='mt-6'>
<div className='flex items-center lg:mt-4'>
<div className='w-[94px] h-[94px]'>
<Image src={city.speakers[speak - 1].img} alt={city.speakers[speak - 1].name} width={0} height={0} className='object-cover rounded-full w-[100%] h-[100%]' />
<Image src={city.speakers[speak - 1].img} alt={city.speakers[speak - 1].name} className='object-cover rounded-full' height={'100%'} width={'100%'} />
</div>
<div className='ml-4 w-[300px] sm:w-[250px]'>
<Heading typeStyle='heading-sm-semibold' className='text-white'>
Expand Down
2 changes: 1 addition & 1 deletion components/Speaker/speaker.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function Speaker({details, location, className}) {
className={`w-auto text-center flex flex-col items-center card h-auto rounded-md p-[27px] ${className}`}
>
<div className='w-[300px] h-[300px] lg:w-[250px] lg:h-[250px] relative overflow-hidden rounded-full'>
<Image src={details.img} alt={details.name} width={0} height={0} sizes='100vw' className='rounded-full object-cover transition-all duration-300 hover:scale-110 w-[100%] h-[100%]' />
<Image src={details.img} alt={details.name} width={0} height={0} sizes='100vw' className='rounded-full object-cover transition-all duration-300 hover:scale-110' />
</div>
<div className='mt-[19px]'>
<h3 className='text-[23px] text-white'>{details.name}</h3>
Expand Down
42 changes: 1 addition & 41 deletions config/speakers.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
{
"location": "",
Expand Down Expand Up @@ -171,46 +170,7 @@
{
"city": "Online",
"location": "Online Edition",
"lists": [ {
"name": "Hari Krishnan",
"title": "Co-founder, CTO at Specmatic",
"img": "img/online-conf-images/HariKrishanan.webp"
},
{
"name": "Yuan Yuan",
"title": "Software Engineer",
"img": "img/online-conf-images/YuanYuan.webp"
},
{
"name": "Ivan Garcia Sainz-Aja",
"title": "Java Architect",
"img": "img/online-conf-images/IvanGarciaSainz-Aja.webp"
},
{
"name": "Atinuke Oluwabamikemi Kayode",
"title": "Community Marketing Specialist at AsyncAPI Initiative",
"img": "img/online-conf-images/AtinukeOluwabamikemiKayode.webp"
},
{
"name": "Aishat Muibudeen",
"title": "Product Designer and UX Researcher",
"img": "img/online-conf-images/AISHAT(Maya)MUIBUDEEN.webp"
},
{
"name": "Thulisile Sibanda",
"title": "Community Manager at AsyncAPI Initiative",
"img": "img/online-conf-images/VThulisileSibanda.webp"
},
{
"name": "Ankit Dash",
"title": "Full Stack Developer",
"img": "img/online-conf-images/AnkitDash.webp"
},
{
"name": "Giri Venkatesan",
"title": "Principal Developer Advocate and Architect at Solace",
"img": "img/online-conf-images/GiriVenkatesan.webp"
}],
"lists": [],
"agenda": null
}
]
Loading

0 comments on commit c5f53ac

Please sign in to comment.