114 Commits

All Branches

Search

Author	SHA1	Message	Date
Aditya Thakral	2abc7e75c1	PR fixes	2021-08-23 22:20:32 -04:00
Jared He	24885e5185	Add margin-bottom for terms	2021-08-23 19:20:22 -05:00
Jared He	56e4313ef2	60px margins	2021-08-23 19:16:01 -05:00
Jared He	bd7df3de6a	Merge branch 'main' into feat/events-term	2021-08-23 19:13:56 -05:00
Amy Wang	490ec7660b	Fetch upcoming events and recent news on home page (#162) ... - Home page displays the 2 soonest upcoming events. - If there are no upcoming events, displays a short message. - If there are 1-2 upcoming events, displays the events. - If there are more than 2 upcoming events, displays the events as well as a link to the Events page. - Home page displays the most recent news. - If there is no news, displays a short message. Closes #149 Co-authored-by: Amy <a258wang@uwaterloo.ca> Reviewed-on: #162 Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-authored-by: Amy <a258wang@csclub.uwaterloo.ca> Co-committed-by: Amy <a258wang@csclub.uwaterloo.ca>	2021-08-23 14:56:11 -04:00
l42luo	09c704c94c	Advice + Internships Page (#161) ... Closes #140 Closes #141 Co-authored-by: Linna Luo <linnaluo18@gmail.com> Reviewed-on: #161 Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-authored-by: l42luo <l42luo@localhost> Co-committed-by: l42luo <l42luo@localhost>	2021-08-23 14:31:04 -04:00
Aditya Thakral	40cc58df18	Create auto deploys for staging (#171) ... https://csclub.uwaterloo.ca/~a3thakra/csc/main/ Reviewed-on: #171 Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>	2021-08-23 13:50:43 -04:00
b38peng	a8cae99c11	Meet the Team page (#94) ... Includes mobile Team Member Card Closes #9 Closes #42 Co-authored-by: Bonnie <bonniepeng2002@gmail.com> Reviewed-on: #94 Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-authored-by: b38peng <b38peng@uwaterloo.ca> Co-committed-by: b38peng <b38peng@uwaterloo.ca>	2021-08-23 11:11:42 -04:00
Aditya Thakral	d1e6c89a0b	Create the constitution page (#165) ... Closes #11 Closes #98 Reviewed-on: #165 Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>	2021-08-23 09:27:59 -04:00
Aditya Thakral	41fdadb229	Add decoration to the bubble component (#152) ... Closes #87 Co-authored-by: l42luo <l42luo@localhost> Co-authored-by: Linna Luo <linnaluo18@gmail.com> Reviewed-on: #152 Reviewed-by: l42luo <l42luo@localhost> Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>	2021-08-22 22:40:54 -04:00
Jared He	3a6f799538	Optimize getStaticPaths	2021-08-22 14:05:29 -05:00
Jared He	9e8b381064	Address CSS issues	2021-08-22 13:57:22 -05:00
Jared He	891b6b29a8	Resolve some issues	2021-08-19 10:04:30 -05:00
Jared He	25c83364d6	Merge branch 'main' into feat/events-term	2021-08-19 08:50:48 -05:00
Amy Wang	6f24b266eb	Add [event].tsx page (#153) ... This is the `[event].tsx` page that displays a single event, with a couple of sample events in `content/events` for testing purposes. Closes #114 Co-authored-by: Amy <minds10@hotmail.com> Reviewed-on: #153 Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-authored-by: Amy <a258wang@csclub.uwaterloo.ca> Co-committed-by: Amy <a258wang@csclub.uwaterloo.ca>	2021-08-18 22:27:22 -04:00
Jared He	38ffa4dee2	Add markdown events in content (#157) ... Closes #156 Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com> Reviewed-on: #157 Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-authored-by: j285he <j285he@localhost> Co-committed-by: j285he <j285he@localhost>	2021-08-18 21:56:11 -04:00
Jared He	3e61407643	Remove events	2021-08-18 16:52:38 -05:00
Jared He	5631217681	Add time detection for current time	2021-08-18 16:45:31 -05:00
Jared He	e971c85afc	Create events/index.tsx	2021-08-18 11:56:31 -05:00
Jared He	e8999d2bb5	Merge branch 'feat/content-events' into feat/events-term	2021-08-18 11:44:14 -05:00
Jared He	416e027ebb	Add futureEvents pastEvents EventCard logic	2021-08-18 11:43:17 -05:00
Jared He	a23a10d8e4	Fix for Fall 2018	2021-08-18 11:18:20 -05:00
Jared He	180bea746d	Add past/future events props	2021-08-18 11:17:36 -05:00
Jared He	16616fe691	Merge branch 'feat/events-year' into feat/events-term	2021-08-18 10:42:40 -05:00
Jared He	50c2f08769	Simplify types	2021-08-18 10:42:10 -05:00
Jared He	66ca814a9f	Update names	2021-08-18 10:40:38 -05:00
Jared He	e0c446b747	Merge branch 'feat/events-year' into feat/events-term	2021-08-18 10:37:51 -05:00
Jared He	29f2c3208c	Fix build error	2021-08-18 10:07:11 -05:00
Jared He	6f429d20bf	Add events	2021-08-18 09:57:00 -05:00
Jared He	10449e921e	Remove events	2021-08-18 09:54:11 -05:00
Jared He	408275e8cf	Remove temp page	2021-08-17 16:33:06 -05:00
Jared He	5dd258ec86	Merge branch 'main' into feat/events-year	2021-08-17 16:26:36 -05:00
Jared He	b342e979c0	Add event files	2021-08-17 16:13:31 -05:00
Aditya Thakral	8b9389885c	Add helper functions for news archive (#145) + Add /news/archive and /news/[year]/[term] pages (#146) ... Closes #138 Reviewed-on: #145 Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>	2021-08-17 15:22:19 -04:00
Jared He	405b7e5ca0	Add events	2021-08-17 14:03:34 -05:00
Jared He	64fbabf204	Add helper functions for fetching events (#115) ... helper functions for [year] and [year]/[term] only closes #110 Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com> Reviewed-on: #115 Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-authored-by: j285he <j285he@localhost> Co-committed-by: j285he <j285he@localhost>	2021-08-17 14:58:06 -04:00
Jared He	2798efc221	Function renaming	2021-08-17 13:53:45 -05:00
Jared He	7afb956009	Merge branch 'feat/events-lib' into feat/events-year	2021-08-17 13:53:09 -05:00
Jared He	fecd3bf3e0	Rename functions	2021-08-17 13:52:29 -05:00
Jared He	40d37c4aea	Fix lint problems	2021-08-17 13:50:32 -05:00
Jared He	b32fd53d95	Remove unneeded dirent conversion	2021-08-16 22:56:14 -05:00
Jared He	057c2c2a03	Merge branch 'feat/events-lib' of https://git.csclub.uwaterloo.ca/www/www-new into feat/events-lib	2021-08-16 22:52:58 -05:00
Jared He	0792eb18b2	Add sorting	2021-08-16 22:52:14 -05:00
Jared He	3a697c09c0	Add sorting	2021-08-16 22:44:28 -05:00
Jared He	cbbd5d4ad5	add order	2021-08-16 22:43:02 -05:00
l42luo	2ced987f42	Mobile Mini Event Card (#97) ... Closes #38 Currently short description is still visible when card is closed Co-authored-by: Linna Luo <linnaluo18@gmail.com> Reviewed-on: #97 Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-authored-by: l42luo <l42luo@localhost> Co-committed-by: l42luo <l42luo@localhost>	2021-08-16 20:23:41 -04:00
Jared He	c4a8ccf68d	Initial file structure	2021-08-16 18:51:00 -05:00
Jared He	d237621d14	ESLint fixes	2021-08-16 18:40:17 -05:00
Jared He	590b2554c0	Fixes for dirents	2021-08-16 16:02:46 -05:00
Aditya Thakral	1f8fd0f408	Change mathsoc link to pdf (#148) ... Fixes #40 Reviewed-on: #148 Reviewed-by: n3parikh <n3parikh@localhost> Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>	2021-08-16 14:33:22 -04:00