Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Przemyslaw Kaminski
haskell-gargantext
Commits
531b18c3
Commit
531b18c3
authored
Aug 27, 2020
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[REFACT] From Core to Prelude.
parent
d912a0ad
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
18 additions
and
18 deletions
+18
-18
Auth.hs
src/Gargantext/API/Admin/Auth.hs
+1
-1
HashedResponse.hs
src/Gargantext/API/HashedResponse.hs
+1
-1
Export.hs
src/Gargantext/API/Node/Corpus/Export.hs
+1
-1
File.hs
src/Gargantext/API/Node/Corpus/New/File.hs
+1
-1
Individu.hs
src/Gargantext/Core/Types/Individu.hs
+1
-1
Node.hs
src/Gargantext/Database/Action/Node.hs
+1
-1
Insert.hs
src/Gargantext/Database/Query/Table/Node/Document/Insert.hs
+1
-1
User.hs
src/Gargantext/Database/Query/Table/User.hs
+1
-1
Auth.hs
src/Gargantext/Prelude/Crypto/Auth.hs
+4
-4
Hash.hs
src/Gargantext/Prelude/Crypto/Hash.hs
+2
-2
Pass.hs
src/Gargantext/Prelude/Crypto/Pass.hs
+2
-2
Mail.hs
src/Gargantext/Prelude/Mail.hs
+1
-1
Utils.hs
src/Gargantext/Prelude/Utils.hs
+1
-1
No files found.
src/Gargantext/API/Admin/Auth.hs
View file @
531b18c3
...
...
@@ -48,7 +48,7 @@ import Servant
import
Servant.Auth.Server
import
Test.QuickCheck
(
elements
,
oneof
)
import
Test.QuickCheck.Arbitrary
(
Arbitrary
,
arbitrary
)
import
qualified
Gargantext.
Core
.Auth
as
Auth
import
qualified
Gargantext.
Prelude.Crypto
.Auth
as
Auth
---------------------------------------------------
...
...
src/Gargantext/API/HashedResponse.hs
View file @
531b18c3
...
...
@@ -17,7 +17,7 @@ import Data.Text (Text)
import
GHC.Generics
(
Generic
)
import
Gargantext.Prelude
import
qualified
Gargantext.
Cor
e.Crypto.Hash
as
Crypto
(
hash
)
import
qualified
Gargantext.
Prelud
e.Crypto.Hash
as
Crypto
(
hash
)
data
HashedResponse
a
=
HashedResponse
{
hash
::
Text
,
value
::
a
}
deriving
(
Generic
)
...
...
src/Gargantext/API/Node/Corpus/Export.hs
View file @
531b18c3
...
...
@@ -30,7 +30,7 @@ import GHC.Generics (Generic)
import
Gargantext.API.Ngrams
import
Gargantext.API.Ngrams.Tools
(
filterListWithRoot
,
mapTermListRoot
,
getRepo
)
import
Gargantext.API.Prelude
(
GargNoServer
)
import
Gargantext.
Cor
e.Crypto.Hash
(
hash
)
import
Gargantext.
Prelud
e.Crypto.Hash
(
hash
)
import
Gargantext.Core.Types
import
Gargantext.Core.Utils.Prefix
(
unPrefix
,
unPrefixSwagger
)
import
Gargantext.Database.Action.Metrics.NgramsByNode
(
getNgramsByNodeOnlyUser
)
...
...
src/Gargantext/API/Node/Corpus/New/File.hs
View file @
531b18c3
...
...
@@ -30,7 +30,7 @@ import Gargantext.API.Ngrams (TODO)
import
Gargantext.Database.Admin.Types.Node
import
Gargantext.Database.Prelude
-- (Cmd, CmdM)
import
Gargantext.Prelude
import
Gargantext.
Cor
e.Crypto.Hash
(
hash
)
import
Gargantext.
Prelud
e.Crypto.Hash
(
hash
)
import
Servant
import
Servant.Multipart
import
Servant.Swagger
(
HasSwagger
(
toSwagger
))
...
...
src/Gargantext/Core/Types/Individu.hs
View file @
531b18c3
...
...
@@ -22,7 +22,7 @@ import Data.Swagger
import
Data.Text
(
Text
,
pack
,
reverse
)
import
Gargantext.Database.Admin.Types.Node
(
NodeId
,
UserId
)
import
Gargantext.Prelude
hiding
(
reverse
)
import
qualified
Gargantext.
Core
.Auth
as
Auth
import
qualified
Gargantext.
Prelude.Crypto
.Auth
as
Auth
-- FIXME UserName used twice
data
User
=
UserDBId
UserId
|
UserName
Text
|
RootId
NodeId
|
UserPublic
...
...
src/Gargantext/Database/Action/Node.hs
View file @
531b18c3
...
...
@@ -28,7 +28,7 @@ import Gargantext.Database.Query.Table.Node
import
Gargantext.Database.Query.Table.Node.Error
import
Gargantext.Database.Query.Table.Node.UpdateOpaleye
(
updateHyperdata
)
import
Gargantext.Prelude
import
Gargantext.
Cor
e.Crypto.Hash
(
hash
)
import
Gargantext.
Prelud
e.Crypto.Hash
(
hash
)
import
Gargantext.Database.Prelude
import
Control.Lens
(
view
)
import
Gargantext.Prelude.Config
(
GargConfig
(
..
))
...
...
src/Gargantext/Database/Query/Table/Node/Document/Insert.hs
View file @
531b18c3
...
...
@@ -72,7 +72,7 @@ import Gargantext.Database.Admin.Types.Hyperdata
import
Gargantext.Database.Admin.Types.Node
import
Gargantext.Database.Prelude
(
Cmd
,
runPGSQuery
)
import
Gargantext.Prelude
import
Gargantext.
Cor
e.Crypto.Hash
(
hash
)
import
Gargantext.
Prelud
e.Crypto.Hash
(
hash
)
import
qualified
Data.Text
as
DT
(
pack
,
concat
,
take
)
-- TODO : the import of Document constructor below does not work
...
...
src/Gargantext/Database/Query/Table/User.hs
View file @
531b18c3
...
...
@@ -39,7 +39,7 @@ import Data.Maybe (Maybe)
import
Data.Text
(
Text
)
import
Data.Time
(
UTCTime
)
import
Gargantext.Core.Types.Individu
import
qualified
Gargantext.
Core
.Auth
as
Auth
import
qualified
Gargantext.
Prelude.Crypto
.Auth
as
Auth
import
Gargantext.Database.Schema.User
import
Gargantext.Database.Prelude
import
Gargantext.Prelude
...
...
src/Gargantext/
Core
/Auth.hs
→
src/Gargantext/
Prelude/Crypto
/Auth.hs
View file @
531b18c3
...
...
@@ -10,10 +10,10 @@ Portability : POSIX
-}
module
Gargantext.
Core
.Auth
(
createPasswordHash
,
checkPassword
,
module
Data
.
Password
.
Argon2
)
module
Gargantext.
Prelude.Crypto
.Auth
(
createPasswordHash
,
checkPassword
,
module
Data
.
Password
.
Argon2
)
where
import
Control.Monad.IO.Class
(
MonadIO
)
...
...
src/Gargantext/
Cor
e/Crypto/Hash.hs
→
src/Gargantext/
Prelud
e/Crypto/Hash.hs
View file @
531b18c3
{-|
Module : Gargantext.
Cor
e.Crypto.Hash
Module : Gargantext.
Prelud
e.Crypto.Hash
Description : Useful Tools near Prelude of the project
Copyright : (c) CNRS, 2017-Present
License : AGPL + CECILL v3
...
...
@@ -11,7 +11,7 @@ Portability : POSIX
{-# OPTIONS_GHC -fno-warn-orphans #-}
module
Gargantext.
Cor
e.Crypto.Hash
module
Gargantext.
Prelud
e.Crypto.Hash
where
import
Prelude
(
String
)
...
...
src/Gargantext/
Cor
e/Crypto/Pass.hs
→
src/Gargantext/
Prelud
e/Crypto/Pass.hs
View file @
531b18c3
{-|
Module : Gargantext.
Cor
e.Crypto.Pass
Module : Gargantext.
Prelud
e.Crypto.Pass
Description :
Copyright : (c) CNRS, 2017-Present
License : Public Domain
...
...
@@ -16,7 +16,7 @@ https://zuttobenkyou.wordpress.com/2011/12/23/simple-password-generation-with-ha
-}
module
Gargantext.
Cor
e.Crypto.Pass
module
Gargantext.
Prelud
e.Crypto.Pass
where
-- import Data.List (nub)
...
...
src/Gargantext/
Cor
e/Mail.hs
→
src/Gargantext/
Prelud
e/Mail.hs
View file @
531b18c3
...
...
@@ -11,7 +11,7 @@ Portability : POSIX
{-# LANGUAGE OverloadedStrings #-}
module
Gargantext.
Cor
e.Mail
module
Gargantext.
Prelud
e.Mail
(
gargMail
)
where
...
...
src/Gargantext/Prelude/Utils.hs
View file @
531b18c3
...
...
@@ -29,7 +29,7 @@ import qualified System.Random.Shuffle as SRS
import
Gargantext.API.Admin.Settings
import
Gargantext.Prelude.Config
import
Gargantext.
Cor
e.Crypto.Hash
import
Gargantext.
Prelud
e.Crypto.Hash
import
Gargantext.Database.Admin.Types.Node
(
NodeId
,
NodeType
)
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