Skip to content

Commit 93501cd

Browse files
fix merge error
Signed-off-by: Nikolas Rauscher <nikolas.rauscher@gmail.com>
1 parent c43a9d9 commit 93501cd

File tree

1 file changed

+14
-80
lines changed

1 file changed

+14
-80
lines changed

Project/frontend/src/components/Graph/index_visjs.tsx

Lines changed: 14 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ import { useParams } from 'react-router-dom';
44
import FloatingControlCard from './FloatingControlCard';
55
import './index.css';
66
import { VISUALIZE_API_PATH } from '../../constant';
7-
<<<<<<< HEAD
87
import { CircularProgress, Typography, Box } from '@mui/material';
9-
=======
108
import SearchIcon from '@mui/icons-material/Search';
119
import TextField from '@mui/material/TextField';
1210
import { InputAdornment } from '@mui/material';
13-
>>>>>>> origin/feat/split-view
1411

1512
const VisGraph = ({ graphData, options, setStabilizationComplete }) => {
1613
const containerRef = useRef(null);
@@ -322,36 +319,7 @@ const GraphVisualization = () => {
322319

323320
const searchGraph = (event) => {
324321
if (event.key === 'Enter') {
325-
// Perform search logic based on searchQuery
326-
}
327-
};
328-
329-
const inputStyle = {
330-
borderRadius: '8px',
331-
padding: '8px',
332-
width: '100%',
333-
marginBottom: '10px',
334-
border: '1px solid #ccc',
335-
boxSizing: 'border-box',
336-
fontSize: '16px',
337-
fontFamily: 'Arial, sans-serif',
338-
};
339-
340-
const textareaStyle = {
341-
borderRadius: '8px',
342-
padding: '8px',
343-
width: '100%',
344-
minHeight: '200px',
345-
border: '1px solid #ccc',
346-
boxSizing: 'border-box',
347-
fontSize: '16px',
348-
fontFamily: 'Arial, sans-serif',
349-
resize: 'none',
350-
};
351-
352-
const searchGraph = (event) => {
353-
if (event.key === 'Enter') {
354-
// Perform the search
322+
// Perform search logic based on searchQuery
355323
}
356324
};
357325

@@ -386,56 +354,11 @@ const GraphVisualization = () => {
386354

387355
return (
388356
<section className="main_graph_container">
389-
<<<<<<< HEAD
390-
<h1>Graph Visualization</h1>
391-
=======
392357
<h1>Graph Visualization </h1>
393-
>>>>>>> origin/feat/split-view
394-
<select onChange={(e) => setLayout(e.target.value)} value={layout}>
395-
<option value="barnesHut">Barnes Hut</option>
396-
<option value="forceAtlas2Based">Force Atlas 2 Based</option>
397-
<option value="hierarchicalRepulsion">Hierarchical Repulsion</option>
398-
<option value="repulsion">Repulsion</option>
399-
<option value="hierarchical">Hierarchical</option>
400-
<option value="grid">Grid</option>
401-
<option value="random">Random</option>
402-
</select>
403358
<section className="graph_container">
404359
<div className="graph_info">
405360
<h1>Graph Information</h1>
406361
<p>
407-
<<<<<<< HEAD
408-
File ID: <br /> {fileId}
409-
<br /> <br />
410-
Created at: <br /> xx.xx.xxxx
411-
</p>
412-
<input
413-
type="text"
414-
placeholder="Search for keywords"
415-
style={inputStyle}
416-
onKeyDown={searchGraph}
417-
/>
418-
<textarea
419-
rows={5}
420-
placeholder="Answer to your search will be displayed here!"
421-
style={textareaStyle}
422-
readOnly
423-
/>
424-
</div>
425-
<VisGraph
426-
graphData={graphData}
427-
options={options}
428-
setStabilizationComplete={setStabilizationComplete}
429-
/>
430-
<FloatingControlCard
431-
layout={layout}
432-
setLayout={setLayout}
433-
physicsOptions={physicsOptions}
434-
handlePhysicsChange={handlePhysicsChange}
435-
restartStabilization={() => setStabilizationComplete(false)}
436-
style={{ position: 'absolute', top: '10px', right: '10px', zIndex: 1000 }}
437-
/>
438-
=======
439362
Document Name: <br /> {graphData.document_name}
440363
<br /> <br />
441364
Created at: <br /> {formattedDate} {formattedTime}
@@ -464,8 +387,19 @@ const GraphVisualization = () => {
464387
}}
465388
/>
466389
</div>
467-
<VisGraph graphData={graphData} options={options} />
468-
>>>>>>> origin/feat/split-view
390+
<VisGraph
391+
graphData={graphData}
392+
options={options}
393+
setStabilizationComplete={setStabilizationComplete}
394+
/>
395+
<FloatingControlCard
396+
layout={layout}
397+
setLayout={setLayout}
398+
physicsOptions={physicsOptions}
399+
handlePhysicsChange={handlePhysicsChange}
400+
restartStabilization={() => setStabilizationComplete(false)}
401+
style={{ position: 'absolute', top: '10px', right: '10px', zIndex: 1000 }}
402+
/>
469403
</section>
470404
</section>
471405
);

0 commit comments

Comments
 (0)