Commit 2a096091 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[DESIGN+clean] icones for text and calc

parent 0e91306d
...@@ -61,7 +61,7 @@ addNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p [] ...@@ -61,7 +61,7 @@ addNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
el = R.hooksComponent "AddNodeView" cpt el = R.hooksComponent "AddNodeView" cpt
cpt {id, name} _ = do cpt {id, name} _ = do
nodeName@(name' /\ setNodeName) <- R.useState' "Name" nodeName@(name' /\ setNodeName) <- R.useState' "Name"
nodeType'@(nt /\ setNodeType) <- R.useState' $ fromMaybe NodeUser $ head nodeTypes nodeType'@(nt /\ setNodeType) <- R.useState' $ fromMaybe NodeFolder $ head nodeTypes
let let
SettingsBox {edit} = settingsBox nt SettingsBox {edit} = settingsBox nt
......
...@@ -79,16 +79,9 @@ data FrameType = Calc | Write ...@@ -79,16 +79,9 @@ data FrameType = Calc | Write
type Base = String type Base = String
type FrameId = String type FrameId = String
hframe :: FrameType -> String
hframe ft = "https://" <> hframe' ft <> ".frame.gargantext.org/test"
where
hframe' Calc = "calc"
hframe' Write = "write"
hframeUrl :: Base -> FrameId -> String hframeUrl :: Base -> FrameId -> String
hframeUrl base frame_id = base <> "/" <> frame_id <> "?both" hframeUrl base frame_id = base <> "/" <> frame_id <> "?both"
frameLayoutView :: Record ViewProps -> R.Element frameLayoutView :: Record ViewProps -> R.Element
frameLayoutView props = R.createElement frameLayoutViewCpt props [] frameLayoutView props = R.createElement frameLayoutViewCpt props []
...@@ -96,11 +89,10 @@ frameLayoutViewCpt :: R.Component ViewProps ...@@ -96,11 +89,10 @@ frameLayoutViewCpt :: R.Component ViewProps
frameLayoutViewCpt = R.hooksComponent "G.C.N.C.frameLayoutView" cpt frameLayoutViewCpt = R.hooksComponent "G.C.N.C.frameLayoutView" cpt
where where
cpt {frame: (NodePoly {hyperdata: Hyperdata {base, frame_id}}), nodeId, reload, session} _ = do cpt {frame: (NodePoly {hyperdata: Hyperdata {base, frame_id}}), nodeId, reload, session} _ = do
pure $ H.div { className : "istex-search" } pure $ H.div { className : "frame" }
[ H.iframe { src: hframeUrl base frame_id [ H.iframe { src: hframeUrl base frame_id
, width: "100%" , width: "100%"
, height: "100%" , height: "100%"
-- , ref: "https://write.frame.gargantext.org/test"
} [] } []
] ]
......
...@@ -245,11 +245,11 @@ fldr Annuaire false = "fa fa-address-card" ...@@ -245,11 +245,11 @@ fldr Annuaire false = "fa fa-address-card"
fldr NodeContact true = "fa fa-address-card-o" fldr NodeContact true = "fa fa-address-card-o"
fldr NodeContact false = "fa fa-address-card" fldr NodeContact false = "fa fa-address-card"
fldr NodeFrameWrite true = "fa fa-file-word-o" fldr NodeFrameWrite true = "fa fa-file-text-o"
fldr NodeFrameWrite false = "fa fa-file-word-o" fldr NodeFrameWrite false = "fa fa-file-text-o"
fldr NodeFrameCalc true = "fa fa-file-excel-o" fldr NodeFrameCalc true = "fa fa-calculator"
fldr NodeFrameCalc false = "fa fa-file-excel-o" fldr NodeFrameCalc false = "fa fa-calculator"
fldr _ false = "fa fa-folder-o" fldr _ false = "fa fa-folder-o"
fldr _ true = "fa fa-folder-open" fldr _ true = "fa fa-folder-open"
......
...@@ -40,13 +40,20 @@ versionCpt = R.hooksComponent "G.C.A.version" cpt ...@@ -40,13 +40,20 @@ versionCpt = R.hooksComponent "G.C.A.version" cpt
liftEffect $ setVer $ const v liftEffect $ setVer $ const v
pure $ case version == versionBack of pure $ case version == versionBack of
true -> H.div {} [] true -> H.a { className: "fa fa-check-circle-o"
, "text-decoration": "none"
, title: "Versions match: frontend ("
<> version
<> "), backend ("
<> versionBack
<> ")"
} []
false -> H.a { className: "fa fa-exclamation-triangle" false -> H.a { className: "fa fa-exclamation-triangle"
, "text-decoration": "none"
, title: "Versions mismatch: frontend (" , title: "Versions mismatch: frontend ("
<> version <> version
<> "), backend (" <> "), backend ("
<> versionBack <> versionBack
<> ")" <> ")"
} } []
[]
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