-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/DSC-McMaster-U/website into…
… feature/MB-29-newsletter-section
- Loading branch information
Showing
5 changed files
with
153 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,75 @@ | ||
| import Link from "next/link"; | ||
| import { socialMedia } from '../constants/socialMedia'; | ||
|
|
||
|
|
||
| const Footer = () => { | ||
| return ( | ||
| <footer> | ||
| <nav className="flex flex-row justify-between w-full"> | ||
| <ul className="flex flex-row"> | ||
| <li> | ||
| <Link href="/">Home</Link> | ||
| </li> | ||
| <li> | ||
| <Link href="/events">Events</Link> | ||
| </li> | ||
| <li> | ||
| <Link href="/newsletters">Newsletters</Link> | ||
| </li> | ||
| </ul> | ||
| {/* <ul> | ||
| <li> | ||
| <Link href="/discord">Join our discord</Link> | ||
| </li> | ||
| </ul> */} | ||
| </nav> | ||
| </footer> | ||
| ); | ||
| } | ||
|
|
||
| export default Footer; | ||
| return ( | ||
| <footer className="bg-google-lightGrey dark:bg-google-black text-google-black dark:text-google-lightGrey py-6 mt-8"> | ||
| <div className="max-w-7xl mx-auto grid grid-cols-1 sm:grid-cols-2 gap-6 px-4"> | ||
|
|
||
| {/* Contact Us */} | ||
| <div className="sm:text-left text-center sm:col-span-1 col-span-full"> | ||
| <h4 className="text-lg sm:text-xl font-bold text-google-black dark:text-google-lightGrey py-2"> | ||
| McMaster University | ||
| </h4> | ||
| <a | ||
| className="text-base sm:text-lg text-google-grey hover:text-google-mediumBlue dark:hover:text-google-lightBlue cursor-pointer" | ||
| href="mailto:[email protected]"> | ||
| [email protected] | ||
| </a> | ||
| </div> | ||
|
|
||
| {/* Follow Us / Site Links */} | ||
| <div className="grid grid-cols-1 sm:grid-cols-3 gap-4 sm:text-left text-center"> | ||
|
|
||
| {/* Follow Us */} | ||
| <div className="sm:text-left text-center sm:col-span-1 col-span-full"> | ||
| <h4 className="font-bold text-google-black dark:text-google-lightGrey mb-2">Follow Us</h4> | ||
| <ul className="space-y-1"> | ||
| {socialMedia.map((media, index) => ( | ||
| <li key={index} className="flex items-center justify-center sm:justify-start"> | ||
| <div className="mr-2 h-5 w-5"> | ||
| {media.icon} | ||
| </div> | ||
| <a | ||
| href={media.href} | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| className="hover:underline text-google-grey hover:text-google-mediumBlue dark:hover:text-google-lightBlue" | ||
| > | ||
| {media.name} | ||
| </a> | ||
| </li> | ||
| ))} | ||
| </ul> | ||
| </div> | ||
|
|
||
| {/* Site Map */} | ||
| <div> | ||
| <h4 className="font-bold text-google-black dark:text-google-lightGrey mb-2">Site Map</h4> | ||
| <ul className="space-y-1"> | ||
| <li><a href="/home" className="hover:underline text-google-grey hover:text-google-mediumBlue">Home</a></li> | ||
| <li><a href="/events" className="hover:underline text-google-grey hover:text-google-mediumBlue">Events</a></li> | ||
| <li><a href="/newsletter" className="hover:underline text-google-grey hover:text-google-mediumBlue">Newsletter</a></li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| {/* Programs */} | ||
| <div> | ||
| <h4 className="font-bold text-google-black dark:text-google-lightGrey mb-2">Programs</h4> | ||
| <ul className="space-y-1"> | ||
| <li><a href="#" className="hover:underline text-google-grey hover:text-google-mediumBlue">Solutions Challenge</a></li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> | ||
|
|
||
| {/* Footer Bottom Section */} | ||
| <div className="max-w-7xl mx-auto text-left mt-4 px-4"> | ||
| <p className="text-sm text-google-grey dark:text-google-lightGrey">© {new Date().getFullYear()} | All rights reserved.</p> | ||
| </div> | ||
| </footer> | ||
| ); | ||
| }; | ||
|
|
||
| export default Footer; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,45 @@ | ||
| import { SiInstagram, SiDiscord, SiLinkedin } from "react-icons/si"; | ||
| import { SiInstagram, SiDiscord, SiLinkedin, SiGithub, SiYoutube, SiFacebook, SiX } from "react-icons/si"; | ||
|
|
||
| export interface SocialMedia { | ||
| name: string; | ||
| href: string; | ||
| icon: JSX.Element; | ||
| } | ||
|
|
||
| export const socialMedia = [ | ||
| { | ||
| name: "Instagram", | ||
| href: "https://www.instagram.com/gdscmcmasteru/", | ||
| icon: <SiInstagram className="w-full h-full" />, | ||
| }, | ||
| { | ||
| name: "Discord", | ||
| href: "https://discord.gg/gdscmcmasteru", | ||
| icon: <SiDiscord className="w-full h-full" />, | ||
| }, | ||
| { | ||
| name: "LinkedIn", | ||
| href: "https://www.linkedin.com/company/gdscmcmasteru/", | ||
| icon: <SiLinkedin className="w-full h-full" />, | ||
| }, | ||
| { | ||
| name: "Github", | ||
| href: "https://github.com/DSC-McMaster-U/", | ||
| icon: <SiGithub className="w-full h-full" /> | ||
| }, | ||
| { | ||
| name: "YouTube", | ||
| href: "https://www.youtube.com/channel/UCyxVVPDEYRCjL0lcwoX9lzA/videos", | ||
| icon: <SiYoutube className="w-full h-full" /> | ||
| }, | ||
| { | ||
| name: "Facebook", | ||
| href: "https://www.facebook.com/GDSCMcMasterU", | ||
| icon: <SiFacebook className="w-full h-full" /> | ||
| }, | ||
| { | ||
| name: "X", | ||
| href: "https://twitter.com/dscmcmasteru", | ||
| icon: <SiX className="w-full h-full" /> | ||
| }, | ||
| ]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters