Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
purescript-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
142
Issues
142
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
purescript-gargantext
Commits
db9ffc69
Commit
db9ffc69
authored
Dec 11, 2019
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Graph] fixes to tree/controls/sidebar layout
Now opening one of them doesn't move the graph.
parent
b083b6c3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
17 deletions
+39
-17
Graph.css
dist/styles/Graph.css
+12
-0
Graph.sass
dist/styles/Graph.sass
+11
-0
GraphExplorer.purs
src/Gargantext/Components/GraphExplorer.purs
+16
-17
No files found.
dist/styles/Graph.css
View file @
db9ffc69
...
...
@@ -10,6 +10,16 @@
display
:
flex
;
max-width
:
200px
;
}
#graph-explorer
.row.controls
{
height
:
79px
;
}
#graph-explorer
.graph-tree
{
position
:
absolute
;
top
:
120px
;
max-height
:
600px
;
overflow-y
:
scroll
;
z-index
:
1
;
}
#graph-explorer
#sp-container
{
position
:
absolute
;
left
:
70%
;
...
...
@@ -17,6 +27,8 @@
z-index
:
1
;
border
:
1px
white
solid
;
background-color
:
white
;
max-height
:
600px
;
overflow-y
:
scroll
;
}
#graph-explorer
#sp-container
#myTab
{
marginBottom
:
18px
;
...
...
dist/styles/Graph.sass
View file @
db9ffc69
...
...
@@ -9,6 +9,15 @@
li
display
:
flex
max-width
:
200px
.row.controls
height
:
79px
.graph-tree
position
:
absolute
top
:
120px
max-height
:
600px
overflow-y
:
scroll
z-index
:
1
#sp-container
position
:
absolute
...
...
@@ -17,6 +26,8 @@
z-index
:
1
border
:
1px
white
solid
background-color
:
white
max-height
:
600px
overflow-y
:
scroll
#myTab
marginBottom
:
18px
...
...
src/Gargantext/Components/GraphExplorer.purs
View file @
db9ffc69
...
...
@@ -108,7 +108,7 @@ explorerCpt = R.hooksComponent "G.C.GraphExplorer.explorer" cpt
, col [ Toggle.controlsToggleButton controls.showControls ]
, col [ pullRight [ Toggle.sidebarToggleButton controls.showSidePanel ] ]
]
, row [ Controls.controls controls ]
, row
Controls
[ Controls.controls controls ]
, row [ tree (fst controls.showTree) {sessions, mCurrentRoute, frontends} (snd showLogin)
, RH.div { ref: graphRef, id: "graph-view", className: graphClassName controls, style: {height: "95%"} } [] -- graph container
, graphView { controls
...
...
@@ -117,29 +117,29 @@ explorerCpt = R.hooksComponent "G.C.GraphExplorer.explorer" cpt
, graph
, multiSelectEnabledRef
}
, mSidebar graph mMetaData { frontends
, session
, selectedNodeIds: controls.selectedNodeIds
, showSidePanel: fst controls.showSidePanel
}
, mSidebar mMetaData { frontends
, graph
, session
, selectedNodeIds: controls.selectedNodeIds
, showSidePanel: fst controls.showSidePanel
}
]
, row [
]
]
]
]
]
graphClassName :: Record Controls.Controls -> String
graphClassName {showSidePanel: (GET.Opened /\ _), showTree: (true /\ _)} = "col-md-8"
graphClassName {showTree: (true /\ _)} = "col-md-10"
graphClassName {showSidePanel: (GET.Opened /\ _)} = "col-md-10"
--
graphClassName {showSidePanel: (GET.Opened /\ _), showTree: (true /\ _)} = "col-md-8"
--
graphClassName {showTree: (true /\ _)} = "col-md-10"
--
graphClassName {showSidePanel: (GET.Opened /\ _)} = "col-md-10"
graphClassName _ = "col-md-12"
outer = RH.div { className: "col-md-12" }
inner = RH.div { className: "container-fluid", style: { paddingTop: "90px" } }
row1 = RH.div { className: "row", style: { paddingBottom: "10px", marginTop: "-24px" } }
row = RH.div { className: "row" }
rowControls = RH.div { className: "row controls" }
col = RH.div { className: "col-md-4" }
pullLeft = RH.div { className: "pull-left" }
pullRight = RH.div { className: "pull-right" }
...
...
@@ -150,18 +150,17 @@ explorerCpt = R.hooksComponent "G.C.GraphExplorer.explorer" cpt
-> R.Element
tree false _ _ = RH.div { id: "tree" } []
tree true {sessions, mCurrentRoute: route, frontends} showLogin =
RH.div {className: "col-md-2", style: {paddingTop: "60px"}}
[forest {sessions, route, frontends, showLogin}]
RH.div {className: "col-md-2 graph-tree"} [forest {sessions, route, frontends, showLogin}]
mSidebar :: SigmaxTypes.SGraph
-> Maybe GET.MetaData
mSidebar :: Maybe GET.MetaData
-> { frontends :: Frontends
, graph :: SigmaxTypes.SGraph
, showSidePanel :: GET.SidePanelState
, selectedNodeIds :: R.State SigmaxTypes.SelectedNodeIds
, session :: Session }
-> R.Element
mSidebar
_
Nothing _ = RH.div {} []
mSidebar
graph (Just metaData) {frontends
, session, selectedNodeIds, showSidePanel} =
mSidebar Nothing _ = RH.div {} []
mSidebar
(Just metaData) {frontends, graph
, session, selectedNodeIds, showSidePanel} =
Sidebar.sidebar { frontends
, graph
, metaData
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment