Commit ebfcb1c7 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[DESIGN/ERGO] Login

parent c99eb587
...@@ -19,7 +19,7 @@ import Reactix as R ...@@ -19,7 +19,7 @@ import Reactix as R
import Reactix.DOM.HTML as H import Reactix.DOM.HTML as H
------------------------------------------------------------------------ ------------------------------------------------------------------------
import Gargantext.Components.Forms (clearfix, card, cardBlock, cardGroup, center, formGroup) import Gargantext.Components.Forms (clearfix, cardBlock, cardGroup, center, formGroup)
import Gargantext.Components.Login.Types (AuthRequest(..)) import Gargantext.Components.Login.Types (AuthRequest(..))
import Gargantext.Ends (Backend(..)) import Gargantext.Ends (Backend(..))
import Gargantext.Sessions (Session, Sessions(..), postAuthRequest, unSessions) import Gargantext.Sessions (Session, Sessions(..), postAuthRequest, unSessions)
...@@ -55,7 +55,6 @@ modalCpt = R.hooksComponent "G.C.Login.modal" cpt where ...@@ -55,7 +55,6 @@ modalCpt = R.hooksComponent "G.C.Login.modal" cpt where
[ H.div { className: "modal-header" } [ H.div { className: "modal-header" }
[ closing [ closing
, logo , logo
, H.h2 { className: "center modal-title" } [H.text "Instances manager"]
] ]
, H.div { className: "modal-body" } children ] ] ] ] , H.div { className: "modal-body" } children ] ] ] ]
modalClass s = "modal myModal" <> if s then "" else " fade" modalClass s = "modal myModal" <> if s then "" else " fade"
...@@ -99,8 +98,9 @@ chooserCpt :: R.Component ChooserProps ...@@ -99,8 +98,9 @@ chooserCpt :: R.Component ChooserProps
chooserCpt = R.staticComponent "G.C.Login.chooser" cpt where chooserCpt = R.staticComponent "G.C.Login.chooser" cpt where
cpt :: Record ChooserProps -> Array R.Element -> R.Element cpt :: Record ChooserProps -> Array R.Element -> R.Element
cpt {backend, backends, sessions} _ = cpt {backend, backends, sessions} _ =
R.fragment $ active <> new <> search R.fragment $ title <> active <> new <> search
where where
title = [H.h2 { className: "center modal-title" } [H.text "Instances manager"]]
active = if DS.length ss > 0 then [ H.h3 {} [H.text "Active connection(s)"] active = if DS.length ss > 0 then [ H.h3 {} [H.text "Active connection(s)"]
, H.ul {} [ renderSessions sessions] , H.ul {} [ renderSessions sessions]
] else [] where ] else [] where
...@@ -165,13 +165,12 @@ formCpt = R.hooksComponent "G.C.Login.form" cpt where ...@@ -165,13 +165,12 @@ formCpt = R.hooksComponent "G.C.Login.form" cpt where
setBox@(checkBox /\ setCheckBox) <- R.useState' false setBox@(checkBox /\ setCheckBox) <- R.useState' false
pure $ R2.row pure $ R2.row
[ cardGroup [ cardGroup
[ card
[ cardBlock [ cardBlock
[ center [ center
[ H.h4 {className: "m-b-0"} [ H.div {className: "text-muted"}
[ H.span {className: "icon-text"} [ H.text "Welcome :)" ] ] [ H.text $ "Login to garg://" <> show backend]
, H.p {className: "text-muted"} , requestAccessLink {}
[ H.text $ "Login to your account or", requestAccessLink {} ] ] ]
, H.div {} , H.div {}
[ csrfTokenInput {} [ csrfTokenInput {}
, formGroup [ H.p {} [ H.text (fst error) ], usernameInput username ] , formGroup [ H.p {} [ H.text (fst error) ], usernameInput username ]
...@@ -190,7 +189,6 @@ formCpt = R.hooksComponent "G.C.Login.form" cpt where ...@@ -190,7 +189,6 @@ formCpt = R.hooksComponent "G.C.Login.form" cpt where
] ]
] ]
] ]
]
onClick {backend, sessions, visible} error username password e = onClick {backend, sessions, visible} error username password e =
launchAff_ $ do launchAff_ $ do
let req = AuthRequest {username: fst username, password: fst password} let req = AuthRequest {username: fst username, password: fst password}
......
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