From 95c629533ec4069c1adc130754f5b3a9c23d000f Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Thu, 14 Nov 2024 12:18:54 +0530 Subject: [PATCH 1/3] update --- src/Components/Loaders/FullscreenLoaders.jsx | 24 +++++--- src/Components/Loaders/Loader01.jsx | 32 +++++++---- src/Pages/SplashScreen.jsx | 60 ++++++++++++-------- 3 files changed, 73 insertions(+), 43 deletions(-) diff --git a/src/Components/Loaders/FullscreenLoaders.jsx b/src/Components/Loaders/FullscreenLoaders.jsx index a821ce3..4f2348a 100644 --- a/src/Components/Loaders/FullscreenLoaders.jsx +++ b/src/Components/Loaders/FullscreenLoaders.jsx @@ -1,18 +1,19 @@ import { Box, Spinner, Text } from "@chakra-ui/react"; import React from "react"; -import './FullscreenLoaders.css' +import "./FullscreenLoaders.css"; -const FullscreenLoaders = ({height}) => { +const FullscreenLoaders = ({ height }) => { return (
+ > + {/*
@@ -21,8 +22,17 @@ const FullscreenLoaders = ({height}) => {
-
- {/* Loading... */} +
*/} + {/* Loading... */} + {/*
*/} + + ); }; diff --git a/src/Components/Loaders/Loader01.jsx b/src/Components/Loaders/Loader01.jsx index d730e32..1ca3a81 100644 --- a/src/Components/Loaders/Loader01.jsx +++ b/src/Components/Loaders/Loader01.jsx @@ -1,19 +1,29 @@ import React from "react"; -import './FullscreenLoaders.css' +import "./FullscreenLoaders.css"; +import { Spinner } from "@chakra-ui/react"; const Loader01 = () => { return ( + //
+ //
+ //
+ //
+ //
+ //
+ //
+ //
+ //
+ //
-
-
-
-
-
-
-
-
-
-
+ // {/*
*/} + + ); }; diff --git a/src/Pages/SplashScreen.jsx b/src/Pages/SplashScreen.jsx index a975efa..47f0bc6 100644 --- a/src/Pages/SplashScreen.jsx +++ b/src/Pages/SplashScreen.jsx @@ -1,31 +1,41 @@ -import { Box, Image, Spinner, Text } from '@chakra-ui/react' -import React from 'react' -import logo from '../assets/logo2.png' +import { Box, Image, Spinner, Text } from "@chakra-ui/react"; +import React from "react"; +import logo from "../assets/logo2.png"; const SplashScreen = () => { return ( - - {/* */} -
-
-
-
-
-
-
-
-
-
- - ) -} + -export default SplashScreen \ No newline at end of file + {/*
*/} + {/* */} + {/*
+
+
+
+
+
+
+
+
+
*/} + + + + ); +}; + +export default SplashScreen; From 272e94caf05bd0ecbb20bf2667a4d475e074942e Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Fri, 22 Nov 2024 18:57:49 +0530 Subject: [PATCH 2/3] upodate --- src/Services/token.serivce.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/token.serivce.js b/src/Services/token.serivce.js index 143762c..639fdf8 100644 --- a/src/Services/token.serivce.js +++ b/src/Services/token.serivce.js @@ -46,7 +46,7 @@ export const baseQuery = async (args, api, extraOptions) => { if (refreshResult.data) { // Save new tokens localStorage.setItem("accessToken", refreshResult?.data?.data?.access?.token); - localStorage.setItem("role", refreshResult?.data?.data?.role); + // localStorage.setItem("role", refreshResult?.data?.data?.role); // console.log(refreshResult?.data?.data?.role); From 9d4d5301e508bed9a9a59ae071fc60b4dbae6f1f Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Fri, 6 Dec 2024 16:09:36 +0530 Subject: [PATCH 3/3] update --- src/Constants/Constants.js | 17 ++++++++++++++++- src/Services/token.serivce.js | 3 ++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Constants/Constants.js b/src/Constants/Constants.js index aaf5bd7..da74880 100644 --- a/src/Constants/Constants.js +++ b/src/Constants/Constants.js @@ -1,6 +1,7 @@ import dns from "node:dns" import * as XLSX from 'xlsx'; +import CryptoJS from "crypto-js"; export const generateSerialNumber = (index, currentPage, pageSize) => { @@ -218,4 +219,18 @@ export function formatDateToYYYYMMDD(dateString) { // Combine the formatted parts return `${year}-${month}-${day}`; -} \ No newline at end of file +} + + +// Encrypt a string +export const encryptString = (text) => { + const ciphertext = CryptoJS.AES.encrypt(text, import.meta.env.VITE_ROLE_ENCRYPTION_KEY).toString(); + return ciphertext; +}; + +// Decrypt a string +export const decryptString = (ciphertext) => { + const bytes = CryptoJS.AES.decrypt(ciphertext, import.meta.env.VITE_ROLE_ENCRYPTION_KEY); + const originalText = bytes.toString(CryptoJS.enc.Utf8); + return originalText; +}; \ No newline at end of file diff --git a/src/Services/token.serivce.js b/src/Services/token.serivce.js index 639fdf8..1b2b827 100644 --- a/src/Services/token.serivce.js +++ b/src/Services/token.serivce.js @@ -1,4 +1,5 @@ import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react"; +import { encryptString } from '../Constants/Constants' // Define a base query function with RTK Query // export const baseQuery = fetchBaseQuery({ @@ -100,7 +101,7 @@ export const apiSlice = createApi({ localStorage.setItem("refreshToken", data?.data?.refresh?.token); // localStorage.setItem('refreshTokenExp', data?.data?.refresh?.expires); localStorage.setItem("accessTokenExp", data?.data?.access?.expires); - localStorage.setItem("role", data?.data?.role); + localStorage.setItem("role", encryptString(data?.data?.role)); } catch (error) { console.error("Login failed:", error); }