From 8c4f23c594aaec32d8e5e1e60590faa88e30dc70 Mon Sep 17 00:00:00 2001 From: Amy Date: Mon, 23 Aug 2021 22:57:57 -0400 Subject: [PATCH 1/6] Fix links on home page (past events/news) (#174) Co-authored-by: Amy Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/174 Reviewed-by: Aditya Thakral Co-authored-by: Amy Co-committed-by: Amy --- pages/index.tsx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pages/index.tsx b/pages/index.tsx index 7b9556c6..ab7d2f71 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -51,10 +51,7 @@ export default function Home(props: Props) {

Upcoming Events

- See past events{" "} - - here - + See past events here

{props.events.length === 0 ? ( @@ -75,10 +72,7 @@ export default function Home(props: Props) { {props.moreEvents ? (

- See more upcoming events{" "} - - here - + See more upcoming events here

) : null}
@@ -86,10 +80,7 @@ export default function Home(props: Props) {

News

Updates from our execs!
- See past news{" "} - - here - + See past news here

{ From 72709f5d6eb78d1ec7896ca7a53d63c98638d555 Mon Sep 17 00:00:00 2001 From: Amy Date: Tue, 24 Aug 2021 12:02:13 -0400 Subject: [PATCH 2/6] Add EmailSignup link (#175) Also changed the `XXX@XXX.COM` in the footer to `exec@csclub.uwaterloo.ca`. Closes #129 Co-authored-by: Amy Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/175 Reviewed-by: Aditya Thakral Co-authored-by: Amy Co-committed-by: Amy --- components/EmailSignup.module.css | 7 ++----- components/EmailSignup.tsx | 21 ++++++++++++--------- components/Footer.module.css | 5 +++++ components/Footer.tsx | 6 +++++- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/components/EmailSignup.module.css b/components/EmailSignup.module.css index 03dc79c1..c44609b8 100644 --- a/components/EmailSignup.module.css +++ b/components/EmailSignup.module.css @@ -1,7 +1,3 @@ -.container form { - box-sizing: border-box; -} - .header { color: var(--primary-accent); font-weight: 600; @@ -9,8 +5,9 @@ } .button { - margin-top: calc(34rem / 16); + margin-top: calc(26rem / 16); display: block; + width: fit-content; } @media only screen and (max-width: calc(768rem / 16)) { diff --git a/components/EmailSignup.tsx b/components/EmailSignup.tsx index 9a1885ae..064a3f13 100644 --- a/components/EmailSignup.tsx +++ b/components/EmailSignup.tsx @@ -1,21 +1,24 @@ import React from "react"; import { Button } from "./Button"; -import { Input } from "./Input"; import styles from "./EmailSignup.module.css"; export function EmailSignup() { return (
-

Join Our Mailing List!

-
- - - -
+

Join our mailing list!

+

+ Join our mailing list to receive email notifications about important + news and upcoming events! +

+
); } diff --git a/components/Footer.module.css b/components/Footer.module.css index 2f4c9d0c..337a419f 100644 --- a/components/Footer.module.css +++ b/components/Footer.module.css @@ -23,6 +23,11 @@ text-align: center; } +.email { + color: unset; + text-decoration: unset; +} + @media only screen and (max-width: calc(768rem / 16)) { .footer { height: calc(120rem / 16); diff --git a/components/Footer.tsx b/components/Footer.tsx index e0fac676..0d008838 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -1,3 +1,4 @@ +import Link from "next/link"; import React from "react"; import { SocialLinks } from "./SocialLinks"; @@ -9,7 +10,10 @@ export function Footer() {