Skip to content

Commit d679840

Browse files
authored
Обновления интерфейса (#606)
* move homework content to the top of the course page * refactor: по умолчанию не выставляем фильтр "только непроверенные"
1 parent 856cabe commit d679840

2 files changed

Lines changed: 20 additions & 10 deletions

File tree

hwproj.front/src/components/Courses/CourseExperimental.tsx

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,6 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
329329
}))
330330
}}/>
331331
</Card>
332-
<DotLottieReact
333-
src="https://lottie.host/5f96ad46-7c60-4d6f-9333-bbca189be66d/iNWo5peHOK.lottie"
334-
loop
335-
autoplay
336-
/>
337332
</Stack>
338333
}
339334

@@ -377,10 +372,18 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
377372
</Card>
378373
}
379374

380-
return <Grid container direction={"row"} spacing={1}>
381-
<Grid item xs={12} sm={12} md={4} lg={4}>
382-
<Timeline style={{maxHeight: "75vh", overflow: 'auto', paddingLeft: 0, paddingRight: 8}}
375+
const renderGif = () =>
376+
<DotLottieReact
377+
src="https://lottie.host/5f96ad46-7c60-4d6f-9333-bbca189be66d/iNWo5peHOK.lottie"
378+
loop
379+
autoplay
380+
/>
381+
382+
return <Grid container direction={{xs: "column", sm: "column", md: "row", lg: "row"}} spacing={1}>
383+
<Grid item xs={12} sm={12} md={4} lg={4} order={{xs: 2, sm: 2, md: 1, lg: 1}}>
384+
<Timeline style={{overflow: 'auto', paddingLeft: 0, paddingRight: 8}}
383385
sx={{
386+
maxHeight: '75vh',
384387
'&::-webkit-scrollbar': {
385388
width: "3px",
386389
},
@@ -483,10 +486,17 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
483486
})}
484487
</Timeline>
485488
</Grid>
486-
<Grid item xs={12} sm={12} md={8} lg={8}>
489+
<Grid item xs={12} sm={12} md={8} lg={8} order={{xs: 1, sm: 1, md: 2, lg: 2}}>
487490
{isHomework
488491
? renderHomework(selectedItem as HomeworkViewModel)
489492
: renderTask(selectedItem as HomeworkTaskViewModel, selectedItemHomework!)}
493+
494+
<Grid item sx={{display: {xs: 'none', md: 'flex'}}}>
495+
{renderGif()}
496+
</Grid>
497+
</Grid>
498+
<Grid item sx={{display: {xs: 'flex', md: 'none'}}} order={{xs: 3, sm: 3}}>
499+
{renderGif()}
490500
</Grid>
491501
</Grid>
492502
}

hwproj.front/src/components/Solutions/StudentSolutionsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const StudentSolutionsPage: FC = () => {
8484
taskStudentsSolutionsPreview: [],
8585
})
8686
const [filterState, setFilterState] = React.useState<Filter[]>(
87-
localStorage.getItem(FilterStorageKey)?.split(", ").filter(x => x !== "").map(x => x as Filter) || ["Только непроверенные"]
87+
localStorage.getItem(FilterStorageKey)?.split(", ").filter(x => x !== "").map(x => x as Filter) || []
8888
)
8989
const handleFilterChange = (event: SelectChangeEvent<typeof filterState>) => {
9090
const filters = filterState.length > 0 ? [] : ["Только непроверенные" as Filter]

0 commit comments

Comments
 (0)