Hide landingState (part 1 without the newtype)

src/Gargantext/Pages/Home/Specs.purs

@@ -6,20 +6,23 @@ import Gargantext.Components.Lang.Landing.EnUS as En
 import Gargantext.Components.Lang.Landing.FrFR as Fr
 import Gargantext.Components.Data.Landing (BlockText(..), BlockTexts(..), Button(..), LandingData(..))
 import Gargantext.Components.Data.Lang (Lang(..))
-import Gargantext.Pages.Home.States (State)
+import Gargantext.Pages.Home.States (State, initialState)
 import Gargantext.Pages.Home.Actions (Action, performAction)
 
 import React (ReactElement)
 import React.DOM (a, div, h3, i, img, p, span, text)
 import React.DOM.Props (Props, _id, aria, className, href, src, target, title)
-import Thermite (Render, Spec, simpleSpec)
+import Thermite (Render, Spec, simpleSpec, hide)
 
 
 -- Layout |
 
-layoutLanding :: Lang -> Spec State {} Action
-layoutLanding FR = layoutLanding' Fr.landingData
-layoutLanding EN = layoutLanding' En.landingData
+landingData :: Lang -> LandingData
+landingData FR = Fr.landingData
+landingData EN = En.landingData
+
+layoutLanding :: Lang -> Spec {} {} Void
+layoutLanding = hide initialState <<< layoutLanding' <<< landingData
 
 ------------------------------------------------------------------------
 

src/Gargantext/Pages/Home/States.purs

@@ -11,14 +11,13 @@ import React.DOM (a, div, h3, i, img, p, span, text)
 import React.DOM.Props (Props, _id, aria, className, href, src, target, title)
 import Thermite (PerformAction, Render, Spec, modifyState, simpleSpec)
 
-newtype State = State
+type State =
   { userName :: String
   , password :: String
   }
 
-
 initialState :: State
-initialState = State
-  {userName : ""
- , password : ""
+initialState =
+  { userName : ""
+  , password : ""
   }

src/Gargantext/Pages/Layout/Actions.purs

@@ -16,7 +16,6 @@ import Gargantext.Pages.Corpus.Doc.Facets.Documents as DV
 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.Layout.Specs.AddCorpus as AC
 import Gargantext.Pages.Layout.Specs.Search as S
 import Gargantext.Pages.Layout.States (AppState)
@@ -26,7 +25,6 @@ import Thermite (PerformAction, modifyState)
 
 data Action
   = Initialize
-  | LandingA   L.Action
   | LoginA     LN.Action
   | SetRoute   Routes
   | AddCorpusA AC.Action
@@ -93,7 +91,6 @@ performAction Initialize  _ state = void do
     _ -> do
       modifyState identity
 
-performAction (LandingA _) _ _ = pure unit
 performAction (LoginA _) _ _ = pure unit
 performAction (AddCorpusA _) _ _ = pure unit
 performAction (DocViewA _) _ _ = pure unit
@@ -107,12 +104,6 @@ performAction (NgramsA _) _ _ = pure unit
 
 ----------------------------------------------------------
 
-_LandingA :: Prism' Action L.Action
-_LandingA = prism LandingA \action ->
-  case action of
-    LandingA caction -> Right caction
-    _-> Left action
-
 _loginAction :: Prism' Action LN.Action
 _loginAction = prism LoginA \action ->
   case action of

src/Gargantext/Pages/Layout/Specs.purs

@@ -18,10 +18,10 @@ 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.Layout.Actions (Action(..), _LandingA, _NgramsA, _addCorpusAction, _dashBoardAction, _docAnnotationViewAction, _docViewAction, _graphExplorerAction, _loginAction, _searchAction, _treeAction, _userPageAction, performAction)
+import Gargantext.Pages.Layout.Actions (Action(..), _NgramsA, _addCorpusAction, _dashBoardAction, _docAnnotationViewAction, _docViewAction, _graphExplorerAction, _loginAction, _searchAction, _treeAction, _userPageAction, performAction)
 import Gargantext.Pages.Layout.Specs.AddCorpus as AC
 import Gargantext.Pages.Layout.Specs.Search as S
-import Gargantext.Pages.Layout.States (AppState, _addCorpusState, _dashBoardSate, _docAnnotationViewState, _docViewState, _graphExplorerState, _landingState, _loginState, _ngramState, _searchState, _treeState, _userPageState)
+import Gargantext.Pages.Layout.States (AppState, _addCorpusState, _dashBoardSate, _docAnnotationViewState, _docViewState, _graphExplorerState, _loginState, _ngramState, _searchState, _treeState, _userPageState)
 import Gargantext.Router (Routes(..))
 import React (ReactElement)
 import React.DOM (a, button, div, footer, hr', img, input, li, p, span, text, ul)
@@ -45,7 +45,6 @@ layoutSpec =
     container = over _render \render d p s c ->
       (render d p s c)
 
-
 pagesComponent :: AppState -> Spec AppState {} Action
 pagesComponent s =
   case s.currentRoute of
@@ -55,7 +54,7 @@ pagesComponent s =
     selectSpec :: Routes -> Spec AppState {} Action
     selectSpec CorpusAnalysis    = layout0 $ noState CA.spec'
     selectSpec Login             = focus _loginState _loginAction LN.renderSpec
-    selectSpec Home              = layout0 $ focus _landingState   _LandingA   (L.layoutLanding EN)
+    selectSpec Home              = layout0 $ noState (L.layoutLanding EN)
     selectSpec AddCorpus         = layout0 $ focus _addCorpusState _addCorpusAction AC.layoutAddcorpus
     selectSpec DocView           = layout0 $ focus _docViewState   _docViewAction   DV.layoutDocview
     selectSpec (UserPage i)      = layout0 $ focus _userPageState  _userPageAction  U.layoutUser

src/Gargantext/Pages/Layout/States.purs

@@ -12,14 +12,12 @@ import Gargantext.Pages.Corpus.Doc.Facets.Documents as DV
 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.Layout.Specs.AddCorpus as AC
 import Gargantext.Pages.Layout.Specs.Search as S
 import Gargantext.Router (Routes(..))
 
 type AppState =
   { currentRoute   :: Maybe Routes
-  , landingState   :: L.State
   , loginState   :: LN.State
   , addCorpusState :: AC.State
   , docViewState   :: DV.State
@@ -39,7 +37,6 @@ type AppState =
 initAppState :: AppState
 initAppState =
   { currentRoute   : Just Home
-  , landingState   : L.initialState
   , loginState     : LN.initialState
   , addCorpusState : AC.initialState
   , docViewState   : DV.tdata
@@ -57,9 +54,6 @@ initAppState =
   }
 
 ---------------------------------------------------------
-_landingState :: Lens' AppState L.State
-_landingState = lens (\s -> s.landingState) (\s ss -> s{landingState = ss})
-
 _loginState :: Lens' AppState LN.State
 _loginState = lens (\s -> s.loginState) (\s ss -> s{loginState = ss})