Commit Graph

30 Commits

Author SHA1 Message Date
e26chiu fbb1bb4bd9 Correct data
continuous-integration/drone/push Build is passing Details
2023-01-28 11:26:33 -05:00
Shahan Nedadahandeh 93d0a69d78 Fixed incorrect data
continuous-integration/drone/push Build is passing Details
2023-01-26 22:21:37 -05:00
Beihao Zhou 5970f9aebe Fix: Demographic Page Pie Chart Number to Percentage (#137)
continuous-integration/drone/push Build is passing Details
Co-authored-by: Beihao Zhou <b72zhou@csclub.uwaterloo.ca>
Co-committed-by: Beihao Zhou <b72zhou@csclub.uwaterloo.ca>
2023-01-08 13:16:26 -05:00
Mark Chiu eb74c8e4a9 Fix StackedBar Graph nitpicks (Closes #51) (#133)
continuous-integration/drone/push Build is passing Details
Decided not to fix NITPICK #1 because aligning the line with the edge of the graph can make the grid column gap seem bigger than intended.

- Center align bottom axis labels in both horizontal and vertical graphs
- Right align left axis labels in both horizontal and vertical graphs
- Fixed Cumulative Average to CAV in Academics page.
- Add line at the top of the horizontal graph

Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Co-authored-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
Reviewed-on: #133
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2023-01-03 13:51:45 -05:00
Mark Chiu 85535414c3 Add Contributors page (Closes #63) (#121)
continuous-integration/drone/push Build is passing Details
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #121
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
Co-authored-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
Co-committed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-12-30 18:49:10 -05:00
Shahan Nedadahandeh b8590f7a28 Adjust pie chart (#117)
continuous-integration/drone/push Build is passing Details
https://adjust-pie-1-csc-class-profile-staging-snedadah.k8s.csclub.cloud/academics/
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Co-authored-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
Reviewed-on: #117
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-12-28 01:32:07 -05:00
Mark Chiu dcc318b671 Add Mental Health page (Closes #61) (#114)
continuous-integration/drone/push Build is passing Details
https://mental-health-page-csc-class-profile-staging-snedadah.k8s.csclub.cloud/mental-health/
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Co-authored-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
Reviewed-on: #114
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-12-27 21:54:51 -05:00
Mark Chiu 519f925155 Add Personal Page (Closes #62) (#113)
continuous-integration/drone/push Build is passing Details
Removed P1 because it was crossed out in https://docs.google.com/document/d/12x1HqxwXJ4WW2K1grtZwUTc8kMcyIHvbHOafD1NEO6M/edit#heading=h.9iho523v97l0

We can add it back if we want to; it could be an entertaining section to read.

We have some NSFW quotes. They have been filtered/censored/sorted to the end.

Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #113
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-12-21 23:20:25 -05:00
Mark Chiu d77ebe0f8d Add Intimacy and Drugs page (Closes #57) (#103)
continuous-integration/drone/push Build is passing Details
Todo:
- [x] Fix Grouped bar graphs (done in a separate PR) (#104) DO NOT MERGE BEFORE OTHER GROUPED BAR PR IS DONE: #108
- [x] Fix responsiveness of quotation carousels.

Note that Lifestyle and Interests link in BottomNav (that appears in the co-op and Intimacy and Drugs pages) is overflowing because the text is a bit too long in mobile.

![image](/attachments/8bd7f7b2-96ce-4e6b-af51-fe1c3304a215)

Other changes:
- Add minWidth to QuotationCarousel
- Fix friends page pie charts percentage values (one of them got converted into a bar graph because the values were too small for the pie to display itself at times and we already had many pie charts in that page already)
- Lifestyle and Interests page had the wrong bottom nav links.
- Fixed the `lowerLabel` value of bar graphs in multiple pages since the alternating labels aren't really necessary. Now that I'm doing it pretty frequently, I think it should be made a default value perhaps 🤔
- SectionWrapper component is fixed so it's centered in mobile.
- Fix ComponentWrapper for mobile responsive purposes
https://intimacy-drugs-page-csc-class-profile-stagin-snedadah.k8s.csclub.cloud/intimacy-and-drugs/

Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #103
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-12-15 20:38:58 -05:00
Beihao Zhou 6ba124ee15 Add Miscellaneous Page (Close #60) (#106)
continuous-integration/drone/push Build is passing Details
Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #106
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-12-13 21:00:34 -05:00
Beihao Zhou 7bcd11e186 Add Friends Page (Close #59) (#105)
continuous-integration/drone/push Build is passing Details
Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #105
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-12-11 19:18:15 -05:00
Beihao Zhou dbb1a5929f Add Postgrad Page (Close #58) (#99)
continuous-integration/drone/push Build is passing Details
https://b72zhou-postgrad-page-csc-class-profile-stag-snedadah.k8s.csclub.cloud/postgrad/
Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #99
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-12-07 21:24:02 -05:00
Mark Chiu f659393335 Add Academics page (Closes #54) (#94)
continuous-integration/drone/push Build is passing Details
Summary of noteworthy changes:
- **Pie charts do NOT currently calculate percentages of values**. I left it as is, and just changed the data to reflect the percentages instead of the actual value (because that is what we're displaying)
- Minor fix to the Stacked Bar Graph so that the legend displays on top in a row instead of in a column to the right of the graph.
- Added styling to Carousel so that it is properly centered.
- In the Stacked Bar Graphs, I grouped certain ranges of values because the value for the individual categories would have been too small and insignificant otherwise.

Problems:
- [x] WordCloud still doesn't display the right text-value association no matter how much I tweak the values. The font size is correctly displayed though and all words are shown (I counted!). Errors still show in the console log.
- [ ] WordCloud still weirdly overflows sometimes when I resize my window. See figure below. (#98)
- [ ] Stacked Bar Graph still needs some fixing (to be done in a separate PR) related to how the legend is displayed + labels.
- [x] **Description blurbs NEED to be re-read before copy-pasting**. I just noticed that the given blurbs are sometimes incomplete, grammatically incorrect, or erroneous.
- [ ] Bar graphs and pie charts need to have tooltips. (all graphs) (#97)
- [ ] Tooltips in Stacked Bar Graphs are not well positioned when hovering over them. (#89)

Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #94
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-12-07 21:13:52 -05:00
Beihao Zhou 3936b7870e Add LifeStyle + Interest Page (Close #56) (#101)
continuous-integration/drone/push Build is passing Details
https://b72zhou-life-and-interest-page-csc-class-pro-snedadah.k8s.csclub.cloud/lifestyle-and-interests/
Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Co-authored-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
Reviewed-on: #101
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-12-07 21:12:33 -05:00
Beihao Zhou 15191bb89e Add Coop Page (Close #55) (#69)
continuous-integration/drone/push Build is passing Details
Closes #55

https://b72zhou-coop-page-csc-class-profile-staging-snedadah.k8s.csclub.cloud/coop/
Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #69
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-12-05 09:31:50 -05:00
Mark Chiu fb9c5243ab Add Demographics page (Closes #53) (#73)
continuous-integration/drone/push Build is passing Details
Changes: (outside of Demographics page)
* colour of the text (might be changed later on) because pure white strains the eye (contrast is too high).
* font size + line height
* SectionHeader word break fix of the title
* `isMobile` breakpoint is changed to 900

https://demographics-page-csc-class-profile-staging-snedadah.k8s.csclub.cloud/demographics/
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #73
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-11-12 11:37:15 -05:00
Shahan Nedadahandeh 80530c1c1a Made bottom arrows optional and refactored routes (Closes #72) (#76)
continuous-integration/drone/push Build is passing Details
2022-11-05 14:06:24 -04:00
Shahan Nedadahandeh bfa3e9960c Header/Side Menu (#52)
continuous-integration/drone/push Build is passing Details
2022-10-22 14:04:12 -04:00
Beihao Zhou d8867d3c86 Line Graph Component using curve (#47)
continuous-integration/drone/push Build is passing Details
https://b72zhou-line-graph-v2-csc-class-profile-staging-snedadah.k8s.csclub.cloud/
Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Reviewed-on: #47
Reviewed-by: Amy Wang <a258wang@csclub.uwaterloo.ca>
2022-10-02 15:01:17 -04:00
Amy Wang 4458dcfa1f Add Grouped Bar Graph (#65)
continuous-integration/drone/push Build is passing Details
Closes #2

Notes:
- Named the component the GroupedBarGraph since it can support bar groups of > 2 bars.
- The horizontal graph is mostly a copy of the vertical graph, with slight modifications. This ended up being the ~~laziest~~ easiest way to implement it.

Reviewed-on: #65
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-10-02 13:11:42 -04:00
Mark Chiu 2d34b84cb0 Add Stacked Bar Graph component (Closes #3) (#37)
continuous-integration/drone/push Build is passing Details
Notes:
- Add Stacked Bar Graph component using the `BarStack` component from Visx.
- Hovering over a bar will add a highlight on the hovered bar and not the entire stacked bar (I have not yet found a way to highlight the entire stacked bar)
- Hovering over a bar will also show a tooltip box with the data for each bar. (The number represents the height of the bar and not the cumulative stacked bar height)
- In the mock data, the number given to each key represent their individual height (and not their overall value). The graph calculates the total height of the stacked bars.
- Missing percentage next to the left axis labels
- Resizable width, height, and margins. Customizable number of ticks for the y axis.

![image](/attachments/0ef5c998-c6c3-4e36-971e-6a33fe72ed1e)

Staging: https://stackedbar-component-csc-class-profile-staging-snedadah.k8s.csclub.cloud/playground/
Co-authored-by: Miniapple8888 <miniapple8888@gmail.com>
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #37
Reviewed-by: Amy Wang <a258wang@csclub.uwaterloo.ca>
2022-10-01 20:54:05 -04:00
Jared He 8253f6cbab Add Sections Component (#49)
continuous-integration/drone/push Build is passing Details
Closes #43.

Will look better when !46 is merged in.

https://j285he-sections-csc-class-profile-staging-snedadah.k8s.csclub.cloud/playground/
Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com>
Reviewed-on: #49
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-09-12 20:07:03 -04:00
Jared He e3948c0577 Add Timeline Component (#35)
continuous-integration/drone/push Build is passing Details
Closes #7

Staging: https://j285he-timeline-csc-class-profile-staging-snedadah.k8s.csclub.cloud/playground/
Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com>
Reviewed-on: #35
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-09-12 20:00:01 -04:00
Jared He 9200e5f491 Pie chart component (#19)
continuous-integration/drone/push Build is passing Details
Closes #5.

To fix:

- [x] Inner pie slice text not perfectly centered

- [x] Create optional props for `padRadius` and `innerRadius`

- [x] Change colors to global colors and merge from main to get fonts

Also, outer labels can get cut off if they are long enough, but the `labelWidth` is provided as a prop for the user to adjust.

Staging url: https://j285he-pie-chart-csc-class-profile-staging-snedadah.k8s.csclub.cloud

Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com>
Reviewed-on: #19
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-09-07 22:20:30 -04:00
Mark Chiu 9526f1b0f5 Add BoxPlot component (Closes #6) (#34)
continuous-integration/drone/push Build is passing Details
Done:

- [x] Display boxplot with left and bottom axis in `playground.tsx`
- [x] Add mock data for boxplot
- [x] Hovering over boxplot displays a Tool Tip box.

My version:
![image](/attachments/6c8c4499-a1bd-4434-9230-7117266691ea)

Note:

 - No percentage displayed next to value axis labels.
 - We can add outlier points although it could complicate the graph.
 - Still displays the following error:
 	- Error: Hydration failed because the initial UI does not match what was rendered on the server.
    - Error: Text content does not match server-rendered HTML.
    - Error: There was an error while hydrating. Because the error happened outside of a Suspense boundary, the entire root will switch to client rendering.

    Staging: https://boxplot-component-csc-class-profile-staging-snedadah.k8s.csclub.cloud/
Co-authored-by: Miniapple8888 <miniapple8888@gmail.com>
Co-authored-by: Emily Chiu <e26chiu@corn-syrup.csclub.uwaterloo.ca>
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #34
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-09-03 11:13:58 -04:00
Amy Wang a2dbcb90c6 Add Quotation Carousel (#36)
continuous-integration/drone/push Build is passing Details
Made without visx, because that was easier.

Closes #10.

Co-authored-by: Amy Wang <a258wang@csclub.uwaterloo.ca>
Reviewed-on: #36
Reviewed-by: j285he <j285he@localhost>
2022-09-02 21:53:05 -04:00
Shahan Nedadahandeh b586d52f72 Add Wordcloud Component (#27)
continuous-integration/drone/push Build is passing Details
2022-08-04 02:17:19 -04:00
Amy Wang 6735c52914 Bar Graph Component (#16)
continuous-integration/drone/push Build is passing Details
Adds a `<BarGraphHorizontal />` component and a `<BarGraphVertical />` component.

Closes #1.

Possible changes for the future:
- Refactor to make the horizontal and vertical bar graphs into one component
- Add (optional) graph title

Co-authored-by: Amy Wang <a258wang@csclub.uwaterloo.ca>
Reviewed-on: #16
Reviewed-by: Shahan Neda <snedadah@csclub.uwaterloo.ca>
2022-07-27 19:46:08 -04:00
Amy Wang 591b885ae2 Fix typo 2022-06-03 02:15:22 -04:00
Amy Wang e4c7be3931 Add sample mock data 2022-06-03 02:11:48 -04:00