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
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Grégoire Locqueville
purescript-gargantext
Commits
cea93004
Commit
cea93004
authored
Sep 03, 2020
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Plain Diff
[Merge]
parents
e275bde5
83b79870
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
96 additions
and
76 deletions
+96
-76
App.purs
src/Gargantext/Components/App.purs
+27
-21
Forest.purs
src/Gargantext/Components/Forest.purs
+0
-1
Settings.purs
src/Gargantext/Components/Forest/Tree/Node/Settings.purs
+1
-1
Pie.purs
src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
+13
-14
Predefined.purs
src/Gargantext/Components/Nodes/Corpus/Chart/Predefined.purs
+25
-12
Tabs.purs
src/Gargantext/Components/Nodes/Lists/Tabs.purs
+20
-15
Ends.purs
src/Gargantext/Ends.purs
+1
-1
Types.purs
src/Gargantext/Types.purs
+9
-11
No files found.
src/Gargantext/Components/App.purs
View file @
cea93004
...
@@ -169,14 +169,16 @@ topBarCpt = R.hooksComponent "G.C.A.topBar" cpt
...
@@ -169,14 +169,16 @@ topBarCpt = R.hooksComponent "G.C.A.topBar" cpt
, className: "navbar navbar-inverse navbar-fixed-top" }
, className: "navbar navbar-inverse navbar-fixed-top" }
[ H.div { className: "container-fluid" }
[ H.div { className: "container-fluid" }
[ H.div { className: "navbar-inner" }
[ H.div { className: "navbar-inner" }
[ logo
[ logo (fst handed)
, H.div { className: "collapse navbar-collapse" }
, H.div { className: "collapse navbar-collapse" <> navHanded}
[ H.ul { className: "nav navbar-nav" } [divDropdownLeft]
$ sortHanded
[ H.ul { className: "nav navbar-nav" <> navHanded} [divDropdownLeft]
, H.ul { title: "If you are Left Handed you can change "
, H.ul { title: "If you are Left Handed you can change "
<> "the interface by clicking on me.\n
"
<> "the interface by clicking on me. Click
"
<> "Click
to come back to previous state."
<> "again
to come back to previous state."
, className: "nav navbar-nav"
, className: "nav navbar-nav" <> navHanded
} [handedChooser { handed }]
} [handedChooser { handed }]
, H.ul { className: "nav navbar-nav" <> navHanded} []
{-, H.ul { title: "Dark Mode soon here"
{-, H.ul { title: "Dark Mode soon here"
, className : "nav navbar-nav"
, className : "nav navbar-nav"
} [ H.li {} [ H.a {} [ H.span {className : "fa fa-moon"}[]
} [ H.li {} [ H.a {} [ H.span {className : "fa fa-moon"}[]
...
@@ -188,6 +190,9 @@ topBarCpt = R.hooksComponent "G.C.A.topBar" cpt
...
@@ -188,6 +190,9 @@ topBarCpt = R.hooksComponent "G.C.A.topBar" cpt
]
]
]
]
]
]
where
navHanded = if fst handed == GT.LeftHanded then " navbar-right" else ""
sortHanded = if fst handed == GT.LeftHanded then reverse else reverse -- identity
-- SB.searchBar {session, databases: allDatabases}
-- SB.searchBar {session, databases: allDatabases}
type HandedChooserProps = (
type HandedChooserProps = (
...
@@ -215,15 +220,16 @@ handedChooserCpt = R.hooksComponent "G.C.A.handedChooser" cpt
...
@@ -215,15 +220,16 @@ handedChooserCpt = R.hooksComponent "G.C.A.handedChooser" cpt
GT.LeftHanded -> GT.RightHanded
GT.LeftHanded -> GT.RightHanded
GT.RightHanded -> GT.LeftHanded
GT.RightHanded -> GT.LeftHanded
logo :: R.Element
logo ::
GT.Handed ->
R.Element
logo =
logo
handed
=
H.a { className, href: "#/" }
H.a { className, href: "#/" }
[ H.img { src, title, width: "30", height: "28" }
[ H.img { src, title, width: "30", height: "28" }
]
]
where
where
className = "navbar-brand logoSmall"
className = "navbar-brand logoSmall"
<> navHanded
src = "images/logoSmall.png"
src = "images/logoSmall.png"
title = "Back to home."
title = "Back to home."
navHanded = if handed == GT.LeftHanded then " navbar-right" else ""
divDropdownLeft :: R.Element
divDropdownLeft :: R.Element
divDropdownLeft =
divDropdownLeft =
...
...
src/Gargantext/Components/Forest.purs
View file @
cea93004
...
@@ -48,7 +48,6 @@ forestCpt = R.hooksComponent "G.C.Forest.forest" cpt where
...
@@ -48,7 +48,6 @@ forestCpt = R.hooksComponent "G.C.Forest.forest" cpt where
)
)
(cpt' openNodes asyncTasks reload showLogin)
(cpt' openNodes asyncTasks reload showLogin)
cpt' openNodes asyncTasks reload showLogin (frontends /\ route /\ sessions /\ _ /\ _ /\ _ /\ _ /\ handed) = do
cpt' openNodes asyncTasks reload showLogin (frontends /\ route /\ sessions /\ _ /\ _ /\ _ /\ _ /\ handed) = do
--pure $ R.fragment $ A.cons (plus showLogin) trees
pure $ R2.row $ [plus handed showLogin] <> trees
pure $ R2.row $ [plus handed showLogin] <> trees
where
where
trees = tree <$> unSessions sessions
trees = tree <$> unSessions sessions
...
...
src/Gargantext/Components/Forest/Tree/Node/Settings.purs
View file @
cea93004
...
@@ -132,7 +132,7 @@ settingsBox FolderShared =
...
@@ -132,7 +132,7 @@ settingsBox FolderShared =
SettingsBox { show : true
SettingsBox { show : true
, edit : true
, edit : true
, doc : Documentation FolderShared
, doc : Documentation FolderShared
, buttons : [ Add [Team, Folder]
, buttons : [ Add [Team, Folder
Shared
]
-- , Delete
-- , Delete
]
]
}
}
...
...
src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
View file @
cea93004
...
@@ -116,8 +116,7 @@ pieCpt = R.hooksComponent "G.C.N.C.C.P.pie" cpt
...
@@ -116,8 +116,7 @@ pieCpt = R.hooksComponent "G.C.N.C.C.P.pie" cpt
loadedPie :: Record MetricsProps -> HistoMetrics -> R.Element
loadedPie :: Record MetricsProps -> HistoMetrics -> R.Element
loadedPie { path, reload, session } loaded =
loadedPie { path, reload, session } loaded =
H.div {} [
H.div {} [ U.reloadButton reload
U.reloadButton reload
, U.chartUpdateButton { chartType: ChartPie, path, reload, session }
, U.chartUpdateButton { chartType: ChartPie, path, reload, session }
, chart $ chartOptionsPie loaded
, chart $ chartOptionsPie loaded
]
]
...
@@ -132,8 +131,8 @@ barCpt = R.hooksComponent "LoadedMetricsBar" cpt
...
@@ -132,8 +131,8 @@ barCpt = R.hooksComponent "LoadedMetricsBar" cpt
cpt {path, session} _ = do
cpt {path, session} _ = do
reload <- R.useState' 0
reload <- R.useState' 0
--pure $ metricsLoadView {getMetrics, loaded: loadedBar, path, reload, session}
--pure $ metricsLoadView {getMetrics, loaded: loadedBar, path, reload, session}
pure $ metricsWithCacheLoadView
{
pure $ metricsWithCacheLoadView
getMetricsHash
{
getMetricsHash
, handleResponse
, handleResponse
, loaded: loadedPie
, loaded: loadedPie
, mkRequest: mkRequest session
, mkRequest: mkRequest session
...
...
src/Gargantext/Components/Nodes/Corpus/Chart/Predefined.purs
View file @
cea93004
...
@@ -19,8 +19,10 @@ import Gargantext.Types (NodeID, Mode(..), TabSubType(..), TabType(..), modeTabT
...
@@ -19,8 +19,10 @@ import Gargantext.Types (NodeID, Mode(..), TabSubType(..), TabType(..), modeTabT
data PredefinedChart =
data PredefinedChart =
CDocsHistogram
CDocsHistogram
| CAuthorsPie
| CAuthorsPie
| CSourcesBar
| CInstitutesTree
| CInstitutesTree
| CTermsMetrics
| CTermsMetrics
derive instance genericPredefinedChart :: Generic PredefinedChart _
derive instance genericPredefinedChart :: Generic PredefinedChart _
instance showPredefinedChart :: Show PredefinedChart where
instance showPredefinedChart :: Show PredefinedChart where
...
@@ -42,30 +44,30 @@ instance encodePredefinedChart :: EncodeJson PredefinedChart where
...
@@ -42,30 +44,30 @@ instance encodePredefinedChart :: EncodeJson PredefinedChart where
instance readPredefinedChart :: Read PredefinedChart where
instance readPredefinedChart :: Read PredefinedChart where
read "CDocsHistogram" = Just CDocsHistogram
read "CDocsHistogram" = Just CDocsHistogram
read "CAuthorsPie" = Just CAuthorsPie
read "CAuthorsPie" = Just CAuthorsPie
read "CSourcesBar" = Just CSourcesBar
read "CInstitutesTree" = Just CInstitutesTree
read "CInstitutesTree" = Just CInstitutesTree
read "CTermsMetrics" = Just CTermsMetrics
read "CTermsMetrics" = Just CTermsMetrics
read _ = Nothing
read _ = Nothing
allPredefinedCharts :: Array PredefinedChart
allPredefinedCharts :: Array PredefinedChart
allPredefinedCharts =
[
allPredefinedCharts =
CDocsHistogram
[
CDocsHistogram
, CAuthorsPie
, CAuthorsPie
, CTermsMetrics
, CTermsMetrics
, CInstitutesTree
, CInstitutesTree
, CSourcesBar
]
]
type Params =
type Params =
(
( corpusId :: NodeID
corpusId :: NodeID
, session :: Session
, session :: Session
-- optinal params
-- optinal params
, limit :: Maybe Int
, limit :: Maybe Int
, listId :: Maybe Int
, listId :: Maybe Int
)
)
render :: PredefinedChart -> Record Params -> R.Element
render :: PredefinedChart -> Record Params -> R.Element
render CDocsHistogram { corpusId, listId, session } = histo { path, session }
render CDocsHistogram { corpusId, listId, session } = histo { path, session }
where
where
...
@@ -93,5 +95,16 @@ render CTermsMetrics { corpusId, limit, listId, session } = metrics { path, sess
...
@@ -93,5 +95,16 @@ render CTermsMetrics { corpusId, limit, listId, session } = metrics { path, sess
path = { corpusId
path = { corpusId
, limit
, limit
, listId: fromMaybe 0 listId
, listId: fromMaybe 0 listId
, tabType: TabCorpus (TabNgramType $ modeTabType
Author
s)
, tabType: TabCorpus (TabNgramType $ modeTabType
Term
s)
}
}
render CSourcesBar { corpusId, limit, listId, session } = metrics { path, session }
where
path = { corpusId
, limit
, listId: fromMaybe 0 listId
, tabType: TabCorpus (TabNgramType $ modeTabType Sources)
}
src/Gargantext/Components/Nodes/Lists/Tabs.purs
View file @
cea93004
...
@@ -18,10 +18,10 @@ import Gargantext.Sessions (Session)
...
@@ -18,10 +18,10 @@ import Gargantext.Sessions (Session)
import Gargantext.Types (ChartType(..), CTabNgramType(..), Mode(..), TabSubType(..), TabType(..), chartTypeFromString, modeTabType)
import Gargantext.Types (ChartType(..), CTabNgramType(..), Mode(..), TabSubType(..), TabType(..), chartTypeFromString, modeTabType)
import Gargantext.Utils.Reactix as R2
import Gargantext.Utils.Reactix as R2
type Props =
type Props = ( session :: Session
( session :: Session
, corpusId :: Int
, corpusId :: Int
, corpusData :: CorpusData )
, corpusData :: CorpusData
)
tabs :: Record Props -> R.Element
tabs :: Record Props -> R.Element
tabs props = R.createElement tabsCpt props []
tabs props = R.createElement tabsCpt props []
...
@@ -54,7 +54,7 @@ ngramsViewCpt = R.hooksComponent "G.C.N.L.T.ngramsView" cpt
...
@@ -54,7 +54,7 @@ ngramsViewCpt = R.hooksComponent "G.C.N.L.T.ngramsView" cpt
chartType <- R.useState' Histo
chartType <- R.useState' Histo
pure $ R.fragment
pure $ R.fragment
$
charts tabNgramType chartType
(
charts tabNgramType chartType
<> [ NT.mainNgramsTable { session
<> [ NT.mainNgramsTable { session
, defaultListId
, defaultListId
, nodeId: corpusId
, nodeId: corpusId
...
@@ -63,16 +63,20 @@ ngramsViewCpt = R.hooksComponent "G.C.N.L.T.ngramsView" cpt
...
@@ -63,16 +63,20 @@ ngramsViewCpt = R.hooksComponent "G.C.N.L.T.ngramsView" cpt
, withAutoUpdate: false
, withAutoUpdate: false
}
}
]
]
)
where
where
tabNgramType = modeTabType mode
tabNgramType = modeTabType mode
tabType = TabCorpus (TabNgramType tabNgramType)
tabType = TabCorpus (TabNgramType tabNgramType)
listId = defaultListId
listId = defaultListId
path = {corpusId, listId, tabType, limit: (Just 1000)}
path = { corpusId
, listId
, tabType
, limit: Just 1000
}
charts CTabTerms (chartType /\ setChartType) = [
charts CTabTerms (chartType /\ setChartType) = [
H.div { className: "row chart-type-selector" } [
H.div { className: "row chart-type-selector" } [
H.div { className: "col-md-3" } [
H.div { className: "col-md-3" } [
R2.select { className: "form-control"
R2.select { className: "form-control"
, on: { change: \e -> setChartType
, on: { change: \e -> setChartType
$ const
$ const
...
@@ -84,6 +88,7 @@ ngramsViewCpt = R.hooksComponent "G.C.N.L.T.ngramsView" cpt
...
@@ -84,6 +88,7 @@ ngramsViewCpt = R.hooksComponent "G.C.N.L.T.ngramsView" cpt
H.option { value: show Histo } [ H.text $ show Histo ]
H.option { value: show Histo } [ H.text $ show Histo ]
, H.option { value: show Scatter } [ H.text $ show Scatter ]
, H.option { value: show Scatter } [ H.text $ show Scatter ]
, H.option { value: show ChartBar } [ H.text $ show ChartBar ]
, H.option { value: show ChartBar } [ H.text $ show ChartBar ]
, H.option { value: show ChartPie } [ H.text $ show ChartPie ]
, H.option { value: show ChartTree } [ H.text $ show ChartTree ]
, H.option { value: show ChartTree } [ H.text $ show ChartTree ]
]
]
]
]
...
...
src/Gargantext/Ends.purs
View file @
cea93004
...
@@ -119,7 +119,7 @@ sessionPath (R.Tab t i) = sessionPath (R.NodeAPI Node i (showTabType
...
@@ -119,7 +119,7 @@ sessionPath (R.Tab t i) = sessionPath (R.NodeAPI Node i (showTabType
sessionPath (R.Children n o l s i) = sessionPath (R.NodeAPI Node i ("children?type=" <> show n <> offsetUrl o <> limitUrl l <> orderUrl s))
sessionPath (R.Children n o l s i) = sessionPath (R.NodeAPI Node i ("children?type=" <> show n <> offsetUrl o <> limitUrl l <> orderUrl s))
sessionPath (R.NodeAPI Phylo pId p) = "phyloscape?nodeId=" <> (show $ fromMaybe 0 pId) <> p
sessionPath (R.NodeAPI Phylo pId p) = "phyloscape?nodeId=" <> (show $ fromMaybe 0 pId) <> p
sessionPath (R.RecomputeNgrams nt nId lId) = "node/" <> (show nId) <> "/ngrams/recompute?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
sessionPath (R.RecomputeNgrams nt nId lId) = "node/" <> (show nId) <> "/ngrams/recompute?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
sessionPath (R.RecomputeListChart ChartBar nt nId lId) = "node/" <> (show nId) <> "/
pie
?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
sessionPath (R.RecomputeListChart ChartBar nt nId lId) = "node/" <> (show nId) <> "/
chart
?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
sessionPath (R.RecomputeListChart ChartPie nt nId lId) = "node/" <> (show nId) <> "/pie?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
sessionPath (R.RecomputeListChart ChartPie nt nId lId) = "node/" <> (show nId) <> "/pie?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
sessionPath (R.RecomputeListChart ChartTree nt nId lId) = "node/" <> (show nId) <> "/tree?" <> (defaultList lId) <> "&ngramsType=" <> (show nt) <> "&listType=" <> show MapTerm
sessionPath (R.RecomputeListChart ChartTree nt nId lId) = "node/" <> (show nId) <> "/tree?" <> (defaultList lId) <> "&ngramsType=" <> (show nt) <> "&listType=" <> show MapTerm
sessionPath (R.RecomputeListChart Histo nt nId lId) = "node/" <> (show nId) <> "/chart?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
sessionPath (R.RecomputeListChart Histo nt nId lId) = "node/" <> (show nId) <> "/chart?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
...
...
src/Gargantext/Types.purs
View file @
cea93004
...
@@ -16,8 +16,6 @@ import Prelude
...
@@ -16,8 +16,6 @@ import Prelude
import Prim.Row (class Union)
import Prim.Row (class Union)
import URI.Query (Query)
import URI.Query (Query)
data Handed = LeftHanded | RightHanded
data Handed = LeftHanded | RightHanded
derive instance genericHanded :: Generic Handed _
derive instance genericHanded :: Generic Handed _
...
...
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