danak/danak-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change toast
deploy to danak / build_and_deploy (push) Has been cancelled
Details

Browse Source
This commit is contained in:
hamid zarghami
2026-07-20 10:55:33 +03:30
parent feed194673
commit d3fd21177b
97 changed files with 437 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/users/Create.tsx
+4 -4
View File
@@ -10,7 +10,7 @@ import { CreateUserType, RoleItemType } from './types/UserTypes'
import * as Yup from 'yup'
import { useSingleUpload } from '../service/hooks/useServiceData'
import { useCreateUser, useGetRoles } from './hooks/useUserData'
import { toast } from 'react-toastify'
import { toast } from '../../components/Toast';
import { ErrorType } from '../../helpers/types'
import { useNavigate } from 'react-router-dom'
import { Pages } from '../../config/Pages'
@@ -27,11 +27,11 @@ const CreateUser: FC = () => {
const handleCreateUser = (values: CreateUserType) => {
createUser.mutate(values, {
onSuccess: () => {
toast.success(t('success'))
toast(t('success'), 'success')
navigate(Pages.users.list)
},
onError: (error: ErrorType) => {
toast.error(error.response?.data?.error?.message[0])
toast(error.response?.data?.error?.message[0], 'error')
}
})
}
@@ -66,7 +66,7 @@ const CreateUser: FC = () => {
handleCreateUser(values)
},
onError: (error: ErrorType) => {
toast.error(error.response?.data?.error?.message[0])
toast(error.response?.data?.error?.message[0], 'error')
}
})
} else {
src/pages/users/GroupCreate.tsx
+3 -3
View File
@@ -12,7 +12,7 @@ import CheckBoxComponent from '../../components/CheckBoxComponent'
import Textarea from '../../components/Textarea'
import { useNavigate } from 'react-router-dom'
import { Pages } from '../../config/Pages'
import { toast } from 'react-toastify'
import { toast } from '../../components/Toast';
import { ErrorType } from '../../helpers/types'
const GroupCreate: FC = () => {
@@ -42,11 +42,11 @@ const GroupCreate: FC = () => {
navigate(Pages.users.groupList)
},
onError: (error: ErrorType) => {
toast.error(error.response?.data?.error?.message[0])
toast(error.response?.data?.error?.message[0], 'error')
}
})
} else {
toast.error(t('user.error_count_users'))
toast(t('user.error_count_users'), 'error')
}
}
})
src/pages/users/List.tsx
+3 -3
View File
@@ -9,7 +9,7 @@ import { Pages } from '../../config/Pages'
import { useDeleteUser, useGetUsers } from './hooks/useUserData'
import { UserItemType } from './types/UserTypes'
import PageLoading from '../../components/PageLoading'
import { toast } from 'react-toastify'
import { toast } from '../../components/Toast';
import { ErrorType } from '../../helpers/types'
import Pagination from '../../components/Pagination'
const UsersList: FC = () => {
@@ -24,11 +24,11 @@ const UsersList: FC = () => {
const handleDeleteUser = (id: string) => {
deleteUser.mutate(id, {
onSuccess: () => {
toast.success(t('success'))
toast(t('success'), 'success')
getUsers.refetch()
},
onError: (error: ErrorType) => {
toast.error(error.response?.data?.error?.message[0])
toast(error.response?.data?.error?.message[0], 'error')
}
})
}
src/pages/users/RoleCreate.tsx
+3 -3
View File
@@ -12,7 +12,7 @@ import * as Yup from 'yup'
import { useNavigate } from 'react-router-dom'
import { Pages } from '../../config/Pages'
import { ErrorType } from '../../helpers/types'
import { toast } from 'react-toastify'
import { toast } from '../../components/Toast';
const RoleCreate: FC = () => {
@@ -48,11 +48,11 @@ const RoleCreate: FC = () => {
navigate(Pages.users.roleList)
},
onError: (error: ErrorType) => {
toast.error(error.response?.data?.error?.message[0])
toast(error.response?.data?.error?.message[0], 'error')
}
})
} else {
toast.error(t('user.error_count_permission'))
toast(t('user.error_count_permission'), 'error')
}
}
})
src/pages/users/RoleUpdate.tsx
+4 -4
View File
@@ -12,7 +12,7 @@ import * as Yup from 'yup'
import { useNavigate, useParams } from 'react-router-dom'
import { Pages } from '../../config/Pages'
import { ErrorType } from '../../helpers/types'
import { toast } from 'react-toastify'
import { toast } from '../../components/Toast';
const RoleUpdate: FC = () => {
@@ -46,15 +46,15 @@ const RoleUpdate: FC = () => {
values.permissions = permissions
updateRole.mutate({ id: id || '', params: values }, {
onSuccess: () => {
toast.success(t('success'))
toast(t('success'), 'success')
navigate(Pages.users.roleList)
},
onError: (error: ErrorType) => {
toast.error(error.response?.data?.error?.message[0])
toast(error.response?.data?.error?.message[0], 'error')
}
})
} else {
toast.error(t('user.error_count_permission'))
toast(t('user.error_count_permission'), 'error')
}
}
})
src/pages/users/Update.tsx
+4 -4
View File
@@ -10,7 +10,7 @@ import { CreateUserType, RoleItemType } from './types/UserTypes'
import * as Yup from 'yup'
import { useSingleUpload } from '../service/hooks/useServiceData'
import { useGetRoles, useGetUserDetail, useUpdateUser } from './hooks/useUserData'
import { toast } from 'react-toastify'
import { toast } from '../../components/Toast';
import { ErrorType } from '../../helpers/types'
import { useNavigate, useParams } from 'react-router-dom'
import { Pages } from '../../config/Pages'
@@ -28,11 +28,11 @@ const UpdateUser: FC = () => {
const handleUpdateUser = (values: CreateUserType) => {
updateUser.mutate({ id: id || '', params: values }, {
onSuccess: () => {
toast.success(t('success'))
toast(t('success'), 'success')
navigate(Pages.users.list)
},
onError: (error: ErrorType) => {
toast.error(error.response?.data?.error?.message[0])
toast(error.response?.data?.error?.message[0], 'error')
}
})
}
@@ -69,7 +69,7 @@ const UpdateUser: FC = () => {
handleUpdateUser(values)
},
onError: (error: ErrorType) => {
toast.error(error.response?.data?.error?.message[0])
toast(error.response?.data?.error?.message[0], 'error')
}
})
} else {