From 2f2c032bd7ddfe72825a3d8d5d6672bf73340e79 Mon Sep 17 00:00:00 2001 From: n3parikh Date: Wed, 15 Sep 2021 21:25:44 -0400 Subject: [PATCH 1/2] add news event for resume review event (#313) https://csclub.uwaterloo.ca/~a3thakra/csc/n3parikh-resume-news/ Co-authored-by: Neil Parikh Co-authored-by: Aditya Thakral Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/313 Reviewed-by: Aditya Thakral Co-authored-by: n3parikh Co-committed-by: n3parikh --- content/news/2021/fall/2021-09-12-n3parikh.md | 15 +++++++++++++++ lib/news.ts | 13 +++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 content/news/2021/fall/2021-09-12-n3parikh.md diff --git a/content/news/2021/fall/2021-09-12-n3parikh.md b/content/news/2021/fall/2021-09-12-n3parikh.md new file mode 100644 index 00000000..3d32fba9 --- /dev/null +++ b/content/news/2021/fall/2021-09-12-n3parikh.md @@ -0,0 +1,15 @@ +--- +author: 'n3parikh' +date: 'Wed Sep 12 2021 00:00:00 GMT-0400 (Eastern Daylight Time)' +--- +📢 UW’s Tech Clubs are proud to present to you Bootcamp! This event is a new initiative brought to you to help sharpen your resumes happening on September 19th from 6 PM to 10 PM ET. + +At this time, we are looking for mentors who are willing to critique resumes, and the applications have officially opened. 📝 In order to qualify to be a mentor, you must at least have started your second coop. This is a great opportunity to help others with the knowledge you have, and make a difference in the UW Tech community. + +If that interests you, please sign up! 💻 We’ll be emailing you more information closer to the event date. + +👉 Sign up at https://bit.ly/bootcamp-resumes-interviews + +Alternatively, you can email us at exec@csclub.uwaterloo.ca specifying that you have started at least your second co-op, your current education path, and your numerical Discord ID. + +📅 Deadline to Sign Up: Friday 17th September 11:59 PM ET diff --git a/lib/news.ts b/lib/news.ts index a5ce2bc7..2db87948 100644 --- a/lib/news.ts +++ b/lib/news.ts @@ -91,12 +91,9 @@ export async function getRecentNews(): Promise { ) ).flat(); - return news - .filter((news) => new Date(news.metadata.date).getTime() <= Date.now()) - .sort((a, b) => { - return ( - new Date(b.metadata.date).getTime() - - new Date(a.metadata.date).getTime() - ); - }); + return news.sort((a, b) => { + return ( + new Date(b.metadata.date).getTime() - new Date(a.metadata.date).getTime() + ); + }); } From 623e1bd52d3bc36596525df57cc3e32f466924e2 Mon Sep 17 00:00:00 2001 From: Amy Date: Wed, 15 Sep 2021 23:17:17 -0400 Subject: [PATCH 2/2] Clean up Shapes Backgrounds on some mobile pages (#307) Addresses some of the shapes shenanigans that I noticed here: https://git.csclub.uwaterloo.ca/www/www-new/issues/236#issuecomment-2450 - Removed shapes from mobile /events/\[year\]/\[term\]/\[event\] page. (I left the default shapes on the mobile /events/\[year\]/\[term\] page, since with the vertical nav header they now fit, but I'd love to hear others' opinions on this!) - Adjusted top margins on mobile Meet the Team, Our Supporters, and Tech Talks/Tech Talk pages to accommodate the shapes. - Changed shapes on mobile Home page to accommodate the expanded Social Links. Co-authored-by: Amy Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/307 Reviewed-by: Aditya Thakral Co-authored-by: Amy Co-committed-by: Amy --- pages/about/our-supporters.module.css | 2 +- pages/about/team.module.css | 1 + pages/events/[year]/[term]/[event].tsx | 11 +++++++++++ pages/index.tsx | 17 +++++------------ pages/resources/tech-talks/index.module.css | 3 +-- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/pages/about/our-supporters.module.css b/pages/about/our-supporters.module.css index 8b8131cb..6fde99bf 100644 --- a/pages/about/our-supporters.module.css +++ b/pages/about/our-supporters.module.css @@ -23,7 +23,7 @@ @media only screen and (max-width: calc(768rem / 16)) { .page { - margin-bottom: calc(30rem / 16); + margin: calc(30rem / 16) 0; } .headerContainer { diff --git a/pages/about/team.module.css b/pages/about/team.module.css index dfbf05de..110127a0 100644 --- a/pages/about/team.module.css +++ b/pages/about/team.module.css @@ -64,6 +64,7 @@ .headerContainer { flex-direction: column-reverse; padding-bottom: 1rem; + margin-top: calc(30rem / 16); } .nav { diff --git a/pages/events/[year]/[term]/[event].tsx b/pages/events/[year]/[term]/[event].tsx index 33a2aeba..4ab46a09 100644 --- a/pages/events/[year]/[term]/[event].tsx +++ b/pages/events/[year]/[term]/[event].tsx @@ -5,6 +5,11 @@ import { MDXRemote } from "next-mdx-remote"; import React from "react"; import { EventCard } from "@/components/EventCard"; +import { + ShapesConfig, + defaultGetShapesConfig, + GetShapesConfig, +} from "@/components/ShapesBackground"; import { Title } from "@/components/Title"; import { Event, @@ -30,6 +35,12 @@ export default function EventInfoPage({ year, term, event }: Props) { ); } +EventInfoPage.getShapesConfig = ((width, height) => { + return window.innerWidth <= 768 + ? ({} as ShapesConfig) + : defaultGetShapesConfig(width, height); +}) as GetShapesConfig; + interface Props { year: string; term: string; diff --git a/pages/index.tsx b/pages/index.tsx index bc58ea3d..e6ced0e6 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -264,20 +264,13 @@ Home.getShapesConfig = (() => { ], hash: [ { - top: "calc(190rem / 16)", - right: "87vw", - width: "calc(60rem / 16)", - height: "calc(60rem / 16)", + top: "calc(250rem / 16)", + right: "80vw", + width: "calc(45rem / 16)", + height: "calc(45rem / 16)", }, ], triangle: [ - { - top: "calc(266rem / 16)", - right: "78vw", - width: "calc(45rem / 16)", - height: "calc(45rem / 16)", - transform: "rotate(-26deg)", - }, { top: "calc(4rem / 16)", right: "3vw", @@ -288,7 +281,7 @@ Home.getShapesConfig = (() => { ], waves: [ { - top: "calc(168rem / 16)", + top: "calc(230rem / 16)", left: "86vw", width: "calc(102rem / 16)", height: "calc(50rem / 16)", diff --git a/pages/resources/tech-talks/index.module.css b/pages/resources/tech-talks/index.module.css index 7f73bc22..9318627f 100644 --- a/pages/resources/tech-talks/index.module.css +++ b/pages/resources/tech-talks/index.module.css @@ -36,8 +36,7 @@ @media only screen and (max-width: calc(768rem / 16)) { .page { - margin-top: 0; - margin-bottom: calc(20rem / 16); + margin: calc(30rem / 16) 0; } .headerContainer {