From fb46a5b1ee969c89de905271105ee042ae755c0d Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Tue, 12 Jul 2022 11:58:19 +0430 Subject: [PATCH] update 8 files --- src/redux/actions/dashboard.js | 5 ++++- src/redux/reducers/dashboard.js | 4 ++++ src/router.js | 2 +- src/views/Auth/Profile/Upload/index.js | 2 +- src/views/Auth/Profile/index.js | 2 +- src/views/Dashboard/index.js | 16 +++++----------- src/views/Dashboard/layouts/Main/index.js | 4 ++-- src/views/Dashboard/layouts/SidebarMenu/index.js | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/redux/actions/dashboard.js b/src/redux/actions/dashboard.js index cf60725..1f17e8b 100644 --- a/src/redux/actions/dashboard.js +++ b/src/redux/actions/dashboard.js @@ -1,5 +1,8 @@ const dashboard = { - + setPage: + (data = {}) => + async (dispatch) => + dispatch({ type: "dashboard/setPage", data }), }; export default dashboard; diff --git a/src/redux/reducers/dashboard.js b/src/redux/reducers/dashboard.js index 0b4fded..815f685 100644 --- a/src/redux/reducers/dashboard.js +++ b/src/redux/reducers/dashboard.js @@ -3,6 +3,7 @@ import { toast } from "react-toastify"; const initialState = { loading: false, error: null, + page: localStorage.getItem("dashboardPage"), sidebar: { userInfo: true, menu: [ @@ -70,6 +71,9 @@ const initialState = { export default function dashboard(state = initialState, action) { let { type, data } = action; switch (type) { + case "dashboard/setPage": + localStorage.setItem("dashboardPage", data); + return { ...state, page: data }; default: return state; } diff --git a/src/router.js b/src/router.js index 428a1ce..dc20aa3 100644 --- a/src/router.js +++ b/src/router.js @@ -604,7 +604,7 @@ function Router({ } /> - {!isMobile ? : null} + {/* {!isMobile ? : null} */} diff --git a/src/views/Auth/Profile/Upload/index.js b/src/views/Auth/Profile/Upload/index.js index 11968f2..b3ed06e 100644 --- a/src/views/Auth/Profile/Upload/index.js +++ b/src/views/Auth/Profile/Upload/index.js @@ -15,7 +15,7 @@ function Upload({ name, value: initValue, onChange }) { return (
) : (
onSubmit()} > { - const [page, setPage] = useState( - localStorage?.getItem("dashboard") || "userItems" - ); - +export const Dashboard = ({ isMobile, headerOptions, setHeaderOptions, setPage, page }) => { useEffect(() => { setHeaderOptions(headerOptions); }, []); - useEffect(() => { - localStorage.setItem("dashboard", page); - }, [page]); - return isMobile ? (
@@ -42,11 +34,13 @@ export const Dashboard = ({ isMobile, headerOptions, setHeaderOptions }) => { }; const mapStateToProps = (state) => ({ - isMobile: state.publicApi.isMobile, + isMobile: state.config.device === 'mobile', + page: state.dashboard.page }); const mapDispatchToProps = { setHeaderOptions: publicApi.setHeaderOptions, + setPage: dashboard.setPage }; export default connect(mapStateToProps, mapDispatchToProps)(Dashboard); diff --git a/src/views/Dashboard/layouts/Main/index.js b/src/views/Dashboard/layouts/Main/index.js index 234e2dd..65714e4 100644 --- a/src/views/Dashboard/layouts/Main/index.js +++ b/src/views/Dashboard/layouts/Main/index.js @@ -13,7 +13,7 @@ import Profile from "../../../Auth/Profile"; const views = { orders: , - mybooks: , + myBooks: , userItems: , ticket: (
@@ -31,7 +31,7 @@ const views = { export const Main = ({ page }) => { return (
{views[page]}
diff --git a/src/views/Dashboard/layouts/SidebarMenu/index.js b/src/views/Dashboard/layouts/SidebarMenu/index.js index 274c2ef..fd2926a 100644 --- a/src/views/Dashboard/layouts/SidebarMenu/index.js +++ b/src/views/Dashboard/layouts/SidebarMenu/index.js @@ -118,7 +118,7 @@ const SidebarMenu = ({ className="bg-gray-50 py-5 border-l-2 border-t-2 border-b-2 pl-4 pr-2 shadow-sm border-gray-300 border-solid overflow-y-scroll no-scrollbar divide-y divide-solid divide-gray-200" style={{ height: "calc(100vh - 71px)", - minWidth: 300, + minWidth: 250, }} > {sidebar?.userInfo ? (