code optimization
This commit is contained in:
@@ -1,10 +1,6 @@
|
|||||||
import React, { useEffect } from "react";
|
import React, { useEffect } from "react";
|
||||||
import useModuleStore from "../store/useModuleStore";
|
import useModuleStore from "../store/useModuleStore";
|
||||||
import {
|
import { useSocketStore, useProjectName, useActiveTool, } from "../store/builder/store";
|
||||||
useSocketStore,
|
|
||||||
useProjectName,
|
|
||||||
useActiveTool,
|
|
||||||
} from "../store/builder/store";
|
|
||||||
import { useNavigate, useParams } from "react-router-dom";
|
import { useNavigate, useParams } from "react-router-dom";
|
||||||
import { useSelectedUserStore } from "../store/collaboration/useCollabStore";
|
import { useSelectedUserStore } from "../store/collaboration/useCollabStore";
|
||||||
import FollowPerson from "../components/templates/FollowPerson";
|
import FollowPerson from "../components/templates/FollowPerson";
|
||||||
@@ -29,7 +25,7 @@ const Project: React.FC = () => {
|
|||||||
const { setActiveModule } = useModuleStore();
|
const { setActiveModule } = useModuleStore();
|
||||||
const { projectId } = useParams();
|
const { projectId } = useParams();
|
||||||
const { setProjectName } = useProjectName();
|
const { setProjectName } = useProjectName();
|
||||||
const { userId, email, organization, userName } = getUserData();
|
const { userId, email, organization } = getUserData();
|
||||||
const { selectedUser } = useSelectedUserStore();
|
const { selectedUser } = useSelectedUserStore();
|
||||||
const { isLogListVisible } = useLogger();
|
const { isLogListVisible } = useLogger();
|
||||||
const { setVersions } = useVersionHistoryStore();
|
const { setVersions } = useVersionHistoryStore();
|
||||||
|
|||||||
@@ -2,9 +2,7 @@ import React, { useState, FormEvent, useEffect } from "react";
|
|||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { LogoIconLarge } from "../components/icons/Logo";
|
import { LogoIconLarge } from "../components/icons/Logo";
|
||||||
import { EyeIcon } from "../components/icons/ExportCommonIcons";
|
import { EyeIcon } from "../components/icons/ExportCommonIcons";
|
||||||
import {
|
import { useLoadingProgress } from "../store/builder/store";
|
||||||
useLoadingProgress,
|
|
||||||
} from "../store/builder/store";
|
|
||||||
import { signInApi } from "../services/factoryBuilder/signInSignUp/signInApi";
|
import { signInApi } from "../services/factoryBuilder/signInSignUp/signInApi";
|
||||||
import { signUpApi } from "../services/factoryBuilder/signInSignUp/signUpApi";
|
import { signUpApi } from "../services/factoryBuilder/signInSignUp/signUpApi";
|
||||||
import FingerprintJS from "@fingerprintjs/fingerprintjs";
|
import FingerprintJS from "@fingerprintjs/fingerprintjs";
|
||||||
@@ -54,14 +52,8 @@ const UserAuth: React.FC = () => {
|
|||||||
);
|
);
|
||||||
if (res.message.isShare) {
|
if (res.message.isShare) {
|
||||||
if (Object.values(projects.RecentlyViewed).length > 0) {
|
if (Object.values(projects.RecentlyViewed).length > 0) {
|
||||||
const recent_opend_projectID = (
|
const recent_opend_projectID = (Object.values(projects?.RecentlyViewed || {})[0] as any)?._id;
|
||||||
Object.values(projects?.RecentlyViewed || {})[0] as any
|
if (Object.values(projects?.RecentlyViewed).filter((val: any) => val._id == recent_opend_projectID)) {
|
||||||
)?._id;
|
|
||||||
if (
|
|
||||||
Object.values(projects?.RecentlyViewed).filter(
|
|
||||||
(val: any) => val._id == recent_opend_projectID
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
setLoadingProgress(1);
|
setLoadingProgress(1);
|
||||||
navigate(`/projects/${recent_opend_projectID}`);
|
navigate(`/projects/${recent_opend_projectID}`);
|
||||||
} else {
|
} else {
|
||||||
@@ -77,14 +69,9 @@ const UserAuth: React.FC = () => {
|
|||||||
}
|
}
|
||||||
} else if (res.message === "User Not Found!!! Kindly signup...") {
|
} else if (res.message === "User Not Found!!! Kindly signup...") {
|
||||||
setError("Account not found");
|
setError("Account not found");
|
||||||
} else if (
|
} else if (res.message === "Email & Password is invalid...Check the credentials") {
|
||||||
res.message === "Email & Password is invalid...Check the credentials"
|
|
||||||
) {
|
|
||||||
setError(res.message);
|
setError(res.message);
|
||||||
} else if (
|
} else if (res.message === "Already LoggedIn on another browser....Please logout!!!") {
|
||||||
res.message ===
|
|
||||||
"Already LoggedIn on another browser....Please logout!!!"
|
|
||||||
) {
|
|
||||||
setError("Already logged in on another browser. Please logout first.");
|
setError("Already logged in on another browser. Please logout first.");
|
||||||
navigate("/");
|
navigate("/");
|
||||||
setError("");
|
setError("");
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ export const recentlyViewed = async (organization: string, userId: string) => {
|
|||||||
);
|
);
|
||||||
const newAccessToken = response.headers.get("x-access-token");
|
const newAccessToken = response.headers.get("x-access-token");
|
||||||
if (newAccessToken) {
|
if (newAccessToken) {
|
||||||
//console.log("New token received:", newAccessToken);
|
|
||||||
localStorage.setItem("token", newAccessToken);
|
localStorage.setItem("token", newAccessToken);
|
||||||
}
|
}
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
|
|||||||
Reference in New Issue
Block a user