Commit Graph

59 Commits

Author SHA1 Message Date
e26chiu f6ec42f793 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile into b72zhou-postgrad-page 2022-12-04 21:28:35 -05:00
e26chiu 53d92f93cc Edit blurb 2022-12-04 21:28:22 -05:00
Shahan Nedadahandeh 3dd978c67e Added default word cloud width util (#102)
continuous-integration/drone/push Build is passing Details
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #102
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-12-04 16:22:06 -05:00
Rebecca-Chou 77b1a4ea30 Merge branch 'b72zhou-postgrad-page' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile into b72zhou-postgrad-page
continuous-integration/drone/push Build is passing Details
2022-11-30 22:06:26 -05:00
Rebecca-Chou f5523d1a21 :fix: renamge page 2022-11-30 22:06:16 -05:00
Beihao Zhou 7dfbe77e6e Merge branch 'main' into b72zhou-postgrad-page
continuous-integration/drone/push Build is passing Details
2022-11-30 22:05:22 -05:00
Rebecca-Chou fa936b08b9 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile into b72zhou-postgrad-page 2022-11-30 22:01:19 -05:00
Beihao Zhou db9f74a42a Enable customized colors for line graph (#92)
continuous-integration/drone/push Build is passing Details
Co-authored-by: Rebecca-Chou <beihaozhou@gmail.com>
Reviewed-on: #92
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-11-30 21:48:36 -05:00
Shahan Nedadahandeh ec4f33919c Fixed WordCloud not displaying values correctly (#95)
continuous-integration/drone/push Build is passing Details
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #95
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-11-30 18:35:42 -05:00
Rebecca-Chou 9c958a6014 :fix: lint
continuous-integration/drone/push Build is passing Details
2022-11-30 16:08:37 -05:00
Rebecca-Chou 4885499ad1 :feat: postgrad page
continuous-integration/drone/push Build is failing Details
2022-11-30 16:03:45 -05:00
Rebecca-Chou 02eafe44d3 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-11-23 13:31:25 -04:00
Mark Chiu 1c0191facc Refactor default prop values into util file (Closes #82) (#87)
continuous-integration/drone/push Build is passing Details
This PR creates a new util file `DefaultProp` that provides default prop values for graph/chart components. More values could be added in the future as the pages are developed.

staging: (shahan: sorry, due to a unlucky naming this branch name doesnt work with staging )
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #87
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-11-16 22:00:56 -05:00
Shahan Nedadahandeh 97aa2261f2 Created TooltipWrapper (#88)
continuous-integration/drone/push Build is passing Details
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #88
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-11-16 21:35:55 -05:00
Shahan Nedadahandeh e061850575 Fixed data and tooltip issues with wordcloud (#84)
continuous-integration/drone/push Build is passing Details
Closes #80
Closes #78

Added finer control for word cloud min/max font sizes. Changed defaults to be a bit more sensible, and also adjusted the values for the demographics page word cloud to display all data (main culprit was "wordPadding" was too big)
Added a console.error for when not all the words are being display to aid in development for when we're adjusting the min/max font sizes.
Fixed word cloud tooltip not being correct on centered word clouds.
Added a min width to the word cloud, aniticipating changes from #85

https://fix-wordcloud-data-csc-class-profile-staging-snedadah.k8s.csclub.cloud/samplePage/

https://fix-wordcloud-data-csc-class-profile-staging-snedadah.k8s.csclub.cloud/demographics/
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #84
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-11-13 23:20:57 -05:00
Shahan Nedadahandeh d39a1f8274 Add media query to section header and update sample page (#85)
continuous-integration/drone/push Build is passing Details
https://update-smpl-page-csc-class-profile-staging-snedadah.k8s.csclub.cloud/demographics/
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #85
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-11-13 23:11:29 -05:00
Mark Chiu aa25b8451b Fix Mobile Vertical Bar Graph Labels (Closes #50) (#83)
continuous-integration/drone/push Build is passing Details
* Add alternating label functionality to vertical bar graphs when the width of the graph reaches its `minWidth`
* Add `minWidth` prop to horizontal and vertical bar graphs, by default, set to 500 (make a PR to contain these default prop values)
* Add overflow scroll on mobile for horizontal and vertical bar graphs

https://fix-mobile-bug-labels-csc-class-profile-stag-snedadah.k8s.csclub.cloud/
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #83
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-11-13 18:36:34 -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
Rebecca-Chou f5c9f2e447 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-11-08 09:26:15 -04: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 0fcc367ab6 Make section component body text optional (Closes #70) (#77)
continuous-integration/drone/push Build is passing Details
https://opt-descrp-csc-class-profile-staging-snedadah.k8s.csclub.cloud/samplePage/
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #77
Reviewed-by: Mark Chiu <e26chiu@csclub.uwaterloo.ca>
2022-11-05 12:18:44 -04:00
Mark Chiu 7404c60d8f Add SectionHeader component (Closes #74) (#75)
continuous-integration/drone/push Build is passing Details
This PR adds the SectionHeader component as described in the issue. The text is centered, so it's adapted for mobile. Possible improvements (or nitpicks) would be to add spacing around the text in mobile version (left and right margin/padding) or maybe make the title or subtitle smaller? I think it looks fine otherwise.

![image](/attachments/9666a512-dd29-471a-943e-d91db7836bd9)

https://sectionheader-component-csc-class-profile-st-snedadah.k8s.csclub.cloud/
Co-authored-by: e26chiu <e26chiu@csc.uwaterloo.ca>
Reviewed-on: #75
Reviewed-by: Shahan Nedadahandeh <snedadah@csclub.uwaterloo.ca>
2022-11-05 09:01:46 -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
Rebecca-Chou 9f6b2c80a0 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-10-19 12:40:17 -04:00
Beihao Zhou fc2bf48706 Add Bottom Navigation (#64)
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>
2022-10-05 21:07:49 -04:00
Rebecca-Chou ed31c4f1fc merge 2022-10-02 15:05:30 -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
Rebecca-Chou ad6436be2a merge main 2022-10-02 14:54:07 -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
Rebecca-Chou eebe20bfc6 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-09-14 15:49:57 -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 fc5600cb20 Add About Component (#48)
continuous-integration/drone/push Build is passing Details
Closes #40.

Will look correct when !46 is merged in.

https://j285he-about-csc-class-profile-staging-snedadah.k8s.csclub.cloud/
Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com>
Reviewed-on: #48
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-09-12 10:20:10 -04:00
Jared He 3cb5780964 Standardize font sizes (#46)
continuous-integration/drone/push Build is passing Details
Closes #33.

There were many more font sizes in the Figma, but as a best design practice, I chose the four most common.

Staging:

https://j285he-standardize-font-sizes-csc-class-prof-snedadah.k8s.csclub.cloud/
Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com>
Co-authored-by: shahanneda <shahan.neda@gmail.com>
Reviewed-on: #46
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
2022-09-12 10:08:01 -04:00
Rebecca-Chou 3bde1f4032 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-09-11 21:58:53 -04:00
Jared He e2d19a281a Add Textbox Component (#45)
continuous-integration/drone/push Build is passing Details
Closes #39.

Padding will look correct when !46 is merged in.

https://j285he-textbox-component-csc-class-profile-staging-snedadah.k8s.csclub.cloud
Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com>
Reviewed-on: #45
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
Reviewed-by: Shahan Neda <snedadah@csclub.uwaterloo.ca>
2022-09-09 17:01:34 -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
Rebecca-Chou 5bee5a98c4 resolve conflict 2022-09-06 13:41:56 -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
Rebecca-Chou 5a0459f2db resolve conflict 2022-09-03 01:34:14 -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 9cd5c158e7 Sample page and graph wrappers (#32)
continuous-integration/drone/push Build is passing Details
2022-09-02 17:39:46 -04:00
Rebecca-Chou fc939fbec3 version 1 with lines shown 2022-08-31 23:25:39 -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 933833d331 Fix monospace fallback (#28)
continuous-integration/drone/push Build is passing Details
Just realized that we shouldn't have quotes around `monospace` 🤦

Co-authored-by: Amy Wang <a258wang@csclub.uwaterloo.ca>
Reviewed-on: #28
Reviewed-by: j285he <j285he@localhost>
2022-07-27 20:45:10 -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 5ce2efdc31 Fix Inconsolata font (#24)
continuous-integration/drone/push Build is passing Details
Fixes #23

Kudos to @j285he for noticing that we had commas in `pages/font.css` when we should've had semicolons.

Co-authored-by: Amy Wang <a258wang@csclub.uwaterloo.ca>
Reviewed-on: #24
Reviewed-by: Shahan Neda <snedadah@csclub.uwaterloo.ca>
2022-07-11 02:28:47 -04:00
Shahan Nedadahandeh 854c5d5bae Fix Staging server 404 error (#22)
continuous-integration/drone/push Build is passing Details
2022-07-07 19:52:43 -04:00
Shahan Nedadahandeh 126a61fc28 Add colors in JS and Color Palette (#18)
continuous-integration/drone/push Build is passing Details
2022-07-01 14:30:57 -04:00