Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement footer #12

Merged
merged 4 commits into from
Dec 10, 2024
Merged

Implement footer #12

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44d3d53
Implement footer
alexzhang1618 Dec 10, 2024
4825d96
Address Sean's comments
alexzhang1618 Dec 10, 2024
0e28ebe
100%
alexzhang1618 Dec 10, 2024
860a1c3
fix side padding mobile
alexzhang1618 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/assets/diamond-pile-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/diamond-pile-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/assets/discord.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets/facebook.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/assets/instagram.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Footer from '@/components/Footer';
import '@/styles/globals.scss';
import type { Metadata } from 'next';
import { DM_Sans } from 'next/font/google';
Expand All @@ -12,7 +13,10 @@ export const metadata: Metadata = {
export default function RootLayout({ children }: { children: React.ReactNode }) {
return (
<html lang="en">
<body className={dmSans.className}>{children}</body>
<body className={dmSans.className}>
{children}
<Footer />
</body>
</html>
);
}
43 changes: 43 additions & 0 deletions src/components/Footer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import Typography from '@/components/Typography';
import styles from './style.module.scss';
import Link from 'next/link';
import Image from 'next/image';
import Instagram from '../../../public/assets/instagram.svg';
import Discord from '../../../public/assets/discord.svg';
import Facebook from '../../../public/assets/facebook.svg';
import DiamondPileLeft from '../../../public/assets/diamond-pile-left.png';
import DiamondPileRight from '../../../public/assets/diamond-pile-right.png';

const Footer: React.FC = () => {
return (
<div className={styles.container}>
<Image src={DiamondPileLeft} alt="Pile of diamonds" className={styles.backgroundLeft} />
<Image src={DiamondPileRight} alt="Pile of diamonds" className={styles.backgroundRight} />
<div className={styles.links}>
<Link href="https://acmucsd.com/about">
<Typography variant="body/large">About Us</Typography>
</Link>
<Link href="https://acmucsd.com/">
<Image src="/acm-logo.png" alt="ACM" width={144} height={144} />
</Link>
<Link href="https://acmucsd.com/#contact">
<Typography variant="body/large">Contact Us</Typography>
</Link>
</div>
<Typography variant="body/large">Made with ♡ by ACM at UC San Diego</Typography>
<div className={styles.socials}>
<Link href="https://www.acmurl.com/instagram/">
<Instagram />
</Link>
<Link href="https://www.acmurl.com/discord/">
<Discord />
</Link>
<Link href="https://www.acmurl.com/facebook/">
<Facebook />
</Link>
</div>
</div>
);
};

export default Footer;
71 changes: 71 additions & 0 deletions src/components/Footer/style.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
@use '@/styles/vars' as vars;

.container {
display: flex;
flex-direction: column;
gap: 2rem;
justify-content: center;
align-items: center;
padding: 8rem vars.$side-padding;
position: relative;
margin: 0 calc(vars.$side-padding * -1);
alexzhang1618 marked this conversation as resolved.
Show resolved Hide resolved

text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.7);
}

.backgroundLeft {
position: absolute;
left: 0;
bottom: 0;
z-index: -1;
max-width: min(100%, 580px);
height: auto;
object-fit: contain;
}

.backgroundRight {
position: absolute;
right: 0;
bottom: 0;
z-index: -1;
max-width: min(100%, 850px);
height: auto;
object-fit: contain;
}

.links {
display: flex;
gap: 6.5rem;
align-items: center;
margin-bottom: 2rem;

a {
text-decoration: none;
color: vars.$white;

img {
filter: drop-shadow(0 4px 8px rgba(0, 0, 0, 0.7));
}
}

@media screen and (max-width: vars.$breakpoint-md) {
gap: 2rem;
a {
img {
display: none;
}
}
}
}

.socials {
display: flex;
gap: 1rem;
align-items: flex-start;

a {
svg {
filter: drop-shadow(0 4px 8px rgba(0, 0, 0, 0.7));
}
}
}
5 changes: 5 additions & 0 deletions src/sections/About/style.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
flex-direction: column;
gap: 6.25rem;

.isDesktop {
margin: 0 calc(-1 * vars.$side-padding);
width: 100vw;
alexzhang1618 marked this conversation as resolved.
Show resolved Hide resolved
}

.isMobile {
display: none;
}
Expand Down
Loading