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

Use shared requirements loading icon component #613

Merged
merged 1 commit into from
Mar 3, 2025
Merged

Use shared requirements loading icon component #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions site/src/pages/RoadmapPage/sidebar/GERequiredCourseList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FC, useEffect, useState } from 'react';
import ProgramRequirementsList from './ProgramRequirementsList';
import trpc from '../../../trpc';
import { Spinner } from 'react-bootstrap';
import RequirementsLoadingIcon from './RequirementsLoadingIcon';
import { setGERequirements } from '../../../store/slices/courseRequirementsSlice';
import { useAppDispatch, useAppSelector } from '../../../store/hooks';

Expand All @@ -27,13 +27,7 @@ const GERequiredCourseList: FC = () => {
});
}, [dispatch, requirements]);

const loadingIcon = (
<div className="requirements-loading">
<Spinner animation="border" />
</div>
);

return <>{resultsLoading ? loadingIcon : <ProgramRequirementsList requirements={requirements} />}</>;
return <>{resultsLoading ? <RequirementsLoadingIcon /> : <ProgramRequirementsList requirements={requirements} />}</>;
};

export default GERequiredCourseList;
10 changes: 2 additions & 8 deletions site/src/pages/RoadmapPage/sidebar/MajorRequiredCourseList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ProgramRequirementsList from './ProgramRequirementsList';
import Select from 'react-select';
import trpc from '../../../trpc';
import { normalizeMajorName, comboboxTheme } from '../../../helpers/courseRequirements';
import { Spinner } from 'react-bootstrap';
import RequirementsLoadingIcon from './RequirementsLoadingIcon';
import {
setMajor,
setMajorList,
Expand Down Expand Up @@ -173,12 +173,6 @@ const MajorRequiredCourseList: FC = () => {

const specSelectOptions = specializations.map((s) => ({ value: s, label: s.name }));

const loadingIcon = (
<div className="requirements-loading">
<Spinner animation="border" />
</div>
);

return (
<>
<Select
Expand Down Expand Up @@ -220,7 +214,7 @@ const MajorRequiredCourseList: FC = () => {
/>
)}
{selectedMajor && (!selectedMajor.specializations.length || selectedSpec) && (
<>{resultsLoading ? loadingIcon : <ProgramRequirementsList requirements={requirements} />}</>
<>{resultsLoading ? <RequirementsLoadingIcon /> : <ProgramRequirementsList requirements={requirements} />}</>
)}
</>
);
Expand Down
12 changes: 4 additions & 8 deletions site/src/pages/RoadmapPage/sidebar/MinorRequiredCourseList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ProgramRequirementsList from './ProgramRequirementsList';
import Select from 'react-select';
import trpc from '../../../trpc';
import { normalizeMajorName, comboboxTheme } from '../../../helpers/courseRequirements';
import { Spinner } from 'react-bootstrap';
import RequirementsLoadingIcon from './RequirementsLoadingIcon';
import { setMinorRequirements, setMinor, setMinorList } from '../../../store/slices/courseRequirementsSlice';
import { useAppDispatch, useAppSelector } from '../../../store/hooks';
import ThemeContext from '../../../style/theme-context';
Expand Down Expand Up @@ -88,12 +88,6 @@ const MinorRequiredCourseList: FC = () => {
label: `${m.name}`,
}));

const loadingIcon = (
<div className="requirements-loading">
<Spinner animation="border" />
</div>
);

return (
<>
<Select
Expand All @@ -112,7 +106,9 @@ const MinorRequiredCourseList: FC = () => {
placeholder="Select a minor..."
theme={(t) => comboboxTheme(t, isDark)}
/>
{selectedMinor && <>{resultsLoading ? loadingIcon : <ProgramRequirementsList requirements={requirements} />}</>}
{selectedMinor && (
<>{resultsLoading ? <RequirementsLoadingIcon /> : <ProgramRequirementsList requirements={requirements} />}</>
)}
</>
);
};
Expand Down
6 changes: 0 additions & 6 deletions site/src/pages/RoadmapPage/sidebar/ProgramRequirementsList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,3 @@ body[data-theme='dark'] {
overflow: hidden;
}
}

.search-sidebar .requirements-loading {
display: flex;
justify-content: center;
margin: 8px auto;
}
5 changes: 5 additions & 0 deletions site/src/pages/RoadmapPage/sidebar/RequirementsLoadingIcon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.requirements-loading {
display: flex;
justify-content: center;
margin: 8px auto;
}
12 changes: 12 additions & 0 deletions site/src/pages/RoadmapPage/sidebar/RequirementsLoadingIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import './RequirementsLoadingIcon.scss';
import { Spinner } from 'react-bootstrap';

const RequirementsLoadingIcon = () => {
return (
<div className="requirements-loading">
<Spinner animation="border" />
</div>
);
};

export default RequirementsLoadingIcon;