Commit 443aba7a authored by Alexandre Delanoë's avatar Alexandre Delanoë

[DESIGN] Adding Charts and fix some design before implementation.

parent 55e35e2f
......@@ -63,7 +63,7 @@ title mainTitle subTitle =
,itemGap: 0.0
,zlevel: 2.0
,z: 2.0
,left: relativePosition (Relative LeftPos)
,left: relativePosition (Relative RightPos)
,top: relativePosition (Relative Top)
,right: numberPosition 60.0
,bottom: percentPosition 40.0
......
......@@ -176,10 +176,9 @@ tableSpec = simpleSpec performAction render
defaultContainer :: {title :: String} -> TableContainerProps -> Array ReactElement
defaultContainer {title} props =
[ div [className "row"]
[ div [className "col-md-1"] [b [] [text title]]
, div [className "col-md-2"] [props.pageSizeControl]
, div [className "col-md-3"] [props.pageSizeDescription]
, div [className "col-md-3"] [props.paginationLinks]
[ div [className "col-md-4"] [props.pageSizeDescription]
, div [className "col-md-4"] [props.paginationLinks]
, div [className "col-md-4"] [props.pageSizeControl]
]
, table [ className "table"]
[ thead [className "thead-dark"] [ props.tableHead ]
......@@ -218,8 +217,9 @@ tableElt props = createElement tableClass props []
sizeDD :: PageSizes -> (Action -> Effect Unit) -> ReactElement
sizeDD ps d
= span []
[ text " "
, select [onChange (\e -> d (ChangePageSize $ string2PageSize $ (unsafeCoerce e).target.value))] $ map (optps ps) aryPS
[ select [ className "form-control"
, onChange (\e -> d (ChangePageSize $ string2PageSize $ (unsafeCoerce e).target.value))
] $ map (optps ps) aryPS
]
textDescription :: Int -> PageSizes -> Int -> ReactElement
......
module Gargantext.Pages.Corpus.Metrics where
module Gargantext.Pages.Corpus.Chart.Metrics where
import Data.Array (foldl)
import Data.Tuple (Tuple(..))
......
module Gargantext.Pages.Corpus.Pie where
module Gargantext.Pages.Corpus.Chart.Pie where
import Data.Array (foldl)
import Data.Tuple (Tuple(..))
......
module Gargantext.Pages.Corpus.Tree where
module Gargantext.Pages.Corpus.Chart.Tree where
import Data.Array (foldl)
import Data.Tuple (Tuple(..))
......
......@@ -41,7 +41,7 @@ render dispatch _ state _ = [
, subTitle : "Total scientific publications"
, xAxis : xAxis' ["2015", "2016", "2017"]
, yAxis : yAxis' { position: "left"
, show: true
, show: false
}
, series : myData
, addZoom : false
......
......@@ -12,9 +12,9 @@ import Gargantext.Config (TabType(..), TabSubType(..))
import Gargantext.Config (CTabNgramType(..), End(..), Path(..), TabSubType(..), TabType(..), toUrl)
import Gargantext.Pages.Corpus.Tabs.Types (Props)
import Gargantext.Pages.Corpus.Metrics (metricsSpec)
import Gargantext.Pages.Corpus.Pie (pieSpec)
import Gargantext.Pages.Corpus.Tree (treeSpec)
import Gargantext.Pages.Corpus.Chart.Metrics (metricsSpec)
import Gargantext.Pages.Corpus.Chart.Pie (pieSpec)
import Gargantext.Pages.Corpus.Chart.Tree (treeSpec)
import Gargantext.Pages.Corpus.Dashboard (globalPublis)
import Gargantext.Components.NgramsTable as NT
......
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