Commit Graph

224 Commits

Author SHA1 Message Date
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
Raymond Li 4aaa112822
Merge branch 'main' of csclub.uwaterloo.ca:www/www-new
continuous-integration/drone/push Build is passing Details
2022-02-14 22:11:06 -05:00
Raymond Li 17ff0e9b7a
Create SeshanRavikumar.jpg
continuous-integration/drone/push Build is passing Details
2022-02-14 17:44:22 -05: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
Raymond Li 73d88f5a46 Remove Paypal (#399)
continuous-integration/drone/push Build is passing Details
Reviewed-on: #399
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
Co-authored-by: Raymond Li <raymo@csclub.uwaterloo.ca>
Co-committed-by: Raymond Li <raymo@csclub.uwaterloo.ca>
2022-02-09 21:12:34 -05:00
Raymond Li 2a93c9029a Replace Paypal with commented WUSA store
continuous-integration/drone/push Build is passing Details
2022-02-09 21:10:31 -05:00
Raymond Li e285cb0553 Remove Paypal
continuous-integration/drone/push Build is passing Details
2022-02-09 19:38:26 -05: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 fc3d3e11d3 Merge branch 'b72zhou-ldap-exec' of https://git.csclub.uwaterloo.ca/www/www-new into b72zhou-ldap-exec
continuous-integration/drone/push Build is passing Details
2022-02-09 21:31:00 +08:00
Rebecca-Chou 0f15953979 Fix Typo 2022-02-09 21:30:15 +08:00
Beihao Zhou cb17e15b22 Merge branch 'main' into b72zhou-ldap-exec
continuous-integration/drone/push Build is passing Details
2022-02-09 08:25:03 -05:00
Rebecca-Chou 79c5005652 add placeholder
continuous-integration/drone/push Build is passing Details
2022-02-09 21:22:38 +08:00
Beihao Zhou 78c751fce0 Add news for winter 2022 election results (Closes #380) (#383)
continuous-integration/drone/push Build is passing Details
If Head of Discord, Heads of Design, Head of Reps are to be included, just notify me ~ 😃

Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Reviewed-on: #383
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
Reviewed-by: j285he <j285he@localhost>
Reviewed-by: n3parikh <n3parikh@csclub.uwaterloo.ca>
Co-authored-by: Beihao Zhou <b72zhou@csclub.uwaterloo.ca>
Co-committed-by: Beihao Zhou <b72zhou@csclub.uwaterloo.ca>
2022-02-09 08:03:04 -05: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 6e8f7bba94 Test using console log
continuous-integration/drone/push Build is failing Details
2022-02-02 16:04:40 +08:00
Rebecca-Chou b06189f5f3 Test Ldap
continuous-integration/drone/push Build is failing Details
2022-02-02 15:32:53 +08:00
Raymond Li b9cd0f6b66 Waive w22 fees (#395)
continuous-integration/drone/push Build is passing Details
Reviewed-on: #395
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
Co-authored-by: Raymond Li <raymo@csclub.uwaterloo.ca>
Co-committed-by: Raymond Li <raymo@csclub.uwaterloo.ca>
2022-02-02 01:20:18 -05:00
Amy Wang fc9236f128 Change Discord Mod to Discord (#393)
continuous-integration/drone/push Build is passing Details
Andy (Head of Discord) asked that we change the label for the Discord team members on the Meet the Team page from "Discord Mod" to either "Codey Coder" or "Discord". I have opted to change it to simply "Discord" for clarity.

When we separate the teams on the Meet the Team page (#364), please change "Discord" to "Developer" (similar to what we have for the Web Committee).

Co-authored-by: Amy <a258wang@uwaterloo.ca>
Reviewed-on: #393
Reviewed-by: Emily Chiu <e26chiu@csclub.uwaterloo.ca>
Co-authored-by: Amy <a258wang@csclub.uwaterloo.ca>
Co-committed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-01-30 17:06:34 -05:00
Mark Chiu 39cece999c Update Meet The Team page for Winter 2022 (Closes #382) (#388)
continuous-integration/drone/push Build is passing Details
Missing pictures:
- Elaine Han
- Tommy Jiang
- Seshan Ravikumar

To ignore:
- Matthew Wang
- Amy Wang
- Ivy Lei
- Amin Bandali
- Anthony Brennan
- Edwin Zhang
- Elana Hashman
- Jennifer Zhou
- Zachary Seguin

Co-authored-by: Miniapple8888 <miniapple8888@gmail.com>
Reviewed-on: #388
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
Co-authored-by: Emily Chiu <e26chiu@csclub.uwaterloo.ca>
Co-committed-by: Emily Chiu <e26chiu@csclub.uwaterloo.ca>
2022-01-26 11:00:14 -05:00
Amy Wang 84144c10ab Add Afterhours and BOT events (#389)
continuous-integration/drone/push Build is passing Details
Added the upcoming Afterhours: Diversity in Tech event, as well as the Beginning of Term event that happened last week.

Co-authored-by: Amy <a258wang@uwaterloo.ca>
Reviewed-on: #389
Reviewed-by: Emily Chiu <e26chiu@csclub.uwaterloo.ca>
Co-authored-by: Amy <a258wang@csclub.uwaterloo.ca>
Co-committed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-01-23 00:25:54 -05:00
Renovate Bot d6509b1bfa Update dependency @next/mdx to v11.1.3 (#143)
continuous-integration/drone/push Build is passing Details
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [@next/mdx](https://github.com/vercel/next.js) | dependencies | minor | [`11.0.1` -> `11.1.3`](https://renovatebot.com/diffs/npm/@next%2fmdx/11.0.1/11.1.3) |

⚠️ Release Notes retrieval for this PR were skipped because no github.com credentials were available.
If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

Co-authored-by: Aditya Thakral <github@9at8.dev>
Reviewed-on: #143
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: Renovate Bot <no-reply@csclub.uwaterloo.ca>
Co-committed-by: Renovate Bot <no-reply@csclub.uwaterloo.ca>
2022-01-20 01:03:24 -05:00
Renovate Bot dcba1a8cd9 Update npm to v8 (#340)
continuous-integration/drone/push Build is passing Details
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [npm](https://docs.npmjs.com/) ([source](https://github.com/npm/cli)) | engines | major | [`^7` -> `^8.0.0`](https://renovatebot.com/diffs/npm/npm/7.24.2/8.3.1) |

⚠️ Release Notes retrieval for this PR were skipped because no github.com credentials were available.
If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

Co-authored-by: Aditya Thakral <github@9at8.dev>
Reviewed-on: #340
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: Renovate Bot <no-reply@csclub.uwaterloo.ca>
Co-committed-by: Renovate Bot <no-reply@csclub.uwaterloo.ca>
2022-01-20 01:00:30 -05:00
Renovate Bot cd660a523e Update dependency postcss-preset-env to v7 (#360)
continuous-integration/drone/push Build is passing Details
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [postcss-preset-env](https://github.com/csstools/postcss-plugins) | devDependencies | major | [`^6.7.0` -> `^7.0.0`](https://renovatebot.com/diffs/npm/postcss-preset-env/6.7.0/7.2.3) |

⚠️ Release Notes retrieval for this PR were skipped because no github.com credentials were available.
If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

Co-authored-by: Aditya Thakral <github@9at8.dev>
Reviewed-on: #360
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: Renovate Bot <no-reply@csclub.uwaterloo.ca>
Co-committed-by: Renovate Bot <no-reply@csclub.uwaterloo.ca>
2022-01-20 00:58:20 -05: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
Amy Wang ff0594eac7 Mobile TeamMemberCard fixes (#368)
continuous-integration/drone/push Build is passing Details
Summary of changes:
- Refactored TeamMemberCard to get rid of `isPopup` prop
- Reorganized TeamMemberCard CSS
- Fixes #213
- Fixes #214
- Fixes #242
- Fixes #286

Related PR: #241

Co-authored-by: Amy <a258wang@uwaterloo.ca>
Reviewed-on: #368
Reviewed-by: j285he <j285he@localhost>
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: Amy <a258wang@csclub.uwaterloo.ca>
Co-committed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-01-18 20:25:14 -05:00