Skip to content

Commit

Permalink
Merge branch 'master' into enhance-card-hover-effect-styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Tanmayshi authored Dec 17, 2024
2 parents d121507 + 3f3d293 commit d9d33de
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion components/Form/Cfp/stepThree.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function StepThree({ setStep, setForm, data }) {
const [value, setValue] = useState({});
useEffect(() => {
setForm({ ...data, ...value});
}, [value]);
}, [value, data, setForm]);
return (
<form className="mt-3 w-[30rem] lg:w-[auto]" onSubmit={(e) => setStep(e, 4)}>
<h1 className="text-white font-bold text-4xl lg:text-3xl">
Expand Down
2 changes: 1 addition & 1 deletion components/Form/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function Dropdown({ options, title, setValue, multi ,dataTest}) {
} else {
setValue(selectedOption.value);
}
}, [selectedOption]);
}, [selectedOption, multi, setValue]);
return (
<div className="relative inline-block w-full">
<Select
Expand Down
9 changes: 3 additions & 6 deletions components/Navbar/navDrop.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const NavDrop = forwardRef((props, ref)=> {
const {setDrop}=props;
const [show, setShow] = useState(null);
return (
<div ref ={ref} className='absolute ml-[-20px] top-16 w-full bg-[#1B1130]'>
<div ref ={ref} className='z-[99] absolute left-0 top-[74px] w-full h-screen bg-[#1B1130]/90 backdrop-filter backdrop-blur-md'>
<div className='flex flex-col p-5 pb-8 w-full'>
{links.map((link) => {
return (
Expand All @@ -22,13 +22,10 @@ const NavDrop = forwardRef((props, ref)=> {
>
{link.subMenu ? (
<div>
<div className='flex items-center justify-between'
>
<div className='flex'>
<div className='text-white'>{link.title}</div>
<Dropdown
className={`transition-transform duration-700 ${
show === link.title ? 'rotate-0' : 'rotate-[-90deg]'
}`}
className={`transition-transform duration-700`}
/>
</div>
{show && show === link.title && (
Expand Down
4 changes: 2 additions & 2 deletions components/Navbar/navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function Navbar() {
};

return (
<div className='flex justify-center items-center sticky top-0 z-[99] text-white'>
<div className={`flex justify-center items-center fixed w-full backdrop-blur ${ drop && 'bg-[#1B1130]/90'} top-0 z-[99] text-white`}>
<div className='w-[1131px]'>
<div className='p-5 flex justify-between h-[75px] w-full items-center'>
<div className='flex items-center sm:justify-between sm:w-full' data-test="nav-Home">
Expand All @@ -86,7 +86,7 @@ function Navbar() {
<Cancel />
</button>
) : (
<button >
<button>
<Hamburger ref={svg} />
</button>
)}
Expand Down
2 changes: 1 addition & 1 deletion config/city-lists.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"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/live/F9wHxd-v2f0?si=PT8BuAUKNmoLHRiM",
"map": "https://www.youtube.com/playlist?list=PLbi1gRlP7pijItMBmw9SeeyWxuEa3jLR2",
"sponsors": [
"/img/apidays.png"
],
Expand Down
2 changes: 1 addition & 1 deletion pages/venue/[id].js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function Venue({ city }) {

<Paragraph className='mt-[24px]' textColor={textColor}>{city.description}</Paragraph>

<Heading typeStyle='lg' className={`${textColor} mt-[24px] hover:underline`}>
<Heading typeStyle='lg' className={`${textColor} mt-[24px] underline`}>
<a href={city.map} target='_blank' rel="noreferrer">
{city.address}
</a>
Expand Down

0 comments on commit d9d33de

Please sign in to comment.