From 0bb8049db344e9790a789986388971d68a4dc4a9 Mon Sep 17 00:00:00 2001 From: Amy Date: Tue, 31 Aug 2021 23:07:19 -0400 Subject: [PATCH 01/10] Fix navbar highlight for Organized Content sections (#182) Also fixes the navbar highlight for the different Advice sections. Closes #181 Co-authored-by: Amy Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/182 Reviewed-by: Aditya Thakral Co-authored-by: Amy Co-committed-by: Amy --- components/Navbar.tsx | 81 ++++++++++++++++--- components/ShapesBackground.tsx | 6 +- .../{coop-advice.mdx => co-op-advice.mdx} | 2 +- pages/resources/advice/academic.tsx | 2 +- .../{coop.module.css => co-op.module.css} | 0 .../resources/advice/{coop.tsx => co-op.tsx} | 10 +-- pages/resources/advice/index.tsx | 10 +++ pages/resources/advice/misc.tsx | 2 +- pages/resources/index.tsx | 2 +- 9 files changed, 96 insertions(+), 19 deletions(-) rename content/advice/{coop-advice.mdx => co-op-advice.mdx} (99%) rename pages/resources/advice/{coop.module.css => co-op.module.css} (100%) rename pages/resources/advice/{coop.tsx => co-op.tsx} (85%) create mode 100644 pages/resources/advice/index.tsx diff --git a/components/Navbar.tsx b/components/Navbar.tsx index ab3e1c1d..73f13bcc 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -9,16 +9,15 @@ import styles from "./Navbar.module.css"; type Menu = { name: string; route: string; - submenu?: { - name: string; - route: string; - }[]; + exact?: boolean; + submenu?: Menu; }[]; const menu: Menu = [ { name: "Home", route: "/", + exact: true, }, { name: "About", @@ -27,6 +26,7 @@ const menu: Menu = [ { name: "About Us", route: "/about", + exact: true, }, { name: "Meet the Team", @@ -76,7 +76,21 @@ const menu: Menu = [ }, { name: "Advice", - route: "/resources/advice/coop", + route: "/resources/advice/co-op", + submenu: [ + { + name: "Co-op Advice", + route: "/resources/advice/co-op", + }, + { + name: "Academic Advice", + route: "/resources/advice/academic", + }, + { + name: "Additional Resources", + route: "/resources/advice/misc", + }, + ], }, { name: "Internships", @@ -198,10 +212,11 @@ interface NavItemProps { function NavItem(props: NavItemProps) { const router = useRouter(); - const isCurrentPage = - router.pathname === props.route || - (props.submenu != null && - router.pathname.startsWith(getMainRoute(props.route))); + const isCurrentPage = shouldHighlight( + router.pathname, + props.name, + props.route + ); const isExternalLink = props.route.includes("http://") || props.route.includes("https://"); @@ -273,6 +288,54 @@ function NavItem(props: NavItemProps) { ); } +interface Leaf { + name: string; + route: string; + exact?: boolean; + ancestors: { name: string; route: string }[]; +} + +function collectLeaves( + accumulator: Leaf[], + entry: { + name: string; + route: string; + exact?: boolean; + submenu?: Menu; + } +): Leaf[] { + if (entry.submenu == null) { + return [...accumulator, { ...entry, ancestors: [] }]; + } + + const subleaves = entry.submenu.reduce(collectLeaves, [] as Leaf[]); + return [ + ...accumulator, + ...subleaves.map((leaf) => ({ + ...leaf, + ancestors: [...leaf.ancestors, { name: entry.name, route: entry.route }], + })), + ]; +} + +const leaves: Leaf[] = menu.reduce(collectLeaves, [] as Leaf[]); + +function shouldHighlight( + pathname: string, + name: string, + route: string +): boolean { + const match = leaves.find((leaf) => + leaf.exact ? leaf.route === pathname : pathname.startsWith(leaf.route) + ); + return match + ? (match.name === name && match.route === route) || + match.ancestors.find( + (ancestor) => ancestor.name === name && ancestor.route === route + ) != null + : false; +} + function getMainRoute(route: string) { if (route === "/") { return "/"; diff --git a/components/ShapesBackground.tsx b/components/ShapesBackground.tsx index a34a0316..0003c73d 100644 --- a/components/ShapesBackground.tsx +++ b/components/ShapesBackground.tsx @@ -45,7 +45,11 @@ export function ShapesBackground({ getConfig }: Props) { }, [getConfig, width, height, prevWidth, prevRoute, router.asPath]); return ( -
+
{Object.entries(config).map(([type, instances]) => instances.map((attributes, idx) => (
- + - Coop Advice + Co-op Advice diff --git a/pages/resources/advice/index.tsx b/pages/resources/advice/index.tsx new file mode 100644 index 00000000..bcd13fcb --- /dev/null +++ b/pages/resources/advice/index.tsx @@ -0,0 +1,10 @@ +import Head from "next/head"; +import React from "react"; + +export default function AdviceRedirect() { + return ( + + + + ); +} diff --git a/pages/resources/advice/misc.tsx b/pages/resources/advice/misc.tsx index 3e9774d6..21ffabaa 100644 --- a/pages/resources/advice/misc.tsx +++ b/pages/resources/advice/misc.tsx @@ -4,7 +4,7 @@ import { Title } from "@/components/Title"; import Content from "../../../content/advice/misc-advice.mdx"; -import { Advice } from "./coop"; +import { Advice } from "./co-op"; export default function MiscAdvice() { return ( diff --git a/pages/resources/index.tsx b/pages/resources/index.tsx index 9a436de6..a60f39b2 100644 --- a/pages/resources/index.tsx +++ b/pages/resources/index.tsx @@ -1,7 +1,7 @@ import Head from "next/head"; import React from "react"; -export default function Resources() { +export default function ResourcesRedirect() { return ( From a0d0b8e8438bdac904970feddb7bd19788eb13da Mon Sep 17 00:00:00 2001 From: Aditya Thakral Date: Tue, 31 Aug 2021 23:07:50 -0400 Subject: [PATCH 02/10] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Simplify=20getCur?= =?UTF-8?q?rentTerm=20to=20fix=20builds=20around=20the=20end=20of=20terms?= =?UTF-8?q?=20=F0=9F=9A=91=EF=B8=8F=20(#244)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Goodbye date comparison when you can just do string comparison šŸ™ƒ Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/244 Reviewed-by: j285he Co-authored-by: Aditya Thakral Co-committed-by: Aditya Thakral --- lib/events.ts | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/lib/events.ts b/lib/events.ts index 2007a89c..3cb7e621 100644 --- a/lib/events.ts +++ b/lib/events.ts @@ -179,28 +179,34 @@ export async function getEventsPageProps({ }; } -export function getCurrentTerm(): { year: string; term: string } { - const date = new Date(); - let term = ""; - const year = date.getUTCFullYear().toString(); +export function getCurrentTerm() { + const today = new Date().toLocaleDateString("en-CA", { + timeZone: "EST", + year: "numeric", + month: "numeric", + day: "numeric", + }); - if ( - new Date(`${year}-01-01 EST`).getTime() <= date.getTime() && - date.getTime() <= new Date(`${year}-04-30 EST`).getTime() - ) { + const [year] = today.split("-"); + + let term = ""; + + if (`${year}-01-01` <= today) { term = "winter"; - } else if ( - new Date(`${year}-05-01 EST`).getTime() <= date.getTime() && - date.getTime() <= new Date(`${year}-08-31 EST`).getTime() - ) { + } + + if (`${year}-05-01` <= today) { term = "spring"; - } else if ( - new Date(`${year}-09-01 EST`).getTime() <= date.getTime() && - date.getTime() <= new Date(`${year}-12-31 EST`).getTime() - ) { + } + + if (`${year}-09-01` <= today) { term = "fall"; } + if (term === "") { + throw new Error("Error setting the current term"); + } + return { year, term }; } @@ -211,7 +217,7 @@ function getPastTerm( const index = TERMS.indexOf(term); if (index === -1) { - throw new Error("Not a valid term"); + throw new Error(`[getPastTerm] Not a valid term: "${term}" "${year}"`); } return index === 0 @@ -232,7 +238,7 @@ function getFutureTerm( const index = TERMS.indexOf(term); if (index === -1) { - throw new Error("Not a valid term"); + throw new Error(`[getFutureTerm] Not a valid term: "${term}" "${year}"`); } return index === TERMS.length - 1 From 966129adf82ef1cffebd32e2719346e3e9308b86 Mon Sep 17 00:00:00 2001 From: j285he Date: Tue, 31 Aug 2021 23:19:33 -0400 Subject: [PATCH 03/10] Fix past events rendered twice (#245) Closes #238 Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com> Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/245 Reviewed-by: Aditya Thakral Co-authored-by: j285he Co-committed-by: j285he --- pages/events/[year]/[term]/index.tsx | 31 ++++++++++------------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx index da884d3c..7073921f 100644 --- a/pages/events/[year]/[term]/index.tsx +++ b/pages/events/[year]/[term]/index.tsx @@ -83,9 +83,18 @@ export default function Term(props: Props) {
)} - {hasPastEvents && props.isCurrentTerm && ( + {hasPastEvents && (
-

Past Events

+ {props.isCurrentTerm ? ( +

Past Events

+ ) : ( +

+ Events Archive: + + {` ${capitalize(props.term)} ${props.year}`} + +

+ )}
{props.pastEvents.map(({ content, metadata }) => (
)} - {hasPastEvents && !props.isCurrentTerm && ( -

- Events Archive: - - {` ${capitalize(props.term)} ${props.year}`} - -

- )} {!hasFutureEvents && !hasPastEvents && ( <>

Events

@@ -114,16 +115,6 @@ export default function Term(props: Props) { later! )} -
- {props.pastEvents.map(({ content, metadata }) => ( - } - key={metadata.name + metadata.date.toString()} - /> - ))} -
); } From 8bb5f160f0772cca1b7e926de6b756c229db9c2c Mon Sep 17 00:00:00 2001 From: Amy Date: Wed, 1 Sep 2021 12:05:46 -0400 Subject: [PATCH 04/10] Fix broken and weird links (#246) Implements all the changes mentioned in #237, except for the following: - Services, Live Streaming - "Icecast" still links to https://icy.csclub.uwaterloo.ca/ - Services, In-Office Books - "extensive collection of Computer Science-related books" still links to http://csclub.uwaterloo.ca/library/ (If these items need to be changed, then we can create new issues for them) Closes #237 Co-authored-by: Amy Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/246 Reviewed-by: j285he Reviewed-by: n3parikh Co-authored-by: Amy Co-committed-by: Amy --- .../code-of-conduct/license-information-and-attribution.md | 2 +- content/about/constitution/code-of-conduct.md | 2 +- content/get-involved.mdx | 2 +- content/resources/services/cs-club-email.md | 2 +- content/resources/services/mailing-lists.md | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/about/code-of-conduct/license-information-and-attribution.md b/content/about/code-of-conduct/license-information-and-attribution.md index e5ec09bb..c913c6f3 100644 --- a/content/about/code-of-conduct/license-information-and-attribution.md +++ b/content/about/code-of-conduct/license-information-and-attribution.md @@ -3,4 +3,4 @@ title: License Information and Attribution index: 11 --- -- The Code of Conduct is distributed under aĀ [Creative Commons Attribution-ShareAlike License](http://creativecommons.org/licenses/by-sa/3.0/)Ā , derived from theĀ [Women in Computer Science Code of Conduct](http://wics.uwaterloo.ca/code-of-conduct/)Ā , theĀ [UW Amateur Radio Club Code of Conduct](http://uwarc.uwaterloo.ca/policies-procedures/code-of-conduct/)Ā , and theĀ [FASS Code of Conduct (Article 2, Section 16)](http://fass.uwaterloo.ca/wp-content/uploads/2015/03/constitution.pdf)Ā . +- The Code of Conduct is distributed under aĀ [Creative Commons Attribution-ShareAlike License](http://creativecommons.org/licenses/by-sa/3.0/), derived from theĀ [Women in Computer Science Code of Conduct](http://wics.uwaterloo.ca/deprecated/code-of-conduct/), theĀ [UW Amateur Radio Club Code of Conduct](http://uwarc.uwaterloo.ca/policies-procedures/code-of-conduct/), and theĀ [FASS Code of Conduct](http://fass.uwaterloo.ca/fassconstitution). diff --git a/content/about/constitution/code-of-conduct.md b/content/about/constitution/code-of-conduct.md index d23cf6c3..ccba21ac 100644 --- a/content/about/constitution/code-of-conduct.md +++ b/content/about/constitution/code-of-conduct.md @@ -4,5 +4,5 @@ index: 12 --- 1. The Club has aĀ [Code of Conduct](/about/code-of-conduct). -2. TheĀ [scope of the Code of Conduct](/about/code-of-conduct/scopes-and-spaces)Ā is specified by the Code of Conduct. +2. TheĀ [scope of the Code of Conduct](/about/code-of-conduct/scope-and-spaces)Ā is specified by the Code of Conduct. 3. Changes to the Code of Conduct are governed by the same rules as changes to the Constitution. diff --git a/content/get-involved.mdx b/content/get-involved.mdx index 5ef48195..16fc6e9e 100644 --- a/content/get-involved.mdx +++ b/content/get-involved.mdx @@ -80,6 +80,6 @@ Each term, the CSC holds elections to determine the executive council: - Assistant Vice-President - Treasurer -To find out when and where the next elections will be held, keep an eye on on the [News](/). +To find out when and where the next elections will be held, keep an eye on on the [News](/#news). For details on the elections, see the [Constitution](/about/constitution). \ No newline at end of file diff --git a/content/resources/services/cs-club-email.md b/content/resources/services/cs-club-email.md index d0b8fe33..ec061c1d 100644 --- a/content/resources/services/cs-club-email.md +++ b/content/resources/services/cs-club-email.md @@ -3,7 +3,7 @@ title: CS Club Email index: 2 --- -Members also receive a **username@csclub.uwaterloo.ca** email address. +Members also receive a **[username@csclub.uwaterloo.ca](#)** email address. - Mailboxes are considered as part of your disk quota, so your mailbox may grow up to the amount of disk quota you have. - Attachments of any file size or type may be sent. diff --git a/content/resources/services/mailing-lists.md b/content/resources/services/mailing-lists.md index b031e548..6dfc754d 100644 --- a/content/resources/services/mailing-lists.md +++ b/content/resources/services/mailing-lists.md @@ -3,8 +3,8 @@ title: Mailing Lists index: 10 --- -OurĀ [csc-general mailing list](http://mailman.csclub.uwaterloo.ca/listinfo/csc-general)Ā informs members about our current events. +OurĀ [csc-general mailing list](https://mailman.csclub.uwaterloo.ca/postorius/lists/csc-general.csclub.uwaterloo.ca/)Ā informs members about our current events. -OurĀ [csc-industry mailing list](http://mailman.csclub.uwaterloo.ca/listinfo/csc-industry) allows students to opt-in to receiving emails from industry representatives. +OurĀ [csc-industry mailing list](https://mailman.csclub.uwaterloo.ca/postorius/lists/csc-industry.csclub.uwaterloo.ca/) allows students to opt-in to receiving emails from industry representatives. - Corporate events, job postings, info sessions, and related events may be posted here. From 75bddd63f93c1b7d1ba2c31e7c19ac57d692b531 Mon Sep 17 00:00:00 2001 From: w25tran Date: Thu, 2 Sep 2021 13:18:38 -0400 Subject: [PATCH 05/10] COC-page-updates (#240) Closes #198 Co-authored-by: William Tran Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/240 Reviewed-by: n3parikh Reviewed-by: Aditya Thakral Co-authored-by: w25tran Co-committed-by: w25tran --- .../code-of-conduct/experiencing-unacceptable-behaviour.md | 2 +- content/about/code-of-conduct/scope-and-spaces.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/content/about/code-of-conduct/experiencing-unacceptable-behaviour.md b/content/about/code-of-conduct/experiencing-unacceptable-behaviour.md index bfdfc0b4..f5e0ad77 100644 --- a/content/about/code-of-conduct/experiencing-unacceptable-behaviour.md +++ b/content/about/code-of-conduct/experiencing-unacceptable-behaviour.md @@ -5,7 +5,7 @@ index: 4 _The Executive Council and Faculty Advisor are herein referred to as the Officers, or singularly as Officer._ -If you notice a dangerous situation, someone in distress, or violations of this Code of Conduct,Ā [contact an Officer](/about). No situation is considered inconsequential. If you do not feel comfortable contacting an Executive Council member due to the nature of the incident, you may contact theĀ [Faculty Advisor](/about#advisor). +If you notice a dangerous situation, someone in distress, or violations of this Code of Conduct,Ā [contact an Officer](mailto:coc@csclub.uwaterloo.ca). No situation is considered inconsequential. If you do not feel comfortable contacting an Executive Council member due to the nature of the incident, you may contact theĀ faculty advisor, [Dr. Prabhakar Ragde](https://uwaterloo.ca/computer-science/about/people/plragde). Upon receiving a complaint the Officer will inform the first of the following people who is not personally involved in the situation, or in a close relationship with the someone involved in the situation and is available, and this person shall handle the complaint and shall here after be referred to as the Handling Officer. diff --git a/content/about/code-of-conduct/scope-and-spaces.md b/content/about/code-of-conduct/scope-and-spaces.md index 3e3298b4..086017dc 100644 --- a/content/about/code-of-conduct/scope-and-spaces.md +++ b/content/about/code-of-conduct/scope-and-spaces.md @@ -9,4 +9,5 @@ We expect all Club participants (participants, organizers, sponsors, and other g - The Code of Conduct applies in the office, where office staff are responsible for enforcing it. - The Code of Conduct applies in the IRC channel, where channel operators are responsible for enforcing it. +- The Code of Conduct applies in the Discord channel, where moderators are responsible for enforcing it. - The Code of Conduct applies at events the CSC organizes or co-organizes, where a designated organizer is responsible for enforcing it. From 9cb30100dfbbb1976242af158f616acaec1aad0c Mon Sep 17 00:00:00 2001 From: w25tran Date: Thu, 2 Sep 2021 13:37:08 -0400 Subject: [PATCH 06/10] Add paypal link (#243) Closes #207 Co-authored-by: William Tran Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/243 Reviewed-by: Aditya Thakral Co-authored-by: w25tran Co-committed-by: w25tran --- content/get-involved.mdx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/content/get-involved.mdx b/content/get-involved.mdx index 16fc6e9e..d23b5b38 100644 --- a/content/get-involved.mdx +++ b/content/get-involved.mdx @@ -22,7 +22,17 @@ That's all! After your account created, you'll have access to all the #### Membership Renewal If you are already a member of the CSC and want to renew your membership, you -can do so by coming in person to our office. +can do so by coming in person to our office. You may also renew your membership +online, though you must pay more than the usual $2.00 to cover PayPal fees. +A one-term renewal via PayPal comes out to $2.37. + +

+

+ + + +
+

From fd867e5fd6f5ed53671506abc41e83a0d746b261 Mon Sep 17 00:00:00 2001 From: Aditya Thakral Date: Thu, 2 Sep 2021 15:33:29 -0400 Subject: [PATCH 07/10] Update execs on /about/team (#227) https://csclub.uwaterloo.ca/~a3thakra/csc/adi-fix-exec/about/team/ - [x] Ravindu is the assistant vp - [x] Remove "words words words" - [x] Kallen - [x] Gordon - [x] Ravindu - [x] Neil - [x] Max Closes #195 Co-authored-by: Neil Parikh Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/227 Co-authored-by: Aditya Thakral Co-committed-by: Aditya Thakral --- content/meet-the-team/execs/01-kallen-tu.md | 2 +- content/meet-the-team/execs/02-gordon-le.md | 2 +- content/meet-the-team/execs/03-nakul-vijhani.md | 6 ------ content/meet-the-team/execs/03-ravindu-angammana.md | 6 ++++++ content/meet-the-team/execs/04-neil-parikh.md | 2 +- content/meet-the-team/execs/05-max-erenberg.md | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 content/meet-the-team/execs/03-nakul-vijhani.md create mode 100644 content/meet-the-team/execs/03-ravindu-angammana.md diff --git a/content/meet-the-team/execs/01-kallen-tu.md b/content/meet-the-team/execs/01-kallen-tu.md index 9f8ffae8..24b41243 100644 --- a/content/meet-the-team/execs/01-kallen-tu.md +++ b/content/meet-the-team/execs/01-kallen-tu.md @@ -3,4 +3,4 @@ name: Kallen Tu role: President --- -words words words codey words words words words codey words words words words codey words words words words codey words words words words codey words words words words words codey words words words words codey words words words words codey words words words words codey words words words +Hello, I'm Kallen, a 4th year CS student. diff --git a/content/meet-the-team/execs/02-gordon-le.md b/content/meet-the-team/execs/02-gordon-le.md index a1a721f7..b565c869 100644 --- a/content/meet-the-team/execs/02-gordon-le.md +++ b/content/meet-the-team/execs/02-gordon-le.md @@ -3,4 +3,4 @@ name: Gordon Le role: Vice President --- -words words words codey words words words words codey words words words words codey words words words words codey words words words words codey words words words words words codey words words words words codey words words words words codey words words words words codey words words words +Hello everyone, I'm Gordon, and welcome to CSC! As a quick introduction, I'm a 4th year CS student at UW who enjoys playing ultimate frisbee, video games, music, and recently I've gotten into doing daily crossword puzzles. At CSC, we're always trying to support UW students in any way that we can, so please come and join us at our events šŸ˜„ If you ever see me on campus, please say hello! šŸ‘‹ diff --git a/content/meet-the-team/execs/03-nakul-vijhani.md b/content/meet-the-team/execs/03-nakul-vijhani.md deleted file mode 100644 index 6c84a61c..00000000 --- a/content/meet-the-team/execs/03-nakul-vijhani.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: Nakul Vijhani -role: Assistant Vice President ---- - -words words words codey words words words words codey words words words words codey words words words words codey words words words words codey words words words words words codey words words words words codey words words words words codey words words words words codey words words words diff --git a/content/meet-the-team/execs/03-ravindu-angammana.md b/content/meet-the-team/execs/03-ravindu-angammana.md new file mode 100644 index 00000000..c0505004 --- /dev/null +++ b/content/meet-the-team/execs/03-ravindu-angammana.md @@ -0,0 +1,6 @@ +--- +name: Ravindu Angammana +role: Assistant Vice President +--- + +Hey guys! I'm Ravindu, a 4th year Software Engineering student here at UW. I joined CSC to help create a healthy community where like-minded students at UW could easily connect with each other. If you ever have the chance to come to one of our events, please do! I promise you won't regret it. When I'm not working, I'll typically be playing video games, listening to music, or planning out a new travel destination (for when COVID ends). Feel free to say hi if you ever see me around! diff --git a/content/meet-the-team/execs/04-neil-parikh.md b/content/meet-the-team/execs/04-neil-parikh.md index a8701efc..2f0e746b 100644 --- a/content/meet-the-team/execs/04-neil-parikh.md +++ b/content/meet-the-team/execs/04-neil-parikh.md @@ -3,4 +3,4 @@ name: Neil Parikh role: Treasurer --- -words words words codey words words words words codey words words words words codey words words words words codey words words words words codey words words words words words codey words words words words codey words words words words codey words words words words codey words words words +Hi, I'm Neil, a 4th year Mechatronics Engineering student. I've been a part of CSC since my first term at Waterloo, and it's been a great experience for me, so I'm excited to share that with you all! In my free time, you can find me climbing or longboarding down one of the trails in Waterloo (usually not at the same time!). diff --git a/content/meet-the-team/execs/05-max-erenberg.md b/content/meet-the-team/execs/05-max-erenberg.md index 6c480e18..c111da34 100644 --- a/content/meet-the-team/execs/05-max-erenberg.md +++ b/content/meet-the-team/execs/05-max-erenberg.md @@ -3,4 +3,4 @@ name: Max Erenberg role: Systems Administrator --- -words words words codey words words words words codey words words words words codey words words words words codey words words words words codey words words words words words codey words words words words codey words words words words codey words words words words codey words words words +Hello, I'm Max, a 4th year CS student. From 10604057422388fe06f7d5cb5efe6bc416e29d63 Mon Sep 17 00:00:00 2001 From: Aditya Thakral Date: Thu, 2 Sep 2021 15:34:09 -0400 Subject: [PATCH 08/10] Fix grammar on the Get Involved page (#272) Closes #271 Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/272 Reviewed-by: n3parikh Co-authored-by: Aditya Thakral Co-committed-by: Aditya Thakral --- content/get-involved.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/get-involved.mdx b/content/get-involved.mdx index d23b5b38..b66b86c6 100644 --- a/content/get-involved.mdx +++ b/content/get-involved.mdx @@ -13,7 +13,7 @@ a bunch of ways you can join and help out. 1. Drop by our office in **MC 3036/3037** with - your WatCard, and - - $2 for term that you would like to pay for + - $2 membership fee for the term that you would like to pay for 2. Sign our [Machine Usage Agreement](/resources/machine-usage-agreement) That's all! After your account created, you'll have access to all the From b960f35572f1bbb958de12385993ad5799123942 Mon Sep 17 00:00:00 2001 From: j285he Date: Thu, 2 Sep 2021 17:19:05 -0400 Subject: [PATCH 09/10] Fix some link bugs (#263) Closes #251. Closes #258. Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com> Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/263 Reviewed-by: Amy Reviewed-by: Aditya Thakral Co-authored-by: j285he Co-committed-by: j285he --- components/Button.tsx | 1 + content/about/index.mdx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/Button.tsx b/components/Button.tsx index 92d75463..daf91e8f 100644 --- a/components/Button.tsx +++ b/components/Button.tsx @@ -21,6 +21,7 @@ export function Button(props: Props) { From 423f97f37b480c6ffef95ce2804710aa04380d38 Mon Sep 17 00:00:00 2001 From: j285he Date: Thu, 2 Sep 2021 17:35:41 -0400 Subject: [PATCH 10/10] Make padding-bottom consistent for pages with EmailSignup component (#247) Closes #101. Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com> Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/247 Reviewed-by: b38peng Co-authored-by: j285he Co-committed-by: j285he --- pages/about/index.module.css | 4 ++++ pages/about/our-supporters.module.css | 8 ++++++++ pages/about/our-supporters.tsx | 4 ++-- pages/get-involved.module.css | 6 +++++- pages/index.module.css | 4 ++-- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pages/about/index.module.css b/pages/about/index.module.css index 8f1d0528..547d2d1b 100644 --- a/pages/about/index.module.css +++ b/pages/about/index.module.css @@ -34,6 +34,10 @@ } @media only screen and (max-width: calc(768rem / 16)) { + .page { + margin-bottom: calc(30rem / 16); + } + .titleContainer { display: flex; flex-direction: column; diff --git a/pages/about/our-supporters.module.css b/pages/about/our-supporters.module.css index 6e6ccff6..8b8131cb 100644 --- a/pages/about/our-supporters.module.css +++ b/pages/about/our-supporters.module.css @@ -1,3 +1,7 @@ +.page { + margin-bottom: calc(60rem / 16); +} + .headerContainer { display: flex; flex-direction: row; @@ -18,6 +22,10 @@ } @media only screen and (max-width: calc(768rem / 16)) { + .page { + margin-bottom: calc(30rem / 16); + } + .headerContainer { flex-direction: column-reverse; align-items: center; diff --git a/pages/about/our-supporters.tsx b/pages/about/our-supporters.tsx index 7822957e..e40560d7 100644 --- a/pages/about/our-supporters.tsx +++ b/pages/about/our-supporters.tsx @@ -9,7 +9,7 @@ import styles from "./our-supporters.module.css"; export default function OurSupporters() { return ( - <> +
Our Supporters

Our Supporters

@@ -18,6 +18,6 @@ export default function OurSupporters() {
- +
); } diff --git a/pages/get-involved.module.css b/pages/get-involved.module.css index 6cc15303..1e0359fe 100644 --- a/pages/get-involved.module.css +++ b/pages/get-involved.module.css @@ -1,5 +1,5 @@ .page { - margin: calc(50rem / 16) 0; + margin: calc(60rem / 16) 0; } .page > header { @@ -51,6 +51,10 @@ } @media only screen and (max-width: calc(768rem / 16)) { + .page { + margin: calc(30rem / 16); + } + .page > header { display: flex; flex-direction: column-reverse; diff --git a/pages/index.module.css b/pages/index.module.css index e62ad859..61e6ff52 100644 --- a/pages/index.module.css +++ b/pages/index.module.css @@ -1,5 +1,5 @@ .page { - padding-bottom: calc(60rem / 16); + margin-bottom: calc(60rem / 16); } .intro { @@ -126,7 +126,7 @@ @media only screen and (max-width: calc(768rem / 16)) { .page { - padding-bottom: calc(30rem / 16); + margin-bottom: calc(30rem / 16); } .intro {