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

[MERGE]

parents 8a899e20 edb4ff57
// Main Gargantext scripts
$(function () {
$('[data-toggle="tooltip"]').tooltip()
console.log("Gargantext is ready.");
})
\ No newline at end of file
This diff is collapsed.
......@@ -6696,6 +6696,10 @@ a:hover {
font-family: ForkAwesome, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
}
.node-layout__title {
font-size: 1.75em;
}
.nav.nav-tabs .nav-link {
cursor: pointer;
}
......
......@@ -6507,6 +6507,10 @@ a:hover {
font-family: ForkAwesome, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
}
.node-layout__title {
font-size: 1.75em;
}
.nav.nav-tabs .nav-link {
cursor: pointer;
}
......
......@@ -6350,6 +6350,10 @@ a:hover {
font-family: ForkAwesome, "Mulish";
}
.node-layout__title {
font-size: 1.75em;
}
.nav.nav-tabs .nav-link {
cursor: pointer;
}
......
......@@ -6571,6 +6571,10 @@ a:hover {
font-family: ForkAwesome, "Nunito";
}
.node-layout__title {
font-size: 1.75em;
}
.nav.nav-tabs .nav-link {
cursor: pointer;
}
......
......@@ -6644,6 +6644,10 @@ a:hover {
font-family: ForkAwesome, "Montserrat";
}
.node-layout__title {
font-size: 1.75em;
}
.nav.nav-tabs .nav-link {
cursor: pointer;
}
......
......@@ -16,12 +16,14 @@ import Gargantext.Hooks.Session (useSession)
import Gargantext.Routes as GR
import Gargantext.Sessions (sessionId)
import Gargantext.Types (ID, defaultCacheParams)
import Gargantext.Types as GT
import Gargantext.Utils (setter, (?))
import Gargantext.Utils.Reactix as R2
import Reactix as R
import Reactix.DOM.HTML as H
import Toestand as T
type Props =
( nodeId :: ID
, nodeData :: Node
......@@ -34,7 +36,7 @@ layout :: R2.Leaf Props
layout = R2.leaf layoutCpt
layoutCpt :: R.Component Props
layoutCpt = here.component "layout" cpt where
cpt { nodeId, nodeData: { name, type_id } } _ = do
cpt { nodeId, nodeData: { name, node_type } } _ = do
-- | Hooks
-- |
boxes@{
......@@ -69,24 +71,37 @@ layoutCpt = here.component "layout" cpt where
pure $
H.div
{ className: "corpus-layout" }
{ className: "node-layout corpus-layout" }
[
-- FV.backButtonSmart { nodeId, session } []
H.div
{ className: "corpus-layout__title" }
{ className: "node-layout__title corpus-layout__title" }
[
H.div
{ className: "node-layout__title__content text-primary" }
[
B.div'
{ className: "corpus-layout__title__text" }
name
B.icon
{ className: "node-layout__title__icon"
, name: GT.getIcon node_type true
}
,
H.span
{ className: "node-layout__title__text mx-1" }
[ H.text name ]
]
,
-- B.div'
-- { className: "corpus-layout__title__text" }
-- name
-- ,
H.hr
{ className: "corpus-layout__title__line"}
{ className: "node-layout__title__line corpus-layout__title__line"}
,
B.iconButton
{ name: expandTableEdition' ?
"caret-up" $
"caret-down"
, className: "corpos-layout__title__expand"
, className: "node-layout__title__expand corpus-layout__title__expand"
, callback: onExpandClick
}
]
......@@ -94,14 +109,14 @@ layoutCpt = here.component "layout" cpt where
R2.when expandTableEdition' $
H.div
{ className: "corpus-layout__edition-block" }
{ className: "node-layout__edition-block corpus-layout__edition-block" }
[
editionBlock
{ nodeId }
]
,
H.div
{ className: "corpus-layout__code-section" }
{ className: "node-layout__code-section corpus-layout__code-section" }
[
tileMenu
{ boxes
......@@ -129,7 +144,7 @@ layoutCpt = here.component "layout" cpt where
]
,
H.div
{ className: "corpus-layout__folders" }
{ className: "node-layout__folders corpus-layout__folders" }
[
FV.folderView
{ nodeId
......
module Gargantext.Components.GraphQL.Node where
import Gargantext.Prelude
import Gargantext.Types (NodeType)
import Gargantext.Utils.GraphQL as GGQL
import Gargantext.Types (NodeType)
import GraphQL.Client.Args (Args, (=>>))
......@@ -12,13 +13,15 @@ type Corpus
= { id :: Int
, name :: String
, parent_id :: Int
, type_id :: Int }
, type_id :: Int
, node_type :: NodeType }
type Node
= { id :: Int
, name :: String
, parent_id :: Int
, type_id :: Int }
, type_id :: Int
, node_type :: NodeType }
type NodesCorpusQuery =
{ nodes_corpus :: Args
......@@ -26,7 +29,8 @@ type NodesCorpusQuery =
{ id :: Unit
, name :: Unit
, parent_id :: Unit
, type_id :: Unit } }
, type_id :: Unit
, node_type :: Unit } }
type NodesQuery =
{ nodes :: Args
......@@ -34,7 +38,8 @@ type NodesQuery =
{ id :: Unit
, name :: Unit
, parent_id :: Unit
, type_id :: Unit } }
, type_id :: Unit
, node_type :: Unit } }
nodesQuery :: NodesQuery
nodesQuery = { nodes: { node_id: Var :: _ "id" Int } =>>
......
.with-icon-font {
font-family: ForkAwesome, $font-family-base;
}
.node-layout {
&__title {
font-size: 1.75em;
}
}
\ No newline at end of file
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