Amit
/
mui-demo-project
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of https://git.sentientgeeks.us/Amit/mui-demo-project

master
Amit Roy 6 months ago
parent
81e6aa98db e13cef605a
commit
54f0cdfa00
12 changed files with 51 additions and 20 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -0
      constant/route.constant.ts
  2. +1
    -0
      package.json
  3. +0
    -0
      src/app/(auth)/login/layout.tsx
  4. +0
    -0
      src/app/(auth)/login/loginPage.module.scss
  5. +3
    -2
      src/app/(auth)/login/page.tsx
  6. +0
    -0
      src/app/(dashboard)/products/page.tsx
  7. +10
    -6
      src/app/layout.tsx
  8. +2
    -1
      src/components/wrapper/dashboardWrapper.tsx
  9. +2
    -1
      src/hoc/authGuard/authGuard.tsx
  10. +3
    -2
      src/services/axios/axiosInstance.ts
  11. +20
    -7
      src/services/store/index.tsx
  12. +6
    -1
      yarn.lock

+ 4
- 0
constant/route.constant.ts View File

@ -0,0 +1,4 @@
export const routes = {
LOGIN: '/login',
PRODUCTS: '/products',
};

+ 1
- 0
package.json View File

@ -25,6 +25,7 @@
"react-dom": "^18",
"react-hook-form": "^7.52.2",
"react-redux": "^9.1.2",
"redux-persist": "^6.0.0",
"sass": "^1.77.8",
"zod": "^3.23.8"
},


src/app/(auth)/log-in/layout.tsx → src/app/(auth)/login/layout.tsx View File


src/app/(auth)/log-in/loginPage.module.scss → src/app/(auth)/login/loginPage.module.scss View File


src/app/(auth)/log-in/page.tsx → src/app/(auth)/login/page.tsx View File

@ -19,6 +19,7 @@ import { useRouter } from "next/navigation";
import { useDispatch, useSelector } from "react-redux";
import { RootState } from "@/services/store";
import { setAuthTokens, setUserDetails } from "@/services/store/authSlice";
import { routes } from "constant/route.constant";
import { grey } from "@mui/material/colors";
const loginSchema = z.object({
@ -54,8 +55,8 @@ export default function LoginPage() {
})
);
dispatch(setUserDetails(response));
setLoader(false);
router.push("/home");
setLoader(false)
router.push(routes.PRODUCTS);
} catch (err) {
setLoader(false);
setError("Invalid credentials");

src/app/(dashboard)/home/page.tsx → src/app/(dashboard)/products/page.tsx View File


+ 10
- 6
src/app/layout.tsx View File

@ -4,10 +4,12 @@ import { ThemeProvider } from "@mui/material/styles";
import theme from "../theme";
import "./globals.scss";
import { Provider } from 'react-redux';
import store from "@/services/store";
import { PersistGate } from 'redux-persist/integration/react';
import { store, persistor } from '.././services/store';
import AuthGuard from "@/hoc/authGuard/authGuard";
import { useRouter } from "next/navigation";
import { useEffect } from "react";
import { routes } from "constant/route.constant";
interface RootLayoutProps {
children: React.ReactNode;
@ -21,18 +23,20 @@ function RootLayout(props: RootLayoutProps): JSX.Element {
const token = localStorage.getItem('token');
if (!token) {
router.push('/log-in');
router.push(routes.LOGIN);
} else {
router.replace('/home');
router.replace(routes.PRODUCTS);
}
}, [router])
return (
<html lang="en">
<body>
<Provider store={store}>
<AppRouterCacheProvider>
<ThemeProvider theme={theme}>{children}</ThemeProvider>
</AppRouterCacheProvider>
<PersistGate loading={null} persistor={persistor}>
<AppRouterCacheProvider>
<ThemeProvider theme={theme}>{children}</ThemeProvider>
</AppRouterCacheProvider>
</PersistGate>
</Provider>
</body>
</html>


+ 2
- 1
src/components/wrapper/dashboardWrapper.tsx View File

@ -22,6 +22,7 @@ import { BUILDING, GEAR } from "@/utilities/svgConstant";
import LogoutIcon from "@mui/icons-material/Logout";
import { useRouter } from "next/navigation";
import { useSelector } from "react-redux";
import { routes } from "constant/route.constant";
const drawerWidth = 260;
@ -129,7 +130,7 @@ export default function DashboardWrapper(props: Props) {
const logoutHandler = () => {
localStorage.removeItem("token");
localStorage.removeItem("refreshToken");
router.push("/log-in");
router.push(routes.LOGIN);
};
return (


+ 2
- 1
src/hoc/authGuard/authGuard.tsx View File

@ -1,4 +1,5 @@
"use client"
import { routes } from 'constant/route.constant';
// hoc/withAuth.tsx
import { useRouter } from 'next/navigation';
import { useEffect } from 'react';
@ -10,7 +11,7 @@ const AuthGuard = (WrappedComponent: any) => {
useEffect(() => {
const token = localStorage.getItem('token');
if (!token) {
router.push('/log-in');
router.push(routes.LOGIN);
}
}, [router]);


+ 3
- 2
src/services/axios/axiosInstance.ts View File

@ -1,5 +1,6 @@
// axiosInstance.ts
import axios from 'axios';
import { routes } from 'constant/route.constant';
const axiosInstance = axios.create({
baseURL: process.env.NEXT_PUBLIC_API_URL,
@ -55,7 +56,7 @@ axiosInstance.interceptors.response.use(
const refreshToken = localStorage.getItem('refreshToken');
if (!refreshToken) {
window.location.href = '/log-in';
window.location.href = routes.LOGIN;
return Promise.reject(error);
}
@ -74,7 +75,7 @@ axiosInstance.interceptors.response.use(
processQueue(err, null);
localStorage.removeItem('token');
localStorage.removeItem('refreshToken');
window.location.href = '/login';
window.location.href = routes.LOGIN;
return Promise.reject(err);
} finally {
isRefreshing = false;


+ 20
- 7
src/services/store/index.tsx View File

@ -1,15 +1,28 @@
// store/index.ts
import { configureStore } from '@reduxjs/toolkit';
import { configureStore, combineReducers } from '@reduxjs/toolkit';
import { persistStore, persistReducer } from 'redux-persist';
import storage from 'redux-persist/lib/storage'; // defaults to localStorage for web
import authReducer from './authSlice';
const rootReducer = combineReducers({
auth: authReducer,
});
const persistConfig = {
key: 'root',
storage,
whitelist: ['auth'], // only auth will be persisted
};
const persistedReducer = persistReducer(persistConfig, rootReducer);
const store = configureStore({
reducer: {
auth: authReducer,
},
reducer: persistedReducer,
});
export type RootState = ReturnType<typeof store.getState>;
const persistor = persistStore(store);
export type RootState = ReturnType<typeof rootReducer>;
export type AppDispatch = typeof store.dispatch;
export default store;
export { store, persistor };

+ 6
- 1
yarn.lock View File

@ -4013,12 +4013,17 @@ redent@^3.0.0:
indent-string "^4.0.0"
strip-indent "^3.0.0"
redux-persist@^6.0.0:
version "6.0.0"
resolved "https://registry.npmjs.org/redux-persist/-/redux-persist-6.0.0.tgz"
integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==
redux-thunk@^3.1.0:
version "3.1.0"
resolved "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz"
integrity sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==
redux@^5.0.0, redux@^5.0.1:
redux@^5.0.0, redux@^5.0.1, redux@>4.0.0:
version "5.0.1"
resolved "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz"
integrity sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==


Write Preview
Loading…
Cancel
Save