Commit 36a472e4 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

[bootstrap v4] ngrams table work

parent 9b3764b0
...@@ -149,11 +149,10 @@ tableContainerCpt { dispatch ...@@ -149,11 +149,10 @@ tableContainerCpt { dispatch
} = R.hooksComponentWithModule thisModule "tableContainer" cpt } = R.hooksComponentWithModule thisModule "tableContainer" cpt
where where
cpt props _ = do cpt props _ = do
pure $ H.div {className: "container-fluid"} pure $ H.div {className: "container-fluid"} [
[ H.div {className: "jumbotron1"} R2.row
[ R2.row [ H.div {className: "card col-12"}
[ H.div {className: "panel panel-default"} [ H.div {className: "card-header"}
[ H.div {className: "panel-heading"}
[ [
R2.row [ H.div {className: "col-md-2", style: {marginTop: "6px"}} R2.row [ H.div {className: "col-md-2", style: {marginTop: "6px"}}
[ H.div {} syncResetButton [ H.div {} syncResetButton
...@@ -214,7 +213,7 @@ tableContainerCpt { dispatch ...@@ -214,7 +213,7 @@ tableContainerCpt { dispatch
else H.div {} [] else H.div {} []
, H.div {id: "terms_table", className: "panel-body"} , H.div {id: "terms_table", className: "panel-body"}
[ H.table {className: "table able"} [ H.table {className: "table able"}
[ H.thead {className: "tableHeader"} [props.tableHead] [ H.thead {className: ""} [props.tableHead]
, H.tbody {} props.tableBody , H.tbody {} props.tableBody
] ]
, H.li {className: "list-group-item"} , H.li {className: "list-group-item"}
...@@ -229,7 +228,6 @@ tableContainerCpt { dispatch ...@@ -229,7 +228,6 @@ tableContainerCpt { dispatch
] ]
] ]
] ]
]
-- WHY setPath f = origSetPageParams (const $ f path) -- WHY setPath f = origSetPageParams (const $ f path)
setTermListFilter x = setPath $ _ { termListFilter = x } setTermListFilter x = setPath $ _ { termListFilter = x }
setTermSizeFilter x = setPath $ _ { termSizeFilter = x } setTermSizeFilter x = setPath $ _ { termSizeFilter = x }
......
...@@ -38,17 +38,21 @@ searchInputCpt :: R.Component SearchInputProps ...@@ -38,17 +38,21 @@ searchInputCpt :: R.Component SearchInputProps
searchInputCpt = R.hooksComponentWithModule thisModule "searchInput" cpt searchInputCpt = R.hooksComponentWithModule thisModule "searchInput" cpt
where where
cpt { onSearch, searchQuery } _ = cpt { onSearch, searchQuery } _ =
pure $ H.div { className: "input-group" } pure $ R2.row [
[ searchButton H.div { className: "col-12" } [
H.div { className: "input-group" } [
searchButton
, fieldInput , fieldInput
] ]
]
]
where where
searchButton = searchButton =
H.div { className: "input-group-addon" } H.div { className: "input-group-prepend" }
[ [
if searchQuery /= "" if searchQuery /= ""
then removeButton then removeButton
else H.span { className: "fa fa-search" } [] else H.span { className: "fa fa-search input-group-text" } []
] ]
removeButton = removeButton =
H.button { className: "btn btn-danger" H.button { className: "btn btn-danger"
......
...@@ -155,7 +155,7 @@ ngramsViewCpt = R.hooksComponentWithModule thisModule "ngramsView" cpt ...@@ -155,7 +155,7 @@ ngramsViewCpt = R.hooksComponentWithModule thisModule "ngramsView" cpt
charts params CTabTerms (chartType /\ setChartType) _ = [ charts params CTabTerms (chartType /\ setChartType) _ = [
H.div {className: "row"} H.div {className: "row"}
[ H.div {className: "col-md-offset-5 col-md-6 content"} [ H.div {className: "col-6 ml-auto mr-auto"}
[ H.img { src: "images/Gargantextuel-212x300.jpg" [ H.img { src: "images/Gargantextuel-212x300.jpg"
, id: "funnyimg" , id: "funnyimg"
} }
......
...@@ -168,11 +168,13 @@ defaultContainer {title} props = R.fragment $ props.syncResetButton <> controls ...@@ -168,11 +168,13 @@ defaultContainer {title} props = R.fragment $ props.syncResetButton <> controls
, H.div {className: "col-md-4"} [ props.paginationLinks ] , H.div {className: "col-md-4"} [ props.paginationLinks ]
, H.div {className: "col-md-4"} [ props.pageSizeControl ] , H.div {className: "col-md-4"} [ props.pageSizeControl ]
] ]
, H.table {className: "table"} , R2.row [
H.table {className: "col-md-12 table"}
[ H.thead {className: "thead-dark"} [ props.tableHead ] [ H.thead {className: "thead-dark"} [ props.tableHead ]
, H.tbody {} props.tableBody , H.tbody {} props.tableBody
] ]
] ]
]
-- TODO: this needs to be in Gargantext.Pages.Corpus.Graph.Tabs -- TODO: this needs to be in Gargantext.Pages.Corpus.Graph.Tabs
graphContainer :: {title :: String} -> Record TableContainerProps -> R.Element graphContainer :: {title :: String} -> Record TableContainerProps -> R.Element
......
...@@ -203,7 +203,7 @@ appendChildToParentId ps c = delay unit $ \_ -> do ...@@ -203,7 +203,7 @@ appendChildToParentId ps c = delay unit $ \_ -> do
Just el -> appendChild el c Just el -> appendChild el c
effectLink :: Effect Unit -> String -> R.Element effectLink :: Effect Unit -> String -> R.Element
effectLink eff msg = H.a {on: {click: const eff}} [H.text msg] effectLink eff msg = H.a { on: {click: const eff} } [H.text msg]
useCache :: forall i o. Eq i => i -> (i -> R.Hooks o) -> R.Hooks o useCache :: forall i o. Eq i => i -> (i -> R.Hooks o) -> R.Hooks o
useCache i f = do useCache i f = do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment