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.

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

Favicon #165

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion apps/site/src/app/(home)/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
export const revalidate = 60;

import Landing from "./sections/Landing";
import Intro from "./sections/Intro";
import GetInvolved from "./sections/GetInvolved";
import Sponsors from "./sections/Sponsors";
import FAQ from "./sections/FAQ";
Expand Down
29 changes: 29 additions & 0 deletions apps/site/src/app/Downloads/ArcGISPro.prvc
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// EducationSiteArcGISPro_SingleUse_1333257.prvc

//Provision
Provision ID=65A06A4B-3336-4FEF-967E0DA70D1BE9B1
Comment=FY24 ArcGIS Pro provisioning file


// User Information
First Name=
Last Name=
Organization=University of California
Department=
Email=
Address 1=
City=
State/Province=
Location Code=
Location=
Zip/Postal Code=
Phone Number=
// Version=10.1

// Features and authorization numbers
Desktop Advanced=ESU250229801
Aviation Charting=ESU636260077
Maritime Bathymetry=ESU259421013
Business Analyst=ESU553141824
LocateXT=ESU409551532
Maritime Charting=ESU706700639
Binary file removed apps/site/src/app/favicon.ico
Binary file not shown.
Binary file modified apps/site/src/app/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions apps/site/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const metadata: Metadata = {
};

const fredoka = Fredoka({
weight: ["400", "600", "700"],
weight: ["400", "500", "600", "700"],
subsets: ["latin"],
variable: "--next-font-fredoka",
});
Expand All @@ -32,7 +32,7 @@ export default function RootLayout({
<body className="background">
{/* <NavBar /> */}
<main>{children}</main>
{/* <Footer /> */}
<Footer />
</body>
</html>
);
Expand Down
4 changes: 0 additions & 4 deletions apps/site/src/assets/icons/Facebook-Logo-Primary-min.svg

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions apps/site/src/assets/icons/discord.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: 0 additions & 3 deletions apps/site/src/assets/icons/email.svg

This file was deleted.

3 changes: 0 additions & 3 deletions apps/site/src/assets/icons/hack-logo.svg

This file was deleted.

3 changes: 3 additions & 0 deletions apps/site/src/assets/icons/hack.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/site/src/assets/icons/instagram.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 apps/site/src/assets/icons/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.
1 change: 1 addition & 0 deletions apps/site/src/assets/icons/tiktok.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 87 additions & 9 deletions apps/site/src/components/Footer/Footer.module.scss
Original file line number Diff line number Diff line change
@@ -1,28 +1,106 @@
.footer {
padding-bottom: 7vw;
padding: 2vw 4vw 2vw 4vw;
}
.left_footer {
text-align: left;
}

.left_footer_text {
color: white;
margin-right: 10px;
margin-left: 5px;
text-decoration: none;
font-weight: 500;
&:hover {
text-decoration: underline;
}
}

.button {
background-color: white;
border: none;
color: hsl(189, 100%, 38%);
padding: 8px 30px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
margin: 0.5vw;
border-radius: 8px;
font-weight: 500;

&:hover {
transform: scale(1.025);
filter: drop-shadow(0px 0px 4px rgba(0, 0, 0, 0.4));
}
}

.right_footer {
text-align: right;
}

#box {
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
}

.text {
font-size: 1.5rem;
font-weight: bold;
color: black;
font-weight: 500;
color: white;
text-align: center;
margin-bottom: 0;
}

.socials {
background-color: white;
margin: 15px;
margin-right: 13px;
padding: 5px;
border-radius: 10px;
filter: drop-shadow(0px 0px 3px rgba(0, 0, 0, 0.5));
object-fit: contain;
transform: scale(0.95);
transition:
transform,
filter 0.25s;

&:hover {
transform: scale(1.025);
filter: drop-shadow(0px 0px 4px rgba(0, 0, 0, 0.4));
}
}

.socials:hover {
transform: scale(1.025);
filter: drop-shadow(0px 0px 4px rgba(0, 0, 0, 0.4));
@media only screen and (max-width: 600px) {
.buttons {
text-align: center;
display: block;
margin: auto;
flex-wrap: nowrap;
}

#box {
justify-content: center;
text-align: center;
}

.button {
margin-top: 0.7rem;
}

.socials {
margin-left: 15px;
margin-right: 15px;
margin-bottom: 10px;
margin-top: 10px;
padding: 0;
}

.text {
font-size: 1rem;
margin-top: 1.5rem;
}

.left_footer {
text-align: center;
}
}
73 changes: 59 additions & 14 deletions apps/site/src/components/Footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,41 @@
"use client";

import Image from "next/image";
import Link from "next/link";
import clsx from "clsx";

import styles from "./Footer.module.scss";

import Mail from "@/assets/icons/email.svg";
import Facebook from "@/assets/icons/Facebook-Logo-Primary-min.svg";
import Instagram from "@/assets/icons/instagram.png";
import Hack from "@/assets/icons/hack-logo.svg";
import TikTok from "@/assets/icons/TikTok-Social-Icon-Circle-White.svg";
import Mail from "@/assets/icons/mail_icon.svg";
import Discord from "@/assets/icons/discord.svg";
import Instagram from "@/assets/icons/instagram.svg";
import Hack from "@/assets/icons/hack.svg";
import TikTok from "@/assets/icons/tiktok.svg";

type Social = {
icon: any;
link: string;
alt: string;
};

const SOCIALS: Social[] = [
const LEFT_SOCIALS: Social[] = [
{
icon: Hack,
link: "https://hack.ics.uci.edu/",
alt: "Hack at UCI logo that links to Hack at UCI's club website",
},
];

const RIGHT_SOCIALS: Social[] = [
{
icon: Mail,
link: "mailto:[email protected]",
alt: "Mail icon that creates an email with Hack at UCI as sender",
},
{
icon: Facebook,
link: "https://www.facebook.com/UCI.Hack/",
alt: "Facebook logo that links to Hack at UCI's Facebook",
icon: Discord,
link: "https://discord.com/invite/pvkGxq2AWM",
alt: "Discord logo that links to Hack at UCI's Discord server",
},
{
icon: Instagram,
Expand All @@ -47,20 +52,60 @@ const SOCIALS: Social[] = [
export default function Footer() {
return (
<footer className={styles.footer}>
<p className={styles.text}>Made with &lt;3 in Irvine, CA - Hack @ UCI</p>
<div className="text-center">
{SOCIALS.map(({ icon, link, alt }) => (
<div className={clsx(styles.left_footer, styles.hack_icon)}>
{LEFT_SOCIALS.map(({ icon, link, alt }) => (
<a key={link} href={link} target="_blank">
<Image
src={icon.src}
alt={alt}
width={45}
height={45}
width={55}
height={55}
className={styles.socials}
/>
</a>
))}
</div>
<div className={styles.buttons}>
<div id={styles.box}>
<div className={clsx(styles.left_footer, styles.links)}>
<Link href="/" className={styles.left_footer_text}>
Home
</Link>
{/* <Link
href="https://zothacks-2023.devpost.com/"
className={styles.left_footer_text}
target="_blank"
>
Devpost
</Link> */}
<Link
href="https://hack.ics.uci.edu/"
className={styles.left_footer_text}
target="_blank"
>
About Us
</Link>
</div>
<div className={styles.right_footer}>
{RIGHT_SOCIALS.map(({ icon, link, alt }) => (
<a key={link} href={link} target="_blank">
<Image
src={icon.src}
alt={alt}
width={40}
height={40}
className={styles.socials}
/>
</a>
))}
</div>
</div>

<a href="/apply" className={styles.button} target="_blank">
Apply Now
</a>
</div>
<p className={styles.text}>Made with 👋 in Irvine, CA - Hack at UCI</p>
</footer>
);
}
Loading
Loading