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

Update socials + our call to action #171

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Update socials + our call to action #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Link from "next/link";
import DiscordLogo from "@/public/images/discord.svg";
import InstagramLogo from "@/public/images/instagram.svg";
import FacebookLogo from "@/public/images/facebook.svg";
import MailLogo from "@/public/images/newsletter.svg";
import LinkedinLogo from "@/public/images/linkedin.svg";
import TropicalImage from "./TropicalImage";

export default function Footer() {
Expand All @@ -26,8 +26,11 @@ export default function Footer() {
>
<TropicalImage img={FacebookLogo} alt="Facebook Redirect" />
</Link>
<Link href="mailto:[email protected]" target="_blank">
<TropicalImage img={MailLogo} alt="Mail Redirect" />
<Link
href="https://www.linkedin.com/company/uclacyber"
target="_blank"
>
<TropicalImage img={LinkedinLogo} alt="LinkedIn Redirect" />
</Link>
</div>
</div>
Expand All @@ -38,10 +41,10 @@ export default function Footer() {
<p>© ACM Cyber 2024</p>
</div>

<div className={styles.joinUsOrElse}>
<div className={styles.githubPages}>
{/* Join Us! */}
<a href="https://tinyurl.com/acmcybernewsletter">
Join our Mailing List!
<a href="https://github.com/uclaacm/acmcyber.com">
Powered by Github Pages
</a>
</div>
</footer>
Expand Down
22 changes: 9 additions & 13 deletions pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import Link from "next/link";
import styles from "styles/Home.module.scss";
import joinStyles from "@/styles/Join.module.scss";
import CyberSeo from "@/components/CyberSeo";
import CyberWordmark from "@/components/CyberWordmark";
import DiscordLogo from "@/public/images/discord.svg";
import Flag from "@/public/images/flag.svg";
import Boba from "@/public/images/boba.svg";
import InstagramLogo from "@/public/images/instagram.svg";
import LinkedinLogo from "@/public/images/linkedin.svg";
import TestTube from "@/public/images/test-tube.svg";
import CyberLogoInverted from "@/public/images/cyber-logo-light-inverted.png";
import TropicalImage from "@/components/TropicalImage";

export default function HomePage() {
return (
Expand Down Expand Up @@ -74,15 +71,14 @@ export default function HomePage() {
Ready to start <em>your</em> cybersecurity journey?
</h1>
<div className={styles.socials}>
<a href="https://discord.com/invite/j9dgf2q">
<TropicalImage img={DiscordLogo} alt="Discord logo" />
</a>
<a href="https://www.instagram.com/uclacyber">
<TropicalImage img={InstagramLogo} alt="Instagram logo" />
</a>
<a href="https://www.linkedin.com/company/uclacyber">
<TropicalImage img={LinkedinLogo} alt="Linkedin Logo" />
</a>
<button className={joinStyles.membershipForm}>
<Link href="https://discord.com/invite/j9dgf2q">
Join our Discord!
</Link>
</button>
<button className={joinStyles.membershipForm}>
<Link href="/join">Fill out the Membership Form!</Link>
</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion styles/Footer.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ footer.footer {
text-align: center;
}

.joinUsOrElse {
.githubPages {
display: block;
margin: 1rem 0px;
padding: 0.2rem;
Expand Down
8 changes: 2 additions & 6 deletions styles/Home.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,8 @@ h1.motto {
width: 100%;
gap: 40px;

div {
width: 60px;
height: 60px;
transform: scale(80%);
object-fit: contain;
background: var(--cyber-gold);
button {
margin: 0;
}
}
}
Loading