Skip to content

Commit

Permalink
Merge pull request #1 from acmucsd/feature/footer
Browse files Browse the repository at this point in the history
Added footer
  • Loading branch information
alexzhang1618 authored Apr 4, 2024
2 parents af369ff + 87add66 commit 837674e
Show file tree
Hide file tree
Showing 12 changed files with 192 additions and 274 deletions.
4 changes: 2 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}
const nextConfig = {};

module.exports = nextConfig
module.exports = nextConfig;
6 changes: 6 additions & 0 deletions public/discord-icon.svg
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/instagram-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/mail-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import './globals.css';
import type { Metadata } from 'next';
import { DM_Sans } from 'next/font/google';
import Footer from '../components/Footer';
import Footer from '@/components/Footer';

const dmSans = DM_Sans({ subsets: ['latin'], weight: ['400', '500', '700'] });

Expand Down
47 changes: 35 additions & 12 deletions src/components/Footer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,44 @@
import { useState } from 'react';
import Link from 'next/link';
import Image from 'next/image';
import './styles.scss';
import styles from './style.module.scss';
import Typography from '../Typography';
import InstagramIcon from '@/public/instagram-logo.svg';

const Footer: React.FC = () => {
// const [email, setEmail] = useState("");
return (
<div className="footer">
<div className="footerContainer">
<div className="footerContents">
<div className="footerContents__wrapper">
<h1>Find us here!</h1>
<p>Interested in learning more?</p>
<p>
<div className={styles.footer}>
<div className={styles.footerContent}>
<div className={styles.findUs}>
<Typography variant="display/medium">Find us here!</Typography>
<div className={styles.description}>
<Typography variant="subheading">Interested in learning more?</Typography>
<Typography variant="subheading" className={styles.subdescription}>
Reach out to get connected, or explore our socials to get a sense of who we are as a
community!
</p>
</Typography>
</div>
</div>
<div className={styles.socials}>
<div className={styles.socialInfo}>
<Image src="/mail-icon.svg" width={50} height={50} alt="Mail Icon" />
{/* <MailIcon /> */}
<Typography variant="subheading" className={styles.socialText}>
Send us an inquiry
</Typography>
</div>

<div className={styles.socialInfo}>
<Image src="/instagram-logo.svg" width={50} height={50} alt="Instagram Logo" />
{/* <InstagramLogo /> */}
<Typography variant="subheading" className={styles.socialText}>
Follow us for updates
</Typography>
</div>

<div className={styles.socialInfo}>
<Image src="/discord-icon.svg" width={50} height={50} alt="Discord Icon" />
<Typography variant="subheading" className={styles.socialText}>
Join the discussion
</Typography>
</div>
</div>
</div>
Expand Down
67 changes: 67 additions & 0 deletions src/components/Footer/style.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
@use 'src/styles/vars.scss' as vars;

.footer {
width: 100%;
background-color: vars.$green;
color: vars.$white;

.footerContent {
display: flex;
justify-content: space-between;
width: 80%;
padding: 7rem 0;
margin: auto;

@media screen and (width <= vars.$breakpoint) {
flex-direction: column;
gap: 1.75rem;
padding: 3rem 0;
align-items: center;
text-align: center;
}

.findUs {
display: flex;
flex-direction: column;
gap: 2rem;
max-width: 40rem;

.description {
display: flex;
flex-direction: column;
gap: 1rem;

@media screen and (width <= vars.$breakpoint) {
.subdescription {
display: none;
}
}
}
}

.socials {
display: flex;
flex-direction: column;
gap: 1.5rem;
min-width: 22rem;

.socialInfo {
display: flex;
flex-direction: row;
gap: 1.25rem;
align-items: center;

@media screen and (width <= vars.$breakpoint) {
.socialText {
display: none;
}
}
}

@media screen and (width <= vars.$breakpoint) {
flex-direction: row;
justify-content: center;
}
}
}
}
24 changes: 0 additions & 24 deletions src/components/Footer/styles.scss

This file was deleted.

Loading

0 comments on commit 837674e

Please sign in to comment.