Merge pull request #1 from HoaAyWK/feat/update

Update structure

src/features/auth/authSlice.js → 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);
         }
     },

src/features/categories/categorySlice.js → 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();
 

src/features/comments/commentSlice.js → 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: [],

src/features/feedbacks/feedbackSlice.js → 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();
 

src/features/jobs/jobSlice.js → 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();
 

src/features/message/messageSlice.js → 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: '',

src/features/offers/offerSlice.js → 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: [],

src/features/payments/paymentSlice.js → 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();
 

src/features/points/pointSlice.js → 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();
 

src/features/statistic/statisticSlice.js → 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: [],

src/features/users/userSlice.js → 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();
 

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: {

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: {

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';
 
 

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}) => ({

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 }) => ({

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,

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 = [

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 = [

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';

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';
 

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,

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 = [
     {

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';

src/layouts/dashboard/index.js → 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';
 
 // ----------------------------------------------------------------------

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';
 
 

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';
 

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',

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 = {

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';
 

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';