Karimaldeen/school-dashboard-exercise
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Moaz Dawalibi 2024-08-12 17:15:04 +03:00
parent 00dfd6c88c
commit 2e1effd7ec
6 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Pages/Tags/Page.tsx
View File

@ -7,11 +7,10 @@ import { Spin } from "antd";
import { canAddTags } from "../../utils/hasAbilityFn"; import { canAddTags } from "../../utils/hasAbilityFn";
import useSetPageTitle from "../../Hooks/useSetPageTitle"; import useSetPageTitle from "../../Hooks/useSetPageTitle";
import { useDeleteTag } from "../../api/tags"; import { useDeleteTag } from "../../api/tags";
import DeleteModels from "../../Layout/Dashboard/DeleteModels";
const Table = lazy(() => import("./Table")); const Table = lazy(() => import("./Table"));
const AddModalForm = lazy(() => import("./Model/AddModel")); const AddModalForm = lazy(() => import("./Model/AddModel"));
const EditModalForm = lazy(() => import("./Model/EditModel")); const EditModalForm = lazy(() => import("./Model/EditModel"));
const DeleteModalForm = lazy(() => import("./Model/Delete")); const DeleteModalForm = lazy(() => import("../../Layout/Dashboard/DeleteModels"));
const SearchField = lazy( const SearchField = lazy(
() => import("../../Components/DataTable/SearchField"), () => import("../../Components/DataTable/SearchField"),
); );
@ -46,7 +45,7 @@ const TableHeader = () => {
</header> </header>
<Table /> <Table />
<DeleteModels <DeleteModalForm
deleteMutation={deleteMutation} deleteMutation={deleteMutation}
ModelEnum={ModalEnum?.TAGS_DELETE} ModelEnum={ModalEnum?.TAGS_DELETE}
/> />

4
src/Pages/Unit/Page.tsx
View File

@ -11,7 +11,7 @@ import { useDeleteUnit } from "../../api/unit";
const Table = lazy(() => import('./Table')); const Table = lazy(() => import('./Table'));
const AddModalForm = lazy(() => import('./Model/AddModel')); const AddModalForm = lazy(() => import('./Model/AddModel'));
const EditModalForm = lazy(() => import('./Model/EditModel')); const EditModalForm = lazy(() => import('./Model/EditModel'));
const DeleteModels = lazy(() => import('../../Layout/Dashboard/DeleteModels')); const DeleteModalForm = lazy(() => import('../../Layout/Dashboard/DeleteModels'));
const TableHeader = () => { const TableHeader = () => {
const [t] = useTranslation(); const [t] = useTranslation();
@ -38,7 +38,7 @@ const TableHeader = () => {
<Table /> <Table />
<AddModalForm /> <AddModalForm />
<EditModalForm /> <EditModalForm />
<DeleteModels <DeleteModalForm
deleteMutation={deleteMutation} deleteMutation={deleteMutation}
ModelEnum={ModalEnum?.UNIT_DELETE} ModelEnum={ModalEnum?.UNIT_DELETE}
/> />

4
src/Pages/lesson/Page.tsx
View File

@ -11,7 +11,7 @@ import { useDeleteLesson } from "../../api/lesson";
const Table = lazy(() => import('./Table')); const Table = lazy(() => import('./Table'));
const AddModalForm = lazy(() => import('./Model/AddModel')); const AddModalForm = lazy(() => import('./Model/AddModel'));
const EditModalForm = lazy(() => import('./Model/EditModel')); const EditModalForm = lazy(() => import('./Model/EditModel'));
const DeleteModels = lazy(() => import('../../Layout/Dashboard/DeleteModels')); const DeleteModelsForm = lazy(() => import('../../Layout/Dashboard/DeleteModels'));
const TableHeader = () => { const TableHeader = () => {
const [t] = useTranslation(); const [t] = useTranslation();
@ -45,7 +45,7 @@ const TableHeader = () => {
<Table /> <Table />
<AddModalForm /> <AddModalForm />
<EditModalForm /> <EditModalForm />
<DeleteModels <DeleteModelsForm
deleteMutation={deleteMutation} deleteMutation={deleteMutation}
ModelEnum={ModalEnum?.LESSON_DELETE} ModelEnum={ModalEnum?.LESSON_DELETE}
/> />

1
src/Pages/question/Page.tsx
View File

@ -1,7 +1,6 @@
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { lazy, Suspense } from "react"; import { lazy, Suspense } from "react";
import { Spin } from "antd"; import { Spin } from "antd";
import DeleteModel from "./Model/Delete";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { ParamsEnum } from "../../enums/params"; import { ParamsEnum } from "../../enums/params";
import { useGetAllUnit } from "../../api/unit"; import { useGetAllUnit } from "../../api/unit";

19
src/Pages/subject/Table/Page.tsx
View File

@ -2,15 +2,14 @@ import { ModalEnum } from "../../../enums/Model";
import useModalHandler from "../../../utils/useModalHandler"; import useModalHandler from "../../../utils/useModalHandler";
import { FaPlus } from "react-icons/fa"; import { FaPlus } from "react-icons/fa";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import TablePage from "./TablePage";
import AddSubjectModalForm from "../Model/AddModel";
import EditSubjectModalForm from "../Model/EditModel";
import DeleteSubjectModalForm from "../Model/Delete";
import useSetPageTitle from "../../../Hooks/useSetPageTitle"; import useSetPageTitle from "../../../Hooks/useSetPageTitle";
import { canAddSubject } from "../../../utils/hasAbilityFn"; import { canAddSubject } from "../../../utils/hasAbilityFn";
import DeleteModels from "../../../Layout/Dashboard/DeleteModels";
import { useDeleteSubject } from "../../../api/subject"; import { useDeleteSubject } from "../../../api/subject";
import { lazy } from "react";
const Table = lazy(() => import("./TablePage"));
const AddModalForm = lazy(() => import("../Model/AddModel"));
const EditModalForm = lazy(() => import("../Model/EditModel"));
const DeleteModalForm = lazy(() => import("../../../Layout/Dashboard/DeleteModels"));
const TableWithHeader = () => { const TableWithHeader = () => {
const { handel_open_model } = useModalHandler(); const { handel_open_model } = useModalHandler();
@ -32,11 +31,11 @@ const TableWithHeader = () => {
</button> </button>
)} )}
</header> </header>
<TablePage /> <Table />
<AddSubjectModalForm /> <AddModalForm />
<EditSubjectModalForm /> <EditModalForm />
<DeleteModels <DeleteModalForm
deleteMutation={deleteMutation} deleteMutation={deleteMutation}
ModelEnum={ModalEnum?.SUBJECT_DELETE} ModelEnum={ModalEnum?.SUBJECT_DELETE}
/> />

4
src/api/config.ts
View File

@ -1,7 +1,7 @@
export const BaseURL = "http://192.168.1.6:8000/api/"; // export const BaseURL = "http://192.168.1.6:8000/api/";
// export const BaseURL = "http://127.0.0.1:8000/api/"; // export const BaseURL = "http://127.0.0.1:8000/api/";
// export const BaseURL = "https://exercise-automation.point-dev.net/api/"; export const BaseURL = "https://exercise-automation.point-dev.net/api/";
// export const ImageBaseURL = "http://192.168.1.9:8000/"; // export const ImageBaseURL = "http://192.168.1.9:8000/";