summaryrefslogtreecommitdiff
path: root/pages/index.tsx
diff options
context:
space:
mode:
authorThomas F. K. Jorna <[email protected]>2021-07-29 16:26:08 +0200
committerThomas F. K. Jorna <[email protected]>2021-07-29 16:26:08 +0200
commit087f14ea0b7a4589d3a5c3a670c20b37d7e8d620 (patch)
tree619c8363a9f0474dc3c4834a75fd8ea470159712 /pages/index.tsx
parent590e7c40526d44aa671c578ba26b9c5e4454ec6c (diff)
solve merge conflicts
Diffstat (limited to 'pages/index.tsx')
-rw-r--r--pages/index.tsx18
1 files changed, 1 insertions, 17 deletions
diff --git a/pages/index.tsx b/pages/index.tsx
index 3540a4c..c1d9a18 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -132,14 +132,9 @@ export function GraphPage() {
const graph3dRef = useRef<any>(null)
useEffect(() => {
-<<<<<<< HEAD
const fg = threeDim ? graph3dRef.current : graph2dRef.current
const socket = new ReconnectingWebSocket('ws://localhost:35903')
socket.addEventListener('open', (event) => {
-=======
- const socket = new WebSocket('ws://localhost:35903')
- socket.addEventListener('open', () => {
->>>>>>> 4e3d884c402b7dc7d12f0cae88a9a312b10f166f
console.log('Connection with Emacs established')
})
socket.addEventListener('message', (event) => {
@@ -174,17 +169,6 @@ export function GraphPage() {
})
}, [])
-<<<<<<< HEAD
- useEffect(() => {
- if (!emacsNodeId) {
- return
- }
- //fetchGraphData()
- }, [emacsNodeId])
-=======
- const [threeDim, setThreeDim] = useState(false)
->>>>>>> 4e3d884c402b7dc7d12f0cae88a9a312b10f166f
-
if (!graphData) {
return null
}
@@ -318,7 +302,7 @@ export const Graph = function (props: GraphProps) {
return false
}
- return !links.some(link => !['parent', 'cite'].includes(link.type))
+ return !links.some((link) => !['parent', 'cite'].includes(link.type))
})
}, [filter, graphData.nodes, linksByNodeId])