Merge main
This commit is contained in:
Jared He
commit
f6a0674923
11
.eslintrc.js
11
.eslintrc.js
|
|
@ -15,10 +15,15 @@ module.exports = {
|
|||
"plugin:react/recommended",
|
||||
"plugin:prettier/recommended",
|
||||
],
|
||||
plugins: ["@typescript-eslint", "react", "react-hooks", "prettier"],
|
||||
plugins: ["@typescript-eslint", "react", "react-hooks", "prettier", "unused-imports"],
|
||||
rules: {
|
||||
"prettier/prettier": "error",
|
||||
|
||||
"no-unused-vars": "off",
|
||||
"unused-imports/no-unused-imports": "error",
|
||||
"unused-imports/no-unused-vars": [
|
||||
"error",
|
||||
{ "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" }
|
||||
],
|
||||
"prettier/prettier": ["error", { "endOfLine": "auto" }],
|
||||
"import/first": "error",
|
||||
"import/order": [
|
||||
"error",
|
||||
|
|
|
|||
|
|
@ -33,4 +33,4 @@
|
|||
font-family: "Inconsolata", monospace;
|
||||
font-weight: 800;
|
||||
fill: var(--label);
|
||||
}
|
||||
}
|
||||
|
|
@ -25,9 +25,9 @@ interface BarGraphProps {
|
|||
right: number;
|
||||
};
|
||||
className?: string;
|
||||
/** Font size of the category tick labels, in pixels. Default is 16px. */
|
||||
/** Font size of the category axis tick labels, in pixels. Default is 16px. */
|
||||
categoryTickLabelSize?: number;
|
||||
/** Font size of the value tick labels, in pixels. Default is 16px. */
|
||||
/** Font size of the value axis tick labels, in pixels. Default is 16px. */
|
||||
valueTickLabelSize?: number;
|
||||
/** Font size of the value that appears when hovering over a bar, in pixels. */
|
||||
hoverLabelSize?: number;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
.container {
|
||||
display: flex;
|
||||
flex-flow: center;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin: calc(40rem / 16) 0;
|
||||
}
|
||||
|
||||
.subBox {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.item {
|
||||
color: var(--primary-text);
|
||||
font-size: calc(28rem / 16);
|
||||
position: relative;
|
||||
margin: calc(24rem / 16);
|
||||
}
|
||||
|
||||
.subBox {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.arrow {
|
||||
width: calc(250rem / 16);
|
||||
height: calc(20rem / 16);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
|
||||
.item:after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
transform: scaleX(0);
|
||||
height: calc(2rem / 16);
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
background-color: var(--primary-accent);
|
||||
cursor: pointer;
|
||||
transform-origin: bottom right;
|
||||
transition: transform 0.25s ease-out;
|
||||
}
|
||||
|
||||
.item:hover:after {
|
||||
transform: scaleX(1);
|
||||
transform-origin: bottom left;
|
||||
}
|
||||
|
||||
.linePath {
|
||||
stroke: var(--primary-text);
|
||||
}
|
||||
|
||||
.arrowPath {
|
||||
fill: var(--primary-text);
|
||||
}
|
||||
|
||||
.right {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
@media screen and (max-width: 1000px) {
|
||||
.subBox {
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.subBoxLeft {
|
||||
flex-direction: column-reverse;
|
||||
align-items: flex-end;
|
||||
}
|
||||
|
||||
|
||||
.item {
|
||||
font-size: calc(20rem / 16);
|
||||
margin: 0;
|
||||
margin-bottom: calc(10rem / 16);
|
||||
}
|
||||
|
||||
.arrow {
|
||||
width: calc(200rem / 16);
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 500px) {
|
||||
.container {
|
||||
justify-content: center;
|
||||
gap: calc(50rem / 16);
|
||||
}
|
||||
|
||||
.arrow {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.containerOnlyRightArrow {
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.containerOnlyLeftArrow {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
import Link from "next/link";
|
||||
import React from "react";
|
||||
|
||||
import styles from "./BottomNav.module.css";
|
||||
|
||||
interface PagesInfo {
|
||||
leftPage?: {
|
||||
url: string;
|
||||
name: string;
|
||||
};
|
||||
rightPage?: {
|
||||
url: string;
|
||||
name: string;
|
||||
};
|
||||
}
|
||||
|
||||
export function BottomNav(props: PagesInfo) {
|
||||
const onlyRightArrow = props.rightPage && !props.leftPage;
|
||||
const onlyLeftArrow = !props.rightPage && props.leftPage;
|
||||
return (
|
||||
<div
|
||||
className={`${styles.container}
|
||||
${onlyRightArrow ? styles.containerOnlyRightArrow : ""}
|
||||
${onlyLeftArrow ? styles.containerOnlyLeftArrow : ""}`}
|
||||
>
|
||||
{props.leftPage ? (
|
||||
<div className={styles.subBox + " " + styles.subBoxLeft}>
|
||||
<Link href={props.leftPage.url}>
|
||||
<a>
|
||||
<Arrow />
|
||||
</a>
|
||||
</Link>
|
||||
<Link href={props.leftPage.url}>
|
||||
<a className={styles.item}>{props.leftPage.name}</a>
|
||||
</Link>
|
||||
</div>
|
||||
) : null}
|
||||
{props.rightPage ? (
|
||||
<div className={styles.subBox}>
|
||||
<Link href={props.rightPage.url}>
|
||||
<a className={styles.item}>{props.rightPage.name}</a>
|
||||
</Link>
|
||||
<Link href={props.rightPage.url}>
|
||||
<a>
|
||||
<Arrow isPointingRight />
|
||||
</a>
|
||||
</Link>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
interface ArrowProps {
|
||||
isPointingRight?: boolean;
|
||||
}
|
||||
|
||||
function Arrow({ isPointingRight }: ArrowProps) {
|
||||
return (
|
||||
<svg className={(isPointingRight ? styles.right : "") + " " + styles.arrow}>
|
||||
<defs>
|
||||
<marker
|
||||
id="arrow"
|
||||
markerWidth="10"
|
||||
markerHeight="10"
|
||||
refX="5"
|
||||
refY="3"
|
||||
orient="auto"
|
||||
markerUnits="strokeWidth"
|
||||
>
|
||||
<path d="M0,0 L0,6 L9,3 z" className={styles.arrowPath} />
|
||||
</marker>
|
||||
</defs>
|
||||
|
||||
<line
|
||||
x1="250"
|
||||
y1="10"
|
||||
x2="100"
|
||||
y2="10" // half of svg height
|
||||
strokeWidth="3"
|
||||
markerEnd="url(#arrow)"
|
||||
className={styles.linePath}
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
display: flex;
|
||||
padding: calc(40rem / 16) calc(50rem / 16);
|
||||
margin: calc(65rem / 16) 0;
|
||||
width: 90%;
|
||||
width: 88%;
|
||||
}
|
||||
|
||||
.wrapperRight {
|
||||
|
|
@ -43,7 +43,12 @@
|
|||
padding: 0 15%;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.wrapperNoBodyText {
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 900px) {
|
||||
.sideWrapperCommon {
|
||||
margin: auto;
|
||||
flex-direction: column;
|
||||
|
|
@ -52,6 +57,10 @@
|
|||
border-radius: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.wrapperCenter {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.internalWrapper {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ type AlignOption = "left" | "center" | "right";
|
|||
type ComponentWrapperProps = {
|
||||
children: React.ReactNode;
|
||||
heading: string;
|
||||
bodyText: string;
|
||||
bodyText?: string;
|
||||
align?: AlignOption;
|
||||
noBackground?: boolean;
|
||||
};
|
||||
|
|
@ -30,11 +30,12 @@ export function ComponentWrapper({
|
|||
className={`
|
||||
${alignClasses[align]}
|
||||
${noBackground ? styles.noBackground : ""}
|
||||
${bodyText ? "" : styles.wrapperNoBodyText}
|
||||
`}
|
||||
>
|
||||
<div className={styles.internalWrapper}>
|
||||
<h3>{heading}</h3>
|
||||
<p>{bodyText}</p>
|
||||
{bodyText ? <p>{bodyText}</p> : null}
|
||||
</div>
|
||||
<div className={styles.internalWrapper}>{children}</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
.wrapper {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: min-content;
|
||||
}
|
||||
|
||||
.barBackground {
|
||||
fill: var(--card-background);
|
||||
}
|
||||
|
||||
.barText {
|
||||
visibility: hidden;
|
||||
|
||||
font-family: "Inconsolata", monospace;
|
||||
font-weight: 800;
|
||||
fill: var(--label);
|
||||
}
|
||||
|
||||
.singleBar:hover .barText {
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
.tickLabel {
|
||||
font-family: "Inconsolata", monospace;
|
||||
font-weight: 800;
|
||||
fill: var(--label);
|
||||
}
|
||||
|
||||
.axisLabel {
|
||||
font-family: "Inconsolata", monospace;
|
||||
font-weight: 800;
|
||||
fill: var(--label);
|
||||
}
|
||||
|
||||
.legend {
|
||||
display: flex;
|
||||
margin: calc(16rem / 16);
|
||||
}
|
||||
|
|
@ -0,0 +1,621 @@
|
|||
import { AxisBottom, AxisLeft } from "@visx/axis";
|
||||
import { bottomTickLabelProps } from "@visx/axis/lib/axis/AxisBottom";
|
||||
import { leftTickLabelProps } from "@visx/axis/lib/axis/AxisLeft";
|
||||
import { GridColumns, GridRows } from "@visx/grid";
|
||||
import { Group } from "@visx/group";
|
||||
import { LegendOrdinal } from "@visx/legend";
|
||||
import { scaleBand, scaleLinear, scaleOrdinal } from "@visx/scale";
|
||||
import { Bar, BarGroup, BarGroupHorizontal } from "@visx/shape";
|
||||
import { BarGroupBar as BarGroupBarType } from "@visx/shape/lib/types";
|
||||
import { Text } from "@visx/text";
|
||||
import React, { useState } from "react";
|
||||
import { Color } from "utils/Color";
|
||||
|
||||
import styles from "./GroupedBarGraph.module.css";
|
||||
|
||||
interface GroupedBarGraphProps {
|
||||
data: GroupedBarGraphData[];
|
||||
/** Colours of bars in each group. */
|
||||
barColors: string[];
|
||||
/** Object mapping from the possible colours of bars in each group (barColors) to the colour of the bar when hovered. */
|
||||
barHoverColorsMap: Record<string, string>;
|
||||
/** Width of the entire graph, in pixels. */
|
||||
width: number;
|
||||
/** Height of the entire graph, in pixels. */
|
||||
height: number;
|
||||
/** Distance between the edge of the graph and the area where the bars are drawn, in pixels. */
|
||||
margin: {
|
||||
top: number;
|
||||
bottom: number;
|
||||
left: number;
|
||||
right: number;
|
||||
};
|
||||
className?: string;
|
||||
/** Font size of the category axis tick labels, in pixels. Default is 16px. */
|
||||
categoryTickLabelSize?: number;
|
||||
/** Font size of the value axis tick labels, in pixels. Default is 16px. */
|
||||
valueTickLabelSize?: number;
|
||||
/** Font size of the value that appears when hovering over a bar, in pixels. */
|
||||
hoverLabelSize?: number;
|
||||
/** Label text for the category axis. */
|
||||
categoryAxisLabel?: string;
|
||||
/** Font size of the label for the cateogry axis, in pixels. */
|
||||
categoryAxisLabelSize?: number;
|
||||
/** Controls the distance between the category axis label and the category axis. */
|
||||
categoryAxisLabelOffset?: number;
|
||||
/** Label text for the value axis. */
|
||||
valueAxisLabel?: string;
|
||||
/** Font size of the label for the value axis, in pixels. */
|
||||
valueAxisLabelSize?: number;
|
||||
/** Controls the distance between the value axis label and the value axis. */
|
||||
valueAxisLabelOffset?: number;
|
||||
legendProps?: LegendProps;
|
||||
}
|
||||
|
||||
// Best format for props
|
||||
interface GroupedBarGraphData {
|
||||
category: string;
|
||||
values: {
|
||||
[key: string]: number;
|
||||
};
|
||||
}
|
||||
|
||||
// Best format for visx
|
||||
interface BarGroupData {
|
||||
category: string;
|
||||
[key: string]: string | number;
|
||||
}
|
||||
|
||||
interface LegendProps {
|
||||
/** Position of the legend, relative to the graph. */
|
||||
position?: "top" | "right";
|
||||
/** Font size of the labels in the legend, in pixels. Default is 16px. */
|
||||
itemLabelSize?: number;
|
||||
/** Gap between items in the legend, in pixels. */
|
||||
itemGap?: number;
|
||||
/** Distance between the legend and other adjacent elements, in pixels. */
|
||||
margin?: {
|
||||
top?: number;
|
||||
bottom?: number;
|
||||
left?: number;
|
||||
right?: number;
|
||||
};
|
||||
}
|
||||
|
||||
// BAR_PADDING must be in the range [0, 1)
|
||||
const BAR_PADDING = 0.2;
|
||||
const BAR_TEXT_PADDING = 12;
|
||||
|
||||
const DEFAULT_LABEL_SIZE = 16;
|
||||
const DEFAULT_LEGEND_GAP = 16;
|
||||
|
||||
export function GroupedBarGraphVertical(props: GroupedBarGraphProps) {
|
||||
const {
|
||||
data: propsData,
|
||||
barColors,
|
||||
barHoverColorsMap,
|
||||
width,
|
||||
height,
|
||||
margin,
|
||||
className,
|
||||
categoryTickLabelSize = DEFAULT_LABEL_SIZE,
|
||||
valueTickLabelSize = DEFAULT_LABEL_SIZE,
|
||||
hoverLabelSize,
|
||||
categoryAxisLabel,
|
||||
categoryAxisLabelSize = DEFAULT_LABEL_SIZE,
|
||||
categoryAxisLabelOffset = 0,
|
||||
valueAxisLabel,
|
||||
valueAxisLabelSize = DEFAULT_LABEL_SIZE,
|
||||
valueAxisLabelOffset = 0,
|
||||
legendProps,
|
||||
} = props;
|
||||
|
||||
const {
|
||||
position: legendPosition = "right",
|
||||
itemLabelSize: legendLabelSize = DEFAULT_LABEL_SIZE,
|
||||
itemGap: legendItemGap = DEFAULT_LEGEND_GAP,
|
||||
margin: legendMargin = {},
|
||||
} = legendProps ?? {};
|
||||
|
||||
const data: BarGroupData[] = propsData.map((datum: GroupedBarGraphData) => {
|
||||
return { category: datum.category, ...datum.values };
|
||||
});
|
||||
|
||||
const keys = Object.keys(propsData[0].values);
|
||||
propsData.forEach((d: GroupedBarGraphData) => {
|
||||
const currentKeys = Object.keys(d.values);
|
||||
if (
|
||||
keys.length != currentKeys.length ||
|
||||
!keys.every((key: string) => currentKeys.includes(key))
|
||||
) {
|
||||
throw new Error(
|
||||
"Every category in a GroupedBarGraph must have the same keys. Check the data prop"
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
const allValues = propsData
|
||||
.map((d: GroupedBarGraphData) => Object.values(d.values))
|
||||
.flat();
|
||||
|
||||
const categoryMax = width - margin.left - margin.right;
|
||||
const valueMax = height - margin.top - margin.bottom;
|
||||
|
||||
const getCategory = (d: BarGroupData) => d.category;
|
||||
|
||||
const categoryScale = scaleBand({
|
||||
domain: data.map(getCategory),
|
||||
padding: BAR_PADDING,
|
||||
});
|
||||
|
||||
const keyScale = scaleBand({
|
||||
domain: keys,
|
||||
});
|
||||
|
||||
const valueScale = scaleLinear<number>({
|
||||
domain: [0, Math.max(...allValues)],
|
||||
});
|
||||
|
||||
const colorScale = scaleOrdinal<string, string>({
|
||||
domain: keys,
|
||||
range: barColors,
|
||||
});
|
||||
|
||||
categoryScale.rangeRound([0, categoryMax]);
|
||||
keyScale.rangeRound([0, categoryScale.bandwidth()]);
|
||||
valueScale.rangeRound([valueMax, 0]);
|
||||
|
||||
return (
|
||||
<div
|
||||
className={className ? `${className} ${styles.wrapper}` : styles.wrapper}
|
||||
style={{
|
||||
flexDirection: legendPosition === "right" ? "row" : "column-reverse",
|
||||
}}
|
||||
>
|
||||
<svg width={width} height={height}>
|
||||
<defs>
|
||||
{Object.keys(barHoverColorsMap).map((color: string) => {
|
||||
// remove brackets from colour name to make ids work
|
||||
const colorId = removeBrackets(color);
|
||||
return (
|
||||
<filter key={`glow-${color}`} id={`glow-${colorId}`}>
|
||||
<feDropShadow
|
||||
dx="0"
|
||||
dy="0"
|
||||
stdDeviation="4"
|
||||
floodColor={barHoverColorsMap[color]}
|
||||
/>
|
||||
</filter>
|
||||
);
|
||||
})}
|
||||
</defs>
|
||||
<Group top={margin.top} left={margin.left}>
|
||||
<Group>
|
||||
{data.map((d, idx) => {
|
||||
const barName = `${getCategory(d)}-${idx}`;
|
||||
const barWidth = categoryScale.bandwidth();
|
||||
const backgroundBarWidth = barWidth / (1 - BAR_PADDING);
|
||||
return idx % 2 === 0 ? (
|
||||
<Bar
|
||||
className={styles.barBackground}
|
||||
key={`bar-${barName}-background`}
|
||||
x={
|
||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||
categoryScale(getCategory(d))! -
|
||||
(backgroundBarWidth - barWidth) / 2
|
||||
}
|
||||
y={0}
|
||||
width={backgroundBarWidth}
|
||||
height={valueMax}
|
||||
/>
|
||||
) : null;
|
||||
})}
|
||||
</Group>
|
||||
<GridRows
|
||||
scale={valueScale}
|
||||
width={categoryMax}
|
||||
numTicks={5}
|
||||
stroke={Color.label}
|
||||
strokeWidth={4}
|
||||
strokeDasharray="10"
|
||||
strokeLinecap="round"
|
||||
/>
|
||||
<BarGroup
|
||||
data={data}
|
||||
keys={keys}
|
||||
height={valueMax}
|
||||
x0={getCategory}
|
||||
x0Scale={categoryScale}
|
||||
x1Scale={keyScale}
|
||||
yScale={valueScale}
|
||||
color={colorScale}
|
||||
>
|
||||
{(barGroups) =>
|
||||
barGroups.map((barGroup) => (
|
||||
<Group
|
||||
key={`bar-group-${barGroup.x0}-${barGroup.index}`}
|
||||
left={barGroup.x0}
|
||||
>
|
||||
{barGroup.bars.map((bar) => (
|
||||
<HoverableBar
|
||||
key={`bar-group-bar-${barGroup.x0}-${barGroup.index}-${bar.key}-${bar.index}`}
|
||||
bar={bar}
|
||||
valueMax={valueMax}
|
||||
hoverFillColor={barHoverColorsMap[bar.color]}
|
||||
hoverLabelSize={hoverLabelSize}
|
||||
/>
|
||||
))}
|
||||
</Group>
|
||||
))
|
||||
}
|
||||
</BarGroup>
|
||||
</Group>
|
||||
<AxisBottom
|
||||
scale={categoryScale}
|
||||
top={valueMax + margin.top}
|
||||
left={margin.left}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
tickLabelProps={() => {
|
||||
return {
|
||||
...bottomTickLabelProps(),
|
||||
className: styles.tickLabel,
|
||||
dy: "-0.25rem",
|
||||
fontSize: `${categoryTickLabelSize / 16}rem`,
|
||||
width: categoryScale.bandwidth(),
|
||||
verticalAnchor: "start",
|
||||
};
|
||||
}}
|
||||
label={categoryAxisLabel}
|
||||
labelClassName={styles.axisLabel}
|
||||
labelOffset={categoryAxisLabelOffset}
|
||||
labelProps={{
|
||||
fontSize: `${categoryAxisLabelSize / 16}rem`,
|
||||
}}
|
||||
/>
|
||||
<AxisLeft
|
||||
scale={valueScale}
|
||||
top={margin.top}
|
||||
left={margin.left}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
numTicks={5}
|
||||
tickLabelProps={() => {
|
||||
return {
|
||||
...leftTickLabelProps(),
|
||||
className: styles.tickLabel,
|
||||
dx: "-0.5rem",
|
||||
dy: "0.25rem",
|
||||
fontSize: `${valueTickLabelSize / 16}rem`,
|
||||
};
|
||||
}}
|
||||
label={valueAxisLabel}
|
||||
labelClassName={styles.axisLabel}
|
||||
labelOffset={valueAxisLabelOffset}
|
||||
labelProps={{
|
||||
fontSize: `${valueAxisLabelSize / 16}rem`,
|
||||
}}
|
||||
/>
|
||||
</svg>
|
||||
<LegendOrdinal
|
||||
className={styles.legend}
|
||||
style={{
|
||||
marginTop: legendMargin.top,
|
||||
marginRight: legendMargin.right,
|
||||
marginBottom: legendMargin.bottom,
|
||||
marginLeft: legendMargin.left,
|
||||
fontSize: legendLabelSize,
|
||||
}}
|
||||
scale={colorScale}
|
||||
direction={legendPosition === "right" ? "column" : "row"}
|
||||
itemMargin={
|
||||
legendPosition === "right"
|
||||
? `calc(${legendItemGap / 2}rem / 16) 0 calc(${
|
||||
legendItemGap / 2
|
||||
}rem / 16) 0`
|
||||
: `0 calc(${legendItemGap / 2}rem / 16) 0 calc(${
|
||||
legendItemGap / 2
|
||||
}rem / 16)`
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function GroupedBarGraphHorizontal(props: GroupedBarGraphProps) {
|
||||
const {
|
||||
data: propsData,
|
||||
barColors,
|
||||
barHoverColorsMap,
|
||||
width,
|
||||
height,
|
||||
margin,
|
||||
className,
|
||||
categoryTickLabelSize = DEFAULT_LABEL_SIZE,
|
||||
valueTickLabelSize = DEFAULT_LABEL_SIZE,
|
||||
hoverLabelSize,
|
||||
categoryAxisLabel,
|
||||
categoryAxisLabelSize = DEFAULT_LABEL_SIZE,
|
||||
categoryAxisLabelOffset = 0,
|
||||
valueAxisLabel,
|
||||
valueAxisLabelSize = DEFAULT_LABEL_SIZE,
|
||||
valueAxisLabelOffset = 0,
|
||||
legendProps,
|
||||
} = props;
|
||||
|
||||
const {
|
||||
position: legendPosition = "top",
|
||||
itemLabelSize: legendLabelSize = DEFAULT_LABEL_SIZE,
|
||||
itemGap: legendItemGap = DEFAULT_LEGEND_GAP,
|
||||
margin: legendMargin = {},
|
||||
} = legendProps ?? {};
|
||||
|
||||
const data: BarGroupData[] = propsData.map((datum: GroupedBarGraphData) => {
|
||||
return { category: datum.category, ...datum.values };
|
||||
});
|
||||
|
||||
const keys = Object.keys(propsData[0].values);
|
||||
propsData.forEach((d: GroupedBarGraphData) => {
|
||||
const currentKeys = Object.keys(d.values);
|
||||
if (
|
||||
keys.length != currentKeys.length ||
|
||||
!keys.every((key: string) => currentKeys.includes(key))
|
||||
) {
|
||||
throw new Error(
|
||||
"Every category in a GroupedBarGraph must have the same keys. Check the data prop"
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
const allValues = propsData
|
||||
.map((d: GroupedBarGraphData) => Object.values(d.values))
|
||||
.flat();
|
||||
|
||||
const categoryMax = height - margin.top - margin.bottom;
|
||||
const valueMax = width - margin.left - margin.right;
|
||||
|
||||
const getCategory = (d: BarGroupData) => d.category;
|
||||
|
||||
const categoryScale = scaleBand({
|
||||
domain: data.map(getCategory),
|
||||
padding: BAR_PADDING,
|
||||
});
|
||||
|
||||
const keyScale = scaleBand({
|
||||
domain: keys,
|
||||
});
|
||||
|
||||
const valueScale = scaleLinear<number>({
|
||||
domain: [Math.max(...allValues), 0],
|
||||
});
|
||||
|
||||
const colorScale = scaleOrdinal<string, string>({
|
||||
domain: keys,
|
||||
range: barColors,
|
||||
});
|
||||
|
||||
categoryScale.rangeRound([0, categoryMax]);
|
||||
keyScale.rangeRound([0, categoryScale.bandwidth()]);
|
||||
valueScale.rangeRound([valueMax, 0]);
|
||||
|
||||
return (
|
||||
<div
|
||||
className={className ? `${className} ${styles.wrapper}` : styles.wrapper}
|
||||
style={{
|
||||
flexDirection: legendPosition === "right" ? "row" : "column-reverse",
|
||||
}}
|
||||
>
|
||||
<svg width={width} height={height}>
|
||||
<defs>
|
||||
{Object.keys(barHoverColorsMap).map((color: string) => {
|
||||
// remove brackets from colour name to make ids work
|
||||
const colorId = removeBrackets(color);
|
||||
return (
|
||||
<filter key={`glow-${color}`} id={`glow-${colorId}`}>
|
||||
<feDropShadow
|
||||
dx="0"
|
||||
dy="0"
|
||||
stdDeviation="4"
|
||||
floodColor={barHoverColorsMap[color]}
|
||||
/>
|
||||
</filter>
|
||||
);
|
||||
})}
|
||||
</defs>
|
||||
<Group top={margin.top} left={margin.left}>
|
||||
<Group>
|
||||
{data.map((d, idx) => {
|
||||
const barName = `${getCategory(d)}-${idx}`;
|
||||
const barWidth = categoryScale.bandwidth();
|
||||
const backgroundBarWidth = barWidth / (1 - BAR_PADDING);
|
||||
return idx % 2 === 0 ? (
|
||||
<Bar
|
||||
className={styles.barBackground}
|
||||
key={`bar-${barName}-background`}
|
||||
x={0}
|
||||
y={
|
||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||
categoryScale(getCategory(d))! -
|
||||
(backgroundBarWidth - barWidth) / 2
|
||||
}
|
||||
width={valueMax}
|
||||
height={backgroundBarWidth}
|
||||
/>
|
||||
) : null;
|
||||
})}
|
||||
</Group>
|
||||
<GridColumns
|
||||
scale={valueScale}
|
||||
height={categoryMax}
|
||||
numTicks={5}
|
||||
stroke={Color.label}
|
||||
strokeWidth={4}
|
||||
strokeDasharray="10"
|
||||
strokeLinecap="round"
|
||||
/>
|
||||
<BarGroupHorizontal
|
||||
data={data}
|
||||
keys={keys}
|
||||
width={valueMax}
|
||||
y0={getCategory}
|
||||
y0Scale={categoryScale}
|
||||
y1Scale={keyScale}
|
||||
xScale={valueScale}
|
||||
color={colorScale}
|
||||
>
|
||||
{(barGroups) =>
|
||||
barGroups.map((barGroup) => (
|
||||
<Group
|
||||
key={`bar-group-${barGroup.y0}-${barGroup.index}`}
|
||||
top={barGroup.y0}
|
||||
>
|
||||
{barGroup.bars.map((bar) => (
|
||||
<HoverableBar
|
||||
key={`bar-group-bar-${barGroup.y0}-${barGroup.index}-${bar.key}-${bar.index}`}
|
||||
bar={bar}
|
||||
valueMax={valueMax}
|
||||
hoverFillColor={barHoverColorsMap[bar.color]}
|
||||
hoverLabelSize={hoverLabelSize}
|
||||
isHorizontal
|
||||
/>
|
||||
))}
|
||||
</Group>
|
||||
))
|
||||
}
|
||||
</BarGroupHorizontal>
|
||||
</Group>
|
||||
<AxisLeft
|
||||
scale={categoryScale}
|
||||
top={margin.top}
|
||||
left={margin.left}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
tickLabelProps={() => {
|
||||
return {
|
||||
...leftTickLabelProps(),
|
||||
className: styles.tickLabel,
|
||||
dx: "-0.5rem",
|
||||
dy: "0.25rem",
|
||||
fontSize: `${valueTickLabelSize / 16}rem`,
|
||||
height: categoryScale.bandwidth(),
|
||||
};
|
||||
}}
|
||||
label={categoryAxisLabel}
|
||||
labelClassName={styles.axisLabel}
|
||||
labelOffset={categoryAxisLabelOffset}
|
||||
labelProps={{
|
||||
fontSize: `${categoryAxisLabelSize / 16}rem`,
|
||||
}}
|
||||
/>
|
||||
<AxisBottom
|
||||
scale={valueScale}
|
||||
top={categoryMax + margin.top}
|
||||
left={margin.left}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
numTicks={5}
|
||||
tickLabelProps={() => {
|
||||
return {
|
||||
...bottomTickLabelProps(),
|
||||
className: styles.tickLabel,
|
||||
dy: "-0.25rem",
|
||||
fontSize: `${categoryTickLabelSize / 16}rem`,
|
||||
verticalAnchor: "start",
|
||||
};
|
||||
}}
|
||||
label={valueAxisLabel}
|
||||
labelClassName={styles.axisLabel}
|
||||
labelOffset={valueAxisLabelOffset}
|
||||
labelProps={{
|
||||
fontSize: `${valueAxisLabelSize / 16}rem`,
|
||||
}}
|
||||
/>
|
||||
</svg>
|
||||
<LegendOrdinal
|
||||
className={styles.legend}
|
||||
style={{
|
||||
marginTop: legendMargin.top,
|
||||
marginRight: legendMargin.right,
|
||||
marginBottom: legendMargin.bottom,
|
||||
marginLeft: legendMargin.left,
|
||||
fontSize: legendLabelSize,
|
||||
}}
|
||||
scale={colorScale}
|
||||
direction={legendPosition === "right" ? "column" : "row"}
|
||||
itemMargin={
|
||||
legendPosition === "right"
|
||||
? `calc(${legendItemGap / 2}rem / 16) 0 calc(${
|
||||
legendItemGap / 2
|
||||
}rem / 16) 0`
|
||||
: `0 calc(${legendItemGap / 2}rem / 16) 0 calc(${
|
||||
legendItemGap / 2
|
||||
}rem / 16)`
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
interface HoverableBarProps {
|
||||
bar: BarGroupBarType<string>;
|
||||
valueMax: number;
|
||||
hoverFillColor?: string;
|
||||
hoverLabelSize?: number;
|
||||
isHorizontal?: boolean;
|
||||
}
|
||||
|
||||
function HoverableBar(props: HoverableBarProps) {
|
||||
const {
|
||||
bar,
|
||||
valueMax,
|
||||
hoverLabelSize,
|
||||
hoverFillColor,
|
||||
isHorizontal = false,
|
||||
} = props;
|
||||
|
||||
const [isHovered, setIsHovered] = useState(false);
|
||||
|
||||
const colorId = removeBrackets(bar.color);
|
||||
|
||||
return (
|
||||
<Group
|
||||
className={styles.singleBar}
|
||||
onMouseEnter={() => {
|
||||
setIsHovered(true);
|
||||
}}
|
||||
onMouseLeave={() => {
|
||||
setIsHovered(false);
|
||||
}}
|
||||
>
|
||||
<Bar
|
||||
x={bar.x}
|
||||
y={bar.y}
|
||||
width={bar.width}
|
||||
height={bar.height}
|
||||
fill={isHovered && hoverFillColor ? hoverFillColor : bar.color}
|
||||
// apply the glow effect when the bar is hovered
|
||||
filter={isHovered ? `url(#glow-${colorId})` : undefined}
|
||||
/>
|
||||
<Text
|
||||
className={styles.barText}
|
||||
x={isHorizontal ? bar.width - BAR_TEXT_PADDING : bar.x + bar.width / 2}
|
||||
y={
|
||||
isHorizontal
|
||||
? bar.y + bar.height / 2
|
||||
: valueMax - bar.height + BAR_TEXT_PADDING
|
||||
}
|
||||
fontSize={
|
||||
hoverLabelSize ?? (isHorizontal ? bar.height : bar.width) * 0.5
|
||||
}
|
||||
textAnchor={isHorizontal ? "end" : "middle"}
|
||||
verticalAnchor={isHorizontal ? "middle" : "start"}
|
||||
>
|
||||
{bar.value}
|
||||
</Text>
|
||||
</Group>
|
||||
);
|
||||
}
|
||||
|
||||
function removeBrackets(str: string) {
|
||||
return str.replace(/\(|\)/g, "");
|
||||
}
|
||||
|
|
@ -0,0 +1,137 @@
|
|||
.headerWrapper {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background: var(--dark--primary-background);
|
||||
z-index: 98;
|
||||
box-sizing: border-box;
|
||||
padding: calc(10rem / 16) calc(100rem / 16) 0;
|
||||
}
|
||||
|
||||
.titleHeader {
|
||||
margin: calc(16rem / 16) 0;
|
||||
}
|
||||
|
||||
.sideBarCommon {
|
||||
position: fixed;
|
||||
right: 0;
|
||||
top: 0;
|
||||
min-width: calc(400rem / 16);
|
||||
height: 100vh;
|
||||
background: var(--secondary-background);
|
||||
padding: calc(100rem / 16);
|
||||
margin: 0;
|
||||
z-index: 100;
|
||||
padding: 0;
|
||||
padding-right: calc(20rem / 16);
|
||||
transition: transform 0.8s;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.sideBarShown {
|
||||
composes: sideBarCommon;
|
||||
/* -1% to hide slight line tip showing in some browsers */
|
||||
transform: translateX(-1%);
|
||||
}
|
||||
|
||||
.sideBarHidden {
|
||||
composes: sideBarCommon;
|
||||
transform: translateX(100%);
|
||||
}
|
||||
|
||||
.backgroundTintCommon {
|
||||
background-color: var(--label);
|
||||
animation: fadeIn 1s;
|
||||
position: fixed;
|
||||
z-index: 99;
|
||||
left: 0;
|
||||
top: 0;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
transition: opacity 0.8s, visibility 0.8s;
|
||||
}
|
||||
|
||||
.backgroundTintShow {
|
||||
composes: backgroundTintCommon;
|
||||
visibility: visible;
|
||||
opacity: 0.2;
|
||||
}
|
||||
|
||||
.backgroundTintHidden {
|
||||
composes: backgroundTintCommon;
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
|
||||
.menuHeader {
|
||||
margin-bottom: 0;
|
||||
padding-left: calc(30rem / 16);
|
||||
padding-bottom: 0;
|
||||
color: var(--dark--secondary-heading);
|
||||
}
|
||||
|
||||
.sectionsWrapper {
|
||||
padding-left: calc(30rem / 16);
|
||||
}
|
||||
|
||||
.menuIcon {
|
||||
background: none;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.menuIcon:hover {
|
||||
opacity: 0.8;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.sideBarCommon {
|
||||
min-width: calc(300rem / 16);
|
||||
max-width: calc(500rem / 16);
|
||||
}
|
||||
|
||||
.menuHeader {
|
||||
padding-left: calc(20rem / 16);
|
||||
}
|
||||
|
||||
.sectionsWrapper {
|
||||
padding-left: calc(20rem / 16);
|
||||
}
|
||||
|
||||
.headerWrapper {
|
||||
padding: calc(10rem / 16) calc(20rem / 16) 0;
|
||||
}
|
||||
}
|
||||
|
||||
.closeMenuButton {
|
||||
background: var(--primary-heading);
|
||||
padding: 0 calc(20rem / 16);
|
||||
border-radius: calc(50rem / 16);
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
margin-left: calc(20rem / 16);
|
||||
/* transparent border fixes weird coloring on the border in some browsers */
|
||||
border: calc(1rem / 16) solid transparent;
|
||||
}
|
||||
|
||||
.closeMenuButton:hover {
|
||||
background-color: var(--secondary-accent-light);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.lineWrapper {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.lineWrapper:before {
|
||||
content: "";
|
||||
flex: 1 1;
|
||||
border-bottom: 3px solid white;
|
||||
margin: auto;
|
||||
}
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
import { pageRoutes } from "data/routes";
|
||||
import Link from "next/link";
|
||||
import React, { useState } from "react";
|
||||
|
||||
import { Sections } from "./Sections";
|
||||
|
||||
import styles from "./Header.module.css";
|
||||
|
||||
export function Header() {
|
||||
const [isShowingMenu, setIsShowingMenu] = useState(false);
|
||||
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
className={
|
||||
isShowingMenu
|
||||
? styles.backgroundTintShow
|
||||
: styles.backgroundTintHidden
|
||||
}
|
||||
onClick={(_) => {
|
||||
setIsShowingMenu(false);
|
||||
}}
|
||||
/>
|
||||
<div className={styles.headerWrapper}>
|
||||
<h1 className={styles.titleHeader}>
|
||||
<Link href="/">CS 2022</Link>
|
||||
</h1>
|
||||
<button
|
||||
onClick={(_) => {
|
||||
setIsShowingMenu(true);
|
||||
}}
|
||||
className={styles.menuIcon}
|
||||
>
|
||||
<img
|
||||
src="/images/menuIcon.svg"
|
||||
width="50"
|
||||
height="50"
|
||||
draggable="false"
|
||||
/>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div
|
||||
className={isShowingMenu ? styles.sideBarShown : styles.sideBarHidden}
|
||||
>
|
||||
<h1 className={styles.menuHeader}>Sections</h1>
|
||||
<div className={styles.lineWrapper}>
|
||||
<button
|
||||
className={styles.closeMenuButton}
|
||||
onClick={(_) => {
|
||||
setIsShowingMenu(false);
|
||||
}}
|
||||
>
|
||||
<img
|
||||
src="/images/rightArrow.svg"
|
||||
className={styles.arrowIcon}
|
||||
width="50"
|
||||
height="50"
|
||||
draggable="false"
|
||||
/>
|
||||
</button>
|
||||
</div>
|
||||
<div className={styles.sectionsWrapper}>
|
||||
<Sections data={pageRoutes} showHeader={false} />
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
.tickLabel {
|
||||
font-family: "Inconsolata", monospace;
|
||||
font-weight: 800;
|
||||
fill: var(--label);
|
||||
}
|
||||
|
||||
.line:hover {
|
||||
filter: drop-shadow(0 0 calc(4rem / 16) var(--primary-accent));
|
||||
}
|
||||
|
||||
.tooltip {
|
||||
font-family: "Inconsolata", monospace;
|
||||
font-weight: bold;
|
||||
top: 0;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
background-color: var(--label);
|
||||
color: var(--primary-background);
|
||||
box-shadow: 0px calc(1rem / 16) calc(2rem / 16) var(--card-background);
|
||||
pointer-events: none;
|
||||
padding: calc(10rem / 16);
|
||||
font-size: calc(18rem / 16);
|
||||
border-radius: calc(10rem / 16);
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: min-content;
|
||||
}
|
||||
|
||||
.legend {
|
||||
display: flex;
|
||||
margin: calc(16rem / 8);
|
||||
}
|
||||
|
|
@ -0,0 +1,311 @@
|
|||
import { AxisBottom, AxisLeft } from "@visx/axis";
|
||||
import { bottomTickLabelProps } from "@visx/axis/lib/axis/AxisBottom";
|
||||
import { leftTickLabelProps } from "@visx/axis/lib/axis/AxisLeft";
|
||||
import { localPoint } from "@visx/event";
|
||||
import { GridColumns, GridRows } from "@visx/grid";
|
||||
import { Group } from "@visx/group";
|
||||
import { LegendOrdinal } from "@visx/legend";
|
||||
import { Point } from "@visx/point";
|
||||
import { scaleBand, scaleLinear, scaleOrdinal } from "@visx/scale";
|
||||
import { LinePath } from "@visx/shape";
|
||||
import { useTooltip, useTooltipInPortal } from "@visx/tooltip";
|
||||
import React from "react";
|
||||
import { Color } from "utils/Color";
|
||||
|
||||
import styles from "./LineGraph.module.css";
|
||||
|
||||
interface LineData {
|
||||
label: string;
|
||||
yValues: number[];
|
||||
}
|
||||
|
||||
interface PointData {
|
||||
x: string;
|
||||
y: number;
|
||||
}
|
||||
|
||||
interface LineGraphData {
|
||||
xValues: string[];
|
||||
lines: LineData[];
|
||||
}
|
||||
|
||||
interface LegendProps {
|
||||
/** Position of the legend, relative to the graph. */
|
||||
position?: "top" | "right";
|
||||
/** Font size of the labels in the legend, in pixels. Default is 16px. */
|
||||
itemLabelSize?: number;
|
||||
/** Gap between items in the legend, in pixels. */
|
||||
itemGap?: number;
|
||||
/** Distance between the legend and other adjacent elements, in pixels. */
|
||||
margin?: {
|
||||
top?: number;
|
||||
bottom?: number;
|
||||
left?: number;
|
||||
right?: number;
|
||||
};
|
||||
}
|
||||
|
||||
interface LineGraphProps {
|
||||
data: LineGraphData;
|
||||
/** Width of the entire graph, in pixels. */
|
||||
width: number;
|
||||
/** Height of the entire graph, in pixels. */
|
||||
height: number;
|
||||
/** Distance between the edge of the graph and the area where the bars are drawn, in pixels. */
|
||||
margin: {
|
||||
top: number;
|
||||
bottom: number;
|
||||
left: number;
|
||||
right: number;
|
||||
};
|
||||
className?: string;
|
||||
/** Font size of the category tick labels, in pixels. Default is 16px. */
|
||||
xTickLabelSize?: number;
|
||||
/** Font size of the value tick labels, in pixels. Default is 16px. */
|
||||
yTickLabelSize?: number;
|
||||
/** Font size of the value that appears when hovering over a bar, in pixels. */
|
||||
hoverLabelSize?: number;
|
||||
/** Label text for the category axis. */
|
||||
xAxisLabel?: string;
|
||||
/** Font size of the label for the cateogry axis, in pixels. */
|
||||
xAxisLabelSize?: number;
|
||||
/** Controls the distance between the category axis label and the category axis. */
|
||||
xAxisLabelOffset?: number;
|
||||
/** Label text for the value axis. */
|
||||
yAxisLabel?: string;
|
||||
/** Font size of the label for the value axis, in pixels. */
|
||||
yAxisLabelSize?: number;
|
||||
/** Controls the distance between the value axis label and the value axis. */
|
||||
yAxisLabelOffset?: number;
|
||||
legendProps?: LegendProps;
|
||||
}
|
||||
|
||||
const DEFAULT_LABEL_SIZE = 16;
|
||||
const DEFAULT_LEGEND_GAP = 16;
|
||||
|
||||
// TODO: Address unused props in this file
|
||||
/* eslint-disable unused-imports/no-unused-vars*/
|
||||
export function LineGraph(props: LineGraphProps) {
|
||||
const {
|
||||
width,
|
||||
height,
|
||||
margin,
|
||||
data,
|
||||
className,
|
||||
xTickLabelSize = DEFAULT_LABEL_SIZE,
|
||||
yTickLabelSize = DEFAULT_LABEL_SIZE,
|
||||
hoverLabelSize,
|
||||
xAxisLabel,
|
||||
xAxisLabelSize = DEFAULT_LABEL_SIZE,
|
||||
xAxisLabelOffset = 0,
|
||||
yAxisLabel,
|
||||
yAxisLabelSize = DEFAULT_LABEL_SIZE,
|
||||
yAxisLabelOffset = 0,
|
||||
legendProps,
|
||||
} = props;
|
||||
|
||||
const {
|
||||
position: legendPosition = "right",
|
||||
itemLabelSize: legendLabelSize = DEFAULT_LABEL_SIZE,
|
||||
itemGap: legendItemGap = DEFAULT_LEGEND_GAP,
|
||||
margin: legendMargin = {},
|
||||
} = legendProps ?? {};
|
||||
|
||||
const xLength = data.xValues.length;
|
||||
|
||||
data.lines.forEach((line) => {
|
||||
if (line.yValues.length != xLength) {
|
||||
throw new Error("Invalid data with wrong length.");
|
||||
}
|
||||
});
|
||||
|
||||
const {
|
||||
tooltipData,
|
||||
tooltipLeft,
|
||||
tooltipTop,
|
||||
tooltipOpen,
|
||||
showTooltip,
|
||||
hideTooltip,
|
||||
} = useTooltip();
|
||||
|
||||
const { containerRef, TooltipInPortal } = useTooltipInPortal({
|
||||
// use TooltipWithBounds
|
||||
detectBounds: true,
|
||||
// when tooltip containers are scrolled, this will correctly update the Tooltip position
|
||||
scroll: true,
|
||||
});
|
||||
|
||||
const yMax = height - margin.top - margin.bottom;
|
||||
const xMax = width - margin.left - margin.right;
|
||||
|
||||
const actualData = data.lines.map((line) => {
|
||||
return line.yValues.map((val, idx) => {
|
||||
return { x: data.xValues[idx], y: val };
|
||||
});
|
||||
});
|
||||
|
||||
const yMaxValue = Math.max(
|
||||
...data.lines.map((line) => {
|
||||
return Math.max(...line.yValues);
|
||||
})
|
||||
);
|
||||
|
||||
// data accessors
|
||||
const getX = (d: PointData) => d.x;
|
||||
const getY = (d: PointData) => d.y;
|
||||
|
||||
// scales
|
||||
const xScale = scaleBand({
|
||||
range: [0, xMax],
|
||||
domain: data.xValues,
|
||||
});
|
||||
|
||||
const yScale = scaleLinear<number>({
|
||||
range: [0, yMax],
|
||||
nice: true,
|
||||
domain: [yMaxValue, 0],
|
||||
});
|
||||
|
||||
const keys = data.lines.map((line) => line.label);
|
||||
|
||||
const legendScale = scaleOrdinal<string, string>({
|
||||
domain: keys,
|
||||
range: [Color.primaryAccent, Color.secondaryAccent],
|
||||
});
|
||||
|
||||
return (
|
||||
<div
|
||||
className={className ? `${className} ${styles.wrapper}` : styles.wrapper}
|
||||
style={{
|
||||
flexDirection: legendPosition === "right" ? "row" : "column-reverse",
|
||||
}}
|
||||
>
|
||||
<svg ref={containerRef} width={width} height={height}>
|
||||
<Group top={margin.top} left={margin.left}>
|
||||
<GridColumns
|
||||
scale={xScale}
|
||||
height={yMax}
|
||||
left={margin.left}
|
||||
numTicks={5}
|
||||
stroke={Color.tertiaryBackground}
|
||||
strokeWidth={4}
|
||||
strokeDasharray="10"
|
||||
strokeLinecap="round"
|
||||
/>
|
||||
<GridRows
|
||||
scale={yScale}
|
||||
width={xMax}
|
||||
left={margin.left * 2.3}
|
||||
numTicks={data.xValues.length}
|
||||
stroke={Color.tertiaryBackground}
|
||||
strokeWidth={4}
|
||||
strokeDasharray="10"
|
||||
strokeLinecap="round"
|
||||
/>
|
||||
<AxisBottom
|
||||
scale={xScale}
|
||||
top={margin.top + yMax}
|
||||
left={margin.left}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
tickLabelProps={() => {
|
||||
return {
|
||||
...bottomTickLabelProps(),
|
||||
className: styles.tickLabel,
|
||||
dy: "-0.25rem",
|
||||
fontSize: `${xTickLabelSize / 16}rem`,
|
||||
width: xScale.bandwidth(),
|
||||
};
|
||||
}}
|
||||
/>
|
||||
<AxisLeft
|
||||
scale={yScale}
|
||||
left={margin.left}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
numTicks={5}
|
||||
tickLabelProps={() => {
|
||||
return {
|
||||
...leftTickLabelProps(),
|
||||
className: styles.tickLabel,
|
||||
dx: "1.25rem",
|
||||
dy: "0.25rem",
|
||||
fontSize: `${yTickLabelSize / 16}rem`,
|
||||
};
|
||||
}}
|
||||
/>
|
||||
<Group left={margin.left + xMax / (data.xValues.length * 2)}>
|
||||
{actualData.map((lineData, i) => {
|
||||
const isEven = i % 2 === 0;
|
||||
return (
|
||||
<Group key={`line-${i}`}>
|
||||
<LinePath
|
||||
onMouseMove={(e) => {
|
||||
const eventSvgCoords = localPoint(
|
||||
// ownerSVGElement is given by visx docs but not recognized by typescript
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
e.target.ownerSVGElement as Element,
|
||||
e
|
||||
) as Point;
|
||||
showTooltip({
|
||||
tooltipData: data.lines[i].label,
|
||||
tooltipTop: eventSvgCoords.y,
|
||||
tooltipLeft: eventSvgCoords.x,
|
||||
});
|
||||
}}
|
||||
onMouseOut={hideTooltip}
|
||||
data={lineData}
|
||||
className={styles.line}
|
||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||
x={(d) => xScale(getX(d))!}
|
||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||
y={(d) => yScale(getY(d))!}
|
||||
stroke={
|
||||
isEven ? Color.primaryAccent : Color.secondaryAccent
|
||||
}
|
||||
strokeWidth={4}
|
||||
strokeOpacity={2}
|
||||
/>
|
||||
</Group>
|
||||
);
|
||||
})}
|
||||
</Group>
|
||||
</Group>
|
||||
</svg>
|
||||
<LegendOrdinal
|
||||
className={styles.legend}
|
||||
style={{
|
||||
marginTop: legendMargin.top,
|
||||
marginRight: legendMargin.right,
|
||||
marginBottom: legendMargin.bottom,
|
||||
marginLeft: legendMargin.left,
|
||||
fontSize: legendLabelSize,
|
||||
}}
|
||||
scale={legendScale}
|
||||
direction={legendPosition === "right" ? "column" : "row"}
|
||||
itemMargin={
|
||||
legendPosition === "right"
|
||||
? `calc(${legendItemGap / 2}rem / 16) 0 calc(${
|
||||
legendItemGap / 2
|
||||
}rem / 16) 0`
|
||||
: `0 calc(${legendItemGap / 2}rem / 16) 0 calc(${
|
||||
legendItemGap / 2
|
||||
}rem / 16)`
|
||||
}
|
||||
/>
|
||||
|
||||
{tooltipOpen && (
|
||||
<TooltipInPortal
|
||||
top={tooltipTop}
|
||||
left={tooltipLeft}
|
||||
className={styles.tooltip}
|
||||
unstyled
|
||||
applyPositionStyle
|
||||
>
|
||||
<>{tooltipData}</>
|
||||
</TooltipInPortal>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
.header {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
padding: calc(40rem / 16) 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.title {
|
||||
color: var(--primary-accent-light);
|
||||
font-size: calc(70rem / 16);
|
||||
margin: calc(40rem / 16) auto;
|
||||
}
|
||||
|
||||
.subTitle {
|
||||
color: var(--primary-accent-lighter);
|
||||
font-size: calc(26rem / 16);
|
||||
margin: auto;
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
import React from "react";
|
||||
|
||||
import styles from "./SectionHeader.module.css";
|
||||
|
||||
interface SectionHeaderProps {
|
||||
title: string;
|
||||
subtitle?: string;
|
||||
}
|
||||
|
||||
export function SectionHeader({ title, subtitle }: SectionHeaderProps) {
|
||||
return (
|
||||
<div className={styles.header}>
|
||||
<h1 className={styles.title}>{title}</h1>
|
||||
{subtitle && <h5 className={styles.subTitle}>{subtitle}</h5>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -1,18 +1,14 @@
|
|||
import { PageRoutes } from "data/routes";
|
||||
import React from "react";
|
||||
|
||||
import styles from "./Sections.module.css";
|
||||
|
||||
interface SectionsData {
|
||||
name: string;
|
||||
url: string;
|
||||
}
|
||||
|
||||
interface SectionsProps {
|
||||
/* Whether to display the "Sections" title and separator that appears on the left. */
|
||||
showHeader?: boolean;
|
||||
/* Width of the entire Sections, in px. */
|
||||
width?: number;
|
||||
data: SectionsData[];
|
||||
data: PageRoutes;
|
||||
className?: string;
|
||||
}
|
||||
|
||||
|
|
@ -39,7 +35,7 @@ export function Sections({
|
|||
)}
|
||||
<nav className={styles.nav}>
|
||||
<ul>
|
||||
{data.map((datum, index) => {
|
||||
{Object.values(data).map((datum, index) => {
|
||||
return (
|
||||
<li key={`${datum.name}-${index}`}>
|
||||
<a href={datum.url}>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
.container {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.barStack:hover {
|
||||
filter: drop-shadow(0 0 calc(4rem / 16) var(--label));
|
||||
}
|
||||
|
||||
.legend {
|
||||
position: absolute;
|
||||
display: flex;
|
||||
font-size: calc(16rem / 16);
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.toolTip {
|
||||
font-family: "Inconsolata", monospace;
|
||||
top: 0;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
background-color: var(--label);
|
||||
color: var(--primary-background);
|
||||
pointer-events: none;
|
||||
border-radius: calc(10rem / 16);
|
||||
padding: calc(10rem / 16);
|
||||
}
|
||||
|
||||
.toolTip p {
|
||||
margin: 0 calc(5rem / 16);
|
||||
font-size: calc(16rem / 16);
|
||||
}
|
||||
|
||||
.key {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
|
@ -0,0 +1,455 @@
|
|||
import { AxisLeft, AxisBottom } from "@visx/axis";
|
||||
import { localPoint } from "@visx/event";
|
||||
import { GridRows, GridColumns } from "@visx/grid";
|
||||
import { Group } from "@visx/group";
|
||||
import { LegendOrdinal } from "@visx/legend";
|
||||
import { Point } from "@visx/point";
|
||||
import { scaleBand, scaleLinear, scaleOrdinal } from "@visx/scale";
|
||||
import { BarStack, BarStackHorizontal, Line } from "@visx/shape";
|
||||
import { SeriesPoint } from "@visx/shape/lib/types";
|
||||
import { withTooltip, Tooltip } from "@visx/tooltip";
|
||||
import { WithTooltipProvidedProps } from "@visx/tooltip/lib/enhancers/withTooltip";
|
||||
import React from "react";
|
||||
import { Color } from "utils/Color";
|
||||
|
||||
import styles from "./StackedBarGraph.module.css";
|
||||
|
||||
interface StackedBarData {
|
||||
category: string;
|
||||
[key: string]: number | string;
|
||||
}
|
||||
|
||||
type TooltipData = {
|
||||
bar: SeriesPoint<StackedBarData>;
|
||||
key: string;
|
||||
index: number;
|
||||
height: number;
|
||||
width: number;
|
||||
x: number;
|
||||
y: number;
|
||||
color: string;
|
||||
};
|
||||
|
||||
export type StackedBarProps = {
|
||||
data: StackedBarData[];
|
||||
/** Width of the entire graph, in pixels, greater than 10. */
|
||||
width: number;
|
||||
/** Height of the entire graph, in pixels. */
|
||||
height: number;
|
||||
/** Names of the groups appearing in the legend */
|
||||
keys: string[];
|
||||
/** Colours for each key */
|
||||
colorRange: string[];
|
||||
/** Distance between the edge of the graph and the area where the bars are drawn, in pixels. */
|
||||
margin: { top: number; left: number };
|
||||
/** Number of ticks for the value axis */
|
||||
numTicksValueAxis?: number;
|
||||
/** Distance between the left axis labels and the start of the lines of the graph, in px. */
|
||||
axisLeftOffset?: number;
|
||||
/** Distance between the bottom axis and the bottom of the container of the graph, in px. */
|
||||
axisBottomOffset?: number;
|
||||
/** Distance between the right side of the graph and the legend, in px. */
|
||||
legendLeftOffset?: number;
|
||||
/** Distance between the top of the graph and the legend, in px. */
|
||||
legendTopOffset?: number;
|
||||
/** Width of the lines in the graph, in px. */
|
||||
strokeWidth?: number;
|
||||
/** Length of the dashes and the gaps in the graph, in px. */
|
||||
strokeDashArray?: string;
|
||||
/** Padding between each bar in the stacked bar graph, from 0 to 1 */
|
||||
scalePadding?: number;
|
||||
/** Margin for each item in the legend */
|
||||
itemMargin?: string;
|
||||
/** Factor multiplied with an offset to center the labels of the category-axis depending on the width/height of the graph.
|
||||
* >1 for width/height <600 and <1 for width/height >600 (vertical=width/horizontal=height) */
|
||||
categoryAxisLeftFactor?: number;
|
||||
};
|
||||
|
||||
let tooltipTimeout: number;
|
||||
|
||||
export const StackedBarGraphVertical = withTooltip<
|
||||
StackedBarProps,
|
||||
TooltipData
|
||||
>(
|
||||
({
|
||||
data,
|
||||
width,
|
||||
height,
|
||||
keys,
|
||||
colorRange,
|
||||
margin,
|
||||
scalePadding = 0.3,
|
||||
numTicksValueAxis = 6,
|
||||
axisLeftOffset = 40,
|
||||
axisBottomOffset = 40,
|
||||
strokeWidth = 2.5,
|
||||
strokeDashArray = "10,4",
|
||||
legendLeftOffset = 40,
|
||||
legendTopOffset = 40,
|
||||
itemMargin = "15px 0 0 0",
|
||||
categoryAxisLeftFactor = 1,
|
||||
tooltipOpen,
|
||||
tooltipLeft,
|
||||
tooltipTop,
|
||||
tooltipData,
|
||||
hideTooltip,
|
||||
showTooltip,
|
||||
}: StackedBarProps & WithTooltipProvidedProps<TooltipData>) => {
|
||||
const yTotals = data.reduce((allTotals, currCategory) => {
|
||||
const yTotal = keys.reduce((categoryTotal, k) => {
|
||||
categoryTotal += currCategory[k] as number;
|
||||
return categoryTotal;
|
||||
}, 0);
|
||||
allTotals.push(yTotal);
|
||||
return allTotals;
|
||||
}, [] as number[]);
|
||||
|
||||
const TICK_LABEL_FONT_WEIGHT = 800;
|
||||
|
||||
// accessors
|
||||
const getCategory = (d: StackedBarData) => d.category;
|
||||
|
||||
// scales
|
||||
const categoryScale = scaleBand<string>({
|
||||
domain: data.map(getCategory),
|
||||
padding: scalePadding,
|
||||
});
|
||||
const valueScale = scaleLinear<number>({
|
||||
domain: [0, Math.max(...yTotals)],
|
||||
nice: true,
|
||||
});
|
||||
const colorScale = scaleOrdinal<string, string>({
|
||||
domain: keys,
|
||||
range: colorRange,
|
||||
});
|
||||
|
||||
// bounds
|
||||
const xMax = width;
|
||||
const yMax = height - margin.top - axisBottomOffset;
|
||||
|
||||
categoryScale.rangeRound([0, xMax - axisLeftOffset]);
|
||||
valueScale.range([yMax, 0]);
|
||||
|
||||
return width < 10 ? null : (
|
||||
<div className={styles.container}>
|
||||
<svg width={width} height={height}>
|
||||
<Group top={margin.top} left={margin.left}>
|
||||
<GridRows
|
||||
scale={valueScale}
|
||||
width={xMax}
|
||||
height={yMax}
|
||||
left={axisLeftOffset}
|
||||
numTicks={numTicksValueAxis}
|
||||
stroke={Color.tertiaryBackground}
|
||||
strokeWidth={strokeWidth}
|
||||
strokeDasharray={strokeDashArray}
|
||||
/>
|
||||
<GridColumns
|
||||
scale={categoryScale}
|
||||
height={yMax}
|
||||
left={axisLeftOffset}
|
||||
offset={categoryScale.bandwidth() / 2}
|
||||
stroke={Color.tertiaryBackground}
|
||||
strokeWidth={strokeWidth}
|
||||
strokeDasharray={strokeDashArray}
|
||||
/>
|
||||
<Group left={axisLeftOffset}>
|
||||
<BarStack<StackedBarData, string>
|
||||
data={data}
|
||||
keys={keys}
|
||||
x={getCategory}
|
||||
xScale={categoryScale}
|
||||
yScale={valueScale}
|
||||
color={colorScale}
|
||||
>
|
||||
{(barStacks) =>
|
||||
barStacks.map((barStack) =>
|
||||
barStack.bars.map((bar) => (
|
||||
<rect
|
||||
className={styles.barStack}
|
||||
key={`bar-stack-${barStack.index}-${bar.index}`}
|
||||
x={bar.x}
|
||||
y={bar.y}
|
||||
height={bar.height}
|
||||
width={bar.width / 2}
|
||||
fill={bar.color}
|
||||
onMouseLeave={() => {
|
||||
tooltipTimeout = window.setTimeout(() => {
|
||||
hideTooltip();
|
||||
}, 300);
|
||||
}}
|
||||
onMouseMove={(event) => {
|
||||
if (tooltipTimeout) clearTimeout(tooltipTimeout);
|
||||
const eventSvgCoords = localPoint(event);
|
||||
const left = bar.x + bar.width / 2;
|
||||
showTooltip({
|
||||
tooltipData: bar,
|
||||
tooltipTop: eventSvgCoords?.y,
|
||||
tooltipLeft: left,
|
||||
});
|
||||
}}
|
||||
/>
|
||||
))
|
||||
)
|
||||
}
|
||||
</BarStack>
|
||||
</Group>
|
||||
<Line
|
||||
fill={Color.tertiaryBackground}
|
||||
to={new Point({ x: axisLeftOffset, y: 0 })}
|
||||
from={new Point({ x: axisLeftOffset, y: yMax })}
|
||||
stroke={Color.tertiaryBackground}
|
||||
strokeWidth={strokeWidth}
|
||||
strokeDasharray={strokeDashArray}
|
||||
/>
|
||||
<AxisBottom
|
||||
top={yMax}
|
||||
scale={categoryScale}
|
||||
left={
|
||||
((categoryScale.bandwidth() * 100) / width) *
|
||||
categoryAxisLeftFactor
|
||||
}
|
||||
hideTicks
|
||||
hideAxisLine
|
||||
labelProps={{
|
||||
fontSize: `${10 / 16}rem`,
|
||||
}}
|
||||
tickLabelProps={() => ({
|
||||
fill: Color.label,
|
||||
fontWeight: TICK_LABEL_FONT_WEIGHT,
|
||||
})}
|
||||
/>
|
||||
<AxisLeft
|
||||
scale={valueScale}
|
||||
top={5}
|
||||
numTicks={numTicksValueAxis}
|
||||
hideAxisLine
|
||||
labelProps={{
|
||||
fontSize: `${10 / 16}rem`,
|
||||
}}
|
||||
tickLabelProps={() => {
|
||||
return {
|
||||
fill: Color.label,
|
||||
fontWeight: TICK_LABEL_FONT_WEIGHT,
|
||||
};
|
||||
}}
|
||||
/>
|
||||
</Group>
|
||||
</svg>
|
||||
<div
|
||||
className={styles.legend}
|
||||
style={{ left: width + legendLeftOffset, top: legendTopOffset }}
|
||||
>
|
||||
<LegendOrdinal
|
||||
scale={colorScale}
|
||||
direction="column"
|
||||
itemMargin={itemMargin}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{tooltipOpen && tooltipData ? (
|
||||
<Tooltip
|
||||
className={styles.toolTip}
|
||||
top={tooltipTop}
|
||||
left={tooltipLeft}
|
||||
unstyled
|
||||
>
|
||||
<p className={styles.key}>{tooltipData.key}</p>
|
||||
<p>{tooltipData.bar.data[tooltipData.key]}</p>
|
||||
<p>{getCategory(tooltipData.bar.data)}</p>
|
||||
</Tooltip>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
export const StackedBarGraphHorizontal = withTooltip<
|
||||
StackedBarProps,
|
||||
TooltipData
|
||||
>(
|
||||
({
|
||||
data,
|
||||
width,
|
||||
height,
|
||||
keys,
|
||||
colorRange,
|
||||
margin,
|
||||
scalePadding = 0.3,
|
||||
numTicksValueAxis = 6,
|
||||
axisLeftOffset = 40,
|
||||
axisBottomOffset = 40,
|
||||
strokeWidth = 2.5,
|
||||
strokeDashArray = "10,4",
|
||||
legendLeftOffset = 40,
|
||||
legendTopOffset = 40,
|
||||
itemMargin = "15px 0 0 0",
|
||||
categoryAxisLeftFactor = 1,
|
||||
tooltipOpen,
|
||||
tooltipLeft,
|
||||
tooltipTop,
|
||||
tooltipData,
|
||||
hideTooltip,
|
||||
showTooltip,
|
||||
}: StackedBarProps & WithTooltipProvidedProps<TooltipData>) => {
|
||||
const yTotals = data.reduce((allTotals, currCategory) => {
|
||||
const yTotal = keys.reduce((categoryTotal, k) => {
|
||||
categoryTotal += currCategory[k] as number;
|
||||
return categoryTotal;
|
||||
}, 0);
|
||||
allTotals.push(yTotal);
|
||||
return allTotals;
|
||||
}, [] as number[]);
|
||||
|
||||
const TICK_LABEL_FONT_WEIGHT = 800;
|
||||
|
||||
// accessors
|
||||
const getCategory = (d: StackedBarData) => d.category;
|
||||
|
||||
// scales
|
||||
const valueScale = scaleLinear<number>({
|
||||
domain: [0, Math.max(...yTotals)],
|
||||
nice: true,
|
||||
});
|
||||
const categoryScale = scaleBand<string>({
|
||||
domain: data.map(getCategory),
|
||||
padding: scalePadding,
|
||||
});
|
||||
const colorScale = scaleOrdinal<string, string>({
|
||||
domain: keys,
|
||||
range: colorRange,
|
||||
});
|
||||
|
||||
// bounds
|
||||
const xMax = width;
|
||||
const yMax = height - margin.top - axisBottomOffset;
|
||||
|
||||
categoryScale.rangeRound([yMax, 0]);
|
||||
valueScale.range([0, xMax - axisLeftOffset]);
|
||||
|
||||
return width < 10 ? null : (
|
||||
<div className={styles.container}>
|
||||
<svg width={width} height={height}>
|
||||
<Group top={margin.top} left={margin.left}>
|
||||
<GridRows
|
||||
scale={categoryScale}
|
||||
width={xMax}
|
||||
height={yMax}
|
||||
offset={categoryScale.bandwidth() / 2}
|
||||
left={axisLeftOffset}
|
||||
stroke={Color.tertiaryBackground}
|
||||
strokeWidth={strokeWidth}
|
||||
strokeDasharray={strokeDashArray}
|
||||
/>
|
||||
<GridColumns
|
||||
scale={valueScale}
|
||||
height={yMax}
|
||||
numTicks={numTicksValueAxis}
|
||||
left={axisLeftOffset}
|
||||
stroke={Color.tertiaryBackground}
|
||||
strokeWidth={strokeWidth}
|
||||
strokeDasharray={strokeDashArray}
|
||||
/>
|
||||
<Group left={axisLeftOffset}>
|
||||
<BarStackHorizontal<StackedBarData, string>
|
||||
data={data}
|
||||
keys={keys}
|
||||
y={getCategory}
|
||||
xScale={valueScale}
|
||||
yScale={categoryScale}
|
||||
color={colorScale}
|
||||
>
|
||||
{(barStacks) =>
|
||||
barStacks.map((barStack) =>
|
||||
barStack.bars.map((bar) => (
|
||||
<rect
|
||||
className={styles.barStack}
|
||||
key={`bar-stack-${barStack.index}-${bar.index}`}
|
||||
x={bar.x}
|
||||
y={bar.y}
|
||||
height={bar.height / 2}
|
||||
width={bar.width}
|
||||
fill={bar.color}
|
||||
onMouseLeave={() => {
|
||||
tooltipTimeout = window.setTimeout(() => {
|
||||
hideTooltip();
|
||||
}, 300);
|
||||
}}
|
||||
onMouseMove={(event) => {
|
||||
if (tooltipTimeout) clearTimeout(tooltipTimeout);
|
||||
const eventSvgCoords = localPoint(event);
|
||||
const left = bar.x + bar.width / 2;
|
||||
showTooltip({
|
||||
tooltipData: bar,
|
||||
tooltipTop: eventSvgCoords?.y,
|
||||
tooltipLeft: left,
|
||||
});
|
||||
}}
|
||||
/>
|
||||
))
|
||||
)
|
||||
}
|
||||
</BarStackHorizontal>
|
||||
</Group>
|
||||
<AxisBottom
|
||||
top={yMax}
|
||||
scale={valueScale}
|
||||
left={axisLeftOffset}
|
||||
numTicks={numTicksValueAxis}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
labelProps={{
|
||||
fontSize: `${10 / 16}rem`,
|
||||
}}
|
||||
tickLabelProps={() => ({
|
||||
fill: Color.label,
|
||||
fontWeight: TICK_LABEL_FONT_WEIGHT,
|
||||
})}
|
||||
/>
|
||||
<AxisLeft
|
||||
top={
|
||||
-((categoryScale.bandwidth() * 100) / width) *
|
||||
categoryAxisLeftFactor
|
||||
}
|
||||
scale={categoryScale}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
labelProps={{
|
||||
fontSize: `${10 / 16}rem`,
|
||||
}}
|
||||
tickLabelProps={() => {
|
||||
return {
|
||||
fill: Color.label,
|
||||
fontWeight: TICK_LABEL_FONT_WEIGHT,
|
||||
};
|
||||
}}
|
||||
/>
|
||||
</Group>
|
||||
</svg>
|
||||
<div
|
||||
className={styles.legend}
|
||||
style={{ left: width + legendLeftOffset, top: legendTopOffset }}
|
||||
>
|
||||
<LegendOrdinal
|
||||
scale={colorScale}
|
||||
direction="column"
|
||||
itemMargin={itemMargin}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{tooltipOpen && tooltipData ? (
|
||||
<Tooltip
|
||||
className={styles.toolTip}
|
||||
top={tooltipTop}
|
||||
left={tooltipLeft}
|
||||
unstyled
|
||||
>
|
||||
<p className={styles.key}>{tooltipData.key}</p>
|
||||
<p>{tooltipData.bar.data[tooltipData.key]}</p>
|
||||
<p>{getCategory(tooltipData.bar.data)}</p>
|
||||
</Tooltip>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
);
|
||||
|
|
@ -80,6 +80,59 @@ export const moreMockCategoricalData = [
|
|||
{ key: "Dart", value: 2.21 },
|
||||
];
|
||||
|
||||
export const mockStackedBarGraphData = [
|
||||
{
|
||||
category: "1A",
|
||||
"geese watchers": 60,
|
||||
"geese breeders": 80,
|
||||
"geese catchers": 90,
|
||||
},
|
||||
{
|
||||
category: "1B",
|
||||
"geese watchers": 25,
|
||||
"geese breeders": 37,
|
||||
"geese catchers": 80,
|
||||
},
|
||||
{
|
||||
category: "2A",
|
||||
"geese watchers": 40,
|
||||
"geese breeders": 50,
|
||||
"geese catchers": 70,
|
||||
},
|
||||
{
|
||||
category: "2B",
|
||||
"geese watchers": 40,
|
||||
"geese breeders": 80,
|
||||
"geese catchers": 88,
|
||||
},
|
||||
{
|
||||
category: "3A",
|
||||
"geese watchers": 15,
|
||||
"geese breeders": 30,
|
||||
"geese catchers": 45,
|
||||
},
|
||||
];
|
||||
|
||||
export const mockStackedBarKeys = [
|
||||
"geese watchers",
|
||||
"geese breeders",
|
||||
"geese catchers",
|
||||
];
|
||||
|
||||
export const mockLineData = {
|
||||
xValues: ["1A", "1B", "2A", "2B", "3A", "3B"],
|
||||
lines: [
|
||||
{
|
||||
label: "Java",
|
||||
yValues: [54, 88, 22, 66, 77, 88],
|
||||
},
|
||||
{
|
||||
label: "C++",
|
||||
yValues: [45, 22, 83, 98, 24, 33],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const mockTimelineData = [
|
||||
{
|
||||
time: "Fall 2020",
|
||||
|
|
@ -148,3 +201,27 @@ export const mockQuoteDataLong = [
|
|||
"Hello, world!",
|
||||
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla in enim neque. Sed sit amet convallis tellus. Integer condimentum a felis id gravida. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nullam metus libero, sagittis in consectetur in, scelerisque sed sapien. Nullam ut feugiat sapien. Praesent dictum ac ipsum ac lacinia.",
|
||||
];
|
||||
|
||||
export const mockGroupedBarGraphData = [
|
||||
{
|
||||
category: "AJ",
|
||||
values: {
|
||||
Shooting: 7,
|
||||
Melee: 9,
|
||||
},
|
||||
},
|
||||
{
|
||||
category: "Zen",
|
||||
values: {
|
||||
Shooting: 17,
|
||||
Melee: 5,
|
||||
},
|
||||
},
|
||||
{
|
||||
category: "Lyra",
|
||||
values: {
|
||||
Shooting: 3,
|
||||
Melee: 14,
|
||||
},
|
||||
},
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,46 +1,65 @@
|
|||
export const sectionsData = [
|
||||
{
|
||||
export interface PageRoute {
|
||||
name: string;
|
||||
url: string;
|
||||
}
|
||||
|
||||
type PageID =
|
||||
| "demographics"
|
||||
| "academics"
|
||||
| "coop"
|
||||
| "lifestyleAndInterests"
|
||||
| "intimacyAndDrugs"
|
||||
| "postGrad"
|
||||
| "friends"
|
||||
| "miscellaneous"
|
||||
| "mentalHealth"
|
||||
| "personal"
|
||||
| "contributors";
|
||||
|
||||
export type PageRoutes = { [key in PageID]: PageRoute };
|
||||
export const pageRoutes: PageRoutes = {
|
||||
demographics: {
|
||||
name: "Demographics",
|
||||
url: "/",
|
||||
url: "/demographics",
|
||||
},
|
||||
{
|
||||
academics: {
|
||||
name: "Academics",
|
||||
url: "/",
|
||||
url: "/academics",
|
||||
},
|
||||
{
|
||||
coop: {
|
||||
name: "Co-op",
|
||||
url: "/",
|
||||
url: "/coop",
|
||||
},
|
||||
{
|
||||
lifestyleAndInterests: {
|
||||
name: "Lifestyle and Interests",
|
||||
url: "/",
|
||||
url: "/lifestyle-and-interests",
|
||||
},
|
||||
{
|
||||
intimacyAndDrugs: {
|
||||
name: "Intimacy and Drugs",
|
||||
url: "/",
|
||||
url: "/intimacy-and-drugs",
|
||||
},
|
||||
{
|
||||
postGrad: {
|
||||
name: "Post-grad",
|
||||
url: "/",
|
||||
url: "/post-grad",
|
||||
},
|
||||
{
|
||||
friends: {
|
||||
name: "Friends",
|
||||
url: "/",
|
||||
url: "/friends",
|
||||
},
|
||||
{
|
||||
miscellaneous: {
|
||||
name: "Miscellaneous",
|
||||
url: "/",
|
||||
url: "/miscellaneous",
|
||||
},
|
||||
{
|
||||
mentalHealth: {
|
||||
name: "Mental Health",
|
||||
url: "/",
|
||||
url: "/mental-health",
|
||||
},
|
||||
{
|
||||
personal: {
|
||||
name: "Personal",
|
||||
url: "/",
|
||||
url: "/personal",
|
||||
},
|
||||
{
|
||||
contributors: {
|
||||
name: "Contributors",
|
||||
url: "/",
|
||||
url: "/contributors",
|
||||
},
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
const nextConfig = {
|
||||
reactStrictMode: true,
|
||||
trailingSlash: true,
|
||||
// This image loader supports `next export`, for optimizing next <Image /> tags
|
||||
images: {
|
||||
loader: 'akamai',
|
||||
path: '',
|
||||
},
|
||||
}
|
||||
|
||||
module.exports = nextConfig
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -19,6 +19,7 @@
|
|||
"@visx/event": "^2.6.0",
|
||||
"@visx/grid": "^2.10.0",
|
||||
"@visx/group": "^2.10.0",
|
||||
"@visx/legend": "^2.10.0",
|
||||
"@visx/mock-data": "^2.1.2",
|
||||
"@visx/scale": "^2.2.2",
|
||||
"@visx/shape": "^2.10.0",
|
||||
|
|
@ -27,6 +28,7 @@
|
|||
"@visx/tooltip": "^2.10.0",
|
||||
"@visx/wordcloud": "^2.10.0",
|
||||
"next": "12.1.6",
|
||||
"npm": "^8.19.0",
|
||||
"react": "18.1.0",
|
||||
"react-dom": "18.1.0"
|
||||
},
|
||||
|
|
@ -43,6 +45,7 @@
|
|||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"eslint-plugin-react": "^7.30.0",
|
||||
"eslint-plugin-react-hooks": "^4.5.0",
|
||||
"eslint-plugin-unused-imports": "^2.0.0",
|
||||
"postcss": "^8.4.14",
|
||||
"postcss-calc": "^8.2.4",
|
||||
"postcss-flexbugs-fixes": "^5.0.2",
|
||||
|
|
|
|||
|
|
@ -145,4 +145,4 @@ a:hover {
|
|||
--card-background: var(--dark--card-background);
|
||||
--label: var(--dark--label);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import { mockTimelineData } from "data/mocks";
|
||||
import { sectionsData } from "data/routes";
|
||||
import { PageRoutes } from "data/routes";
|
||||
import Link from "next/link";
|
||||
import React from "react";
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ export default function Home() {
|
|||
you see!
|
||||
</p>
|
||||
</CenterWrapper>
|
||||
<Sections data={sectionsData} />
|
||||
<Sections data={PageRoutes} />
|
||||
<Timeline data={mockTimelineData} />
|
||||
<p>
|
||||
Click <Link href="/playground">here</Link> to visit the playground
|
||||
|
|
|
|||
|
|
@ -3,21 +3,36 @@ import { BoxPlot } from "components/Boxplot";
|
|||
import {
|
||||
mockCategoricalData,
|
||||
moreMockCategoricalData,
|
||||
mockStackedBarKeys,
|
||||
mockStackedBarGraphData,
|
||||
mockBoxPlotData,
|
||||
mockLineData,
|
||||
mockQuoteData,
|
||||
mockQuoteDataLong,
|
||||
mockPieData,
|
||||
mockTimelineData,
|
||||
mockGroupedBarGraphData,
|
||||
} from "data/mocks";
|
||||
import { sectionsData } from "data/routes";
|
||||
import { pageRoutes } from "data/routes";
|
||||
import React from "react";
|
||||
import { Color } from "utils/Color";
|
||||
|
||||
import { About } from "@/components/About";
|
||||
import {
|
||||
GroupedBarGraphHorizontal,
|
||||
GroupedBarGraphVertical,
|
||||
} from "@/components/GroupedBarGraph";
|
||||
import { LineGraph } from "@/components/LineGraph";
|
||||
import { PieChart } from "@/components/PieChart";
|
||||
import { QuotationCarousel } from "@/components/QuotationCarousel";
|
||||
import { Sections } from "@/components/Sections";
|
||||
import {
|
||||
StackedBarGraphVertical,
|
||||
StackedBarGraphHorizontal,
|
||||
} from "@/components/StackedBarGraph";
|
||||
import { Timeline } from "@/components/Timeline";
|
||||
|
||||
import { BottomNav } from "../components/BottomNav";
|
||||
import { CenterWrapper } from "../components/CenterWrapper";
|
||||
import { ColorPalette } from "../components/ColorPalette";
|
||||
import { WordCloud } from "../components/WordCloud";
|
||||
|
|
@ -26,7 +41,7 @@ import styles from "./playground.module.css";
|
|||
|
||||
export default function Home() {
|
||||
return (
|
||||
<div className={styles.page}>
|
||||
<div className={styles.page} suppressHydrationWarning>
|
||||
<h1>Playground</h1>
|
||||
<p>Show off your components here!</p>
|
||||
|
||||
|
|
@ -95,6 +110,48 @@ export default function Home() {
|
|||
}))}
|
||||
/>
|
||||
|
||||
<h2>
|
||||
<code>{"<StackedBarGraphVertical />"}</code>
|
||||
</h2>
|
||||
<StackedBarGraphVertical
|
||||
width={600}
|
||||
height={400}
|
||||
keys={mockStackedBarKeys}
|
||||
colorRange={[
|
||||
Color.primaryAccent,
|
||||
Color.secondaryAccentLight,
|
||||
Color.primaryAccentLighter,
|
||||
]}
|
||||
data={mockStackedBarGraphData}
|
||||
margin={{
|
||||
top: 20,
|
||||
left: 20,
|
||||
}}
|
||||
/>
|
||||
|
||||
<h2>
|
||||
<code>{"<StackedBarGraphHorizontal />"}</code>
|
||||
</h2>
|
||||
<p>
|
||||
<code>{"<StackedBarGraphHorizontal />"}</code> takes the same props as{" "}
|
||||
<code>{"<StackedBarGraphVertical />"}</code>.
|
||||
</p>
|
||||
<StackedBarGraphHorizontal
|
||||
width={600}
|
||||
height={400}
|
||||
keys={mockStackedBarKeys}
|
||||
colorRange={[
|
||||
Color.primaryAccent,
|
||||
Color.secondaryAccentLight,
|
||||
Color.primaryAccentLighter,
|
||||
]}
|
||||
data={mockStackedBarGraphData}
|
||||
margin={{
|
||||
top: 20,
|
||||
left: 20,
|
||||
}}
|
||||
/>
|
||||
|
||||
<h2>
|
||||
<code>{"<Timeline />"}</code>
|
||||
</h2>
|
||||
|
|
@ -132,10 +189,26 @@ export default function Home() {
|
|||
</p>
|
||||
</CenterWrapper>
|
||||
|
||||
<h2>
|
||||
<code>{"<LineGraph />"}</code>
|
||||
</h2>
|
||||
<LineGraph
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
||||
data={mockLineData}
|
||||
width={600}
|
||||
height={400}
|
||||
margin={{
|
||||
top: 20,
|
||||
bottom: 80,
|
||||
left: 30,
|
||||
right: 20,
|
||||
}}
|
||||
/>
|
||||
|
||||
<h2>
|
||||
<code>{"<Sections />"}</code>
|
||||
</h2>
|
||||
<Sections data={sectionsData} />
|
||||
<Sections data={pageRoutes} />
|
||||
|
||||
<h2>
|
||||
<code>{"<About />"}</code>
|
||||
|
|
@ -167,6 +240,60 @@ export default function Home() {
|
|||
circleDiameter={180}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<h2>
|
||||
<code>{"<BottomNav />"}</code>
|
||||
</h2>
|
||||
<BottomNav
|
||||
leftPage={pageRoutes.demographics}
|
||||
rightPage={pageRoutes.coop}
|
||||
></BottomNav>
|
||||
|
||||
<h2>
|
||||
<code>{"<GroupedBarGraphVertical />"}</code>
|
||||
</h2>
|
||||
<GroupedBarGraphVertical
|
||||
className={styles.barGraphDemo}
|
||||
data={mockGroupedBarGraphData}
|
||||
barColors={[Color.primaryAccentLight, Color.secondaryAccentLight]}
|
||||
barHoverColorsMap={{
|
||||
[Color.primaryAccentLight]: Color.primaryAccent,
|
||||
[Color.secondaryAccentLight]: Color.secondaryAccent,
|
||||
}}
|
||||
width={500}
|
||||
height={400}
|
||||
margin={{
|
||||
top: 20,
|
||||
bottom: 40,
|
||||
left: 50,
|
||||
right: 20,
|
||||
}}
|
||||
/>
|
||||
|
||||
<h2>
|
||||
<code>{"<GroupedBarGraphHorizontal />"}</code>
|
||||
</h2>
|
||||
<p>
|
||||
<code>{"<GroupedBarGraphHorizontal />"}</code> takes the same props as{" "}
|
||||
<code>{"<GroupedBarGraphVertical />"}</code>.
|
||||
</p>
|
||||
<GroupedBarGraphHorizontal
|
||||
className={styles.barGraphDemo}
|
||||
data={mockGroupedBarGraphData}
|
||||
barColors={[Color.primaryAccentLight, Color.secondaryAccentLight]}
|
||||
barHoverColorsMap={{
|
||||
[Color.primaryAccentLight]: Color.primaryAccent,
|
||||
[Color.secondaryAccentLight]: Color.secondaryAccent,
|
||||
}}
|
||||
width={600}
|
||||
height={400}
|
||||
margin={{
|
||||
top: 20,
|
||||
bottom: 40,
|
||||
left: 60,
|
||||
right: 20,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
import { BarGraphHorizontal, BarGraphVertical } from "components/BarGraph";
|
||||
import { mockCategoricalData, moreMockCategoricalData } from "data/mocks";
|
||||
import { pageRoutes } from "data/routes";
|
||||
import React from "react";
|
||||
import { useWindowDimensions } from "utils/getWindowDimensions";
|
||||
import { useIsMobile } from "utils/isMobile";
|
||||
|
||||
import { BarGraphVertical, BarGraphHorizontal } from "@/components/BarGraph";
|
||||
import { BottomNav } from "@/components/BottomNav";
|
||||
import { ComponentWrapper } from "@/components/ComponentWrapper";
|
||||
|
||||
import { WordCloud } from "../components/WordCloud";
|
||||
import { Header } from "@/components/Header";
|
||||
import { SectionHeader } from "@/components/SectionHeader";
|
||||
import { WordCloud } from "@/components/WordCloud";
|
||||
|
||||
import styles from "./samplePage.module.css";
|
||||
|
||||
|
|
@ -14,23 +17,29 @@ export default function SamplePage() {
|
|||
const { width } = useWindowDimensions();
|
||||
const isMobile = useIsMobile();
|
||||
|
||||
// For components that are in the side wrappers, it looks better if they fill a certain amount of width, so we can make the width dynamic like this
|
||||
const defaultGraphWidth = isMobile ? width / 1.25 : width / 2;
|
||||
const defaultGraphHeight = 500;
|
||||
|
||||
// Make vars for common configs such as common margins
|
||||
const defaultBarGraphMargin = { top: 20, bottom: 40, left: 150, right: 20 };
|
||||
|
||||
return (
|
||||
<div className={styles.page}>
|
||||
<Header />
|
||||
<SectionHeader
|
||||
title="Demographics"
|
||||
subtitle="An insight into the demographics of UW’s CS programs"
|
||||
/>
|
||||
<ComponentWrapper
|
||||
heading="What program are you in?"
|
||||
bodyText="There are a total of 106 respondents of the CS Class Profile. Interestingly, there are a huge number of students that are just in CS, partially due to the overwhelming number of people in CS as seen in the total demographics."
|
||||
>
|
||||
<BarGraphVertical
|
||||
data={mockCategoricalData}
|
||||
// For components that are in the side wrappers, it looks better if they fill a certain amount of width, so we can make the width dynamic like this
|
||||
width={isMobile ? width / 1.25 : width / 2}
|
||||
height={500}
|
||||
margin={{
|
||||
top: 20,
|
||||
bottom: 80,
|
||||
left: 60,
|
||||
right: 20,
|
||||
}}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
margin={defaultBarGraphMargin}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
|
|
@ -45,8 +54,8 @@ export default function SamplePage() {
|
|||
value: word.value,
|
||||
}))}
|
||||
// For components that we don't want to match the width necessarily we can provide direct values
|
||||
width={isMobile ? width / 1.5 : 800}
|
||||
height={500}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
|
|
@ -58,14 +67,9 @@ export default function SamplePage() {
|
|||
<BarGraphHorizontal
|
||||
className={styles.barGraphDemo}
|
||||
data={mockCategoricalData}
|
||||
width={isMobile ? width / 1.45 : width / 2}
|
||||
height={500}
|
||||
margin={{
|
||||
top: 20,
|
||||
bottom: 40,
|
||||
left: 150,
|
||||
right: 20,
|
||||
}}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
margin={defaultBarGraphMargin}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
|
|
@ -78,32 +82,19 @@ export default function SamplePage() {
|
|||
<BarGraphHorizontal
|
||||
className={styles.barGrapDemo}
|
||||
data={mockCategoricalData}
|
||||
width={isMobile ? width / 1.45 : width / 2}
|
||||
height={500}
|
||||
margin={{
|
||||
top: 20,
|
||||
bottom: 40,
|
||||
left: 150,
|
||||
right: 20,
|
||||
}}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
margin={defaultBarGraphMargin}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
<ComponentWrapper
|
||||
heading="What program are you in?"
|
||||
bodyText="There are a total of 106 respondents of the CS Class Profile. Interestingly, there are a huge number of students that are just in CS, partially due to the overwhelming number of people in CS as seen in the total demographics."
|
||||
>
|
||||
<ComponentWrapper heading="What program are you in?" align="left">
|
||||
<BarGraphHorizontal
|
||||
className={styles.barGraphDemo}
|
||||
data={mockCategoricalData}
|
||||
width={isMobile ? width / 1.45 : width / 2}
|
||||
height={500}
|
||||
margin={{
|
||||
top: 20,
|
||||
bottom: 40,
|
||||
left: 150,
|
||||
right: 20,
|
||||
}}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
margin={defaultBarGraphMargin}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
|
|
@ -118,10 +109,87 @@ export default function SamplePage() {
|
|||
text: word.key,
|
||||
value: word.value,
|
||||
}))}
|
||||
width={isMobile ? width / 1.5 : width / 2}
|
||||
height={500}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
<ComponentWrapper heading="What program are you in? " align="right">
|
||||
<WordCloud
|
||||
data={moreMockCategoricalData.map((word) => ({
|
||||
text: word.key,
|
||||
value: word.value,
|
||||
}))}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
<ComponentWrapper heading="What program are you in?" align="center">
|
||||
<WordCloud
|
||||
data={moreMockCategoricalData.map((word) => ({
|
||||
text: word.key,
|
||||
value: word.value,
|
||||
}))}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
<ComponentWrapper heading="What program are you in?" align="left">
|
||||
<WordCloud
|
||||
data={moreMockCategoricalData.map((word) => ({
|
||||
text: word.key,
|
||||
value: word.value,
|
||||
}))}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
<ComponentWrapper
|
||||
heading="What program are you in?"
|
||||
bodyText="There are a total of 106 respondents of the CS Class Profile. Interestingly, there are a huge number of students that are just in CS, partially due to the overwhelming number of people in CS as seen in the total demographics."
|
||||
align="right"
|
||||
noBackground
|
||||
>
|
||||
<BarGraphHorizontal
|
||||
className={styles.barGraphDemo}
|
||||
data={mockCategoricalData}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
margin={defaultBarGraphMargin}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
<ComponentWrapper
|
||||
heading="What program are you in?"
|
||||
bodyText="There are a total of 106 respondents of the CS Class Profile. Interestingly, there are a huge number of students that are just in CS, partially due to the overwhelming number of people in CS as seen in the total demographics."
|
||||
align="left"
|
||||
>
|
||||
<BarGraphHorizontal
|
||||
className={styles.barGraphDemo}
|
||||
data={mockCategoricalData}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
margin={defaultBarGraphMargin}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
<ComponentWrapper heading="What program are you in?" align="center">
|
||||
<WordCloud
|
||||
data={moreMockCategoricalData.map((word) => ({
|
||||
text: word.key,
|
||||
value: word.value,
|
||||
}))}
|
||||
width={defaultGraphWidth}
|
||||
height={defaultGraphHeight}
|
||||
/>
|
||||
</ComponentWrapper>
|
||||
|
||||
<BottomNav
|
||||
leftPage={pageRoutes.demographics}
|
||||
rightPage={pageRoutes.contributors}
|
||||
></BottomNav>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
<svg width="144" height="100" viewBox="0 0 144 100" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<line x1="139" y1="5" x2="5.00003" y2="4.99999" stroke="#E18E89" stroke-width="10" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<line x1="139" y1="50" x2="5.00003" y2="50" stroke="#E18E89" stroke-width="10" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<line x1="139" y1="95" x2="5.00003" y2="95" stroke="#E18E89" stroke-width="10" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 495 B |
|
|
@ -0,0 +1,3 @@
|
|||
<svg width="118" height="63" viewBox="0 0 118 63" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M116.615 34.4078C118.278 32.7447 118.278 30.0483 116.615 28.3852L89.513 1.28349C87.8499 -0.379606 85.1535 -0.379606 83.4904 1.28349C81.8273 2.94658 81.8273 5.64299 83.4904 7.30609L107.581 31.3965L83.4904 55.4869C81.8273 57.15 81.8273 59.8464 83.4904 61.5095C85.1535 63.1726 87.8499 63.1726 89.513 61.5095L116.615 34.4078ZM0.75 35.6551H113.603V27.1379H0.75V35.6551Z" fill="#603E2F"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 496 B |
Loading…
Reference in New Issue