Merge branch 'branch-v2' into branch-1
This commit is contained in:
@@ -100,7 +100,7 @@ export const GetAllProjects = async (data: GetProjectsInterface) => {
|
|||||||
.find({
|
.find({
|
||||||
isArchive: false,
|
isArchive: false,
|
||||||
})
|
})
|
||||||
.select("_id projectName createdBy thumbnail createdAt");
|
.select("_id projectName createdBy thumbnail createdAt projectUuid");
|
||||||
if (projectDatas) return { status: "Success", Datas: projectDatas };
|
if (projectDatas) return { status: "Success", Datas: projectDatas };
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
return { status: error };
|
return { status: error };
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import { addfloat, deletefloat, duplicatefloat } from '../services/visualization
|
|||||||
import { addTemplate, addTemplateZone, TemplateZoneDelete } from '../services/visualization/templateServices.ts';
|
import { addTemplate, addTemplateZone, TemplateZoneDelete } from '../services/visualization/templateServices.ts';
|
||||||
import { deleteAssetModel, replaceEventDatas, setAssetModel } from '../services/assets/asset-Controller.ts';
|
import { deleteAssetModel, replaceEventDatas, setAssetModel } from '../services/assets/asset-Controller.ts';
|
||||||
import { add3Dwidget, delete3Dwidget, update3D } from '../services/visualization/3dWidget-Service.ts';
|
import { add3Dwidget, delete3Dwidget, update3D } from '../services/visualization/3dWidget-Service.ts';
|
||||||
|
import { projectDeleteHandleEvent, projectHandleEvent, projecUpdateHandleEvent } from '../controllers/project/projectController.ts';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1109,6 +1110,8 @@ export const initSocketServer = (httpServer: any) => {
|
|||||||
// zone: io.of("/zone"),
|
// zone: io.of("/zone"),
|
||||||
Builder: io.of('/Builder'),
|
Builder: io.of('/Builder'),
|
||||||
visualization: io.of('/Visualization'),
|
visualization: io.of('/Visualization'),
|
||||||
|
project: io.of('/project'),
|
||||||
|
|
||||||
// widget:io.of('/widget')
|
// widget:io.of('/widget')
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1180,6 +1183,6 @@ export const initSocketServer = (httpServer: any) => {
|
|||||||
// handleNamespace("widget", namespaces.visualization, widgetHandleEvent);
|
// handleNamespace("widget", namespaces.visualization, widgetHandleEvent);
|
||||||
handleNamespace("Builder", namespaces.Builder, userStatus, modelAssetHandleEvent, cameraHandleEvent, EnvironmentHandleEvent, wallItemsHandleEvent, lineHandleEvent, zoneHandleEvent);
|
handleNamespace("Builder", namespaces.Builder, userStatus, modelAssetHandleEvent, cameraHandleEvent, EnvironmentHandleEvent, wallItemsHandleEvent, lineHandleEvent, zoneHandleEvent);
|
||||||
handleNamespace("Visualization", namespaces.visualization, panelHandleEvent, widgetHandleEvent, floatHandleEvent, templateHandleEvent, Widget3DHandleEvent);
|
handleNamespace("Visualization", namespaces.visualization, panelHandleEvent, widgetHandleEvent, floatHandleEvent, templateHandleEvent, Widget3DHandleEvent);
|
||||||
|
handleNamespace("project", namespaces.project, projectHandleEvent, projectDeleteHandleEvent, projecUpdateHandleEvent)
|
||||||
return io;
|
return io;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user