Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reverse Prerequisite Tree #3263

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Reverse Prerequisite Tree #3263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4892781
Reverse prereq tree
sciffany Mar 5, 2021
0eb80c4
Delete package-lock.json
sciffany Mar 5, 2021
14a2810
Delete yarn.lock
sciffany Mar 5, 2021
f2906ca
Rename the terms used
sciffany Mar 5, 2021
57ce2f2
Merge branch 'reverse-prereq-tree' of https://github.com/sciffany/nus…
sciffany Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions website/src/views/modules/ModuleTree.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $connector-size: 0.75rem;

.container {
display: flex;
flex-direction: row-reverse;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For accessibility reasons, we should not use row-reverse here.
I know it's a lot more work to flip the dom order, but I think it's worth it to prevent confusion for our fellow students with visual disabilities.

overflow-y: auto;
align-items: center;
// Leave some space for the tooltip
Expand Down Expand Up @@ -42,12 +43,12 @@ $connector-size: 0.75rem;
justify-content: center;
align-items: center;
padding: 0.125rem 0.25rem;
margin: 0 0 1px $connector-size;
margin: 0 $connector-size 1px 0;
border-radius: $btn-border-radius;

&::before {
top: 50%;
left: -$connector-size;
right: -$connector-size;
width: $connector-size;
height: 1px;
}
Expand Down Expand Up @@ -75,11 +76,12 @@ $connector-size: 0.75rem;
.conditional {
flex: 0 0 auto;
margin-right: $connector-size;
margin-left: $connector-size;
border: 0;

&::after {
top: 50%;
right: -$connector-size;
left: -$connector-size;
width: $connector-size;
height: 1px;
}
Expand All @@ -88,11 +90,12 @@ $connector-size: 0.75rem;
.branch {
position: relative;
display: flex;
flex-direction: row-reverse;
align-items: center;

&::before,
&::after {
left: 0;
right: 0;
width: 1px;
height: 50%;
}
Expand All @@ -111,19 +114,19 @@ $connector-size: 0.75rem;
}
}

.prereqBranch {
.dependentBranch {
&::before,
&::after {
right: 0;
left: auto;
left: 0;
right: auto;
}
}

.prereqNode {
margin: 0 $connector-size 1px 0;
.dependentNode {
margin: 0 0 1px $connector-size;

&::before {
right: -$connector-size;
left: auto;
left: -$connector-size;
right: auto;
}
}
14 changes: 7 additions & 7 deletions website/src/views/modules/ModuleTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ type Props = {
interface TreeDisplay {
layer: number;
node: PrereqTree;
isPrereq?: boolean;
isDependent?: boolean;
}

const formatConditional = (name: string) => (name === 'or' ? 'one of' : 'all of');
const formatConditional = (name: string) => (name === 'or' ? 'take one' : 'take all');

const nodeName = (node: PrereqTree) => (typeof node === 'string' ? node : Object.keys(node)[0]);

Expand All @@ -38,7 +38,7 @@ const Branch: React.FC<{ nodes: PrereqTree[]; layer: number }> = (props) => (
);

const Tree: React.FC<TreeDisplay> = (props) => {
const { layer, node, isPrereq } = props;
const { layer, node, isDependent } = props;

const isConditional = typeof node !== 'string';
const name = nodeName(node);
Expand All @@ -49,7 +49,7 @@ const Tree: React.FC<TreeDisplay> = (props) => {
className={classnames(styles.node, {
[`hoverable color-${layer}`]: !isConditional,
[styles.conditional]: isConditional,
[styles.prereqNode]: isPrereq,
[styles.dependentNode]: isDependent,
})}
>
{isConditional ? (
Expand All @@ -76,14 +76,14 @@ const ModuleTree: React.FC<Props> = (props) => {
{fulfillRequirements.map((fulfilledModule) => (
<li
key={fulfilledModule}
className={classnames(styles.branch, styles.prereqBranch)}
className={classnames(styles.branch, styles.dependentBranch)}
>
<Tree layer={0} node={fulfilledModule} isPrereq />
<Tree layer={0} node={fulfilledModule} isDependent />
</li>
))}
</ul>

<div className={classnames(styles.node, styles.conditional)}>needs</div>
<div className={classnames(styles.node, styles.conditional)}>unlocks</div>
</>
)}

Expand Down