From eae33d68db1be7990b0e7c099b3ac52db32d9b75 Mon Sep 17 00:00:00 2001
From: Matthias Konitzny <konitzny@ibr.cs.tu-bs.de>
Date: Fri, 22 Jul 2022 16:34:12 +0200
Subject: [PATCH] Moved graph data structures into common folder
---
src/{ => common}/datasets.js | 0
src/{display => common}/graph.ts | 0
src/display/components/nodeinfo/neighbors.tsx | 2 +-
src/display/components/nodeinfo/nodeinfobar.tsx | 2 +-
src/display/components/searchbar.tsx | 2 +-
src/display/display.tsx | 5 ++---
src/display/renderer.tsx | 2 +-
src/editor/js/editor.js | 2 +-
src/editor/js/interactions.js | 2 +-
src/editor/js/tools/savetool.js | 2 +-
10 files changed, 9 insertions(+), 10 deletions(-)
rename src/{ => common}/datasets.js (100%)
rename src/{display => common}/graph.ts (100%)
diff --git a/src/datasets.js b/src/common/datasets.js
similarity index 100%
rename from src/datasets.js
rename to src/common/datasets.js
diff --git a/src/display/graph.ts b/src/common/graph.ts
similarity index 100%
rename from src/display/graph.ts
rename to src/common/graph.ts
diff --git a/src/display/components/nodeinfo/neighbors.tsx b/src/display/components/nodeinfo/neighbors.tsx
index 02c2839..b7f713e 100644
--- a/src/display/components/nodeinfo/neighbors.tsx
+++ b/src/display/components/nodeinfo/neighbors.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { NodeData } from "../../graph";
+import { NodeData } from "../../../common/graph";
import FancyScrollbar from "../fancyscrollbar";
import Collapsible from "../collapsible";
diff --git a/src/display/components/nodeinfo/nodeinfobar.tsx b/src/display/components/nodeinfo/nodeinfobar.tsx
index 5816bb8..9d98add 100644
--- a/src/display/components/nodeinfo/nodeinfobar.tsx
+++ b/src/display/components/nodeinfo/nodeinfobar.tsx
@@ -1,7 +1,7 @@
import React from "react";
import "./nodeinfobar.css";
-import { NodeData } from "../../graph";
+import { NodeData } from "../../../common/graph";
import TitleArea from "./titlearea";
import FancyScrollbar from "../fancyscrollbar";
import MediaArea from "./mediaarea";
diff --git a/src/display/components/searchbar.tsx b/src/display/components/searchbar.tsx
index 2740f0f..4016a54 100644
--- a/src/display/components/searchbar.tsx
+++ b/src/display/components/searchbar.tsx
@@ -1,7 +1,7 @@
import React, { useEffect, useRef, useState } from "react";
import "./searchbar.css";
-import { NodeData } from "../graph";
+import { NodeData } from "../../common/graph";
interface SearchBarProps {
minified: boolean;
diff --git a/src/display/display.tsx b/src/display/display.tsx
index bb220f2..71449a4 100644
--- a/src/display/display.tsx
+++ b/src/display/display.tsx
@@ -5,12 +5,11 @@ import PropTypes, { InferType } from "prop-types";
import "./display.css";
import { GraphNode, GraphRenderer } from "./renderer";
import * as Helpers from "./helpers";
-import Graph, { NodeData } from "./graph";
-import { loadGraphJson } from "../datasets";
+import Graph, { NodeData } from "../common/graph";
+import { loadGraphJson } from "../common/datasets";
import NodeInfoBar from "./components/nodeinfo/nodeinfobar";
import FilterMenu from "./components/nodefilter/filtermenu";
import SearchBar from "./components/searchbar";
-import { graph } from "../editor/js/editor";
/**
* This component manages and renders a 3d-force-graph with additional menus to navigate, filter and view information on nodes.
diff --git a/src/display/renderer.tsx b/src/display/renderer.tsx
index 9e0b93e..a1ac049 100644
--- a/src/display/renderer.tsx
+++ b/src/display/renderer.tsx
@@ -10,7 +10,7 @@ import React from "react";
import PropTypes, { InferType } from "prop-types";
import SpriteText from "three-spritetext";
import { Object3D, Sprite } from "three";
-import Graph, { Coordinate, LinkData, NodeData } from "./graph";
+import Graph, { Coordinate, LinkData, NodeData } from "../common/graph";
export interface GraphNode extends NodeData {
x: number;
diff --git a/src/editor/js/editor.js b/src/editor/js/editor.js
index c45f59c..f5fb7c3 100644
--- a/src/editor/js/editor.js
+++ b/src/editor/js/editor.js
@@ -1,6 +1,6 @@
import { State } from "./state";
import * as Graph from "./graph";
-import { loadGraphJson } from "../../datasets";
+import { loadGraphJson } from "../../common/datasets";
import ForceGraph from "force-graph";
import * as Interactions from "./interactions";
import { setSpace, SPACE } from "../../config";
diff --git a/src/editor/js/interactions.js b/src/editor/js/interactions.js
index 1f7f1bf..c0fafe2 100644
--- a/src/editor/js/interactions.js
+++ b/src/editor/js/interactions.js
@@ -1,6 +1,6 @@
import jQuery from "jquery";
import { state } from "./editor";
-import { listAllSpaces, saveGraphJson } from "../../datasets";
+import { listAllSpaces, saveGraphJson } from "../../common/datasets";
import { SPACE } from "../../config";
/**
diff --git a/src/editor/js/tools/savetool.js b/src/editor/js/tools/savetool.js
index fa1c1ee..124f6bc 100644
--- a/src/editor/js/tools/savetool.js
+++ b/src/editor/js/tools/savetool.js
@@ -1,5 +1,5 @@
import Tool from "./tool";
-import { saveGraphJson } from "../../../datasets";
+import { saveGraphJson } from "../../../common/datasets";
import { state, graph } from "../editor";
import { SPACE } from "../../../config";
import SaveIcon from "../../images/tools/save.png";
--
GitLab