updated

2025-06-23 09:37:53 +05:30
parent 2fbdf8ab61
commit 54b02541c1
278 changed files with 10134 additions and 7904 deletions
--- a/app/src/components/Dashboard/DashboardCard.tsx
+++ b/app/src/components/Dashboard/DashboardCard.tsx
@@ -1,7 +1,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 { getUserData } from "../../functions/getUserData";
 import { useLoadingProgress, useProjectName, useSocketStore } from "../../store/builder/store";
 import { viewProject } from "../../services/dashboard/viewProject";
 import OuterClick from "../../utils/outerClick";
@@ -60,12 +60,6 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({

    const navigateToProject = async (e: any) => {
        if (active && active == "trash") return;
-        try {
-            const viewedProject = await viewProject(organization, projectId, userId);
-            console.log("Viewed project:", viewedProject);
-        } catch (error) {
-            console.error("Error opening project:", error);
-        }
        setLoadingProgress(1)
        setProjectName(projectName);
        navigate(`/${projectId}`);
@@ -75,9 +69,9 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
        switch (option) {
            case "delete":
                if (handleDeleteProject) {
-                    await handleDeleteProject(projectId);
+                    handleDeleteProject(projectId);
                } else if (handleTrashDeleteProject) {
-                    await handleTrashDeleteProject(projectId);
+                    handleTrashDeleteProject(projectId);
                }
                break;
            case "restore":
@@ -133,7 +127,7 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
        if (!projectId) return;
        try {
            const projects = await getAllProjects(userId, organization);
-            console.log("projects: ", projects);
+            // console.log("projects: ", projects);
            let projectUuid = projects.Projects.find(
                (val: any) => val.projectUuid === projectId || val._id === projectId
            );
@@ -264,7 +258,6 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
                            key={option}
                            className="option"
                            onClick={(e) => {
-                                console.log("option", option);
                                e.stopPropagation();
                                handleOptionClick(option);
                            }}
--- a/app/src/components/Dashboard/DashboardHome.tsx
+++ b/app/src/components/Dashboard/DashboardHome.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import DashboardCard from "./DashboardCard";
 import DashboardNavBar from "./DashboardNavBar";
 import MarketPlaceBanner from "./MarketPlaceBanner";
-import { getUserData } from "./functions/getUserData";
+import { getUserData } from "../../functions/getUserData";
 import { useSocketStore } from "../../store/builder/store";
 import { recentlyViewed } from "../../services/dashboard/recentlyViewed";
 import { searchProject } from "../../services/dashboard/searchProjects";
@@ -34,8 +34,7 @@ const DashboardHome: React.FC = () => {
  const fetchRecentProjects = async () => {
    try {
      const projects = await recentlyViewed(organization, userId);
-      console.log("RecentlyViewed: ", projects);
-
+     
      if (JSON.stringify(projects) !== JSON.stringify(recentProjects)) {
        setRecentProjects(projects);
      }
@@ -59,7 +58,6 @@ const DashboardHome: React.FC = () => {
  };

  const handleDeleteProject = async (projectId: any) => {
-    console.log("projectId:delete ", projectId);
    try {
      //API for delete project
      // const deletedProject = await deleteProject(
@@ -115,6 +113,7 @@ const DashboardHome: React.FC = () => {

  const renderProjects = () => {
    const projectList = recentProjects[Object.keys(recentProjects)[0]];
+    console.log('projectList: ', projectList);

    if (!projectList?.length) {
      return <div className="empty-state">No recent projects found</div>;
@@ -150,7 +149,7 @@ const DashboardHome: React.FC = () => {
        handleRecentProjectSearch={handleRecentProjectSearch}
      />
      <MarketPlaceBanner />
-      <div className="container">
+      <div className="dashboard-container">
        <h2 className="section-header">Recents</h2>
        <div className="cards-container">{renderProjects()}</div>
      </div>
--- a/app/src/components/Dashboard/DashboardProjects.tsx
+++ b/app/src/components/Dashboard/DashboardProjects.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import DashboardNavBar from "./DashboardNavBar";
 import DashboardCard from "./DashboardCard";
-import { getUserData } from "./functions/getUserData";
+import { getUserData } from "../../functions/getUserData";
 import { useSocketStore } from "../../store/builder/store";
 import { getAllProjects } from "../../services/dashboard/getAllProjects";
 import { searchProject } from "../../services/dashboard/searchProjects";
@@ -65,7 +65,7 @@ const DashboardProjects: React.FC = () => {
      // console.log('deletedProject: ', deletedProject);
      const deleteProjects = {
        projectId,
-        organization: organization,
+        organization,
        userId,
      };

--- a/app/src/components/Dashboard/DashboardTrash.tsx
+++ b/app/src/components/Dashboard/DashboardTrash.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import DashboardCard from "./DashboardCard";
 import DashboardNavBar from "./DashboardNavBar";
-import { getUserData } from "./functions/getUserData";
+import { getUserData } from "../../functions/getUserData";
 import { trashSearchProject } from "../../services/dashboard/trashSearchProject";
 import { restoreTrash } from "../../services/dashboard/restoreTrash";
 import { getTrash } from "../../services/dashboard/getTrash";
@@ -22,9 +22,7 @@ interface DiscardedProjects {
 }

 const DashboardTrash: React.FC = () => {
-  const [discardedProjects, setDiscardedProjects] = useState<DiscardedProjects>(
-    {}
-  );
+  const [discardedProjects, setDiscardedProjects] = useState<DiscardedProjects>({});
  const [isSearchActive, setIsSearchActive] = useState(false);
  const { userId, organization } = getUserData();
  const { projectSocket } = useSocketStore();
@@ -60,7 +58,6 @@ const DashboardTrash: React.FC = () => {
  };

  const handleRestoreProject = async (projectId: any) => {
-    console.log("projectId: ", projectId);
    try {
      const restoreProject = await restoreTrash(organization, projectId);
      // console.log('restoreProject: ', restoreProject);
@@ -86,6 +83,7 @@ const DashboardTrash: React.FC = () => {
  };

  const handleTrashDeleteProject = async (projectId: any) => {
+    console.log('projectId: ', projectId);
    try {
      // const deletedProject = await deleteTrash(
      //   organization, projectId
--- a/app/src/components/Dashboard/SidePannel.tsx
+++ b/app/src/components/Dashboard/SidePannel.tsx
@@ -12,7 +12,7 @@ import { useNavigate } from "react-router-dom";
 import darkThemeImage from "../../assets/image/darkThemeProject.png";
 import lightThemeImage from "../../assets/image/lightThemeProject.png";
 import { SettingsIcon, TrashIcon } from "../icons/ExportCommonIcons";
-import { getUserData } from "./functions/getUserData";
+import { getUserData } from "../../functions/getUserData";
 import { useLoadingProgress, useSocketStore } from "../../store/builder/store";
 import { createProject } from "../../services/dashboard/createProject";

@@ -42,7 +42,7 @@ const SidePannel: React.FC<SidePannelProps> = ({ setActiveTab, activeTab }) => {
      const projectId = generateProjectId();
      useSocketStore.getState().initializeSocket(email, organization, token);

-   
+
      //API for creating new Project
      // const project = await createProject(
      //   projectId,
@@ -57,11 +57,11 @@ const SidePannel: React.FC<SidePannelProps> = ({ setActiveTab, activeTab }) => {
        organization: organization,
        projectUuid: projectId,
      };
-      console.log("projectSocket: ", projectSocket);
+      // console.log("projectSocket: ", projectSocket);
      if (projectSocket) {
        // console.log('addProject: ', addProject);
        const handleResponse = (data: any) => {
-          console.log('Project add response:', data);
+          // console.log('Project add response:', data);
          if (data.message === "Project created successfully") {
            setLoadingProgress(1)
            navigate(`/${data.data.projectId}`);
@@ -70,7 +70,7 @@ const SidePannel: React.FC<SidePannelProps> = ({ setActiveTab, activeTab }) => {
        };
        projectSocket.on("v1-project:response:add", handleResponse);

-        console.log('addProject: ', addProject);
+        // console.log('addProject: ', addProject);
        projectSocket.emit("v1:project:add", addProject);
      } else {
        console.error("Socket is not connected.");
@@ -163,7 +163,10 @@ const SidePannel: React.FC<SidePannelProps> = ({ setActiveTab, activeTab }) => {
            <SettingsIcon />
            Settings
          </div>
-          <div className="option-list" style={{ cursor: "pointer" }}>
+          <div className="option-list" style={{ cursor: "pointer" }} onClick={() => {
+            localStorage.clear();
+            navigate("/");
+          }}>
            <LogoutIcon />
            Log out
          </div>
--- a/app/src/components/Dashboard/functions/getUserData.ts
+++ b/app/src/components/Dashboard/functions/getUserData.ts
@@ -1,36 +0,0 @@
-interface UserData {
-  email: string;
-  userId: string;
-  userName?: string; // Optional
-  organization: string;
-}
-
-export const getUserData = (): UserData => {
-  const email = localStorage.getItem("email");
-  const userId = localStorage.getItem("userId");
-  const userName = localStorage.getItem("userName");
-
-  if (!email || !userId) {
-    return {
-      email: '',
-      userId: '',
-      userName: '',
-      organization: '',
-    };
-  }
-
-  const [_, emailDomain] = email.split("@");
-
-  if (!emailDomain) {
-    throw new Error("Invalid email format");
-  }
-
-  const [organization] = emailDomain.split(".");
-
-  return {
-    email: email,
-    userId: userId,
-    userName: userName ?? undefined,
-    organization,
-  };
-};
--- a/app/src/components/Dashboard/socket/projectSocketRes.dev.tsx
+++ b/app/src/components/Dashboard/socket/projectSocketRes.dev.tsx
@@ -1,7 +1,7 @@

 import React, { useEffect } from 'react';
 import { useSocketStore } from '../../../store/builder/store';
-import { getUserData } from '../functions/getUserData';
+import { getUserData } from '../../../functions/getUserData';
 import { getAllProjects } from '../../../services/dashboard/getAllProjects';
 import { recentlyViewed } from '../../../services/dashboard/recentlyViewed';

@@ -56,7 +56,7 @@ const ProjectSocketRes = ({
            if (data?.message === "Project Duplicated successfully") {
                if (setWorkspaceProjects) {
                    const allProjects = await getAllProjects(userId, organization);
-                    console.log('allProjects: ', allProjects);
+                    // console.log('allProjects: ', allProjects);
                    setWorkspaceProjects(allProjects);
                } else if (setRecentProjects) {
                    const recentProjects = await recentlyViewed(organization, userId);