From 04e6caeb3b2ddbc8fe6c4c86f22ef72b167ff546 Mon Sep 17 00:00:00 2001
From: Przemek Kaminski <pk@intrepidus.pl>
Date: Thu, 19 Mar 2020 08:52:15 +0100
Subject: [PATCH] [version] add frontend version number
---
.psc-package/local/.set/packages.json | 7 +++++++
package.json | 2 ++
packages.dhall | 5 +++++
psc-package.json | 1 +
src/Gargantext/Components/App.purs | 3 ++-
src/Gargantext/Components/GraphExplorer.purs | 9 +++++----
6 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/.psc-package/local/.set/packages.json b/.psc-package/local/.set/packages.json
index 60a4e892..e971c49c 100644
--- a/.psc-package/local/.set/packages.json
+++ b/.psc-package/local/.set/packages.json
@@ -3235,6 +3235,13 @@
"repo": "https://github.com/natefaubion/purescript-variant.git",
"version": "v6.0.1"
},
+ "versions": {
+ "dependencies": [
+ "prelude"
+ ],
+ "repo": "https://github.com/hdgarrood/purescript-versions.git",
+ "version": "v5.0.1"
+ },
"web-clipboard": {
"dependencies": [
"web-html"
diff --git a/package.json b/package.json
index c2c1fdbe..31c67a45 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,6 @@
{
+ "name": "Gargantext",
+ "version": "0.0.0.4",
"scripts": {
"rebase-set": "spago package-set-upgrade && spago psc-package-insdhall",
"rebuild-set": "spago psc-package-insdhall",
diff --git a/packages.dhall b/packages.dhall
index 9504d254..23d5fee1 100644
--- a/packages.dhall
+++ b/packages.dhall
@@ -135,6 +135,11 @@ let additions =
[ "prelude", "maybe", "strings" ]
"https://github.com/truqu/purescript-read"
"v1.0.1"
+ , versions =
+ mkPackage
+ [ "prelude" ]
+ "https://github.com/hdgarrood/purescript-versions.git"
+ "v5.0.1"
}
in upstream ⫽ overrides ⫽ additions
diff --git a/psc-package.json b/psc-package.json
index f1037dd0..b7fadae9 100644
--- a/psc-package.json
+++ b/psc-package.json
@@ -39,6 +39,7 @@
"tuples-native",
"uint",
"uri",
+ "versions",
"web-html"
]
}
diff --git a/src/Gargantext/Components/App.purs b/src/Gargantext/Components/App.purs
index 64b756b8..c8d65be6 100644
--- a/src/Gargantext/Components/App.purs
+++ b/src/Gargantext/Components/App.purs
@@ -30,6 +30,7 @@ import Gargantext.Routes (AppRoute(..))
import Gargantext.Sessions (Sessions, useSessions)
import Gargantext.Sessions as Sessions
import Gargantext.Utils.Reactix as R2
+import Gargantext.Version as GV
-- TODO (what does this mean?)
-- tree changes endConfig state => trigger endConfig change in outerLayout, layoutFooter etc
@@ -234,7 +235,7 @@ footerCpt = R.staticComponent "G.C.Layout.footer" cpt
[ H.p {}
[ H.text "Gargantext "
, H.span {className: "glyphicon glyphicon-registration-mark"} []
- , H.text ", version 4.0"
+ , H.text $ ", version 4.0 (frontend: " <> GV.versionS <> ", backend: TODO)"
, H.a { href: "http://www.cnrs.fr"
, target: "blank"
, title: "Project hosted by CNRS."
diff --git a/src/Gargantext/Components/GraphExplorer.purs b/src/Gargantext/Components/GraphExplorer.purs
index c20201fc..d0f12e04 100644
--- a/src/Gargantext/Components/GraphExplorer.purs
+++ b/src/Gargantext/Components/GraphExplorer.purs
@@ -14,6 +14,11 @@ import Data.Set as Set
import Data.Tuple (fst, snd, Tuple(..))
import Data.Tuple.Nested ((/\))
import Effect.Aff (Aff)
+import Math (log)
+import Partial.Unsafe (unsafePartial)
+import Reactix as R
+import Reactix.DOM.HTML as RH
+
import Gargantext.Components.Forest (forest)
import Gargantext.Components.Graph as Graph
import Gargantext.Components.GraphExplorer.Controls as Controls
@@ -30,10 +35,6 @@ import Gargantext.Sessions (Session, Sessions, get)
import Gargantext.Types as Types
import Gargantext.Utils.Range as Range
import Gargantext.Utils.Reactix as R2
-import Math (log)
-import Partial.Unsafe (unsafePartial)
-import Reactix as R
-import Reactix.DOM.HTML as RH
type GraphId = Int
--
2.21.0