CRM/Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CFE-6 notification bug fix

Browse Source
This commit is contained in:
Mohammad Jalali
2023-10-30 16:35:08 +03:30
parent 3be39d451c
commit 73ca237817
10 changed files with 102 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/components/notifications/ErrorNotification.jsx
View File

@@ -1,9 +1,11 @@
import DangerousIcon from "@mui/icons-material/Dangerous";
import {Box, Typography} from "@mui/material";
import {toast} from "react-toastify";
import useToast from "@/lib/app/hooks/useToast";
const ErrorNotification = (t, status, message) => {
toast(
const ErrorNotification = (notificationType, t, status, message) => {
const {pushToastList} = useToast();
const toastId = toast(
() => (
<>
<Box
@@ -35,6 +37,7 @@ const ErrorNotification = (t, status, message) => {
draggable: false,
}
);
pushToastList(notificationType, toastId);
};
export default ErrorNotification;

11
src/core/components/notifications/PendingNotification.jsx
View File

@@ -1,14 +1,17 @@
import {toast} from "react-toastify";
import useToast from "@/lib/app/hooks/useToast";
let a = {pending: []}
const PendingNotification = (t) => {
toast(t("notifications.pending"), {
const PendingNotification = (notificationType, t) => {
const {pushToastList} = useToast();
const toastId = toast(t("notifications.pending"), {
containerId: 'validation',
autoClose: false,
closeButton: false,
closeOnClick: false,
draggable: false,
})
});
pushToastList(notificationType, toastId);
};
export default PendingNotification;

5
src/core/components/notifications/SuccessNotification.jsx
View File

@@ -2,8 +2,8 @@ import BeenhereIcon from "@mui/icons-material/Beenhere";
import {Box, Typography} from "@mui/material";
import {toast} from "react-toastify";
const SuccessNotification = (t, status) => {
toast(
const SuccessNotification = (notificationType, t, status) => {
const toastId = toast(
() => (
<>
<Box
@@ -38,6 +38,7 @@ const SuccessNotification = (t, status) => {
draggable: true,
}
);
notification_type_id.success.push(toastId);
};
export default SuccessNotification;

5
src/core/components/notifications/WarningNotification.jsx
View File

@@ -2,8 +2,8 @@ import ReportIcon from "@mui/icons-material/Report";
import {Box, Typography} from "@mui/material";
import {toast} from "react-toastify";
const WarningNotification = (t, status) => {
toast(
const WarningNotification = (notificationType, t, status) => {
const toastId = toast(
() => (
<>
<Box
@@ -36,6 +36,7 @@ const WarningNotification = (t, status) => {
draggable: false,
}
);
notification_type_id.warning.push(toastId);
};
export default WarningNotification;

32
src/core/components/notifications/index.jsx
View File

@@ -4,21 +4,23 @@ import ErrorNotification from "@/core/components/notifications/ErrorNotification
import SuccessNotification from "@/core/components/notifications/SuccessNotification";
const Notifications = (notificationType, t, status, message) => {
let notification_type_id = {
pending: [],
error: [],
warning: [],
success: []
}
if (notificationType === "pending") {
pendingNotification(t);
} else if (notificationType === "warning") {
WarningNotification(t, status);
} else if (notificationType === "error") {
message ? ErrorNotification(t, status, message) : ErrorNotification(t, status);
} else if (notificationType === "success") {
SuccessNotification(t, status);
switch (notificationType) {
case "pending":
pendingNotification(notificationType, t);
break;
case "warning":
WarningNotification(notificationType, t, status);
break;
case "error":
if (message) {
ErrorNotification(notificationType, t, status, message)
} else {
ErrorNotification(notificationType, t, status)
}
break;
case "success":
SuccessNotification(notificationType, t, status);
break;
}
};

3
src/layouts/DashboardLayout.jsx
View File

@@ -1,4 +1,3 @@
import CallWidget from "src/components/layouts/Dashboard/CallWidget";
import Dashboard from "src/components/layouts/Dashboard";
const DashboardLayout = (props) => {
@@ -6,7 +5,7 @@ const DashboardLayout = (props) => {
return (
<>
<Dashboard {...props}/>
<CallWidget/>
{/*<CallWidget/>*/}
</>
);
};

30
src/lib/app/contexts/toast.jsx Normal file
View File

@@ -0,0 +1,30 @@
import {createContext, useReducer} from "react";
export const ToastContext = createContext()
const reducer = (state, action) => {
switch (action.type) {
case "PUSH":
return {
...state,
[action.toast_type]: [...state[action.toast_type], action.toast_id]
};
}
};
export const ToastProvider = ({children}) => {
const [state, dispatch] = useReducer(reducer, {
pending: [],
error: [],
warning: [],
success: []
});
console.log(state)
return (
<ToastContext.Provider value={{state, dispatch}}>
{children}
</ToastContext.Provider>
);
};

4
src/lib/app/hooks/useRequest.jsx
View File

@@ -5,6 +5,7 @@ import useUser from "@/lib/app/hooks/useUser";
import {errorRequest, errorResponse, errorSetting} from "@/core/utils/errorHandler";
import useNetwork from "@/lib/app/hooks/useNetwork";
import Notifications from "@/core/components/notifications";
import useToast from "@/lib/app/hooks/useToast";
const defaultOptions = {
auth: false, data: {}, requestOptions: {
@@ -23,6 +24,7 @@ const useRequest = (initOptions) => {
const network = useNetwork()
const t = useTranslations()
const {token, clearToken} = useUser()
const {pushToastList} = useToast();
let _options = {...defaultOptions, ...initOptions}
function requestServer(url = '', method = 'get', options) {
@@ -33,13 +35,13 @@ const useRequest = (initOptions) => {
headers: {..._options.requestOptions.headers, authorization: `Bearer ${token}`}
}
}
return new Promise((resolve, reject) => {
if (!network.online) {
reject()
return
}
if (_options.notification && _options.failed.notification.show && _options.pending) Notifications("pending", t)
axios({
url: url, method: method, data: _options.data, ..._options.requestOptions
})

22
src/lib/app/hooks/useToast.jsx Normal file
View File

@@ -0,0 +1,22 @@
import {useContext} from "react";
import {ToastContext} from "@/lib/app/contexts/toast";
const useToast = () => {
const {state, dispatch} = useContext(ToastContext);
const pushToastList = (toast_type, toast_id) => {
console.log()
dispatch({type: "PUSH", toast_type, toast_id});
};
const dismissToastList = () => {
dispatch({type: "DISMISS"});
};
return {
pushToastList,
dismissToastList
}
};
export default useToast;

19
src/pages/_app.jsx
View File

@@ -8,21 +8,24 @@ import "moment/locale/fa";
import {NextIntlProvider} from "next-intl";
import TitlePage from "@/core/components/TitlePage";
import {SocketProvider} from "@/lib/app/contexts/socket";
import {ToastProvider} from "@/lib/app/contexts/toast";
const App = ({Component, pageProps}) => {
return (<>
<UserProvider>
<LanguageProvider>
<NextIntlProvider locale = {pageProps.locale} messages = {pageProps.messages || {}}>
<MuiLayout isBot = {pageProps.isBot}>
{pageProps.messages ? <TitlePage text = {pageProps.title}/> : ''}
<NextIntlProvider locale={pageProps.locale} messages={pageProps.messages || {}}>
<MuiLayout isBot={pageProps.isBot}>
{pageProps.messages ? <TitlePage text={pageProps.title}/> : ''}
<LoadingProvider>
<AppLayout isBot = {pageProps.isBot}>
<SocketProvider>
<Component {...pageProps} />
</SocketProvider>
</AppLayout>
<ToastProvider>
<AppLayout isBot={pageProps.isBot}>
<SocketProvider>
<Component {...pageProps} />
</SocketProvider>
</AppLayout>
</ToastProvider>
</LoadingProvider>
</MuiLayout>
</NextIntlProvider>