Merge branch 'master' into Venue-clickable-address-links

asyncapi · Nov 22, 2023 · 47a79de · 47a79de
2 parents 9c6d8e2 + aa0a693
commit 47a79de
Show file tree

Hide file tree

Showing 11 changed files with 1,957 additions and 4,674 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -45,7 +45,7 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
           GITHUB_LOGIN: asyncapi-bot
-          MERGE_LABELS: ""
+          MERGE_LABELS: "!do-not-merge"
           MERGE_METHOD: "squash"
           MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
           MERGE_RETRIES: "20"

diff --git a/components/Countdown/countdown.js b/components/Countdown/countdown.js
@@ -14,6 +14,10 @@ const dates = [
 		name: 'Bangalore, India',
 		date: 'November 30, 2023',
 	},
+	{
+		name: 'Paris, France',
+		date: 'December 6, 2023',
+	},
 ];
 
 function Countdowns() {
@@ -29,10 +33,14 @@ function Countdowns() {
 			dateRef.current.classList.add('home-title');
 			setSelectedIndex((prevIndex) => (prevIndex + 1) % dates.length);
 			setTimeout(() => {
-				locationRef.current.classList.remove('home-title');
-				locationRef.current.classList.add('hidden');
-				dateRef.current.classList.remove('home-title');
-				dateRef.current.classList.add('hidden');
+				if(locationRef?.current) {
+					locationRef.current.classList.remove('home-title');
+					locationRef.current.classList.add('hidden');
+				}
+				if(dateRef?.current) {
+					dateRef.current.classList.remove('home-title');
+					dateRef.current.classList.add('hidden');
+				}
 			}, 9900); // Element stays visible for 800 milliseconds
 		}, 10000); // Toggle visibility every 1500 milliseconds
 
@@ -56,7 +64,6 @@ function Countdowns() {
 						<span className='glitch text-white text-[30px] sm:text-[18px]'>
 							Ended
 						</span>
-						{/* <p className='text-lg mt-[30px]'>Seconds</p> */}
 					</div>
 				</div>
 		} else {
@@ -70,25 +77,21 @@ function Countdowns() {
 						<span className='glitch text-white text-[30px] sm:text-[18px]'>
 							{days}:
 						</span>
-						{/* <p className='text-lg mt-[30px]'>Days</p> */}
 					</div>
 					<div>
 						<span className='glitch text-white text-[30px] sm:text-[18px]'>
 							{hours}:
 						</span>
-						{/* <p className='text-lg mt-[30px]'>Hours</p> */}
 					</div>
 					<div>
 						<span className='glitch text-white text-[30px] sm:text-[18px]'>
 							{minutes}:
 						</span>
-						{/* <p className='text-lg mt-[30px]'>Minutes</p> */}
 					</div>
 					<div>
 						<span className='glitch text-white text-[30px] sm:text-[18px]'>
 							{seconds}
 						</span>
-						{/* <p className='text-lg mt-[30px]'>Seconds</p> */}
 					</div>
 				</div>
 			);

diff --git a/components/Form/subscription.js b/components/Form/subscription.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import Button from '../Buttons/button';
 
 function Subcription() {
 	return (
@@ -8,12 +9,13 @@ function Subcription() {
 					Subscribe for AACoT’23 updates!
 				</h3>
 				<a href='https://www.asyncapi.com/newsletter' target='_blank' rel="noreferrer" className='sm:w-full'>
-					<button
-						type='submit'
-						className='w-[299px] lg:w-full bg-[#875AE2] h-[84px] mt-[40px] text-[24px] text-white rounded-lg lg:mt-6'
-					>
-						Subscribe
-					</button>
+				<Button
+					type='submit'
+					className='w-full md:w-[200px] mt-8 px-10' 
+				>
+					Subscribe
+				</Button>
+
 				</a>
 			</div>
 		</div>

diff --git a/components/Header/header.js b/components/Header/header.js
@@ -97,11 +97,11 @@ function Header() {
 							</div>
 							<div className='mt-[54px] relative flex items-center justify-center'>
 								<a
-									href='https://www.eventbrite.com/e/entradas-asyncapi-conf-on-tour-2023-735378636297?aff=ebdssbdestsearch&keep_tld=1'
+									href='https://opencollective.com/asyncapi/events/asyncapi-conference-on-tour-6b3c0aa1/contribute/aacot-london-edition-66187'
 									target='_blank'
 									rel='noreferrer'
 								>
-									<Button className='w-[200px]'>Register for Madrid</Button>
+									<Button className='w-[200px]'>Get Bangalore Ticket</Button>
 								</a>
 							</div>
 						</div>

diff --git a/components/Navbar/navbar.js b/components/Navbar/navbar.js
@@ -1,17 +1,26 @@
 import Link from 'next/link';
 import Dropdown from '../illustration/dropdown';
-import { useState } from 'react';
+import { useState,useEffect } from 'react';
 import links from '../../config/links.json';
 import NavDrop from './navDrop';
 import Hamburger from '../illustration/hamburger';
 import { useMediaQuery } from 'react-responsive';
 import Cancel from '../illustration/cancel';
 
 
+
 function Navbar() {
 	const isTablet = useMediaQuery({ maxWidth: '1118px' });
 	const [drop, setDrop] = useState(false);
 	const [show, setShow] = useState(null);
+	function handleClosing(event) {
+		if (show && !event.target.closest('.subMenu')) {
+			setShow(false);
+		}
+	}
+	useEffect(() => {
+		document.addEventListener('mousedown', handleClosing);
+	}, [show]);
 	return (
 		<div className='container flex justify-center items-center sticky top-0 backdrop-blur z-[99]'>
 			<div className='w-[1131px]'>
@@ -43,16 +52,16 @@ function Navbar() {
 										onClick={() =>
 											show === link.title ? setShow(null) : setShow(link.title)
 										}
-										className='text-[#F0F4F5] ml-16 text-[15px] cursor-pointer relative flex flex-col'
+										className='text-[#F0F4F5] ml-16 text-[15px] group cursor-pointer relative flex flex-col'
 									>
 										<div>
 											{link.subMenu ? (
-												<div className='flex items-center'>
+												<div className='flex items-center '>
 													{link.title}{' '}
 													{link.subMenu && (
 														<Dropdown
 															className={`ml-2 transition-transform duration-700 ${show === link.title ? 'rotate-180' : 'rotate-0'
-																}`}
+															}`}
 														/>
 													)}
 												</div>
@@ -61,7 +70,7 @@ function Navbar() {
 											)}
 										</div>
 										{show && show === link.title && link.subMenu && (
-											<div className='absolute z-[9] mt-8 w-[140px] rounded-md left-[-15px] gradient-bg pl-2 pt-1 flex flex-col justify-center space-y-0'>
+											<div className='subMenu absolute z-[9] mt-8 w-[140px] rounded-md left-[-15px] gradient-bg pl-2 pt-1 flex flex-col justify-center space-y-0'>
 												{link.subMenu.map((subL) => (
 													<Link href={subL.ref} key={subL.title}>
 														<div className='h-[32px] text-[16px]'>
@@ -83,4 +92,4 @@ function Navbar() {
 	);
 }
 
-export default Navbar;
+export default Navbar;
diff --git a/config/city-lists.json b/config/city-lists.json
@@ -25,10 +25,10 @@
 		"sponsors": [
 			"/img/sngular.png"
 		],
-		"ticket": "https://www.eventbrite.es/e/entradas-asyncapi-conf-on-tour-2023-735378636297",
+		"ticket": "https://www.youtube.com/watch?v=FN5eR1Zqh9c",
 		"freeTickets":"",
 		"freeTicketText":"Grab Free Tickets",
-		"buttonText":"Register"
+		"buttonText":"See Recordings"
 	},
 	{
 		"name": "Bangalore",
@@ -55,9 +55,9 @@
 		"sponsors": [
 			"/img/apidays.png"
 		],
-		"ticket": "",
+		"ticket": "https://ticket.apidays.global/event/apidays-paris-2023/8a1f3904-e2be-4c69-a880-37d2ddf1027d/cart?coupon=ASYNCAPICONF23",
 		"freeTickets":"",
 		"freeTicketText":"Grab Free Tickets",
-		"buttonText":"Get your Tickets"
+		"buttonText":"Grab Free Tickets"
 	}
 ]