Skip to content

Commit

Permalink
Small adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
leehack committed Sep 13, 2024
1 parent 9f352cb commit 49bf487
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 48 deletions.
14 changes: 7 additions & 7 deletions src/app/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ export const metadata = {
export default function RootLayout({ children }) {
return (<html lang="en">
<body className={openSans.className}>
<Header />
<main className="container flex mx-auto py-2 flex-col flex-grow"> {/* Allow main content to expand */}
{children}
</main>
<Footer />
<GoogleAnalytics />
<Header />
<main className="container flex mx-auto p-2 flex-col flex-grow"> {/* Allow main content to expand */}
{children}
</main>
<Footer />
<GoogleAnalytics />
</body>
</html>
</html>
);
}
7 changes: 3 additions & 4 deletions src/components/elements/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const Navbar = ({ isMobile }) => {


return (
<nav className={isMobile ? 'flex flex-col space-y-2 ' : 'hidden lg:flex space-x-2 items-center'}>
<nav className={isMobile ? 'flex flex-col space-y-2 ' : 'hidden md:flex space-x-2 items-center'}>
{navigation.map((link) => (
<Link
key={link.href}
Expand All @@ -21,11 +21,10 @@ const Navbar = ({ isMobile }) => {
hover:text-black
hover:bg-gray-200
${!isMobile && 'rounded-full'}
${
pathname === link.href
${pathname === link.href
? 'bg-gray-300 text-gray-800' // Active link styles
: ''
}
}
`}
>
{link.label}
Expand Down
22 changes: 7 additions & 15 deletions src/components/sections/EventHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,16 @@ import PillButton from '@/components/elements/PillButton';
import Link from 'next/link';

const EventHeader = ({
eventData,
}) => {
eventData,
}) => {
return (
<div className="relative pt-28">
<div className="container mx-auto px-4 flex flex-col items-center lg:flex-row justify-around">

<div className="relative">
<h1 className="text-6xl font-semibold tracking-tighter text-gray-800 py-12 text-center">
{eventData.eventName} {eventData.eventCity} {eventData.year}
</h1>
<div className="container mx-auto flex flex-col items-center md:flex-row justify-around">
<div className="mb-6 md:mb-0 text-left md:text-left">
<h1 className="text-6xl font-semibold tracking-tighter text-gray-800 py-3">{eventData.eventName} <br />
<span className="font-semibold">{eventData.eventCity}</span>
</h1>
<p className="text-gray-600">{eventData.year}</p>
<p className="text-gray-600 max-w-xl">{eventData.description}</p>


<div className="flex text-black font-medium lg:items-center my-5 justify-start lg:justify-start">
<CalendarDaysIcon className="h-5 w-5 text-gray-500 mr-2" />
<p className="text-gray-700">{eventData.date}</p>
Expand All @@ -28,14 +24,10 @@ const EventHeader = ({
href="#venue">
{eventData.location}
</Link>

</p>
</div>

<PillButton className="my-6 flex" href={eventData.buttonLink} label={eventData.buttonText} />

</div>

<div className="p-5">
<Image
src={eventData.imageUrl}
Expand Down
28 changes: 14 additions & 14 deletions src/components/sections/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@ const Footer = () => {
return (
<footer
id="footer"
className="container flex flex-col sm:flex-row mx-auto py-7 items-center justify-around rounded-ss-2xl rounded-se-2xl gap-3 w-full bg-black text-gray-300 pb-3 text-center sm:text-start">
className="container flex flex-col md:flex-row mx-auto p-3 items-center justify-around rounded-ss-2xl rounded-se-2xl gap-3 w-full bg-black text-gray-300 pb-3 text-center md:text-start">

<div className="text-gray-300">© {new Date().getFullYear()} GDG Montreal. All rights reserved.</div>

<div className="flex flex-row gap-6 items-start justify-start w-fit">

<Link id="twitter" href="https://www.papercall.io/devfest-2024-mtl" target="_blank" rel="noopener noreferrer"
className="hover:cursor-pointer">
className="hover:cursor-pointer">
Call for paper
</Link>
<Link id="twitter"
href="https://docs.google.com/presentation/d/1ezmE9o9o-EXhEa_ofPospL9hFGxAYm8xtnV_0m3AqSo/edit?usp=sharing"
target="_blank" rel="noopener noreferrer"
className="hover:cursor-pointer">
href="https://docs.google.com/presentation/d/1ezmE9o9o-EXhEa_ofPospL9hFGxAYm8xtnV_0m3AqSo/edit?usp=sharing"
target="_blank" rel="noopener noreferrer"
className="hover:cursor-pointer">
Sponsorship proposal
</Link>
<Link id="twitter" href="/code-of-conduct" target="_blank" rel="noopener noreferrer"
className="hover:cursor-pointer">
<Link id="twitter" href="/code-of-conduct"
className="hover:cursor-pointer">
Code of conduct
</Link>

</div>

<div className="flex flex-row gap-6 items-start justify-start w-fit">
<a id="twitter" href="https://twitter.com/gdgmontreal" target="_blank" rel="noopener noreferrer"
className="hover:cursor-pointer">
className="hover:cursor-pointer">
<svg
xmlns="http://www.w3.org/2000/svg"
className="icon icon-tabler icon-tabler-brand-x"
Expand All @@ -48,8 +48,8 @@ const Footer = () => {
</svg>
</a>
<a id="linkedin" href="https://www.linkedin.com/company/gdgmontreal" target="_blank"
rel="noopener noreferrer"
className="hover:cursor-pointer">
rel="noopener noreferrer"
className="hover:cursor-pointer">
<svg
xmlns="http://www.w3.org/2000/svg"
className="icon icon-tabler icon-tabler-brand-linkedin"
Expand All @@ -72,8 +72,8 @@ const Footer = () => {
</a>

<a id="instgram" href="https://www.instagram.com/gdgmtl/" target="_blank"
rel="noopener noreferrer"
className="hover:cursor-pointer">
rel="noopener noreferrer"
className="hover:cursor-pointer">
<svg
xmlns="http://www.w3.org/2000/svg"
className="icon icon-tabler icon-tabler-brand-instagram"
Expand All @@ -94,7 +94,7 @@ const Footer = () => {
</a>

<a id="discord" href="https://discord.gg/rKMxWWDSTT" target="_blank" rel="noopener noreferrer"
className="hover:cursor-pointer">
className="hover:cursor-pointer">
<svg
xmlns="http://www.w3.org/2000/svg"
className="icon icon-tabler icon-tabler-brand-discord"
Expand All @@ -118,7 +118,7 @@ const Footer = () => {
</a>

<a id="youtube" href="https://youtube.com/@gdgmontreal" target="_blank" rel="noopener noreferrer"
className="hover:cursor-pointer">
className="hover:cursor-pointer">
<svg
xmlns="http://www.w3.org/2000/svg"
className="icon icon-tabler icon-tabler-brand-youtube"
Expand Down
8 changes: 4 additions & 4 deletions src/components/sections/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ const Header = () => {
<div className="flex flex-row ">
{/* Navigation (Desktop) on the right */}
<Navbar isMobile={false} />
<PillButton className="ml-3 hidden lg:flex" href="https://devfestmontreal2024.eventbrite.ca"
label="Get Tickets" />
<PillButton className="ml-3 hidden md:flex" href="https://devfestmontreal2024.eventbrite.ca"
label="Get Tickets" />

</div>
{/* Hamburger Menu (Mobile) */}
<button
className="lg:hidden text-gray-800 hover:text-black focus:outline-none p-2 hover:bg-gray-200 rounded-full"
className="md:hidden text-gray-800 hover:text-black focus:outline-none p-2 hover:bg-gray-200 rounded-full"
onClick={() => setIsMenuOpen(true)}
>
<Bars3Icon className="h-6 w-6" />
Expand All @@ -45,7 +45,7 @@ const Header = () => {

{/*App Drawer overlay background*/}
{isMenuOpen && <div
className="lg:hidden fixed inset-0 bg-black bg-opacity-40"
className="md:hidden fixed inset-0 bg-black bg-opacity-40"
onClick={() => setIsMenuOpen(false)}
>

Expand Down
2 changes: 1 addition & 1 deletion src/components/sections/Venue.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Venue = ({ venueData }) => {
<div className="relative h-full"> {/* Adjust width as needed */}
<div className="aspect-video h-full"> {/* Maintain aspect ratio for map embed */}
<iframe
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d22373.210209553163!2d-73.61781282568357!3d45.496966700000016!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc91a6a8dd7e037%3A0xf7e97c225e7151a2!2sConcordia%20University%20Multi%20Faith%20%26%20Spirituality%20Centre!5e0!3m2!1sen!2sca!4v1726211675398!5m2!1sen!2sca"
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2796.728385132924!2d-73.58400550876223!3d45.49541409649223!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc91a6a52a5e115%3A0x7f6e51eeba31e9bc!2sConcordia%20University%2C%20John%20Molson%20Building!5e0!3m2!1sen!2sca!4v1726228096000!5m2!1sen!2sca"
width="100%"
height="100%"
style={{ border: 0 }}
Expand Down
3 changes: 0 additions & 3 deletions src/data/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ export const navigation = [
label: 'Home',
},
{
href: '/schedule',
label: 'Schedule',
}, {
href: '/speakers',
label: 'Speakers',
},
Expand Down

0 comments on commit 49bf487

Please sign in to comment.