diff --git a/src/features/auth/authSlice.js b/src/app/slices/authSlice.js similarity index 91% rename from src/features/auth/authSlice.js rename to src/app/slices/authSlice.js index c57717a..4658de2 100644 --- a/src/features/auth/authSlice.js +++ b/src/app/slices/authSlice.js @@ -1,9 +1,8 @@ import axios from 'axios'; import { createSlice, createAsyncThunk } from "@reduxjs/toolkit"; -import { BASE_API_URL, action_status, MESSAGE_VARIANT } from '../../app/constants'; -import { setMessage } from '../message/messageSlice'; -import { ROLES } from '../../app/constants'; +import { BASE_API_URL, action_status, ROLES, MESSAGE_VARIANT } from '../constants'; +import { setMessage } from './messageSlice'; const initialState = { user: null, @@ -27,6 +26,7 @@ export const login = createAsyncThunk( throw new Error('You do not have permission to access this page'); } + console.log(response.data); return response.data.user; } catch (error) { const message = (error.response && error.response.data && error.response.data.message) @@ -105,7 +105,14 @@ const authSlice = createSlice({ state.changedPasswordStatus = action_status.IDLE; }, logout: (state, action) => { - state = initialState; + state.user = null; + state.isAuthenticated = false; + state.changedPasswordStatus = action_status.IDLE; + state.updateStatus = action_status.IDLE; + state.error = null; + state.status = action_status.IDLE; + state.changedPassword = false; + state.updated = false; localStorage.setItem('user', null); } }, diff --git a/src/features/categories/categorySlice.js b/src/app/slices/categorySlice.js similarity index 98% rename from src/features/categories/categorySlice.js rename to src/app/slices/categorySlice.js index f6fcfed..f852d80 100644 --- a/src/features/categories/categorySlice.js +++ b/src/app/slices/categorySlice.js @@ -1,8 +1,8 @@ import { createSlice, createAsyncThunk, createEntityAdapter } from '@reduxjs/toolkit'; import axios from 'axios'; -import { action_status, BASE_API_URL, MESSAGE_VARIANT } from '../../app/constants'; -import { setMessage } from '../message/messageSlice'; +import { action_status, BASE_API_URL, MESSAGE_VARIANT } from '../constants'; +import { setMessage } from './messageSlice'; const categoriesAdapter = createEntityAdapter(); diff --git a/src/features/comments/commentSlice.js b/src/app/slices/commentSlice.js similarity index 95% rename from src/features/comments/commentSlice.js rename to src/app/slices/commentSlice.js index bbafada..fa10e01 100644 --- a/src/features/comments/commentSlice.js +++ b/src/app/slices/commentSlice.js @@ -1,8 +1,8 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit'; import axios from 'axios'; -import { action_status, BASE_API_URL, MESSAGE_VARIANT } from '../../app/constants'; -import { setMessage } from '../message/messageSlice'; +import { action_status, BASE_API_URL, MESSAGE_VARIANT } from '../constants'; +import { setMessage } from './messageSlice'; const initialState = { comments: [], diff --git a/src/features/feedbacks/feedbackSlice.js b/src/app/slices/feedbackSlice.js similarity index 96% rename from src/features/feedbacks/feedbackSlice.js rename to src/app/slices/feedbackSlice.js index 1bc95a7..f219a84 100644 --- a/src/features/feedbacks/feedbackSlice.js +++ b/src/app/slices/feedbackSlice.js @@ -1,6 +1,7 @@ import { createAsyncThunk, createSlice, createEntityAdapter, createSelector } from '@reduxjs/toolkit'; import axios from 'axios'; -import { action_status, BASE_API_URL } from '../../app/constants'; + +import { action_status, BASE_API_URL } from '../constants'; const feedbacksAdapter = createEntityAdapter(); diff --git a/src/features/jobs/jobSlice.js b/src/app/slices/jobSlice.js similarity index 95% rename from src/features/jobs/jobSlice.js rename to src/app/slices/jobSlice.js index ff5421f..9afff21 100644 --- a/src/features/jobs/jobSlice.js +++ b/src/app/slices/jobSlice.js @@ -1,7 +1,7 @@ import axios from 'axios'; import { createSlice, createAsyncThunk, createEntityAdapter, createSelector } from "@reduxjs/toolkit"; -import { action_status, BASE_API_URL } from '../../app/constants'; +import { action_status, BASE_API_URL } from '../constants'; const jobsAdapter = createEntityAdapter(); diff --git a/src/features/message/messageSlice.js b/src/app/slices/messageSlice.js similarity index 91% rename from src/features/message/messageSlice.js rename to src/app/slices/messageSlice.js index e529e8d..b2ca88b 100644 --- a/src/features/message/messageSlice.js +++ b/src/app/slices/messageSlice.js @@ -1,6 +1,6 @@ import { createSlice } from '@reduxjs/toolkit'; -import { MESSAGE_VARIANT } from '../../app/constants'; +import { MESSAGE_VARIANT } from '../constants'; const initialState = { message: '', diff --git a/src/features/offers/offerSlice.js b/src/app/slices/offerSlice.js similarity index 95% rename from src/features/offers/offerSlice.js rename to src/app/slices/offerSlice.js index d729e8d..00811c8 100644 --- a/src/features/offers/offerSlice.js +++ b/src/app/slices/offerSlice.js @@ -1,7 +1,8 @@ import axios from 'axios'; import { createAsyncThunk, createSlice } from '@reduxjs/toolkit'; -import { action_status, BASE_API_URL, MESSAGE_VARIANT } from '../../app/constants'; -import { setMessage } from '../message/messageSlice'; + +import { action_status, BASE_API_URL, MESSAGE_VARIANT } from '../constants'; +import { setMessage } from './messageSlice'; const initialState = { offers: [], diff --git a/src/features/payments/paymentSlice.js b/src/app/slices/paymentSlice.js similarity index 96% rename from src/features/payments/paymentSlice.js rename to src/app/slices/paymentSlice.js index 013c3b0..1875a7f 100644 --- a/src/features/payments/paymentSlice.js +++ b/src/app/slices/paymentSlice.js @@ -1,6 +1,7 @@ import axios from 'axios'; import { createSlice, createAsyncThunk, createEntityAdapter, createSelector } from "@reduxjs/toolkit"; -import { action_status, BASE_API_URL } from "../../app/constants"; + +import { action_status, BASE_API_URL } from "../constants"; const paymentsAdapter = createEntityAdapter(); diff --git a/src/features/points/pointSlice.js b/src/app/slices/pointSlice.js similarity index 95% rename from src/features/points/pointSlice.js rename to src/app/slices/pointSlice.js index 083fdba..c027a48 100644 --- a/src/features/points/pointSlice.js +++ b/src/app/slices/pointSlice.js @@ -1,8 +1,7 @@ import axios from "axios"; import { createSlice, createAsyncThunk, createEntityAdapter } from "@reduxjs/toolkit"; -import { action_status, BASE_API_URL } from "../../app/constants"; -import { setMessage } from "../message/messageSlice"; -import { MESSAGE_VARIANT } from "../../app/constants"; +import { action_status, BASE_API_URL, MESSAGE_VARIANT } from "../constants"; +import { setMessage } from "./messageSlice"; const pointsAdapter = createEntityAdapter(); diff --git a/src/features/statistic/statisticSlice.js b/src/app/slices/statisticSlice.js similarity index 94% rename from src/features/statistic/statisticSlice.js rename to src/app/slices/statisticSlice.js index d2205ce..0a6bdea 100644 --- a/src/features/statistic/statisticSlice.js +++ b/src/app/slices/statisticSlice.js @@ -1,6 +1,7 @@ import { createSlice, createAsyncThunk } from "@reduxjs/toolkit"; import axios from "axios"; -import { action_status, BASE_API_URL } from "../../app/constants"; + +import { action_status, BASE_API_URL } from "../constants"; const initialState = { statistic: [], diff --git a/src/features/users/userSlice.js b/src/app/slices/userSlice.js similarity index 97% rename from src/features/users/userSlice.js rename to src/app/slices/userSlice.js index 6aa1d4c..a10404a 100644 --- a/src/features/users/userSlice.js +++ b/src/app/slices/userSlice.js @@ -1,8 +1,8 @@ import { createAsyncThunk, createSlice, createEntityAdapter } from "@reduxjs/toolkit"; import axios from 'axios'; -import { action_status, BASE_API_URL, MESSAGE_VARIANT } from '../../app/constants'; -import { setMessage } from '../message/messageSlice'; +import { action_status, BASE_API_URL, MESSAGE_VARIANT } from '../constants'; +import { setMessage } from './messageSlice'; const usersAdapter = createEntityAdapter(); diff --git a/src/app/store.js b/src/app/store.js index dbbbed1..1b79c9a 100644 --- a/src/app/store.js +++ b/src/app/store.js @@ -1,15 +1,15 @@ import { configureStore } from '@reduxjs/toolkit'; -import authReducer from '../features/auth/authSlice'; -import jobReducer from '../features/jobs/jobSlice'; -import messageReducer from '../features/message/messageSlice'; -import categoryReducer from '../features/categories/categorySlice'; -import userReducer from '../features/users/userSlice'; -import pointReducer from '../features/points/pointSlice'; -import paymentReducer from '../features/payments/paymentSlice'; -import statisticReducer from '../features/statistic/statisticSlice'; -import feedbackReducer from '../features/feedbacks/feedbackSlice'; -import commentReducer from '../features/comments/commentSlice'; -import offerReducer from '../features/offers/offerSlice' +import authReducer from './slices/authSlice'; +import jobReducer from './slices/jobSlice'; +import messageReducer from './slices/messageSlice'; +import categoryReducer from './slices/categorySlice'; +import userReducer from './slices/userSlice'; +import pointReducer from './slices/pointSlice'; +import paymentReducer from './slices/paymentSlice'; +import statisticReducer from './slices/statisticSlice'; +import feedbackReducer from './slices/feedbackSlice'; +import commentReducer from './slices/commentSlice'; +import offerReducer from './slices/offerSlice' export const store = configureStore({ reducer: { diff --git a/src/components/chart/EarningChart.jsx b/src/components/chart/EarningChart.jsx index 73e0f8a..047a4a9 100644 --- a/src/components/chart/EarningChart.jsx +++ b/src/components/chart/EarningChart.jsx @@ -5,7 +5,7 @@ import ReactApexChart from 'react-apexcharts'; import { useEffect } from 'react'; import { action_status } from '../../app/constants'; -import { getStatistic } from '../../features/statistic/statisticSlice'; +import { getStatistic } from '../../app/slices/statisticSlice'; const earningChartOptions = { chart: { diff --git a/src/features/account/AccountForm.jsx b/src/features/account/AccountForm.jsx index b2940f0..e22bd84 100644 --- a/src/features/account/AccountForm.jsx +++ b/src/features/account/AccountForm.jsx @@ -6,12 +6,12 @@ import { yupResolver } from '@hookform/resolvers/yup'; import { Box, Paper, Grid } from '@mui/material'; import { LoadingButton } from '@mui/lab'; import { useSnackbar } from 'notistack'; +import { useDispatch, useSelector } from 'react-redux'; import { RHFTextField, RHFRadioGroup, FormProvider } from '../../components/hook-form'; import AvatarUploader from './AvatarUploader'; -import { useDispatch, useSelector } from 'react-redux'; -import { refresh, updateAccount } from '../auth/authSlice'; -import { clearMessage } from '../message/messageSlice'; +import { refresh, updateAccount } from '../../app/slices/authSlice'; +import { clearMessage } from '../../app/slices/messageSlice'; import { action_status } from '../../app/constants'; diff --git a/src/features/account/ChangePasswordFrom.jsx b/src/features/account/ChangePasswordFrom.jsx index 6e9e1cf..71db24e 100644 --- a/src/features/account/ChangePasswordFrom.jsx +++ b/src/features/account/ChangePasswordFrom.jsx @@ -7,11 +7,11 @@ import { Box, Paper, Stack } from '@mui/material'; import { LoadingButton } from '@mui/lab'; import { useSnackbar } from 'notistack'; import { useNavigate } from 'react-router-dom'; +import { useDispatch, useSelector } from 'react-redux'; import { RHFTextField, FormProvider } from '../../components/hook-form'; -import { useDispatch, useSelector } from 'react-redux'; -import { changePassword, refresh } from '../auth/authSlice'; -import { clearMessage } from '../message/messageSlice'; +import { changePassword, refresh } from '../../app/slices/authSlice'; +import { clearMessage } from '../../app/slices/messageSlice'; import { action_status } from '../../app/constants'; const PaperStyle = styled(Paper)(({theme}) => ({ diff --git a/src/features/auth/login/LoginForm.jsx b/src/features/auth/login/LoginForm.jsx index 0ef847c..3668e08 100644 --- a/src/features/auth/login/LoginForm.jsx +++ b/src/features/auth/login/LoginForm.jsx @@ -7,10 +7,10 @@ import { LoadingButton } from '@mui/lab'; import * as Yup from 'yup'; import { useDispatch, useSelector } from 'react-redux'; -import { login } from '../../../features/auth/authSlice'; +import { login } from '../../../app/slices/authSlice'; import Iconify from '../../../components/Iconify'; import { FormProvider, RHFTextField, RHFCheckbox } from '../../../components/hook-form'; -import { clearMessage } from '../../message/messageSlice'; +import { clearMessage } from '../../../app/slices/messageSlice'; import { action_status } from '../../../app/constants'; const AlertStyle = styled(Alert)(({ theme }) => ({ diff --git a/src/features/categories/CategoryForm.jsx b/src/features/categories/CategoryForm.jsx index 7e3b357..2812dc1 100644 --- a/src/features/categories/CategoryForm.jsx +++ b/src/features/categories/CategoryForm.jsx @@ -9,9 +9,9 @@ import { LoadingButton } from '@mui/lab'; import { Link as RouterLink, useNavigate } from 'react-router-dom'; import { FormProvider, RHFTextField, RHFSelect } from '../../components/hook-form'; -import { getCategories, refresh, selectAllCategories } from './categorySlice'; +import { getCategories, refresh, selectAllCategories } from '../../app/slices/categorySlice'; import { action_status, MESSAGE_VARIANT } from '../../app/constants'; -import { setMessage } from '../message/messageSlice'; +import { setMessage } from '../../app/slices/messageSlice'; const PaperStyle = styled(Paper)(({ theme }) => ({ color: theme.palette.main, diff --git a/src/features/comments/UserCommentsTable.jsx b/src/features/comments/UserCommentsTable.jsx index d64def8..a2274e9 100644 --- a/src/features/comments/UserCommentsTable.jsx +++ b/src/features/comments/UserCommentsTable.jsx @@ -25,7 +25,7 @@ import MoreMenuItem from '../../components/tables/MoreMenuItem'; import { fDate } from '../../utils/formatTime'; import SimpleTableListHead from '../../components/tables/SimpleTableListHead'; import Iconify from '../../components/Iconify'; -import { getCommentsByUser } from './commentSlice'; +import { getCommentsByUser } from '../../app/slices/commentSlice'; import LetterAvatar from '../../components/LetterAvatar'; const TABLE_HEAD = [ diff --git a/src/features/jobs/UserJobTable.jsx b/src/features/jobs/UserJobTable.jsx index fc959bf..46953f3 100644 --- a/src/features/jobs/UserJobTable.jsx +++ b/src/features/jobs/UserJobTable.jsx @@ -23,9 +23,8 @@ import Label from '../../components/Label'; import { action_status } from '../../app/constants'; import { MoreMenu } from '../../components/tables'; import MoreMenuItem from '../../components/tables/MoreMenuItem'; -import { getJobs } from './jobSlice'; import { fDate } from '../../utils/formatTime'; -import { selectJobsByUser } from './jobSlice'; +import { selectJobsByUser, getJobs } from '../../app/slices/jobSlice'; import SimpleTableListHead from '../../components/tables/SimpleTableListHead'; const TABLE_HEAD = [ diff --git a/src/features/payments/RecentPaymentsTable.jsx b/src/features/payments/RecentPaymentsTable.jsx index 3579524..54615c7 100644 --- a/src/features/payments/RecentPaymentsTable.jsx +++ b/src/features/payments/RecentPaymentsTable.jsx @@ -1,10 +1,10 @@ import React, { useState, useEffect } from 'react'; import { Link as RouterLink } from 'react-router-dom'; -import { Avatar, Box, Button, Container, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Typography } from '@mui/material'; -import { getPayments, selectPaymentsByNumber } from './paymentSlice'; +import { Avatar, Box, Button, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Typography } from '@mui/material'; import { useDispatch, useSelector } from 'react-redux'; import { sentenceCase } from 'change-case'; +import { getPayments, selectPaymentsByNumber } from '../../app/slices/paymentSlice'; import { action_status } from '../../app/constants'; import LetterAvatar from '../../components/LetterAvatar'; import Label from '../../components/Label'; diff --git a/src/features/payments/UserPaymentTable.jsx b/src/features/payments/UserPaymentTable.jsx index 2f44951..90e74b3 100644 --- a/src/features/payments/UserPaymentTable.jsx +++ b/src/features/payments/UserPaymentTable.jsx @@ -20,7 +20,7 @@ import { action_status } from '../../app/constants'; import { MoreMenu } from '../../components/tables'; import MoreMenuItem from '../../components/tables/MoreMenuItem'; import { fDate } from '../../utils/formatTime'; -import { getPayments, selectPaymentsByUser } from './paymentSlice' +import { getPayments, selectPaymentsByUser } from '../../app/slices/paymentSlice' import SimpleTableListHead from '../../components/tables/SimpleTableListHead'; import Iconify from '../../components/Iconify'; diff --git a/src/features/points/PointForm.jsx b/src/features/points/PointForm.jsx index 55b002a..07a1cd5 100644 --- a/src/features/points/PointForm.jsx +++ b/src/features/points/PointForm.jsx @@ -10,7 +10,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { useSnackbar } from 'notistack'; import { FormProvider, RHFTextField } from '../../components/hook-form'; -import { refresh } from './pointSlice'; +import { refresh } from '../../app/slices/pointSlice'; const PaperStyle = styled(Paper)(({ theme }) => ({ color: theme.palette.main, diff --git a/src/layouts/dashboard/AccountPopover.jsx b/src/layouts/dashboard/AccountPopover.jsx index 45d4863..c4b0897 100644 --- a/src/layouts/dashboard/AccountPopover.jsx +++ b/src/layouts/dashboard/AccountPopover.jsx @@ -5,7 +5,7 @@ import { Box, Divider, Typography, Stack, MenuItem, Avatar, IconButton } from '@ import { useDispatch } from 'react-redux'; import MenuPopover from '../../components/MenuPopover'; -import { logout } from '../../features/auth/authSlice'; +import { logout } from '../../app/slices/authSlice'; const MENU_OPTIONS = [ { diff --git a/src/layouts/dashboard/DashboardSidebar.jsx b/src/layouts/dashboard/DashboardSidebar.jsx index a796167..ce23065 100644 --- a/src/layouts/dashboard/DashboardSidebar.jsx +++ b/src/layouts/dashboard/DashboardSidebar.jsx @@ -2,7 +2,6 @@ import React, { useEffect } from 'react'; import { Link as RouterLink, useLocation } from 'react-router-dom'; import { styled } from '@mui/material/styles'; import { Box, Link, Drawer, Typography, Avatar, Stack } from '@mui/material'; -import { useSelector } from 'react-redux'; import useResponsive from '../../hooks/useResponsive'; import Logo from '../../components/Logo'; diff --git a/src/layouts/dashboard/index.js b/src/layouts/dashboard/index.jsx similarity index 96% rename from src/layouts/dashboard/index.js rename to src/layouts/dashboard/index.jsx index 4571102..5281cb6 100644 --- a/src/layouts/dashboard/index.js +++ b/src/layouts/dashboard/index.jsx @@ -5,7 +5,7 @@ import { useDispatch, useSelector } from 'react-redux'; import DashboardNavbar from './DashboardNavbar'; import DashboardSidebar from './DashboardSidebar'; -import { getCurrentUser } from '../../features/auth/authSlice'; +import { getCurrentUser } from '../../app/slices/authSlice'; import useLocalStorage from '../../hooks/useLocalStorage.js'; // ---------------------------------------------------------------------- diff --git a/src/pages/AccountSettings.jsx b/src/pages/AccountSettings.jsx index 42f5add..a87a625 100644 --- a/src/pages/AccountSettings.jsx +++ b/src/pages/AccountSettings.jsx @@ -6,9 +6,8 @@ import { TabContext, TabList, TabPanel } from '@mui/lab'; import Page from '../components/Page'; import BreadcrumbRouter from '../components/BreadcrumbRouter'; -import Iconify from '../components/Iconify'; import useLocalStorage from '../hooks/useLocalStorage'; -import { getCurrentUser } from '../features/auth/authSlice'; +import { getCurrentUser } from '../app/slices/authSlice'; import { AccountForm, ChangePasswordForm } from '../features/account'; diff --git a/src/pages/Category.jsx b/src/pages/Category.jsx index 1c44497..025d52d 100644 --- a/src/pages/Category.jsx +++ b/src/pages/Category.jsx @@ -24,11 +24,11 @@ import { useSnackbar } from 'notistack'; import Page from '../components/Page'; import Iconify from '../components/Iconify'; import SearchNotFound from '../components/SearchNotFound'; -import { deleteCategory, getCategories, refresh, selectAllCategories } from '../features/categories/categorySlice'; +import { deleteCategory, getCategories, refresh, selectAllCategories } from '../app/slices/categorySlice'; import { action_status } from '../app/constants'; import { TableListHead, TableListToolbar, MoreMenu } from '../components/tables'; import { fDateTimeSuffix } from '../utils/formatTime'; -import { clearMessage } from '../features/message/messageSlice'; +import { clearMessage } from '../app/slices/messageSlice'; import MoreMenuLinkItem from '../components/tables/MoreMenuLinkItem'; import MoreMenuItem from '../components/tables/MoreMenuItem'; diff --git a/src/pages/CreateCategory.jsx b/src/pages/CreateCategory.jsx index ba3370f..b968fc6 100644 --- a/src/pages/CreateCategory.jsx +++ b/src/pages/CreateCategory.jsx @@ -6,8 +6,8 @@ import { useSnackbar } from 'notistack'; import BreadcrumbsRouter from '../components/BreadcrumbRouter'; import Page from '../components/Page'; import CategoryForm from '../features/categories/CategoryForm'; -import { clearMessage } from '../features/message/messageSlice'; -import { createCategory } from '../features/categories/categorySlice'; +import { clearMessage } from '../app/slices/messageSlice'; +import { createCategory } from '../app/slices/categorySlice'; const breadcrumbNameMap = { '': 'Dashboard', diff --git a/src/pages/CreatePoint.jsx b/src/pages/CreatePoint.jsx index eb4a04e..fef11ea 100644 --- a/src/pages/CreatePoint.jsx +++ b/src/pages/CreatePoint.jsx @@ -5,8 +5,8 @@ import { useSnackbar } from 'notistack'; import BreadcrumbsRouter from '../components/BreadcrumbRouter'; import Page from '../components/Page'; -import { clearMessage } from '../features/message/messageSlice'; -import { createPoint } from '../features/points/pointSlice'; +import { clearMessage } from '../app/slices/messageSlice'; +import { createPoint } from '../app/slices/pointSlice'; import PointForm from '../features/points/PointForm'; const breadcrumbNameMap = { diff --git a/src/pages/DashboardApp.jsx b/src/pages/DashboardApp.jsx index 4d88e65..1f32aa6 100644 --- a/src/pages/DashboardApp.jsx +++ b/src/pages/DashboardApp.jsx @@ -19,13 +19,12 @@ import { useDispatch, useSelector } from 'react-redux'; import Page from '../components/Page'; import LetterAvatar from '../components/LetterAvatar'; -import Iconify from '../components/Iconify'; import { EarningCard, TotalUserCard } from '../features/dashboard'; import EarningChart from '../components/chart/EarningChart'; import { action_status } from '../app/constants'; -import { getStatistic } from '../features/statistic/statisticSlice'; +import { getStatistic } from '../app/slices/statisticSlice'; import MainCard from '../components/MainCard'; -import { getFeedbacks, selectFeedbackByNumber } from '../features/feedbacks/feedbackSlice'; +import { getFeedbacks, selectFeedbackByNumber } from '../app/slices/feedbackSlice'; import { fToNow } from '../utils/formatTime'; import RecentPaymentsTable from '../features/payments/RecentPaymentsTable'; diff --git a/src/pages/Job.jsx b/src/pages/Job.jsx index 4dd929c..45ac0ef 100644 --- a/src/pages/Job.jsx +++ b/src/pages/Job.jsx @@ -28,9 +28,8 @@ import Label from '../components/Label'; import SearchNotFound from '../components/SearchNotFound'; import { action_status } from '../app/constants'; import { TableListHead, TableListToolbar, MoreMenu } from '../components/tables'; -import { clearMessage } from '../features/message/messageSlice'; import MoreMenuItem from '../components/tables/MoreMenuItem'; -import { getJobs, selectAllJobs } from '../features/jobs/jobSlice'; +import { getJobs, selectAllJobs } from '../app/slices/jobSlice'; import { fDate } from '../utils/formatTime'; import LetterAvatar from '../components/LetterAvatar'; import MoreMenuLinkItem from '../components/tables/MoreMenuLinkItem'; diff --git a/src/pages/JobDetails.jsx b/src/pages/JobDetails.jsx index c3c6c92..c6982fa 100644 --- a/src/pages/JobDetails.jsx +++ b/src/pages/JobDetails.jsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react'; +import React, { useEffect } from 'react'; import { styled } from '@mui/material/styles'; import { Avatar, @@ -12,24 +12,19 @@ import { Divider, Card, CardContent, - TableContainer, - TableBody, - TableRow, - TableCell, Button } from '@mui/material'; import { useSelector, useDispatch } from 'react-redux'; import { useParams, Link as RouterLink } from 'react-router-dom'; import Page from '../components/Page'; -import { getJobs, selectJobById } from '../features/jobs/jobSlice'; +import { getJobs, selectJobById } from '../app/slices/jobSlice'; import { action_status } from '../app/constants'; import LetterAvatar from '../components/LetterAvatar'; import Label from '../components/Label'; -import { fDate, fDateTime } from '../utils/formatTime'; -import Iconify from '../components/Iconify'; +import { fDate } from '../utils/formatTime'; import JobInfoLine from '../features/jobs/JobInfoLine'; -import { getOffersByJob } from '../features/offers/offerSlice'; +import { getOffersByJob } from '../app/slices/offerSlice'; import Offer from '../features/offers/Offer'; const PaperStyle = styled(Paper)(({ theme }) => ({ diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx index c2e628a..cfaa930 100644 --- a/src/pages/Login.jsx +++ b/src/pages/Login.jsx @@ -1,8 +1,8 @@ -import React, { useState, useEffect } from 'react'; +import React, { useEffect } from 'react'; import { Link as RouterLink } from 'react-router-dom'; import { styled } from '@mui/material/styles'; import { Card, Link, Container, Typography } from '@mui/material'; -import { useSelector, useDispatch } from 'react-redux'; +import { useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; import useResponsive from '../hooks/useResponsive'; @@ -10,7 +10,6 @@ import Page from '../components/Page'; import Logo from '../components/Logo'; import { LoginForm } from '../features/auth/login'; import { action_status } from '../app/constants'; -import { clearMessage } from '../features/message/messageSlice'; const RootStyle = styled('div')(({ theme }) => ({ [theme.breakpoints.up('md')]: { diff --git a/src/pages/Payment.jsx b/src/pages/Payment.jsx index 9a587c1..c1c6ed8 100644 --- a/src/pages/Payment.jsx +++ b/src/pages/Payment.jsx @@ -26,9 +26,8 @@ import Label from '../components/Label'; import SearchNotFound from '../components/SearchNotFound'; import { action_status } from '../app/constants'; import { TableListHead, TableListToolbar, MoreMenu } from '../components/tables'; -import { clearMessage } from '../features/message/messageSlice'; import MoreMenuItem from '../components/tables/MoreMenuItem'; -import { getPayments, selectAllPayments } from '../features/payments/paymentSlice'; +import { getPayments, selectAllPayments } from '../app/slices/paymentSlice'; import { fDateTimeSuffix } from '../utils/formatTime'; import LetterAvatar from '../components/LetterAvatar'; diff --git a/src/pages/Point.jsx b/src/pages/Point.jsx index 16f2ea1..c629f07 100644 --- a/src/pages/Point.jsx +++ b/src/pages/Point.jsx @@ -26,9 +26,9 @@ import Iconify from '../components/Iconify'; import SearchNotFound from '../components/SearchNotFound'; import { action_status } from '../app/constants'; import { TableListHead, TableListToolbar, MoreMenu } from '../components/tables'; -import { clearMessage } from '../features/message/messageSlice'; +import { clearMessage } from '../app/slices/messageSlice'; import MoreMenuItem from '../components/tables/MoreMenuItem'; -import { selectAllPoints, refresh, getPoints, deletePoint } from '../features/points/pointSlice'; +import { selectAllPoints, refresh, getPoints, deletePoint } from '../app/slices/pointSlice'; const TABLE_HEAD = [ { id: 'name', label: 'Name', alignRight: false }, diff --git a/src/pages/Profile.jsx b/src/pages/Profile.jsx index 3ac127c..b2f71ef 100644 --- a/src/pages/Profile.jsx +++ b/src/pages/Profile.jsx @@ -5,7 +5,7 @@ import { Container, Box, Typography, Stack, Avatar, Grid, Link as MuiLink } from import Page from '../components/Page'; import BreadcrumbRouter from '../components/BreadcrumbRouter'; import { useDispatch, useSelector } from 'react-redux'; -import { getCurrentUser } from '../features/auth/authSlice'; +import { getCurrentUser } from '../app/slices/authSlice'; import Iconify from '../components/Iconify'; import CardInfo from '../components/CardInfo'; import LetterAvatar from '../components/LetterAvatar'; diff --git a/src/pages/UpdateCategory.jsx b/src/pages/UpdateCategory.jsx index f214198..85e9869 100644 --- a/src/pages/UpdateCategory.jsx +++ b/src/pages/UpdateCategory.jsx @@ -7,8 +7,8 @@ import { useParams } from 'react-router-dom'; import BreadcrumbsRouter from '../components/BreadcrumbRouter'; import Page from '../components/Page'; import CategoryForm from '../features/categories/CategoryForm'; -import { clearMessage } from '../features/message/messageSlice'; -import { selectCategoryById, updateCategory } from '../features/categories/categorySlice'; +import { clearMessage } from '../app/slices/messageSlice'; +import { selectCategoryById, updateCategory } from '../app/slices/categorySlice'; const breadcrumbNameMap = { '': 'Dashboard', diff --git a/src/pages/User.jsx b/src/pages/User.jsx index 06a5223..2913ed4 100644 --- a/src/pages/User.jsx +++ b/src/pages/User.jsx @@ -27,9 +27,9 @@ import Label from '../components/Label'; import SearchNotFound from '../components/SearchNotFound'; import { action_status } from '../app/constants'; import { TableListHead, TableListToolbar, MoreMenu } from '../components/tables'; -import { clearMessage } from '../features/message/messageSlice'; +import { clearMessage } from '../app/slices/messageSlice'; import MoreMenuItem from '../components/tables/MoreMenuItem'; -import { selectAllUsers, getAllUsers, banUser, refresh } from '../features/users/userSlice'; +import { selectAllUsers, getAllUsers, banUser, refresh } from '../app/slices/userSlice'; import LetterAvatar from '../components/LetterAvatar'; const TABLE_HEAD = [ diff --git a/src/pages/UserDetails.jsx b/src/pages/UserDetails.jsx index a565049..aad1e94 100644 --- a/src/pages/UserDetails.jsx +++ b/src/pages/UserDetails.jsx @@ -7,7 +7,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { useParams } from 'react-router-dom'; import { sentenceCase } from 'change-case'; -import { getAllUsers, selectUserById } from '../features/users/userSlice'; +import { getAllUsers, selectUserById } from '../app/slices/userSlice'; import Page from '../components/Page'; import { useEffect } from 'react'; import { action_status } from '../app/constants';