Skip to content

Commit e79def8

Browse files
committed
style: improve courses table style
1 parent 741f95e commit e79def8

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

frontend/platform/courses/Courses.jsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ import TableRow from '@mui/material/TableRow';
1616
import TableBody from '@mui/material/TableBody';
1717
import TableCell from '@mui/material/TableCell';
1818
import Base from '../../src/components/Base.jsx'
19-
import FilterListIcon from '@mui/icons-material/FilterList';
2019
import SchoolIcon from '@mui/icons-material/School';
2120
import DeleteIcon from '@mui/icons-material/Delete';
2221
import EditIcon from '@mui/icons-material/Edit';
2322
import render, { useAppContext } from '../../src/render.jsx';
2423
import { getCookie } from '../../src/utils.js';
25-
import FilterForm from './components/FilterForm.jsx';
2624
import { lazy, Suspense } from "react";
2725

2826
const CourseForm = lazy(() => import("./components/CourseForm.jsx"));
@@ -38,6 +36,7 @@ function Courses() {
3836
const [organizationId, setOrganizationId] = useState(null);
3937
const [queryParameters, setQueryParameters] = useState("");
4038
const { direction, localeMessages, apiBaseUrl, platformBaseUrl, userRole, languageOptions = [] } = useAppContext();
39+
const [coursesAreLoaded, setCoursesAreLoaded] = useState(false);
4140

4241
const getLanguageLabel = (languageCode) => {
4342
return languageOptions.find((languageOption) => languageOption.value === languageCode)?.label || languageCode;
@@ -56,7 +55,10 @@ function Courses() {
5655
},
5756
})
5857
.then(response => response.json())
59-
.then(data => setCourses(data.courses))
58+
.then(data => {
59+
setCourses(data.courses);
60+
setCoursesAreLoaded(true);
61+
})
6062
.catch(error => console.error('Error fetching courses:', error));
6163
};
6264

@@ -131,7 +133,7 @@ function Courses() {
131133
createMode={true}
132134
/></Suspense>);
133135
setDialogOpen(true);}}>{localeMessages["add_course"]}</Button>}
134-
<TableContainer component={Paper}>
136+
{coursesAreLoaded ? <TableContainer component={Paper}>
135137
<Table aria-label={localeMessages["courses"]}>
136138
<TableHead>
137139
<TableRow>
@@ -183,7 +185,7 @@ function Courses() {
183185
)}
184186
</TableBody>
185187
</Table>
186-
</TableContainer>
188+
</TableContainer> : <LinearProgress />}
187189
</Box>
188190
</Grid>
189191

frontend/src/theme/themes.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ const defaultOptions = {
112112
paddingTop: 12,
113113
paddingBottom: 12,
114114
},
115+
'a': {
116+
color: theme.palette.mode === 'light' ? theme.palette.secondary.dark : theme.palette.secondary.main,
117+
textDecoration: 'none',
118+
},
115119
'& .MuiIconButton-root': {
116120
borderRadius: 8,
117121
color: theme.palette.mode === 'light'

0 commit comments

Comments
 (0)