diff --git a/src/components/Buttons/index.tsx b/src/components/Buttons/index.tsx new file mode 100644 index 0000000..d67b216 --- /dev/null +++ b/src/components/Buttons/index.tsx @@ -0,0 +1,9 @@ +import React from 'react'; +import { ButtonProps, Button } from '@chakra-ui/button'; +import { AddIcon } from '@chakra-ui/icons'; + +export const CreateButton: React.FC = props => ( + +); diff --git a/src/pages/courses/courses.tsx b/src/pages/courses/courses.tsx index 33485dc..05fb8a0 100644 --- a/src/pages/courses/courses.tsx +++ b/src/pages/courses/courses.tsx @@ -27,6 +27,7 @@ import { useRootStore } from '@educt/hooks/useRootStore'; import { useHistory } from 'react-router'; import CategoryItem from './components/CategoryList/CategoryItem'; import CourseItem from './components/CourseList/CourseItem'; +import { CreateButton } from '@educt/components/Buttons'; /** * Courses page @@ -47,16 +48,7 @@ const CoursesPage: React.FC = () => { Courses List of all courses. - {(me.isAdmin || me.isTeacher) && ( - - )} + {(me.isAdmin || me.isTeacher) && history.push('/courses/create')} />} {(me.isAdmin || me.isTeacher) && } diff --git a/src/pages/courses/edit/components/StudentTableList/BulkActionsMenu.tsx b/src/pages/courses/edit/components/StudentTableList/BulkActionsMenu.tsx index 4542cf5..ad7aa40 100644 --- a/src/pages/courses/edit/components/StudentTableList/BulkActionsMenu.tsx +++ b/src/pages/courses/edit/components/StudentTableList/BulkActionsMenu.tsx @@ -24,7 +24,7 @@ const BulkActionsMenu: React.FC = ({ selected, rows, s return ( - }> + }> Bulk Actions diff --git a/src/pages/courses/edit/components/StudentTableList/StudentTableList.tsx b/src/pages/courses/edit/components/StudentTableList/StudentTableList.tsx index 8ab4406..cf69bf7 100644 --- a/src/pages/courses/edit/components/StudentTableList/StudentTableList.tsx +++ b/src/pages/courses/edit/components/StudentTableList/StudentTableList.tsx @@ -17,6 +17,7 @@ import type { ICourse } from '@educt/interfaces'; */ import { useCallback, useState } from 'react'; import { useDisclosure } from '@chakra-ui/react'; +import { AddIcon } from '@chakra-ui/icons'; type StudentTableListPropsType = { render: React.FC; @@ -90,7 +91,7 @@ const StudentTableList: React.FC = ({ render: Row, st } /> - + @@ -103,7 +104,7 @@ const StudentTableList: React.FC = ({ render: Row, st )} - @@ -121,6 +122,9 @@ const StudentTableList: React.FC = ({ render: Row, st ))} + + {students.length} students + ); }; diff --git a/src/pages/users/components/CreateUserForm/CreateUserForm.tsx b/src/pages/users/components/CreateUserForm/CreateUserForm.tsx index ecc4e0e..9d9abce 100644 --- a/src/pages/users/components/CreateUserForm/CreateUserForm.tsx +++ b/src/pages/users/components/CreateUserForm/CreateUserForm.tsx @@ -50,6 +50,7 @@ import { UsersPageContext } from '@educt/contexts'; * Schema */ import CreateUserSchema from './CreateUserForm.validator'; +import { CreateButton } from '@educt/components/Buttons'; type CreateUserFormPropsType = {}; @@ -108,9 +109,7 @@ const CreateUserModal: React.FC = () => { return ( <> - + diff --git a/src/pages/users/components/UserList/UserList.tsx b/src/pages/users/components/UserList/UserList.tsx index e5d9040..c932e0c 100644 --- a/src/pages/users/components/UserList/UserList.tsx +++ b/src/pages/users/components/UserList/UserList.tsx @@ -77,7 +77,7 @@ const UserList: React.FC = ({ render: Item, limit }) => { {users.length !== 0 ? ( <> - + Total: ({pagination.total}) Actions @@ -98,7 +98,9 @@ const UserList: React.FC = ({ render: Item, limit }) => { - Page {pagination.current_page} of {pagesCount} + + Page {pagination.current_page} of {pagesCount} +