Skip to content

Commit

Permalink
Merge branch 'online-agenda' of https://github.com/thulieblack/confer…
Browse files Browse the repository at this point in the history
…ence-website into online-agenda
  • Loading branch information
thulieblack committed Oct 18, 2024
2 parents a214e5e + 791ed5b commit 28ad6e1
Show file tree
Hide file tree
Showing 26 changed files with 4,320 additions and 2,752 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
18
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} className='object-cover rounded-full' height={'100%'} width={'100%'} />
<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%]' />
</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} className='object-cover rounded-full' height={'100%'} width={'100%'} />
<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%]' />
</div>
<div className='ml-4 w-[300px] sm:w-[250px]'>
<Heading typeStyle='heading-sm-semibold' className='text-white'>
Expand Down
4 changes: 3 additions & 1 deletion components/Header/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import cities from '../../config/city-lists.json';
import Venue from '../Venue/venue';
import Announcement from '../announcement';
import Link from 'next/link';
import { useMediaQuery } from 'react-responsive';

function Header() {
const isMobile = useMediaQuery({ maxWidth: '590px' });
return (
<div className='relative'>
<div className='container w-full flex items-center justify-center'>
Expand Down Expand Up @@ -43,7 +45,7 @@ function Header() {
</div>
</div>
<div className='mt-24'>
<ReactSlider>
<ReactSlider>
{cities.map((city) => {
return <Venue key={city.name} city={city}/>;
})}
Expand Down
9 changes: 7 additions & 2 deletions components/Slider/slider.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@ function ReactSlider({ children }) {
variableWidth: isMobile ? false : true,
arrows: false,
};

return (
<Slider ref={slider} {...settings}>
<>
{ children.length > 4 || isMobile ?
(<Slider ref={slider} {...settings}>
{children}
</Slider>
</Slider>):(
<div className='flex m-2 justify-center'>{children}</div>)}
</>
);
}

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' />
<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%]' />
</div>
<div className='mt-[19px]'>
<h3 className='text-[23px] text-white'>{details.name}</h3>
Expand Down
2 changes: 1 addition & 1 deletion components/Venue/venue.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function Venue({ className, city }) {
return (
<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 rounded-md bg-[image:var(--image-url)] flex items-center justify-center p-4 cursor-pointer'>
className='relative w-[300px] h-[400px] sm:w-[250px] sm:h-[350px] card-bg rounded-md bg-[image:var(--image-url)] flex items-center justify-center p-4 cursor-pointer m-2'>
<div className='flex justify-between flex-col w-full h-full'>
<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}
Expand Down
2 changes: 1 addition & 1 deletion config/city-lists.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"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",
"img": "/img/testMic.webp",
"address": "AsyncAPI Youtube Channel",
"map": "https://www.youtube.com/@AsyncAPI",
"sponsors": [
Expand Down
6 changes: 6 additions & 0 deletions config/links.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,14 @@
"title": "Helsinki Slides",
"ref": "https://drive.google.com/drive/folders/1nY7dZF8WFXZ3r2rCWJDDoT2C_GMfQJMV?usp=drive_link",
"target": "_blank"
},
{
"title": "London Slides",
"ref": "https://drive.google.com/drive/folders/1PsIZSsQmsvSILZ83f9L-2ErV-pXM6PQf?usp=drive_link",
"target": "_blank"
}


]
}

Expand Down
57 changes: 54 additions & 3 deletions config/speakers.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
{
"location": "",
Expand Down Expand Up @@ -164,14 +163,66 @@
{
"city": "Paris",
"location": "Paris, France",
"lists": [],
"lists": [
{
"name": "Dr. Annegret Junker",
"title": "Chief Software Architect at codecentric AG",
"img": "img/paris-images/Annegret.webp"
},
{
"name": "Leonid Lukyanov",
"title": "Co-Founder, CEO at Aklivity",
"img": "img/paris-images/Leonid.webp"
},
{
"name": "Hugo Guerrero",
"title": "Developer Advocate at Redhat",
"img": "img/paris-images/Hugo.webp"
},
{
"name": "Naresh Jain",
"title": "Founder, CEO at Specmatic",
"img": "img/paris-images/Naresh.webp"
},
{
"name": "Frank Kilcommins",
"title": "Principal API Technical Evangelist at SmartBear",
"img": "img/paris-images/Frank.webp"
},
{
"name": "Laurent Broudoux",
"title": "Co-founder at Microcks",
"img": "img/paris-images/Laurent.webp"
},
{
"name": "Hari Krishnan",
"title": "Co-Founder, CTO at Specmatic",
"img": "img/paris-images/Hari.webp"
},
{
"name": "Joel Rosario",
"title": "Chief Scientist at Specmatic",
"img": "img/paris-images/Joel.webp"
},
{
"name": "Julien Testut",
"title": "Senior Principal Product Manager at Oracle",
"img": "img/paris-images/Julien.webp"
},
{
"name": "Alessandro Cagnetti",
"title": "Customer Engineering at Solace",
"img": "img/paris-images/Alessandro.webp"
}
],
"agenda": null
},

{
"city": "Online",
"location": "Online Edition",
"lists": [ {
"lists": [
{
"name": "Hari Krishnan",
"title": "Co-founder, CTO at Specmatic",
"img": "img/online-conf-images/HariKrishanan.webp"
Expand Down
Loading

0 comments on commit 28ad6e1

Please sign in to comment.