Skip to content
This repository was archived by the owner on Oct 5, 2023. It is now read-only.

Commit abf8e48

Browse files
buihuyhoang1107renovate-botdanghieuliemcanhuyhHuỳnh Thanh Cảnh
authored
Cu 1wfmc4a fe update time 1 (#1010)
* Update * Cập-nhật-giao-diện-làm-bài-trắc-nghiệm:-Duration-sửa-thành-Thời-gian * Cần-ẩn-cột-trạng-thái-ở-lộ-trình,-tài-liệu-trắc-nghiệm-trên-giao-diện-học-viên * Cần-ẩn-cột-trạng-thái-ở-lộ-trình,-tài-liệu-trắc-nghiệm-trên-giao-diện-học-viên2 * Tăng-height-của-card,-default-page-size-=-25-của-lộ-trình,-bài-tập,-tài-liệu,-trắc-nghiệm * Cần-ẩn-cột-học-phí-và-cột-số-lượng-học-viên-trong-danh-sách-khóa-học-của-học-viên * Cập-nhật-giao-diện-điểm-danh-để-có-thể-thấy-rõ-tên-học-viên * Cầncậpnhậtđộrộngcộttrongdanhsáchtrắcnghiệm * Thêm-bài-tập-trắc-ngiệm-trước-buổi-học * Thêm-trắc-nghiệm-trong/sau-buổi-học * Danh-sách-lộ-trình-trước-trong-sau-bài-tập-trắc-nghiệm-học-viên * Gom-cột-thời-gian-bắt-đầu-và-thời-gian-kết-thúc-lại-làm-một.-Nếu-trùng-ngày-thì-chỉ-ghi-1-lần. * Tăng-popup-video*1.5 * Update dependency ts-jest to v27.1.0 * BE-when-add-student-to-course-sort-it (#995) * BE-when-add-student-to-course-sort-it * BE-when-add-student-to-course-sort-it * BE-when-add-student-to-course-sort-it * BE-when-add-student-to-course-sort-it Co-authored-by: Cảnh Huỳnh <61925916+canhuyh@users.noreply.github.com> * Add submission editing function (#998) * Add updateClassworkSubmission, addFilesToClassworkSubmission, removeFilesFromClassworkSubmission functions * add delete file by directory, model and id in array file Co-authored-by: Huỳnh Thanh Cảnh <macbookpro@Huynh-Thanh-Canh.local> * Update dependency chart.js to v3.6.2 * Update dependency @testing-library/jest-dom to v5.16.1 * Update dependency react-helmet-async to v1.2.2 * Update typescript-eslint monorepo to v5.6.0 * Update dependency graphql to v15.8.0 * Update dependency apollo-upload-client to v17 * Update dependency @apollo/client to v3.5.6 * Add published all functions (#1004) * Published all lessons * Published all classworkMaterials * Published all classworkAssignments * Publised all quizzes Co-authored-by: Huỳnh Thanh Cảnh <macbookpro@Huynh-Thanh-Canh.local> * Update dependency ts-jest to v27.1.1 * Update dependency @types/lodash to v4.14.178 * Update dependency jest to v27.4.4 * Update dependency body-parser to v1.19.1 * Thêm-bài-tập-trắc-ngiệm-trước-buổi-học * Thêm-trắc-nghiệm-trong/sau-buổi-học * Danh-sách-lộ-trình-trước-trong-sau-bài-tập-trắc-nghiệm-học-viên * Gom-cột-thời-gian-bắt-đầu-và-thời-gian-kết-thúc-lại-làm-một.-Nếu-trùng-ngày-thì-chỉ-ghi-1-lần. * Update dependency @emotion/react to v11.7.1 * Tăng-popup-video*1.5 * Update dependency @nestjs/cli to v8.1.6 * Update typescript-eslint monorepo to v5.7.0 * Update dependency jest to v27.4.5 * Update dependency ts-jest to v27.1.2 * Update dependency @types/node to v14.18.1 * Update nest monorepo to v8.2.4 * Update dependency lint-staged to v12.1.3 * Update dependency react-number-format to v4.9.0 * Update typescript-eslint monorepo to v5.8.0 * Update dependency @types/node to v14.18.2 * Update dependency phosphor-react to v1.4.0 * Update dependency chart.js to v3.7.0 * Update dependency lint-staged to v12.1.4 Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Liêm Đặng <60537515+danghieuliem@users.noreply.github.com> Co-authored-by: Cảnh Huỳnh <61925916+canhuyh@users.noreply.github.com> Co-authored-by: Huỳnh Thanh Cảnh <macbookpro@Huynh-Thanh-Canh.local>
1 parent c34a21d commit abf8e48

21 files changed

Lines changed: 1310 additions & 145 deletions

File tree

packages/web/src/@kathena/theme/theme.constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ export const HEADING_FONT = `'Inter', sans-serif`
1111
export const SIDEBAR_WIDTH = 280
1212
export const APP_BAR_HEIGHT = 64
1313
export const DASHBOARD_SPACING = 3
14-
export const DASHBOARD_CARD_CONTENT_MAX_HEIGHT = 500
14+
export const DASHBOARD_CARD_CONTENT_MAX_HEIGHT = 2000

packages/web/src/@kathena/ui/Dialog/Dialog.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export type DialogProps = {
2121
width?: number | string
2222
classes?: Partial<Record<'dialogPaper', string>>
2323
children?: React.ReactNode
24+
right?: number | string
2425
}
2526

2627
const Dialog = (props: DialogProps) => {
@@ -43,7 +44,11 @@ const Dialog = (props: DialogProps) => {
4344
<DialogContentMUI>{children}</DialogContentMUI>
4445
<DialogActionsMUI>
4546
{extraDialogActions}
46-
<Button onClick={handleClose} type="button">
47+
<Button
48+
onClick={handleClose}
49+
type="button"
50+
className={classes.rightPaper}
51+
>
4752
Đóng
4853
</Button>
4954
</DialogActionsMUI>
@@ -52,11 +57,14 @@ const Dialog = (props: DialogProps) => {
5257
)
5358
}
5459

55-
const useStyles = makeStyles<Theme, DialogProps, 'dialogPaper'>(() => ({
60+
const useStyles = makeStyles<Theme, DialogProps>(() => ({
5661
dialogPaper: {
5762
maxWidth: '95vw',
5863
width: ({ width }) => width,
5964
},
65+
rightPaper: {
66+
paddingRight: ({ right }) => right,
67+
},
6068
}))
6169

6270
export default Dialog

packages/web/src/@kathena/ui/hooks/usePagination.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const usePagination = (initialValues?: Partial<PaginationState>) => {
1414
} = useLocationQuery()
1515
const [{ page, perPage }, $setPagination] = useState<PaginationState>({
1616
page: initialValues?.page ?? +(qPage ?? '0'),
17-
perPage: initialValues?.perPage ?? +(qPerPage ?? '10'),
17+
perPage: initialValues?.perPage ?? +(qPerPage ?? '25'),
1818
})
1919
const dirtyRef = useRef(false)
2020

@@ -58,7 +58,7 @@ export const usePagination = (initialValues?: Partial<PaginationState>) => {
5858

5959
return {
6060
page: +((qPage ?? '0') as string),
61-
perPage: +((qPerPage ?? '10') as string),
61+
perPage: +((qPerPage ?? '25') as string),
6262
setPage,
6363
setPerPage,
6464
}

packages/web/src/components/VideoPopup/VideoPopup.tsx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ const VideoPopup: FC<VideoPopupProps> = (props) => {
2222
<Dialog
2323
open={open}
2424
onClose={onClose}
25+
right="3.4em"
2526
extraDialogActions={
26-
<>
27+
<div style={{ justifyContent: 'space-between' }}>
2728
<Button
2829
disabled={index === 0}
2930
onClick={() => setIndex((state) => state - 1)}
@@ -36,11 +37,19 @@ const VideoPopup: FC<VideoPopupProps> = (props) => {
3637
>
3738
Next
3839
</Button>
39-
</>
40+
</div>
4041
}
4142
>
42-
<Typography variant='h3' style={{ marginBottom: 10 }} >{videos[index].title}</Typography>
43-
<div style={{ position: 'relative' }}>
43+
<div
44+
style={{
45+
position: 'relative',
46+
padding: '0 2em 0 2em',
47+
}}
48+
>
49+
<Typography variant="h3" style={{ marginBottom: 10 }}>
50+
{videos[index].title}
51+
</Typography>
52+
4453
<div
4554
// eslint-disable-next-line react/no-danger
4655
dangerouslySetInnerHTML={{ __html: videos[index].iframe as ANY }}

0 commit comments

Comments
 (0)