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
138
Issues
138
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
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
0f9d2064
Commit
0f9d2064
authored
Jun 28, 2021
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into 300-dev-purescript-simple-json
parents
afcab72f
09145c47
Pipeline
#1559
failed with stage
Changes
6
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
11 deletions
+14
-11
sass.css
dist/styles/sass.css
+1
-1
TopBar.purs
src/Gargantext/Components/GraphExplorer/TopBar.purs
+1
-2
Router.purs
src/Gargantext/Components/Router.purs
+3
-2
SimpleLayout.purs
src/Gargantext/Components/SimpleLayout.purs
+4
-3
TopBar.purs
src/Gargantext/Components/TopBar.purs
+4
-2
_tree.sass
src/sass/_tree.sass
+1
-1
No files found.
dist/styles/sass.css
View file @
0f9d2064
...
@@ -540,7 +540,7 @@ li .leaf:hover a.settings {
...
@@ -540,7 +540,7 @@ li .leaf:hover a.settings {
position
:
fixed
;
position
:
fixed
;
top
:
3.7em
;
top
:
3.7em
;
width
:
15%
;
width
:
15%
;
z-index
:
9
0
0
;
z-index
:
9
1
0
;
}
}
.left-handed
.forest-layout
{
.left-handed
.forest-layout
{
...
...
src/Gargantext/Components/GraphExplorer/TopBar.purs
View file @
0f9d2064
...
@@ -39,8 +39,7 @@ topBarCpt = here.component "topBar" cpt where
...
@@ -39,8 +39,7 @@ topBarCpt = here.component "topBar" cpt where
Nothing -> RH.div {} []
Nothing -> RH.div {} []
pure $ RH.form { className: "d-flex" }
pure $ RH.form { className: "d-flex" }
[ Toggle.treeToggleButton { state: showTree } []
[ Toggle.controlsToggleButton { state: showControls } []
, Toggle.controlsToggleButton { state: showControls } []
, Toggle.sidebarToggleButton { state: sidePanelState } []
, Toggle.sidebarToggleButton { state: sidePanelState } []
, search
, search
]
]
...
...
src/Gargantext/Components/Router.purs
View file @
0f9d2064
...
@@ -91,14 +91,15 @@ topBar p = R.createElement topBarCpt p []
...
@@ -91,14 +91,15 @@ topBar p = R.createElement topBarCpt p []
topBarCpt :: R.Component Props
topBarCpt :: R.Component Props
topBarCpt = here.component "topBar" cpt where
topBarCpt = here.component "topBar" cpt where
cpt props@{ boxes: boxes@{ handed
cpt props@{ boxes: boxes@{ handed
, route } } _ = do
, route
, showTree } } _ = do
route' <- T.useLive T.unequal boxes.route
route' <- T.useLive T.unequal boxes.route
let children = case route' of
let children = case route' of
GR.PGraphExplorer s g -> [ GETB.topBar { boxes } ]
GR.PGraphExplorer s g -> [ GETB.topBar { boxes } ]
_ -> []
_ -> []
pure $ TopBar.topBar { handed } children
pure $ TopBar.topBar { handed
, showTree
} children
mainPage :: R2.Leaf Props
mainPage :: R2.Leaf Props
mainPage p = R.createElement mainPageCpt p []
mainPage p = R.createElement mainPageCpt p []
...
...
src/Gargantext/Components/SimpleLayout.purs
View file @
0f9d2064
...
@@ -17,6 +17,7 @@ here = R2.here "Gargantext.Components.SimpleLayout"
...
@@ -17,6 +17,7 @@ here = R2.here "Gargantext.Components.SimpleLayout"
-- Simple layout does not accommodate the tree
-- Simple layout does not accommodate the tree
type SimpleLayoutProps = (
type SimpleLayoutProps = (
handed :: T.Box GT.Handed
handed :: T.Box GT.Handed
, showTree :: T.Box Boolean
)
)
simpleLayout :: R2.Component SimpleLayoutProps
simpleLayout :: R2.Component SimpleLayoutProps
...
@@ -25,7 +26,7 @@ simpleLayout = R.createElement simpleLayoutCpt
...
@@ -25,7 +26,7 @@ simpleLayout = R.createElement simpleLayoutCpt
simpleLayoutCpt :: R.Component SimpleLayoutProps
simpleLayoutCpt :: R.Component SimpleLayoutProps
simpleLayoutCpt = here.component "simpleLayout" cpt
simpleLayoutCpt = here.component "simpleLayout" cpt
where
where
cpt { handed } children = do
cpt { handed
, showTree
} children = do
pure $ H.div { className: "simple-layout" } (
pure $ H.div { className: "simple-layout" } (
[ topBar { handed } [] ] <> children <> [ license ]
[ topBar { handed
, showTree
} [] ] <> children <> [ license ]
)
)
src/Gargantext/Components/TopBar.purs
View file @
0f9d2064
...
@@ -11,11 +11,12 @@ import Gargantext.Prelude
...
@@ -11,11 +11,12 @@ import Gargantext.Prelude
import Gargantext.Components.Themes (themeSwitcher, defaultTheme, allThemes)
import Gargantext.Components.Themes (themeSwitcher, defaultTheme, allThemes)
import Gargantext.Types (Handed(..), reverseHanded)
import Gargantext.Types (Handed(..), reverseHanded)
import Gargantext.Utils.Reactix as R2
import Gargantext.Utils.Reactix as R2
import Gargantext.Components.GraphExplorer.ToggleButton as Toggle
here :: R2.Here
here :: R2.Here
here = R2.here "Gargantext.Components.TopBar"
here = R2.here "Gargantext.Components.TopBar"
type TopBarProps = ( handed :: T.Box Handed )
type TopBarProps = ( handed :: T.Box Handed
, showTree :: T.Box Boolean
)
topBar :: R2.Component TopBarProps
topBar :: R2.Component TopBarProps
topBar = R.createElement topBarCpt
topBar = R.createElement topBarCpt
...
@@ -23,7 +24,7 @@ topBar = R.createElement topBarCpt
...
@@ -23,7 +24,7 @@ topBar = R.createElement topBarCpt
topBarCpt :: R.Component TopBarProps
topBarCpt :: R.Component TopBarProps
topBarCpt = here.component "topBar" cpt
topBarCpt = here.component "topBar" cpt
where
where
cpt { handed } children = do
cpt { handed
, showTree
} children = do
handed' <- T.useLive T.unequal handed
handed' <- T.useLive T.unequal handed
pure $ H.div { className: "navbar navbar-expand-lg navbar-dark bg-dark fixed-top"
pure $ H.div { className: "navbar navbar-expand-lg navbar-dark bg-dark fixed-top"
...
@@ -42,6 +43,7 @@ topBarCpt = here.component "topBar" cpt
...
@@ -42,6 +43,7 @@ topBarCpt = here.component "topBar" cpt
, smiley
, smiley
, H.li { className: "nav-item" } [ themeSwitcher { theme: defaultTheme
, H.li { className: "nav-item" } [ themeSwitcher { theme: defaultTheme
, themes: allThemes } [] ]
, themes: allThemes } [] ]
, Toggle.treeToggleButton { state: showTree } []
] <> children)
] <> children)
]
]
]
]
...
...
src/sass/_tree.sass
View file @
0f9d2064
...
@@ -173,7 +173,7 @@ li
...
@@ -173,7 +173,7 @@ li
position
:
fixed
position
:
fixed
top
:
3
.7em
top
:
3
.7em
width
:
15%
width
:
15%
z-index
:
9
0
0
z-index
:
9
1
0
.left-handed
.left-handed
.forest-layout
.forest-layout
left
:
80%
left
:
80%
...
...
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