Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
195
Issues
195
List
Board
Labels
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
8426629a
Commit
8426629a
authored
Aug 26, 2020
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[REFACT] Config in Prelude now
parent
2d5a3e0a
Pipeline
#1013
failed with stage
Changes
5
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
Settings.hs
src/Gargantext/API/Admin/Settings.hs
+1
-1
Node.hs
src/Gargantext/Database/Action/Node.hs
+1
-1
Prelude.hs
src/Gargantext/Database/Prelude.hs
+1
-1
Config.hs
src/Gargantext/Prelude/Config.hs
+2
-2
Utils.hs
src/Gargantext/Prelude/Utils.hs
+1
-1
No files found.
src/Gargantext/API/Admin/Settings.hs
View file @
8426629a
...
@@ -54,7 +54,7 @@ import System.Log.FastLogger
...
@@ -54,7 +54,7 @@ import System.Log.FastLogger
import
Web.HttpApiData
(
parseUrlPiece
)
import
Web.HttpApiData
(
parseUrlPiece
)
import
qualified
Data.ByteString.Lazy
as
L
import
qualified
Data.ByteString.Lazy
as
L
import
qualified
Servant.Job.Core
import
qualified
Servant.Job.Core
import
Gargantext.Config
(
GargConfig
(),
readConfig
,
defaultConfig
)
import
Gargantext.
Prelude.
Config
(
GargConfig
(),
readConfig
,
defaultConfig
)
type
PortNumber
=
Int
type
PortNumber
=
Int
...
...
src/Gargantext/Database/Action/Node.hs
View file @
8426629a
...
@@ -31,7 +31,7 @@ import Gargantext.Prelude
...
@@ -31,7 +31,7 @@ import Gargantext.Prelude
import
Gargantext.Core.Crypto.Hash
(
hash
)
import
Gargantext.Core.Crypto.Hash
(
hash
)
import
Gargantext.Database.Prelude
import
Gargantext.Database.Prelude
import
Control.Lens
(
view
)
import
Control.Lens
(
view
)
import
Gargantext.Config
(
GargConfig
(
..
))
import
Gargantext.
Prelude.
Config
(
GargConfig
(
..
))
------------------------------------------------------------------------
------------------------------------------------------------------------
-- | TODO mk all others nodes
-- | TODO mk all others nodes
...
...
src/Gargantext/Database/Prelude.hs
View file @
8426629a
...
@@ -34,7 +34,7 @@ import Database.PostgreSQL.Simple (Connection, connect)
...
@@ -34,7 +34,7 @@ import Database.PostgreSQL.Simple (Connection, connect)
import
Database.PostgreSQL.Simple.FromField
(
Conversion
,
ResultError
(
ConversionFailed
),
fromField
,
returnError
)
import
Database.PostgreSQL.Simple.FromField
(
Conversion
,
ResultError
(
ConversionFailed
),
fromField
,
returnError
)
import
Database.PostgreSQL.Simple.Internal
(
Field
)
import
Database.PostgreSQL.Simple.Internal
(
Field
)
import
Gargantext.Prelude
import
Gargantext.Prelude
import
Gargantext.Config
(
GargConfig
())
import
Gargantext.
Prelude.
Config
(
GargConfig
())
import
Opaleye
(
Query
,
Unpackspec
,
showSqlForPostgres
,
FromFields
,
Select
,
runQuery
)
import
Opaleye
(
Query
,
Unpackspec
,
showSqlForPostgres
,
FromFields
,
Select
,
runQuery
)
import
Opaleye.Aggregate
(
countRows
)
import
Opaleye.Aggregate
(
countRows
)
import
System.IO
(
FilePath
)
import
System.IO
(
FilePath
)
...
...
src/Gargantext/Config.hs
→
src/Gargantext/
Prelude/
Config.hs
View file @
8426629a
{-|
{-|
Module : Gargantext.Config
Module : Gargantext.
Prelude.
Config
Description : Textmining Collaborative Platform
Description : Textmining Collaborative Platform
Copyright : (c) CNRS, 2017-Present
Copyright : (c) CNRS, 2017-Present
License : AGPL + CECILL v3
License : AGPL + CECILL v3
...
@@ -11,7 +11,7 @@ Portability : POSIX
...
@@ -11,7 +11,7 @@ Portability : POSIX
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TemplateHaskell #-}
module
Gargantext.Config
where
module
Gargantext.
Prelude.
Config
where
import
System.IO
(
FilePath
)
import
System.IO
(
FilePath
)
import
Data.Ini
(
readIniFile
,
lookupValue
)
import
Data.Ini
(
readIniFile
,
lookupValue
)
...
...
src/Gargantext/Prelude/Utils.hs
View file @
8426629a
...
@@ -28,7 +28,7 @@ import System.Random (newStdGen)
...
@@ -28,7 +28,7 @@ import System.Random (newStdGen)
import
qualified
System.Random.Shuffle
as
SRS
import
qualified
System.Random.Shuffle
as
SRS
import
Gargantext.API.Admin.Settings
import
Gargantext.API.Admin.Settings
import
Gargantext.Config
import
Gargantext.
Prelude.
Config
import
Gargantext.Core.Crypto.Hash
import
Gargantext.Core.Crypto.Hash
import
Gargantext.Database.Admin.Types.Node
(
NodeId
,
NodeType
)
import
Gargantext.Database.Admin.Types.Node
(
NodeId
,
NodeType
)
import
Gargantext.Prelude
import
Gargantext.Prelude
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment