Merge branch 'v3' into v3-wall
This commit is contained in:
commit
b101d20778
|
@ -2,7 +2,7 @@ import React, { useState, useRef, useEffect } from "react";
|
|||
import img from "../../assets/image/image.png";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { getUserData } from "./functions/getUserData";
|
||||
import { useProjectName, useSocketStore } from "../../store/builder/store";
|
||||
import { useLoadingProgress, useProjectName, useSocketStore } from "../../store/builder/store";
|
||||
import { viewProject } from "../../services/dashboard/viewProject";
|
||||
import OuterClick from "../../utils/outerClick";
|
||||
import { KebabIcon } from "../icons/ExportCommonIcons";
|
||||
|
@ -54,6 +54,7 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
|
|||
const [renameValue, setRenameValue] = useState(projectName);
|
||||
const [isRenaming, setIsRenaming] = useState(false);
|
||||
const { projectSocket } = useSocketStore();
|
||||
const { setLoadingProgress } = useLoadingProgress();
|
||||
const kebabRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const navigateToProject = async (e: any) => {
|
||||
|
@ -64,9 +65,8 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
|
|||
} catch (error) {
|
||||
console.error("Error opening project:", error);
|
||||
}
|
||||
|
||||
setLoadingProgress(1)
|
||||
setProjectName(projectName);
|
||||
console.log('projectId: ', projectId);
|
||||
navigate(`/${projectId}`);
|
||||
};
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ const DashboardHome: React.FC = () => {
|
|||
const { userId, organization } = getUserData();
|
||||
const { projectSocket } = useSocketStore();
|
||||
const [recentDuplicateData, setRecentDuplicateData] = useState<Object>({});
|
||||
console.log("duplicateData: ", recentDuplicateData);
|
||||
|
||||
|
||||
const fetchRecentProjects = async () => {
|
||||
try {
|
||||
|
|
|
@ -427,7 +427,7 @@ async function handleModelLoad(
|
|||
userId: userId,
|
||||
};
|
||||
|
||||
console.log('completeData: ', completeData);
|
||||
console.log("completeData: ", completeData);
|
||||
socket.emit("v1:model-asset:add", completeData);
|
||||
|
||||
const asset: Asset = {
|
||||
|
|
|
@ -88,7 +88,6 @@ const Project: React.FC = () => {
|
|||
useEffect(() => {
|
||||
generateThumbnail();
|
||||
}, []);
|
||||
const { isRenameMode, setIsRenameMode } = useRenameModeStore();
|
||||
// console.log('isRenameMode: ', isRenameMode);
|
||||
|
||||
const { selectedUser } = useSelectedUserStore();
|
||||
|
|
|
@ -38,7 +38,6 @@ const UserAuth: React.FC = () => {
|
|||
const handleLogin = async (e: FormEvent<HTMLFormElement>) => {
|
||||
e.preventDefault();
|
||||
const organization = email.split("@")[1].split(".")[0];
|
||||
|
||||
try {
|
||||
const res = await signInApi(email, password, organization, fingerprint);
|
||||
if (res.message.message === "login successfull") {
|
||||
|
|
|
@ -20,8 +20,10 @@ import useCameraModeStore, {
|
|||
import { detectModifierKeys } from "./detectModifierKeys";
|
||||
import { useSelectedZoneStore } from "../../store/visualization/useZoneStore";
|
||||
import { useLogger } from "../../components/ui/log/LoggerContext";
|
||||
import { useComparisonProduct } from "../../store/simulation/useSimulationStore";
|
||||
|
||||
const KeyPressListener: React.FC = () => {
|
||||
const { clearComparisonProduct } = useComparisonProduct();
|
||||
const { activeModule, setActiveModule } = useModuleStore();
|
||||
const { setActiveSubTool } = useActiveSubTool();
|
||||
const { toggleUILeft, toggleUIRight, setToggleUI } = useToggleStore();
|
||||
|
@ -170,6 +172,7 @@ const KeyPressListener: React.FC = () => {
|
|||
clearSelectedZone();
|
||||
setShowShortcuts(false);
|
||||
setIsVersionSaved(false);
|
||||
clearComparisonProduct();
|
||||
setIsLogListVisible(false);
|
||||
setIsRenameMode(false);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue