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.

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

feat: migrate to API rewrite #351

Merged
merged 26 commits into from
Jan 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
99e9495
feat: initial migrate test
ecxyzzy Sep 12, 2023
e95e9bb
feat: stable ground (no more ts errors)
ecxyzzy Sep 14, 2023
0be7ea0
feat: everything works(?)
ecxyzzy Sep 14, 2023
9203d9a
fix: update footer
ecxyzzy Sep 14, 2023
aad7f0e
feat: more cleanup
ecxyzzy Sep 15, 2023
a818227
fix: properly case GitHub
ecxyzzy Sep 15, 2023
932a80b
fix: sort grade dist quarter dropdown, misc fixes
ecxyzzy Sep 20, 2023
fd84899
fix: use async because it is almost 2024
ecxyzzy Sep 20, 2023
9c9fbf1
chore: merge master into api-next-migrate
ecxyzzy Nov 28, 2023
6a6a913
fix: address most comment changes
ecxyzzy Nov 29, 2023
4dc87c3
fix: show class title in prereq tree nodes, correct links
ecxyzzy Nov 30, 2023
f4f15ac
fix: less bad solution for prereq titles
ecxyzzy Nov 30, 2023
e20bb5b
feat: fetch course/instructor data on demand
ecxyzzy Dec 3, 2023
4796fe2
fixed prereq box to only appear when there is text (#367)
kylerpan Oct 20, 2023
0baca8c
fix: grab review form fix from #375
ecxyzzy Dec 4, 2023
406e43d
feat: use graphql for courses again, set endpoint to staging
ecxyzzy Dec 4, 2023
c522297
chore: migrate to latest api staging
ecxyzzy Dec 18, 2023
8c9432b
chore: merge main into api-next-migrate
ecxyzzy Dec 18, 2023
09e763a
fix: make prereq tree node labels consistently spaced
ecxyzzy Dec 18, 2023
8be9403
fix: reincorporate #391 changes
ecxyzzy Dec 19, 2023
65e958d
Merge branch 'master' into api-next-migrate
ecxyzzy Dec 19, 2023
a2243d7
feat: migrate to latest staging, hopefully fix perf issues
ecxyzzy Dec 28, 2023
87189e3
Merge remote-tracking branch 'origin/master' into api-next-migrate
js0mmer Jan 20, 2024
bae581d
Fix review form merging
js0mmer Jan 20, 2024
038d959
Restore original transformation fucntions
js0mmer Jan 21, 2024
b25c63b
Restore API url env vars
js0mmer Jan 21, 2024
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
18 changes: 12 additions & 6 deletions site/src/component/PrereqTree/PrereqTree.tsx
ecxyzzy marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,19 @@ const Node: FC<NodeProps> = (props) => {
<div style={{ padding: "1px 0" }} className={`node-container ${props.node}`} key={props.index}>
<Popup
trigger={
<a href={'/course/' + props.label.split('(')[0].replace(/\s+/g, '')} role='button' style={{ padding: '0.5rem' }} className={'node ui button'}>
{props.label}
</a>
!props.label.startsWith("AP ") ? (
<a href={'/course/' + props.label.split('(')[0].replace(/\s+/g, '')} role="button" style={{ padding: "0.5rem" }} className={`node ui button`}>
{props.label}
</a>
) : (
<button style={{ padding: "0.5rem" }} className={`node ui button`}>{`${props.label}`}</button>
)
}
content={props.content.length ? props.content : props.label}
basic position='top center' wide='very' />
basic
position="top center"
wide="very"
/>
</div>
);
};
Expand Down Expand Up @@ -126,7 +133,7 @@ const PrereqTree: FC<PrereqProps> = (props) => {
{Object.values(props.prerequisiteFor).map(
(dependency, index) => (
<li key={`dependency-node-${index}`} className={'dependency-node'}>
<Node label={dependency.id} content={dependency.title} node={'dependency-node'} />
<Node label={`${dependency.department} ${dependency.courseNumber}`} content={dependency.title} node={'dependency-node'} />
</li>
)
)}
Expand Down Expand Up @@ -157,7 +164,6 @@ const PrereqTree: FC<PrereqProps> = (props) => {
prerequisiteNames={props.prerequisiteList}
prerequisiteJSON={props.prerequisiteTree}
/>

</div>
)}

Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.