diff --git a/src/Pages/Admin/QuestionBank/useTableColumns.tsx b/src/Pages/Admin/QuestionBank/useTableColumns.tsx index da5680c..9bbac06 100644 --- a/src/Pages/Admin/QuestionBank/useTableColumns.tsx +++ b/src/Pages/Admin/QuestionBank/useTableColumns.tsx @@ -66,6 +66,7 @@ export const useColumns = () => { align: "center", render: (_text, record, index) => { + return ( { const { filterState } = useFilterState(); const response = useGetAllQuestion({ - lesson_id: lesson_id, + lessonsIds: [lesson_id], pagination: true, ...filterState, }); diff --git a/src/Pages/Auth/FormField.tsx b/src/Pages/Auth/FormField.tsx index 28ec2d0..50ba4f1 100644 --- a/src/Pages/Auth/FormField.tsx +++ b/src/Pages/Auth/FormField.tsx @@ -1,18 +1,5 @@ -import React, { useEffect, useState } from "react"; -import { Form, Field, useFormikContext } from "formik"; -import Image from "../../Components/Ui/Image"; -import { Input } from "antd"; -import AuthSelect from "../../Components/Ui/Custom/AuthSelect"; -// import { useGetAllCycle } from "../../api/cycle"; -// import { useGetAllBranch } from "../../api/branch"; -import { useGetAllTerm } from "../../api/term"; -import { FormValues } from "../../types/Auth"; -import { - BRANCH_OBJECT_KEY, - CYCLE_OBJECT_KEY, - TERM_OBJECT_KEY, -} from "../../config/AppKey"; -import useFormatAuthDataToSelect from "../../utils/useFormatAuthDataToSelect"; +import { Form, useFormikContext } from "formik"; + import { useTranslation } from "react-i18next"; import ValidationField from "../../Components/ValidationField/ValidationField"; @@ -22,6 +9,9 @@ type FormFieldType = { const FormField = ({ isLoading }: FormFieldType) => { const [t] = useTranslation(); + const {isValid} = useFormikContext(); + console.log(isValid,"isValid"); + return (
{/* */} @@ -45,7 +35,7 @@ const FormField = ({ isLoading }: FormFieldType) => { /> */} -
diff --git a/src/Pages/Auth/LoginForm.tsx b/src/Pages/Auth/LoginForm.tsx index b5699fe..ffbcbf8 100644 --- a/src/Pages/Auth/LoginForm.tsx +++ b/src/Pages/Auth/LoginForm.tsx @@ -39,7 +39,7 @@ const LoginForm = () => { return (
- + {(formikProps) => }
diff --git a/src/api/auth.ts b/src/api/auth.ts index 16d5a99..b29bbe4 100644 --- a/src/api/auth.ts +++ b/src/api/auth.ts @@ -5,4 +5,4 @@ const API = { LOGIN: `login`, LOGOUT: `logout`, }; -export const useLoginAdmin = () => useAddMutation(KEY, API.LOGIN, false); +export const useLoginAdmin = () => useAddMutation(KEY, API.LOGIN, true); diff --git a/src/api/helper/useAxios.ts b/src/api/helper/useAxios.ts index b2f39fc..69da961 100644 --- a/src/api/helper/useAxios.ts +++ b/src/api/helper/useAxios.ts @@ -50,6 +50,8 @@ function useAxios() { return response; }, function (error) { + console.log(error?.response); + const status = error?.request?.status; const errorMsg = error?.response?.data?.message; const errorField = error?.response?.data; diff --git a/src/translate/ar.json b/src/translate/ar.json index bd36428..0c62043 100644 --- a/src/translate/ar.json +++ b/src/translate/ar.json @@ -754,7 +754,7 @@ "param": "معامل", "student_package": "حزمة الطالب", "quiz":"الاختبارات", - "QuestionBank":"بنك الأسئلة" + "questionBank":"بنك الأسئلة" }, "message": { "some_thing_went_wrong": "حدث خطأ ما",