[FACTO] adding AddCorpus to Specs of Layout and Corpus description to the right place.

src/Gargantext/Pages/Corpus.purs

-module Gargantext.Pages.Corpus
-  ( module Gargantext.Pages.Corpus.States
-  , module Gargantext.Pages.Corpus.Actions
-  , module Gargantext.Pages.Corpus.Specs
-  ) where
+module Gargantext.Pages.Corpus where
 
-import Gargantext.Pages.Corpus.States
-import Gargantext.Pages.Corpus.Actions
-import Gargantext.Pages.Corpus.Specs
+import Prelude hiding (div)
 
+import Control.Monad.Eff.Console (CONSOLE)
+import DOM (DOM)
+import Data.Array (fold)
+import Gargantext.Components.Charts.Options.ECharts (chart)
+import Gargantext.Pages.Corpus.Doc.Facets.Dashboard (globalPublis)
+import Gargantext.Pages.Corpus.Doc.Facets as Tab
+import Network.HTTP.Affjax (AJAX)
+import React.DOM (div, h3, hr, i, p, text)
+import React.DOM.Props (className, style)
+import Thermite (Render, Spec, defaultPerformAction, simpleSpec)
+
+type State = Tab.State
+
+type Action = Tab.Action
+
+type Corpus = { title :: String
+              , desc  :: String
+              , query :: String
+              , date  :: String
+              , authors :: String
+              }
+
+initialState :: State
+initialState = Tab.initialState
+
+spec' :: forall eff props. Spec (dom :: DOM, console :: CONSOLE, ajax :: AJAX | eff) Tab.State props Tab.Action
+spec' = fold [ corpusSpec
+             , Tab.tab1
+             ]
+
+corpusSpec :: forall props eff . Spec eff Tab.State props Tab.Action
+corpusSpec = simpleSpec defaultPerformAction render
+  where
+    render :: Render Tab.State props Tab.Action
+    render dispatch _ state _ =
+      [ div [className "row"]
+        [ div [className "col-md-3"] [ h3 [] [text corpus.title] ]
+        , div [className "col-md-9"] [ hr [style {height : "2px",backgroundColor : "black"}] [] ]
+        ]
+      , div [className "row"] [ div [className "jumbotron1", style {padding : "12px 0px 20px 12px"}]
+            [ div [ className "col-md-8 content"]
+                  [ p [] [ i [className "fa fa-globe"] []
+                         , text corpus.desc
+                         ]
+                  , p [] [ i [className "fab fa-searchengin"] []
+                         , text corpus.query
+                         ]
+                  ]
+            , div [ className "col-md-4 content"]
+                  [ p [] [ i [className "fa fa-calendar"] []
+                         , text corpus.date
+                         ]
+                  , p [] [ i [className "fa fa-user"] []
+                         , text corpus.authors
+                         ]
+                  ]
+            ]
+        ]
+        , chart globalPublis
+      ]
+        where
+          corpus :: Corpus
+          corpus = { title : "IMT Global Publications"
+                   , desc  : " Hal Database"
+                   , query : " Query: all publications"
+                   , date  : " June. 26 2018, 10:59 am"
+                   , authors : " Author(s): françois.pineau"
+                   }

src/Gargantext/Pages/Corpus/Doc/Body.purs

-module Gargantext.Pages.Corpus.Doc.Body where
-
-import Prelude hiding (div)
-
-import Control.Monad.Eff.Console (CONSOLE)
-import DOM (DOM)
-import Data.Array (fold)
-import Gargantext.Components.Charts.Options.ECharts (chart)
-import Gargantext.Pages.Corpus.Doc.Facets.Dashboard (globalPublis)
-import Gargantext.Pages.Corpus.Doc.Facets as Tab
-import Network.HTTP.Affjax (AJAX)
-import React.DOM (div, h3, hr, i, p, text)
-import React.DOM.Props (className, style)
-import Thermite (Render, Spec, defaultPerformAction, simpleSpec)
-
-type State = Tab.State
-
-type Action = Tab.Action
-
-initialState :: State
-initialState = Tab.initialState
-
-spec' :: forall eff props. Spec (dom :: DOM, console :: CONSOLE, ajax :: AJAX | eff) Tab.State props Tab.Action
-spec' = fold [ corpusAnalysisSpec
-             , Tab.tab1
-             ]
-
-corpusAnalysisSpec :: forall props eff . Spec eff Tab.State props Tab.Action
-corpusAnalysisSpec = simpleSpec defaultPerformAction render
-  where
-    render :: Render Tab.State props Tab.Action
-    render dispatch _ state _ =
-      [ div [className "row"]
-        [ div [className "col-md-3"]
-          [ h3 [] [text "IMT Global publications"]
-
-          ]
-        , div [className "col-md-9"]
-          [ hr [style {height : "2px",backgroundColor : "black"}] []
-          ]
-        ]
-      , div [className "row"]
-          [ div [className "jumbotron1", style {padding : "12px 0px 20px 12px"}]
-            [ div [ className "col-md-8 content"]
-                  [ p [] [ i [className "fa fa-globe"] []
-                         , text " Hal Database"
-                         ]
-                  , p [] [ i [className "fab fa-searchengin"] []
-                         , text " Query: all publications with all schools ids"
-                         ]
-                  ]
-            , div [ className "col-md-4 content"]
-                  [ p [] [ i [className "fa fa-calendar"] []
-                         , text " June. 26 2018, 10:59 am"
-                         ]
-                  , p [] [ i [className "fa fa-user"] []
-                         , text " Author(s): françois.pineau"
-                         ]
-                  ]
-            ]
-        ]
-        , chart globalPublis
-      ]

src/Gargantext/Pages/Layout.purs

@@ -3,7 +3,7 @@ module Gargantext.Pages.Layout where
 import Prelude hiding (div)
 import Gargantext.Components.Login as LN
 import Gargantext.Pages.Layout.Actions (Action(..))
-import Gargantext.Pages.Corpus as AC
+import Gargantext.Pages.Layout.Specs.AddCorpus as AC
 import Gargantext.Pages.Corpus.Doc.Annotation as D
 import Gargantext.Pages.Corpus.Doc.Document as DV
 import Gargantext.Pages.Corpus.Doc.Facets as TV
@@ -11,7 +11,7 @@ import Gargantext.Pages.Corpus.Doc.Facets.Graph as GE
 import Gargantext.Pages.Corpus.Doc.Facets.Terms.NgramsTable as NG
 import Gargantext.Pages.Corpus.User.Users as U
 import Gargantext.Pages.Home as L
-import Gargantext.Pages.Search as S
+import Gargantext.Pages.Layout.Specs.Search as S
 import Gargantext.Router (Routes(..))
 
 dispatchAction :: forall t115 t445 t447.

src/Gargantext/Pages/Layout/Actions.purs

@@ -13,9 +13,9 @@ import Data.Lens (Prism', prism)
 import Gargantext.Components.Login              as LN
 import Gargantext.Components.Modals.Modal          (modalShow)
 import Gargantext.Components.Tree               as Tree
-import Gargantext.Pages.Corpus                  as AC
+import Gargantext.Pages.Layout.Specs.AddCorpus as AC
 import Gargantext.Pages.Corpus.Doc.Annotation   as D
-import Gargantext.Pages.Corpus.Doc.Body         as CA
+import Gargantext.Pages.Corpus                  as CA
 import Gargantext.Pages.Corpus.Doc.Document     as DV
 import Gargantext.Pages.Corpus.Doc.Facets       as TV
 import Gargantext.Pages.Corpus.Doc.Facets.Dashboard as Dsh
@@ -24,7 +24,7 @@ import Gargantext.Pages.Corpus.Doc.Facets.Terms.NgramsTable as NG
 import Gargantext.Pages.Corpus.User.Users       as U
 import Gargantext.Pages.Home                    as L
 import Gargantext.Pages.Layout.States (AppState)
-import Gargantext.Pages.Search                  as S
+import Gargantext.Pages.Layout.Specs.Search     as S
 import Gargantext.Router                           (Routes)
 
 import Network.HTTP.Affjax (AJAX)

src/Gargantext/Pages/Layout/Specs.purs

@@ -42,9 +42,9 @@ import Gargantext.Pages.Layout.Actions (         _addCorpusAction
                                        ,              _treeAction
                                        ,          _userPageAction
                                        )
-import Gargantext.Pages.Corpus as AC
+import Gargantext.Pages.Layout.Specs.AddCorpus as AC
 import Gargantext.Pages.Corpus.Doc.Annotation as D
-import Gargantext.Pages.Corpus.Doc.Body as CA
+import Gargantext.Pages.Corpus as CA
 import Gargantext.Pages.Corpus.Doc.Document as DV
 import Gargantext.Pages.Corpus.Doc.Facets as TV
 import Gargantext.Pages.Corpus.Doc.Facets.Dashboard as Dsh
@@ -54,7 +54,7 @@ import Gargantext.Pages.Corpus.User.Users as U
 import Gargantext.Pages.Home as L
 import Gargantext.Pages.Layout.Actions (Action(..), performAction)
 import Gargantext.Pages.Layout.States (AppState, E)
-import Gargantext.Pages.Search as S
+import Gargantext.Pages.Layout.Specs.Search as S
 import Gargantext.Router (Routes(..))
 
 import Network.HTTP.Affjax (AJAX)

src/Gargantext/Pages/Layout/Specs/AddCorpus.purs

+module Gargantext.Pages.Layout.Specs.AddCorpus
+  ( module Gargantext.Pages.Layout.Specs.AddCorpus.States
+  , module Gargantext.Pages.Layout.Specs.AddCorpus.Actions
+  , module Gargantext.Pages.Layout.Specs.AddCorpus.Specs
+  ) where
+
+import Gargantext.Pages.Layout.Specs.AddCorpus.States
+import Gargantext.Pages.Layout.Specs.AddCorpus.Actions
+import Gargantext.Pages.Layout.Specs.AddCorpus.Specs
+

src/Gargantext/Pages/Corpus/Actions.purs → src/Gargantext/Pages/Layout/Specs/AddCorpus/Actions.purs

-module Gargantext.Pages.Corpus.Actions where
+module Gargantext.Pages.Layout.Specs.AddCorpus.Actions where
 
 import Prelude hiding (div)
 
@@ -17,7 +17,7 @@ import Data.Maybe (Maybe(Just))
 import Data.MediaType.Common (applicationJSON)
 
 import Gargantext.Components.Modals.Modal (modalHide)
-import Gargantext.Pages.Corpus.States
+import Gargantext.Pages.Layout.Specs.AddCorpus.States
 
 import Network.HTTP.Affjax (AJAX, affjax, defaultRequest)
 import Network.HTTP.RequestHeader (RequestHeader(..))

src/Gargantext/Pages/Corpus/Specs.purs → src/Gargantext/Pages/Layout/Specs/AddCorpus/Specs.purs

-module Gargantext.Pages.Corpus.Specs where
+module Gargantext.Pages.Layout.Specs.AddCorpus.Specs where
 
 import Prelude hiding (div)
 
@@ -18,8 +18,8 @@ import Data.MediaType.Common (applicationJSON)
 
 import Gargantext.Components.Modals.Modal (modalHide)
 
-import Gargantext.Pages.Corpus.States
-import Gargantext.Pages.Corpus.Actions
+import Gargantext.Pages.Layout.Specs.AddCorpus.States
+import Gargantext.Pages.Layout.Specs.AddCorpus.Actions
 
 import Network.HTTP.Affjax (AJAX, affjax, defaultRequest)
 import Network.HTTP.RequestHeader (RequestHeader(..))
@@ -30,40 +30,32 @@ import Routing.Hash.Aff (setHash)
 import Thermite (PerformAction, Render, Spec, _render, cotransform, modifyState, simpleSpec)
 
 
-
 modalSpec :: forall eff props. Boolean -> String -> Spec eff State props Action -> Spec eff State props Action
 modalSpec sm t = over _render \render d p s c ->
   [ div [ _id "addCorpus", className $ "modal myModal" <> if sm then "" else " fade"
-            , role "dialog"
-            , _data {show : true}
-            ][ div [ className "modal-dialog"
-                   , role "document"
-                   ] [ div [ className "modal-content"]
-                       [ div [ className "modal-header"]
-                         [ h5 [ className "modal-title"
-                              ]
-                           [ text $ t
+        , role "dialog"
+        , _data {show : true}
+        ][ div [ className "modal-dialog", role "document"]
+               [ div [ className "modal-content"] 
+                     [ div [ className "modal-header"]
+                           [ h5 [ className "modal-title" ] [ text $ t ]
+                           , button [ _type "button"
+                                    , className "close"
+                                    , _data { dismiss : "modal"}
+                                    ] [ span [ aria {hidden : true}] [ text "X"] ]
                            ]
-                         , button [ _type "button"
-                                  , className "close"
-                                  , _data { dismiss : "modal"}
-                                  ] [ span [ aria {hidden : true}]
-                                      [ text "X"]
-                                    ]
-                         ]
-
-                       , div [ className "modal-body"]
-                         (render d p s c)
-                       ]
-                     ]
-             ]
-  ]
+
+                      , div [ className "modal-body"] (render d p s c)
+                      ]
+                ]
+         ]
+   ]
+
 
 spec' :: forall eff props. Spec (console:: CONSOLE, ajax :: AJAX, dom :: DOM | eff) State props Action
 spec' = modalSpec true "Search Results" layoutAddcorpus
 
 
-
 layoutModal :: forall e.  { response :: Array Response | e} -> Array ReactElement
 layoutModal state =
       [button [ _type "button"
@@ -78,10 +70,8 @@ layoutModal state =
                           , role "document"
                           ] [ div [ className "modal-content"]
                                   [ div [ className "modal-header"]
-                                        [ h5 [ className "modal-title"
-                                             ]
-                                             [ text "CorpusView"
-                                             ]
+                                        [ h5 [className "modal-title"]
+                                             [text "CorpusView"      ]
                                         , button [ _type "button"
                                                  , className "close"
                                                  , _data { dismiss : "modal"}
@@ -112,27 +102,21 @@ layoutModal state =
           ]
 
 
-
 layoutAddcorpus :: forall props eff . Spec (console::CONSOLE, ajax::AJAX, dom::DOM | eff) State props Action
 layoutAddcorpus = simpleSpec performAction render
   where
     render :: Render State props Action
     render dispatch _ state _ =
-      [
-        div [className "container1"] []
-      ,  div [className "container1"]
-        [
-          div [className "jumbotron"]
+      [ div [className "container1"] []
+      , div [className "container1"]
+        [ div [className "jumbotron"]
           [ div [className "row"]
-           [
-             div [className "col-md-6"] (layoutModal state)
+           [ div [className "col-md-6"] (layoutModal state)
            , div [className "col-md-6"]
-             [
-               h3 [] [text "Corpusview"]
+             [ h3 [] [text "Corpusview"]
              , ul [className "list-group"] $ map fn1 state.response
              , button [onClick \_ -> dispatch GO] [text "GO"]
              ]
-
            ]
           ]
         ]

src/Gargantext/Pages/Corpus/States.purs → src/Gargantext/Pages/Layout/Specs/AddCorpus/States.purs

-module Gargantext.Pages.Corpus.States where
+module Gargantext.Pages.Layout.Specs.AddCorpus.States where
 
 import Prelude hiding (div)
 import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, encodeJson, jsonEmptyObject, (.?), (:=), (~>))

src/Gargantext/Pages/Search.purs → src/Gargantext/Pages/Layout/Specs/Search.purs

-module Gargantext.Pages.Search where
+module Gargantext.Pages.Layout.Specs.Search where
 
 import Control.Monad.Aff.Console (CONSOLE)
 import Control.Monad.Cont.Trans (lift)
@@ -21,7 +21,7 @@ type State =
 initialState :: State
 initialState =
   {
-    query : ""
+    query : "empty query"
   }
 
 

src/Gargantext/Pages/Layout/States.purs

@@ -9,9 +9,9 @@ import Data.Maybe (Maybe(Just))
 
 import Gargantext.Components.Login              as LN
 import Gargantext.Components.Tree               as Tree
-import Gargantext.Pages.Corpus                  as AC
+import Gargantext.Pages.Layout.Specs.AddCorpus  as AC
+import Gargantext.Pages.Corpus                  as CA
 import Gargantext.Pages.Corpus.Doc.Annotation   as D
-import Gargantext.Pages.Corpus.Doc.Body         as CA
 import Gargantext.Pages.Corpus.Doc.Document     as DV
 import Gargantext.Pages.Corpus.Doc.Facets       as TV
 import Gargantext.Pages.Corpus.Doc.Facets.Dashboard as Dsh
@@ -19,7 +19,7 @@ import Gargantext.Pages.Corpus.Doc.Facets.Graph as GE
 import Gargantext.Pages.Corpus.Doc.Facets.Terms.NgramsTable as NG
 import Gargantext.Pages.Corpus.User.Users       as U
 import Gargantext.Pages.Home                    as L
-import Gargantext.Pages.Search                  as S
+import Gargantext.Pages.Layout.Specs.Search     as S
 import Gargantext.Router                           (Routes(..))
 
 import Network.HTTP.Affjax (AJAX)
@@ -37,7 +37,7 @@ type AppState =
   , docAnnotationState :: D.State
   , ntreeState     :: Tree.State
   , tabviewState   :: TV.State
-  , search    :: String
+  , search         :: String
   , corpusState    :: CA.State
   , showLogin      :: Boolean
   , showCorpus     :: Boolean