Commit 002eb113 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[FOREST] CSS fixes.

parent e79f1a8b
......@@ -205,4 +205,8 @@ li:hover a#rename-leaf {
justify-content: center;
}
a:focus, a:hover {
cursor: pointer;
}
/*# sourceMappingURL=Login.css.map */
......@@ -189,3 +189,12 @@ li
flew-wrap: wrap
justify-content: center
.flex-space-between
.flex-center
display: flex
justify-content: space-between
a:focus, a:hover
cursor: pointer
This diff is collapsed.
......@@ -350,7 +350,7 @@ panelAction d {id, name, nodeType, action, session, search} p = case action of
(Just Upload) -> fragmentPT "Soon, you will be able to upload your file here"
(Just Download) -> fragmentPT "Soon, you will be able to dowload your file here"
(Just SearchBox) -> R.fragment [ H.p {} [ H.text $ "Search and create a private corpus with the search query as corpus name." ]
(Just SearchBox) -> R.fragment [ H.p {"style": {"margin" :"10px"}} [ H.text $ "Search and create a private corpus with the search query as corpus name." ]
, searchBar {session, langs:allLangs, search}
]
(Just Delete) -> case nodeType of
......
......@@ -4,9 +4,11 @@
module Gargantext.Components.Login where
import Prelude (Unit, bind, const, discard, pure, flip, show, ($), (<>), (*>), (<$>), (>))
import Data.Array (head)
import Data.Either (Either(..))
import Data.Maybe (Maybe(..))
import Data.Maybe (Maybe(..), fromMaybe)
import Data.Tuple (fst, snd)
import Data.String as DST
import DOM.Simple.Console (log)
import Data.Sequence as DS
import Effect (Effect)
......@@ -51,7 +53,7 @@ modalCpt = R.hooksComponent "G.C.Login.modal" cpt where
[ H.div { className: "modal-header" }
[ closing
, logo
, H.h2 { className: "center modal-title" } [H.text "Backends manager"]
, H.h2 { className: "center modal-title" } [H.text "Instances manager"]
]
, H.div { className: "modal-body" } children ] ] ] ]
modalClass s = "modal myModal" <> if s then "" else " fade"
......@@ -130,16 +132,15 @@ renderBackend backend@(Backend {name}) state =
renderBackend :: Backend -> R.State (Maybe Backend) -> R.Element
renderBackend backend@(Backend {name}) state =
H.li {} $ [ H.a { on : {click}
-- , className: glyphicon "log-in"
-- , id : "log-in"
} [ H.text $ " Connect to " <> name ] ]
H.li {} $ [ H.div {className: "flex-space-between"} [ H.a { on : {click}} [H.text label], H.div {}[H.text url]] ]
<> [ H.a { on : {click}
, className : "glyphitem glyphicon glyphicon-log-in"
, title: "Log In"} []]
, title: "Log In"} []
]
where
click _ = (snd state) (const $ Just backend)
label = DST.toUpper $ fromMaybe "" $ head $ DST.split (DST.Pattern ".") name
url = "(garg://" <> name <> ")"
type FormProps =
( backend :: Backend
......
......@@ -34,7 +34,7 @@ searchBarCpt = R.hooksComponent "G.C.Node.SearchBar.searchBar" cpt
where
cpt {session, langs, search: search@(s /\ _)} _ = do
onSearchChange session s
pure $ H.div { style: {width: "100%"} }
pure $ H.div {"style": {"margin" :"10px"}}
[ searchField {databases:allDatabases, langs, search}]
......
......@@ -35,7 +35,7 @@ eqSearch s s' = (s.datafield == s'.datafield)
&& (s.node_id == s'.node_id)
defaultSearch :: Search
defaultSearch = { datafield: Just Gargantext
defaultSearch = { datafield: Nothing
, term: ""
, lang: Nothing
, node_id: Nothing
......@@ -76,7 +76,7 @@ searchFieldComponent = R.memo (R.hooksComponent "SearchField" cpt) eqProps
, if isExternal s.datafield
then databaseInput search props.databases
else div {} []
, H.text $ show s.datafield
, if isHAL s.datafield
then orgInput search allOrgs
else div {} []
......@@ -140,7 +140,6 @@ isIsTex :: Maybe DataField -> Boolean
isIsTex (Just (External (Just (IsTex)))) = true
isIsTex _ = false
isIMT :: Maybe DataField -> Boolean
isIMT (Just ( External ( Just ( HAL ( Just ( IMT _)))))) = true
isIMT _ = false
......
......@@ -71,8 +71,8 @@ data DataField = Gargantext
| Files
instance showDataField :: Show DataField where
show Gargantext = "In Gargantext"
show (External _) = "Ext.Database"
show Gargantext = "Interne"
show (External x) = "Externe " <> show x
show Web = "Web"
show Files = "Files"
......
......@@ -5,12 +5,13 @@ import Gargantext.Ends
import Gargantext.Types (ApiVersion(..))
defaultBackends :: NonEmpty Array Backend
defaultBackends = local :| [prod, dev, demo]
defaultBackends = prod :| [partner, demo, dev, local]
where
prod = backend V10 "/api/" "https://v4.gargantext.org" "v4.gargantext.org"
dev = backend V10 "/api/" "https://dev.gargantext.org" "dev.gargantext.org"
demo = backend V10 "/api/" "https://demo.gargantext.org" "demo.gargantext.org"
local = backend V10 "/api/" "http://localhost:8008" "localhost"
prod = backend V10 "/api/" "https://v4.gargantext.org" "iscpif.cnrs"
partner = backend V10 "/api/" "https://demo.gargantext.org" "institut-mines-telecom.imt"
demo = backend V10 "/api/" "https://demo.gargantext.org" "demo.cnrs"
dev = backend V10 "/api/" "https://dev.gargantext.org" "devel.cnrs"
local = backend V10 "/api/" "http://localhost:8008" "local.cnrs"
defaultApps :: NonEmpty Array Frontend
defaultApps = relative :| [prod, dev, demo, haskell, caddy]
......
......@@ -9,7 +9,6 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous">
<link href="styles/login.min.css" rel="stylesheet">
<link href="styles/bootstrap.min.css" rel="stylesheet">
<!-- <link href="styles/lavish-bootstrap.css" rel="stylesheet"> -->
<link rel="stylesheet" type="text/css" href="styles/context-menu.css"/>
<link rel="stylesheet" type="text/css" href="styles/menu.css"/>
<link href="styles/Graph.css" rel="stylesheet" type="text/css" />
......
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