Commit Graph

61 Commits

Author SHA1 Message Date
Rebecca-Chou cafdf334fe final fix
continuous-integration/drone/push Build is passing Details
2022-03-10 10:42:49 +08:00
Rebecca-Chou 00caa70143 fix data type
continuous-integration/drone/push Build is passing Details
2022-03-10 10:31:57 +08:00
Rebecca-Chou ccd075fa84 resolve conflicts with main
continuous-integration/drone/push Build is passing Details
2022-03-10 01:09:45 +08:00
Rebecca-Chou 67afba862a fix type bug
continuous-integration/drone/push Build is passing Details
2022-03-10 00:51:18 +08:00
Rebecca-Chou 4c087b4af4 eliminate position name to keep in sync
continuous-integration/drone/push Build is failing Details
2022-03-10 00:38:37 +08:00
Beihao Zhou d04115fb12 Separate Teams on Meet the Team page (Close #346) (#404)
continuous-integration/drone/push Build is passing Details
Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Reviewed-on: #404
Reviewed-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
2022-03-09 10:03:26 -05:00
Rebecca-Chou 51bb491277 fix undefined bug
continuous-integration/drone/push Build is passing Details
2022-03-04 17:08:52 +08:00
Rebecca-Chou 2d9176256d Fix logic for fetching array
continuous-integration/drone/push Build is failing Details
2022-03-04 16:15:15 +08:00
Beihao Zhou 83b68a3ce3 Merge branch 'main' into b72zhou-ldap-exec
continuous-integration/drone/push Build is passing Details
2022-02-27 09:19:25 -05:00
Mark Chiu 31c81f8620 Add Multiple News Items on Homepage and Single News Item Page (Closes #281) (#390)
continuous-integration/drone/push Build is passing Details
* 3 News items are displayed on the homepage (`MiniNewsCard` component)
* Single News item path: `/news/20xx/term/20xx-xx-xx` (`NewsCard` component)
	* Purple header for the date
    * News items of the same date are displayed on the same page

Co-authored-by: Miniapple8888 <miniapple8888@gmail.com>
Reviewed-on: #390
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-02-23 00:15:37 -05:00
Shahan Nedadahandeh bb78a3d53d Warning Header (Closes #205) (#394)
continuous-integration/drone/push Build is passing Details
Update:
In order to solve the issues discussed below, we decided to put the warnings in a json file, since they can be easily imported into a javascript file and webpack automatically bundles them with the client side app, so no static props is needed.

__________

To get the warning data, since it is something that needs to be on all pages, it makes sense for the component to go in the app.js file (similar to the nav bar). However, next.js has a cumbersome issue that it does not support getStaticProps in the app.ts file (and getStaticProps only works in page files), thus we have no way of requesting the warning data easily in the \<WarningHeader\> Component. (https://github.com/vercel/next.js/discussions/10949)

Here is my solution:
- Request the warning data on the client side through the use of an api.
    - I made a warning api (/api/currentWarning) which sends a json of the current warning
    - Advantage: warnings will always be up to date since it is recalculated on every request
    - Advantage: It can potentially incorporate with other CSC services who might need to know about the warning (eg linktree?)
    - Disadvantage: can get expensive if we have a lot of warnings, to fix this I can cache the current warning and only re-read the files every 24h if this is a problem, but if we don’t have that many warnings I think it should be fine
    - Disadvantage: listed below:

The current problem with what I implemented is that it doesn’t build in the production environment:
- The way we build the website, when we call “next export” that disables any api endpoints.
- According to this https://github.com/vercel/vercel/discussions/6551, if we want to allow api endpoints, we have to just do “next build”. This has implications that the site won’t be completely static anymore, but the other solutions also have similar problems  ( though the GitHub post says that next will still optimize for static with only next build).

Another advantage of allowing api’s is that maybe in the future we will implement other features where an api might be useful.

If you want to try it out, my branch works fine locally (when just running npm run dev or npm run build”)

Other possible solutions:
- Use getInitialProps inside _app.js, but this has the downside that it will “disable Automatic Static Optimization in pages without Static Generation.” (https://nextjs.org/docs/advanced-features/custom-app), which I believe will slow the whole site down, but, we will be able to still use the old build command I think, I am not sure of the full effect of this.
	- However, implementing this would also be relatively simple.

- Add the warning request to the getStaticProps of every single page, possibly through some wrapper component around every single page, this has the disadvantage that we need to do a lot of refactoring of all the pages of the site and cant use the intended “_app.ts” wrapper.

- Add warning header only to the homepage (or maybe one or two other important pages).

Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #394
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-02-22 23:29:53 -05:00
Rebecca-Chou 856f849526 finalize ldap
continuous-integration/drone/push Build is passing Details
2022-02-17 11:42:05 +08:00
Rebecca-Chou 0c0515a3c6 fetch array at index 0 from ldap
continuous-integration/drone/push Build is passing Details
2022-02-17 10:58:42 +08:00
Rebecca-Chou 3dbc1efe39 test data type for position
continuous-integration/drone/push Build is passing Details
2022-02-17 00:06:08 +08:00
Rebecca-Chou f09580151f test position array
continuous-integration/drone/push Build is passing Details
2022-02-16 23:42:40 +08:00
Rebecca-Chou bb743f4ca6 test president
continuous-integration/drone/push Build is failing Details
2022-02-16 23:31:14 +08:00
Rebecca-Chou ca1a9f3185 debug sort function
continuous-integration/drone/push Build is passing Details
2022-02-16 21:45:37 +08:00
Rebecca-Chou 3506b6d00c test sort function
continuous-integration/drone/push Build is passing Details
2022-02-16 21:07:19 +08:00
Rebecca-Chou 615a8ddbf9 test filter function
continuous-integration/drone/push Build is passing Details
2022-02-16 20:50:40 +08:00
Rebecca-Chou 6dc69fbe14 get position test
continuous-integration/drone/push Build is passing Details
2022-02-16 20:29:32 +08:00
Rebecca-Chou 9a1ecf82bd edit president to presidentcro
continuous-integration/drone/push Build is passing Details
2022-02-16 20:15:27 +08:00
Rebecca-Chou f96d776259 Test position field 2
continuous-integration/drone/push Build is passing Details
2022-02-16 20:01:46 +08:00
Rebecca-Chou fe3358d9ae Test position field
continuous-integration/drone/push Build is passing Details
2022-02-16 19:35:13 +08:00
Rebecca-Chou 340dfa67b5 Add placeholder
continuous-integration/drone/push Build is passing Details
2022-02-14 11:45:30 +08:00
Rebecca-Chou 57f67bc8d1 edit codey file name
continuous-integration/drone/push Build is passing Details
2022-02-14 10:09:12 +08:00
Rebecca-Chou ae66794a54 add codey
continuous-integration/drone/push Build is failing Details
2022-02-14 09:59:58 +08:00
Rebecca-Chou be43b75694 change order of exec
continuous-integration/drone/push Build is passing Details
2022-02-14 09:33:00 +08:00
Beihao Zhou 2aeaeaccde Fix Line Format
continuous-integration/drone/push Build is failing Details
2022-02-13 11:32:05 -05:00
Beihao Zhou c729bf40ee Fix name order
continuous-integration/drone/push Build is failing Details
2022-02-13 11:22:28 -05:00
Rebecca-Chou 8b8432cf76 Change the order of exec name 2022-02-14 00:11:08 +08:00
Rebecca-Chou 3a7ec04f4e Debug ldap data fetch function
continuous-integration/drone/push Build is failing Details
2022-02-13 23:48:30 +08:00
Rebecca-Chou ae0b81c4cc debug getExecNames
continuous-integration/drone/push Build is failing Details
2022-02-10 01:35:23 +08:00
Rebecca-Chou c7947d9054 Test new getExecNames
continuous-integration/drone/push Build is passing Details
2022-02-10 01:22:09 +08:00
Rebecca-Chou 6ad38d1971 Test getExec function
continuous-integration/drone/push Build is failing Details
2022-02-10 01:01:39 +08:00
Rebecca-Chou 608f6342da Debug placeholder
continuous-integration/drone/push Build is passing Details
2022-02-10 00:44:56 +08:00
Rebecca-Chou 0f15953979 Fix Typo 2022-02-09 21:30:15 +08:00
Rebecca-Chou 79c5005652 add placeholder
continuous-integration/drone/push Build is passing Details
2022-02-09 21:22:38 +08:00
Rebecca-Chou 8f144983ef Test Ldap
continuous-integration/drone/push Build is failing Details
2022-02-02 21:48:21 +08:00
Rebecca-Chou fbcdec33eb Change returned data type
continuous-integration/drone/push Build is failing Details
2022-02-02 17:06:13 +08:00
Rebecca-Chou b06189f5f3 Test Ldap
continuous-integration/drone/push Build is failing Details
2022-02-02 15:32:53 +08:00
Jared He 2264e60852 Add Term Type (#361)
continuous-integration/drone/push Build is passing Details
Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com>
Reviewed-on: #361
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
Reviewed-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
Co-authored-by: j285he <j285he@localhost>
Co-committed-by: j285he <j285he@localhost>
2022-01-19 20:19:13 -05:00
Beihao Zhou fdb6bb1ccf Sort Members by name instead of userid (Fixes #371) (#384)
continuous-integration/drone/push Build is passing Details
Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Reviewed-on: #384
Reviewed-by: j285he <j285he@localhost>
Co-authored-by: Beihao Zhou <b72zhou@csclub.uwaterloo.ca>
Co-committed-by: Beihao Zhou <b72zhou@csclub.uwaterloo.ca>
2022-01-17 00:15:39 -05:00
Jared He e6315cf906 Generate members list (#354)
continuous-integration/drone/push Build is passing Details
#301

https://csclub.uwaterloo.ca/~a3thakra/csc/j285he-ldap/about/members/

Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com>
Co-authored-by: Jared He <j285he@uwaterloo.ca>
Reviewed-on: #354
Reviewed-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
Co-authored-by: j285he <j285he@localhost>
Co-committed-by: j285he <j285he@localhost>
2021-11-22 12:47:00 -05:00
Amy Wang aae5c9adef Image Optimization Script (#348)
continuous-integration/drone/push Build is passing Details
A build-time script to optimize images. Note that going forward, all images should be placed in `images` instead of `public/images`.

Co-authored-by: Amy <a258wang@uwaterloo.ca>
Reviewed-on: #348
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Reviewed-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
Co-authored-by: Amy <a258wang@csclub.uwaterloo.ca>
Co-committed-by: Amy <a258wang@csclub.uwaterloo.ca>
2021-10-31 16:58:14 -04:00
Aditya Thakral 47352f4e82 Change date format for events and news (#343)
continuous-integration/drone/push Build is passing Details
https://csclub.uwaterloo.ca/~a3thakra/csc/adi-event-dates

Reviewed-on: #343
Reviewed-by: b38peng <b38peng@uwaterloo.ca>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-10-13 21:36:08 -04:00
Aditya Thakral 34fb652fb9 Dynamically generate event calendar (#332)
continuous-integration/drone/push Build is passing Details
Closes #134

- Dynamically generates the calendar before the export step
- I tested it with google calendar, updates are propagating as expected (it takes a day for google calendar to get updated)

You can try adding this URL to your calendar to test things out: https://csclub.uwaterloo.ca/~a3thakra/csc/adi-ical/events.ics

Reviewed-on: #332
Reviewed-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-09-27 16:20:18 -04:00
Neil Parikh 2f2c032bd7 add news event for resume review event (#313)
continuous-integration/drone/push Build is passing Details
https://csclub.uwaterloo.ca/~a3thakra/csc/n3parikh-resume-news/

Co-authored-by: Neil Parikh <n3parikh@csclub.uwaterloo.ca>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Reviewed-on: #313
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
Co-committed-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
2021-09-15 21:25:44 -04:00
Neil Parikh e088ff1f4f Add permalink in event card (#316)
continuous-integration/drone/push Build is passing Details
https://csclub.uwaterloo.ca/~a3thakra/csc/permalink-homepage/

Co-authored-by: Neil Parikh <n3parikh@csclub.uwaterloo.ca>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Reviewed-on: #316
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
Co-committed-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
2021-09-12 20:15:31 -04:00
Neil Parikh 71bdeecb77 Add BOT event (#296)
continuous-integration/drone/push Build is passing Details
https://csclub.uwaterloo.ca/~a3thakra/csc/n3parikh-patch-1/

https://csclub.uwaterloo.ca/~a3thakra/csc/n3parikh-patch-1/events/2021/fall/BOT/

Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Reviewed-on: #296
Co-authored-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
Co-committed-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
2021-09-08 13:50:22 -04:00
Aditya Thakral 964b112481 Move content to match routes (#289)
continuous-integration/drone/push Build is passing Details
Make sure that the advice, team, and tech-talk pages are loading properly

Reviewed-on: #289
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-09-03 21:55:23 -04:00