Merge branch 'asyncapi:master' into fix-apply-as-a-speaker

asyncapi · Sep 22, 2023 · 1c71d0a · 1c71d0a
2 parents 0734b99 + 39e3f66
commit 1c71d0a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/components/Dropdown/dropdown.js b/components/Dropdown/dropdown.js
@@ -7,7 +7,7 @@ function Dropdown({ active, items, setOptions, setOptions2 }) {
 			<div className='w-full'>
 				<button
 					type='button'
-					className='flex justify-between text-white p-4 w-full justify-center gap-x-1.5 rounded-md shadow-sm border border-gray card-bg hover:bg-gray-50'
+					className='flex justify-between text-white p-4 w-full justify-center gap-x-1.5 rounded-md shadow-sm card-bg hover:bg-gray-50 gradient-bg no-border'
 					id='menu-button'
 					aria-expanded='true'
 					aria-haspopup='true'

diff --git a/config/speakers.json b/config/speakers.json
@@ -1,4 +1,9 @@
 [
+	{
+		"location": "",
+		"city": "All",
+		"lists": []
+	},
 	{
 		"location": "Madrid, Spain",
 		"city": "Madrid",

diff --git a/pages/index.js b/pages/index.js
@@ -28,15 +28,16 @@ export default function Home() {
 		ReactGA.initialize('UA-109278936-3');
 		ReactGA.pageview(window.location.pathname + window.location.search);
 	}
+	speakers[0].lists = [];
+	speakers.map((speaker) => {
+		if (Array.isArray(speaker.lists) && Object.keys(speaker.lists).length > 0) {
+			speakers[0].lists.push(...speaker.lists);
+		}
+	});
 	useEffect(() => {
-		const newArr = []
-		speakers.map((speaker) => {
-			if (Array.isArray(speaker.lists) && Object.keys(speaker.lists).length > 0) {
-				newArr.push(...speaker.lists)
-			}
-		});
-		setSpeakersList(newArr)
-	},[])
+		setCity(speakers[0]);
+		setSpeakersList(speakers[0].lists);
+	},[]);
 	return (
 		<div>
 			<Head>
@@ -90,7 +91,7 @@ export default function Home() {
 								</div>
 							) : (
 								<div className='flex justify-center'>
-									<div className='w-[720px] lg:w-full flex justify-between'>
+									<div className='w-[900px] lg:w-full flex justify-between'>
 										{speakers.map((speaker) => {
 											return (
 												<div

diff --git a/styles/globals.css b/styles/globals.css
@@ -69,8 +69,8 @@ body {
   bottom: 0 !important;
 }
 
-.gradient-bg{
-   background-image: linear-gradient(225deg, #2DCCFD 9.35%, #AD20E2 88.41%);
+.gradient-bg {
+   background-image: linear-gradient(225deg, #2DCCFD 9.35%, #AD20E2 88.41%) !important;
 }
 
 .navbg:hover, .navbg:focus{
@@ -90,6 +90,10 @@ body {
   box-shadow: 0px 59px 100px rgba(0, 0, 0, 0.25), 0px 44px 94px rgba(0, 0, 0, 0.15);
 }
 
+.no-border {
+  border: none !important;
+}
+
 .header-bg{
 background: linear-gradient(320deg, #2db4fd 10.35%, #410854 88.41%);
 }