From a2467ef1a6e53749b6a0cc063eb99d82e7e44924 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Wed, 3 Apr 2024 20:30:46 +0530 Subject: [PATCH] refactor code --- apps/OpenSign/src/layout/HomeLayout.js | 48 ++++++++++++++++++++++++++ apps/OpenSign/src/pages/Dashboard.js | 48 +------------------------- 2 files changed, 49 insertions(+), 47 deletions(-) diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js index 12301e917..913f43e7d 100644 --- a/apps/OpenSign/src/layout/HomeLayout.js +++ b/apps/OpenSign/src/layout/HomeLayout.js @@ -10,6 +10,7 @@ import Parse from "parse"; import ModalUi from "../primitives/ModalUi"; import { useNavigate, useLocation, Outlet } from "react-router-dom"; import { isEnableSubscription } from "../constant/const"; +import { useCookies } from "react-cookie"; const HomeLayout = () => { const navigate = useNavigate(); @@ -24,6 +25,21 @@ const HomeLayout = () => { const [isTour, setIsTour] = useState(false); const [tourStatusArr, setTourStatusArr] = useState([]); const [tourConfigs, setTourConfigs] = useState([]); + const [, setCookie] = useCookies([ + "TenantId", + "userDetails", + "userEmail", + "profileImg", + "fev_Icon", + "accesstoken", + `Parse/${localStorage.getItem("parseAppId")}/currentUser`, + "appLogo", + "baseUrl", + "domain", + "parseAppId", + "username", + "main_Domain" + ]); useEffect(() => { (async () => { @@ -43,8 +59,40 @@ const HomeLayout = () => { setIsUserValid(false); } })(); + saveCookies(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + //function to use save data in cookies storage + const saveCookies = () => { + setCookie("TenantId", localStorage.getItem("TenantId"), { secure: true }); + setCookie("userDetails", localStorage.getItem("userDetails"), { + secure: true + }); + setCookie("userEmail", localStorage.getItem("userEmail"), { secure: true }); + setCookie("profileImg", localStorage.getItem("profileImg"), { + secure: true + }); + setCookie("fev_Icon", localStorage.getItem("fev_Icon"), { secure: true }); + setCookie("accesstoken", localStorage.getItem("accesstoken"), { + secure: true + }); + setCookie( + `Parse/${localStorage.getItem("parseAppId")}/currentUser`, + localStorage.getItem( + `Parse/${localStorage.getItem("parseAppId")}/currentUser` + ), + { secure: true } + ); + setCookie("appLogo", localStorage.getItem("appLogo"), { secure: true }); + setCookie("baseUrl", localStorage.getItem("baseUrl"), { secure: true }); + setCookie("domain", localStorage.getItem("domain"), { secure: true }); + setCookie("parseAppId", localStorage.getItem("parseAppId"), { + secure: true + }); + setCookie("username", localStorage.getItem("username"), { secure: true }); + setCookie("main_Domain", window.location.host, { secure: true }); + }; async function checkIsSubscribed() { const currentUser = Parse.User.current(); diff --git a/apps/OpenSign/src/pages/Dashboard.js b/apps/OpenSign/src/pages/Dashboard.js index 2fa8f2d1d..3b580d396 100644 --- a/apps/OpenSign/src/pages/Dashboard.js +++ b/apps/OpenSign/src/pages/Dashboard.js @@ -6,7 +6,7 @@ import { useNavigate, useParams } from "react-router-dom"; import Title from "../components/Title"; import { useDispatch } from "react-redux"; import { saveTourSteps } from "../redux/reducers/TourStepsReducer"; -import { useCookies } from "react-cookie"; + const Dashboard = () => { const navigate = useNavigate(); const dispatch = useDispatch(); @@ -15,25 +15,9 @@ const Dashboard = () => { const [classnameArray, setclassnameArray] = useState([]); const [loading, setloading] = useState(false); const [defaultQuery, setDefaultQuery] = useState(""); - const [, setCookie] = useCookies([ - "TenantId", - "userDetails", - "userEmail", - "profileImg", - "fev_Icon", - "accesstoken", - `Parse/${localStorage.getItem("parseAppId")}/currentUser`, - "appLogo", - "baseUrl", - "domain", - "parseAppId", - "username", - "main_Domain" - ]); useEffect(() => { if (localStorage.getItem("accesstoken")) { - saveCookies(); if (id !== undefined) { getDashboard(id); } else { @@ -45,36 +29,6 @@ const Dashboard = () => { // eslint-disable-next-line }, [id]); - //function to use save data in cookies storage - const saveCookies = () => { - setCookie("TenantId", localStorage.getItem("TenantId"), { secure: true }); - setCookie("userDetails", localStorage.getItem("userDetails"), { - secure: true - }); - setCookie("userEmail", localStorage.getItem("userEmail"), { secure: true }); - setCookie("profileImg", localStorage.getItem("profileImg"), { - secure: true - }); - setCookie("fev_Icon", localStorage.getItem("fev_Icon"), { secure: true }); - setCookie("accesstoken", localStorage.getItem("accesstoken"), { - secure: true - }); - setCookie( - `Parse/${localStorage.getItem("parseAppId")}/currentUser`, - localStorage.getItem( - `Parse/${localStorage.getItem("parseAppId")}/currentUser` - ), - { secure: true } - ); - setCookie("appLogo", localStorage.getItem("appLogo"), { secure: true }); - setCookie("baseUrl", localStorage.getItem("baseUrl"), { secure: true }); - setCookie("domain", localStorage.getItem("domain"), { secure: true }); - setCookie("parseAppId", localStorage.getItem("parseAppId"), { - secure: true - }); - setCookie("username", localStorage.getItem("username"), { secure: true }); - setCookie("main_Domain", window.location.host, { secure: true }); - }; const getDashboard = async (id) => { setloading(true); try {