CLI default to help & CLI subpackage (#395)

fission-codes · Aug 30, 2020 · a71ae79 · a71ae79
1 parent 57a199d
commit a71ae79
Show file tree

Hide file tree

Showing 421 changed files with 1,326 additions and 400 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -45,4 +45,4 @@ jobs:
 
     - name: Test
       run: |
-        stack --no-terminal test --fast
+        stack test --no-terminal
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -7,104 +7,4 @@
 
 Seamlessly deploy websites and store secure user data
 
-## QuickStart
-
-### MacOS
-
-```shell
-# IPFS on MacOS, otherwise https://docs.ipfs.io/introduction/install/
-brew install ipfs
-brew services start ipfs
-
-brew install fission-suite/fission/fission-cli
-```
-
-Or to build from source:
-
-```shell
-# Dependencies
-brew install stack
-brew install postgresql
-
-# Go to the Fission repo
-cd $FISSION_REPO
-
-# Build & install
-stack install --no-nix fission:fission-cil
-
-# Build only
-stack build --no-nix fission:fission-cli 
-```
-
-### Binary Releases
-
-Grab the latest binary for your operating system from our [release page](https://github.com/fission-suite/fission/releases).
-
-You'll find the most up to date instructions for [installation](https://guide.fission.codes/hosting/installation) and [getting started](https://guide.fission.codes/hosting/getting-started) in our [Guide](https://guide.fission.codes).
-
-If using Linux, install `libpq-dev`
-
-### Seamless Deployments
-Deployments are just one step: `fission app publish`
-
-
-```
-$ fission up hello-universe/
-🚀 Now live on the network
-👌 QmRVvvMeMEPi1zerpXYH9df3ATdzuB63R1wf3Mz5NS5HQN
-📝 DNS updated! Check out your site at:
-🔗 hello-universe.fission.name
-```
-
-Simple as that!
-
-If you'd like to redeploy everytime you change a file, use `fission app publish --watch`
-
-## Web API Documentation
-
-Available at https://runfission.com/docs
-
-## Development
-
-### Setup
-
-Install [Haskell Stack](https://docs.haskellstack.org/en/stable/README/#how-to-install).
-
-Install PostgreSQL database.
-
-On MacOS with Homebrew:
-
-`brew install stack`
-`brew install postgresql`
-
-### Create Database
-
-```shell
-$ psql
-> CREATE DATABASE web_api;
-
-```
-
-Migrations will be performed automatically when running the server
-
-### Commands
-
-There is a `Makefile` filled with helpful commands. The most used in development is `make watch`.
-
-```shell
-# Setup env variables
-make init
-
-# Install development tools
-make setup
-
-# Watch project for changes, validating types and syntax
-make dev
-
-# Live code checking
-make live
-
-# Run server in debug/verbose mode
-DEBUG=true make serve
-```
-
+This project can build multiple binaries. Please refer to the README for the specific package (e.g. fission-cli, fission-core).
diff --git a/LICENSE → fission-cli/LICENSE b/LICENSE → fission-cli/LICENSE
diff --git a/fission-cli/README.md b/fission-cli/README.md
@@ -0,0 +1,80 @@
+# Fission CLI
+
+![Continuous Integration](https://github.com/fission-suite/fission/workflows/Continuous%20Integration/badge.svg)
+![License](https://img.shields.io/github/license/fission-suite/fission)
+[![Discord](https://img.shields.io/discord/478735028319158273.svg)](https://fission.codes/discord)
+[![Discourse](https://img.shields.io/discourse/https/talk.fission.codes/topics)](https://talk.fission.codes)
+
+Seamlessly deploy websites and store secure user data
+
+## QuickStart
+
+### MacOS
+
+```shell
+# IPFS on MacOS, otherwise https://docs.ipfs.io/introduction/install/
+brew install ipfs
+brew services start ipfs
+
+brew install fission-suite/fission/fission-cli
+```
+
+Or to build from source:
+
+```shell
+# Dependencies
+brew install stack
+brew install postgresql
+
+# Go to the Fission repo
+cd $FISSION_REPO
+
+# Build & install
+stack install --no-nix fission:fission-cil
+
+# Build only
+stack build --no-nix fission:fission-cli 
+```
+
+### Binary Releases
+
+Grab the latest binary for your operating system from our [release page](https://github.com/fission-suite/fission/releases).
+
+You'll find the most up to date instructions for [installation](https://guide.fission.codes/hosting/installation) and [getting started](https://guide.fission.codes/hosting/getting-started) in our [Guide](https://guide.fission.codes).
+
+If using Linux, install `libpq-dev`
+
+### Seamless Deployments
+Deployments are just one step: `fission app publish`
+
+
+```
+$ fission up hello-universe/
+🚀 Now live on the network
+👌 QmRVvvMeMEPi1zerpXYH9df3ATdzuB63R1wf3Mz5NS5HQN
+📝 DNS updated! Check out your site at:
+🔗 hello-universe.fission.name
+```
+
+Simple as that!
+
+If you'd like to redeploy everytime you change a file, use `fission app publish --watch`
+
+## Development
+
+### Setup
+
+Install [Haskell Stack](https://docs.haskellstack.org/en/stable/README/#how-to-install).
+
+Install PostgreSQL database.
+
+On MacOS with Homebrew:
+
+`brew install stack`
+`brew install postgresql`
+
+### Build
+
+``` shell
+stack install fission-cli
+```
diff --git a/Setup.hs → fission-cli/Setup.hs b/Setup.hs → fission-cli/Setup.hs
diff --git a/benchmark/Main.hs → fission-cli/benchmark/Main.hs b/benchmark/Main.hs → fission-cli/benchmark/Main.hs
diff --git a/doctest/Main.hs → fission-cli/doctest/Main.hs b/doctest/Main.hs → fission-cli/doctest/Main.hs
diff --git a/cli/Main.hs → fission-cli/exe/Main.hs b/cli/Main.hs → fission-cli/exe/Main.hs
diff --git a/library/Fission/CLI.hs → fission-cli/library/Fission/CLI.hs b/library/Fission/CLI.hs → fission-cli/library/Fission/CLI.hs
diff --git a/library/Fission/CLI/App.hs → fission-cli/library/Fission/CLI/App.hs b/library/Fission/CLI/App.hs → fission-cli/library/Fission/CLI/App.hs
diff --git a/library/Fission/CLI/Base/Types.hs → ...ion-cli/library/Fission/CLI/Base/Types.hs b/library/Fission/CLI/Base/Types.hs → ...ion-cli/library/Fission/CLI/Base/Types.hs
diff --git a/library/Fission/CLI/Connected.hs → fission-cli/library/Fission/CLI/Connected.hs b/library/Fission/CLI/Connected.hs → fission-cli/library/Fission/CLI/Connected.hs
diff --git a/library/Fission/CLI/Connected/Types.hs → ...li/library/Fission/CLI/Connected/Types.hs b/library/Fission/CLI/Connected/Types.hs → ...li/library/Fission/CLI/Connected/Types.hs
diff --git a/library/Fission/CLI/Context.hs → fission-cli/library/Fission/CLI/Context.hs b/library/Fission/CLI/Context.hs → fission-cli/library/Fission/CLI/Context.hs
diff --git a/library/Fission/CLI/DNS.hs → fission-cli/library/Fission/CLI/DNS.hs b/library/Fission/CLI/DNS.hs → fission-cli/library/Fission/CLI/DNS.hs
diff --git a/library/Fission/CLI/Display/Cursor.hs → ...cli/library/Fission/CLI/Display/Cursor.hs b/library/Fission/CLI/Display/Cursor.hs → ...cli/library/Fission/CLI/Display/Cursor.hs
diff --git a/library/Fission/CLI/Display/Error.hs → ...-cli/library/Fission/CLI/Display/Error.hs b/library/Fission/CLI/Display/Error.hs → ...-cli/library/Fission/CLI/Display/Error.hs
diff --git a/library/Fission/CLI/Display/Loader.hs → ...cli/library/Fission/CLI/Display/Loader.hs b/library/Fission/CLI/Display/Loader.hs → ...cli/library/Fission/CLI/Display/Loader.hs
diff --git a/library/Fission/CLI/Display/Success.hs → ...li/library/Fission/CLI/Display/Success.hs b/library/Fission/CLI/Display/Success.hs → ...li/library/Fission/CLI/Display/Success.hs
diff --git a/library/Fission/CLI/Display/Text.hs → ...n-cli/library/Fission/CLI/Display/Text.hs b/library/Fission/CLI/Display/Text.hs → ...n-cli/library/Fission/CLI/Display/Text.hs
diff --git a/library/Fission/CLI/Display/Wait.hs → ...n-cli/library/Fission/CLI/Display/Wait.hs b/library/Fission/CLI/Display/Wait.hs → ...n-cli/library/Fission/CLI/Display/Wait.hs
diff --git a/library/Fission/CLI/Environment.hs → ...on-cli/library/Fission/CLI/Environment.hs b/library/Fission/CLI/Environment.hs → ...on-cli/library/Fission/CLI/Environment.hs
diff --git a/library/Fission/CLI/Environment/Class.hs → .../library/Fission/CLI/Environment/Class.hs b/library/Fission/CLI/Environment/Class.hs → .../library/Fission/CLI/Environment/Class.hs
diff --git a/library/Fission/CLI/Environment/Error.hs → .../library/Fission/CLI/Environment/Error.hs b/library/Fission/CLI/Environment/Error.hs → .../library/Fission/CLI/Environment/Error.hs
diff --git a/library/Fission/CLI/Environment/Override.hs → ...brary/Fission/CLI/Environment/Override.hs b/library/Fission/CLI/Environment/Override.hs → ...brary/Fission/CLI/Environment/Override.hs
diff --git a/...Fission/CLI/Environment/Override/Types.hs → ...Fission/CLI/Environment/Override/Types.hs b/...Fission/CLI/Environment/Override/Types.hs → ...Fission/CLI/Environment/Override/Types.hs
diff --git a/library/Fission/CLI/Environment/Types.hs → .../library/Fission/CLI/Environment/Types.hs b/library/Fission/CLI/Environment/Types.hs → .../library/Fission/CLI/Environment/Types.hs
diff --git a/library/Fission/CLI/Error/Types.hs → ...on-cli/library/Fission/CLI/Error/Types.hs b/library/Fission/CLI/Error/Types.hs → ...on-cli/library/Fission/CLI/Error/Types.hs
diff --git a/library/Fission/CLI/Handler.hs → fission-cli/library/Fission/CLI/Handler.hs b/library/Fission/CLI/Handler.hs → fission-cli/library/Fission/CLI/Handler.hs
diff --git a/library/Fission/CLI/Handler/App/Info.hs → ...i/library/Fission/CLI/Handler/App/Info.hs b/library/Fission/CLI/Handler/App/Info.hs → ...i/library/Fission/CLI/Handler/App/Info.hs
diff --git a/library/Fission/CLI/Handler/App/Init.hs → ...i/library/Fission/CLI/Handler/App/Init.hs b/library/Fission/CLI/Handler/App/Init.hs → ...i/library/Fission/CLI/Handler/App/Init.hs
diff --git a/library/Fission/CLI/Handler/Setup.hs → ...-cli/library/Fission/CLI/Handler/Setup.hs b/library/Fission/CLI/Handler/Setup.hs → ...-cli/library/Fission/CLI/Handler/Setup.hs
diff --git a/library/Fission/CLI/Handler/Up.hs → ...ion-cli/library/Fission/CLI/Handler/Up.hs b/library/Fission/CLI/Handler/Up.hs → ...ion-cli/library/Fission/CLI/Handler/Up.hs
diff --git a/library/Fission/CLI/Handler/Whoami.hs → ...cli/library/Fission/CLI/Handler/Whoami.hs b/library/Fission/CLI/Handler/Whoami.hs → ...cli/library/Fission/CLI/Handler/Whoami.hs
diff --git a/library/Fission/CLI/IPFS/Connect.hs → ...n-cli/library/Fission/CLI/IPFS/Connect.hs b/library/Fission/CLI/IPFS/Connect.hs → ...n-cli/library/Fission/CLI/IPFS/Connect.hs
diff --git a/library/Fission/CLI/Parser.hs → fission-cli/library/Fission/CLI/Parser.hs b/library/Fission/CLI/Parser.hs → fission-cli/library/Fission/CLI/Parser.hs
diff --git a/library/Fission/CLI/Parser/Command.hs → ...cli/library/Fission/CLI/Parser/Command.hs b/library/Fission/CLI/Parser/Command.hs → ...cli/library/Fission/CLI/Parser/Command.hs
@@ -35,7 +35,7 @@ shortcuts =
     [ commandGroup "Shortcuts"
     , metavar "SHORTCUT"
     , command "setup" $ Command.User . User.Register <$> User.Register.parserWithInfo
-    , command "up"    $ Command.App  . App.Up <$> App.Up.parserWithInfo
+    , command "up"    $ Command.App  . App.Up        <$> App.Up.parserWithInfo
     ]
 
 subCommands :: Parser Command

diff --git a/library/Fission/CLI/Parser/Command/App.hs → ...library/Fission/CLI/Parser/Command/App.hs b/library/Fission/CLI/Parser/Command/App.hs → ...library/Fission/CLI/Parser/Command/App.hs
diff --git a/...ry/Fission/CLI/Parser/Command/App/Info.hs → ...ry/Fission/CLI/Parser/Command/App/Info.hs b/...ry/Fission/CLI/Parser/Command/App/Info.hs → ...ry/Fission/CLI/Parser/Command/App/Info.hs
diff --git a/...sion/CLI/Parser/Command/App/Info/Types.hs → ...sion/CLI/Parser/Command/App/Info/Types.hs b/...sion/CLI/Parser/Command/App/Info/Types.hs → ...sion/CLI/Parser/Command/App/Info/Types.hs
diff --git a/...ry/Fission/CLI/Parser/Command/App/Init.hs → ...ry/Fission/CLI/Parser/Command/App/Init.hs b/...ry/Fission/CLI/Parser/Command/App/Init.hs → ...ry/Fission/CLI/Parser/Command/App/Init.hs
diff --git a/...sion/CLI/Parser/Command/App/Init/Types.hs → ...sion/CLI/Parser/Command/App/Init/Types.hs b/...sion/CLI/Parser/Command/App/Init/Types.hs → ...sion/CLI/Parser/Command/App/Init/Types.hs
diff --git a/...y/Fission/CLI/Parser/Command/App/Types.hs → ...y/Fission/CLI/Parser/Command/App/Types.hs b/...y/Fission/CLI/Parser/Command/App/Types.hs → ...y/Fission/CLI/Parser/Command/App/Types.hs
diff --git a/library/Fission/CLI/Parser/Command/App/Up.hs → ...rary/Fission/CLI/Parser/Command/App/Up.hs b/library/Fission/CLI/Parser/Command/App/Up.hs → ...rary/Fission/CLI/Parser/Command/App/Up.hs
diff --git a/...ission/CLI/Parser/Command/App/Up/Types.hs → ...ission/CLI/Parser/Command/App/Up/Types.hs b/...ission/CLI/Parser/Command/App/Up/Types.hs → ...ission/CLI/Parser/Command/App/Up/Types.hs
diff --git a/library/Fission/CLI/Parser/Command/Types.hs → ...brary/Fission/CLI/Parser/Command/Types.hs b/library/Fission/CLI/Parser/Command/Types.hs → ...brary/Fission/CLI/Parser/Command/Types.hs
diff --git a/library/Fission/CLI/Parser/Command/User.hs → ...ibrary/Fission/CLI/Parser/Command/User.hs b/library/Fission/CLI/Parser/Command/User.hs → ...ibrary/Fission/CLI/Parser/Command/User.hs
diff --git a/...ssion/CLI/Parser/Command/User/Register.hs → ...ssion/CLI/Parser/Command/User/Register.hs b/...ssion/CLI/Parser/Command/User/Register.hs → ...ssion/CLI/Parser/Command/User/Register.hs
diff --git a/...CLI/Parser/Command/User/Register/Types.hs → ...CLI/Parser/Command/User/Register/Types.hs b/...CLI/Parser/Command/User/Register/Types.hs → ...CLI/Parser/Command/User/Register/Types.hs
diff --git a/.../Fission/CLI/Parser/Command/User/Types.hs → .../Fission/CLI/Parser/Command/User/Types.hs b/.../Fission/CLI/Parser/Command/User/Types.hs → .../Fission/CLI/Parser/Command/User/Types.hs
diff --git a/...Fission/CLI/Parser/Command/User/WhoAmI.hs → ...Fission/CLI/Parser/Command/User/WhoAmI.hs b/...Fission/CLI/Parser/Command/User/WhoAmI.hs → ...Fission/CLI/Parser/Command/User/WhoAmI.hs
diff --git a/...n/CLI/Parser/Command/User/WhoAmI/Types.hs → ...n/CLI/Parser/Command/User/WhoAmI/Types.hs b/...n/CLI/Parser/Command/User/WhoAmI/Types.hs → ...n/CLI/Parser/Command/User/WhoAmI/Types.hs
diff --git a/...ary/Fission/CLI/Parser/Command/Version.hs → ...ary/Fission/CLI/Parser/Command/Version.hs b/...ary/Fission/CLI/Parser/Command/Version.hs → ...ary/Fission/CLI/Parser/Command/Version.hs
@@ -11,7 +11,7 @@ parser :: Parser Options
 parser = do
   let verboseFlag = VerboseFlag False
 
-  _ <- switch $ mconcat
+  _ <- flag' () $ mconcat
     [ help  "Print version"
     ----------
     , long  "version"

diff --git a/...ssion/CLI/Parser/Command/Version/Types.hs → ...ssion/CLI/Parser/Command/Version/Types.hs b/...ssion/CLI/Parser/Command/Version/Types.hs → ...ssion/CLI/Parser/Command/Version/Types.hs
diff --git a/library/Fission/CLI/Parser/Config/IPFS.hs → ...library/Fission/CLI/Parser/Config/IPFS.hs b/library/Fission/CLI/Parser/Config/IPFS.hs → ...library/Fission/CLI/Parser/Config/IPFS.hs
diff --git a/...y/Fission/CLI/Parser/Config/IPFS/Types.hs → ...y/Fission/CLI/Parser/Config/IPFS/Types.hs b/...y/Fission/CLI/Parser/Config/IPFS/Types.hs → ...y/Fission/CLI/Parser/Config/IPFS/Types.hs
diff --git a/library/Fission/CLI/Parser/Config/Remote.hs → ...brary/Fission/CLI/Parser/Config/Remote.hs b/library/Fission/CLI/Parser/Config/Remote.hs → ...brary/Fission/CLI/Parser/Config/Remote.hs
diff --git a/...Fission/CLI/Parser/Config/Remote/Types.hs → ...Fission/CLI/Parser/Config/Remote/Types.hs b/...Fission/CLI/Parser/Config/Remote/Types.hs → ...Fission/CLI/Parser/Config/Remote/Types.hs
diff --git a/library/Fission/CLI/Parser/DID.hs → ...ion-cli/library/Fission/CLI/Parser/DID.hs b/library/Fission/CLI/Parser/DID.hs → ...ion-cli/library/Fission/CLI/Parser/DID.hs
diff --git a/library/Fission/CLI/Parser/Internal.hs → ...li/library/Fission/CLI/Parser/Internal.hs b/library/Fission/CLI/Parser/Internal.hs → ...li/library/Fission/CLI/Parser/Internal.hs
diff --git a/library/Fission/CLI/Parser/Remote.hs → ...-cli/library/Fission/CLI/Parser/Remote.hs b/library/Fission/CLI/Parser/Remote.hs → ...-cli/library/Fission/CLI/Parser/Remote.hs
diff --git a/library/Fission/CLI/Parser/Types.hs → ...n-cli/library/Fission/CLI/Parser/Types.hs b/library/Fission/CLI/Parser/Types.hs → ...n-cli/library/Fission/CLI/Parser/Types.hs
diff --git a/library/Fission/CLI/Parser/Verbose.hs → ...cli/library/Fission/CLI/Parser/Verbose.hs b/library/Fission/CLI/Parser/Verbose.hs → ...cli/library/Fission/CLI/Parser/Verbose.hs
diff --git a/library/Fission/CLI/Parser/Verbose/Types.hs → ...brary/Fission/CLI/Parser/Verbose/Types.hs b/library/Fission/CLI/Parser/Verbose/Types.hs → ...brary/Fission/CLI/Parser/Verbose/Types.hs
diff --git a/library/Fission/CLI/Parser/Watch/Types.hs → ...library/Fission/CLI/Parser/Watch/Types.hs b/library/Fission/CLI/Parser/Watch/Types.hs → ...library/Fission/CLI/Parser/Watch/Types.hs
diff --git a/library/Fission/CLI/Prompt.hs → fission-cli/library/Fission/CLI/Prompt.hs b/library/Fission/CLI/Prompt.hs → fission-cli/library/Fission/CLI/Prompt.hs
diff --git a/library/Fission/CLI/Prompt/BuildDir.hs → ...li/library/Fission/CLI/Prompt/BuildDir.hs b/library/Fission/CLI/Prompt/BuildDir.hs → ...li/library/Fission/CLI/Prompt/BuildDir.hs
diff --git a/library/Fission/CLI/Prompt/Error/Types.hs → ...library/Fission/CLI/Prompt/Error/Types.hs b/library/Fission/CLI/Prompt/Error/Types.hs → ...library/Fission/CLI/Prompt/Error/Types.hs
diff --git a/library/Fission/CLI/Prompt/Fields.hs → ...-cli/library/Fission/CLI/Prompt/Fields.hs b/library/Fission/CLI/Prompt/Fields.hs → ...-cli/library/Fission/CLI/Prompt/Fields.hs
diff --git a/library/Fission/CLI/Remote.hs → fission-cli/library/Fission/CLI/Remote.hs b/library/Fission/CLI/Remote.hs → fission-cli/library/Fission/CLI/Remote.hs
diff --git a/library/Fission/CLI/Remote/Types.hs → ...n-cli/library/Fission/CLI/Remote/Types.hs b/library/Fission/CLI/Remote/Types.hs → ...n-cli/library/Fission/CLI/Remote/Types.hs
diff --git a/library/Fission/CLI/Types.hs → fission-cli/library/Fission/CLI/Types.hs b/library/Fission/CLI/Types.hs → fission-cli/library/Fission/CLI/Types.hs
diff --git a/library/Fission/Web/Client.hs → fission-cli/library/Fission/Web/Client.hs b/library/Fission/Web/Client.hs → fission-cli/library/Fission/Web/Client.hs
diff --git a/library/Fission/Web/Client/App.hs → ...ion-cli/library/Fission/Web/Client/App.hs b/library/Fission/Web/Client/App.hs → ...ion-cli/library/Fission/Web/Client/App.hs
@@ -4,25 +4,23 @@ module Fission.Web.Client.App
   , mkUpdateReq
   ) where
 
-import Fission.Prelude
+import qualified Crypto.PubKey.Ed25519           as Ed25519
+import           Network.IPFS.CID.Types
 
-import           Servant
+import           Servant.API
 import           Servant.Client
 
+import           Fission.Prelude
 
-import           Fission.Web.Client     as Client
-import           Fission.Web.Routes     (AppPrefix)
-import qualified Fission.Web.App.Create as App.Create
-import qualified Fission.Web.App.Update as App.Update
-import qualified Fission.Web.Auth.Types as Auth
+import qualified Fission.Web.App.Create          as App.Create
+import qualified Fission.Web.App.Update          as App.Update
 import           Fission.Web.Auth.Token
+import qualified Fission.Web.Auth.Types          as Auth
+import           Fission.Web.Client              as Client
+import           Fission.Web.Routes              (AppPrefix)
 
-import qualified Crypto.PubKey.Ed25519 as Ed25519
-import           Network.IPFS.CID.Types
-
-import           Fission.URL
 import           Fission.Authorization.ServerDID
-
+import           Fission.URL
 
 type Create
   = AppPrefix

diff --git a/library/Fission/Web/Client/Auth.hs → ...on-cli/library/Fission/Web/Client/Auth.hs b/library/Fission/Web/Client/Auth.hs → ...on-cli/library/Fission/Web/Client/Auth.hs
diff --git a/library/Fission/Web/Client/Auth/Class.hs → .../library/Fission/Web/Client/Auth/Class.hs b/library/Fission/Web/Client/Auth/Class.hs → .../library/Fission/Web/Client/Auth/Class.hs
diff --git a/library/Fission/Web/Client/Class.hs → ...n-cli/library/Fission/Web/Client/Class.hs b/library/Fission/Web/Client/Class.hs → ...n-cli/library/Fission/Web/Client/Class.hs
diff --git a/library/Fission/Web/Client/Error.hs → ...n-cli/library/Fission/Web/Client/Error.hs b/library/Fission/Web/Client/Error.hs → ...n-cli/library/Fission/Web/Client/Error.hs
diff --git a/library/Fission/Web/Client/JWT.hs → ...ion-cli/library/Fission/Web/Client/JWT.hs b/library/Fission/Web/Client/JWT.hs → ...ion-cli/library/Fission/Web/Client/JWT.hs
diff --git a/library/Fission/Web/Client/Peers.hs → ...n-cli/library/Fission/Web/Client/Peers.hs b/library/Fission/Web/Client/Peers.hs → ...n-cli/library/Fission/Web/Client/Peers.hs
@@ -4,16 +4,15 @@ module Fission.Web.Client.Peers
   , getPeers
   ) where
 
-import           Fission.Prelude
+import qualified Network.IPFS.Types         as IPFS
 
-import           Servant
+import           Servant.API
 import           Servant.Client
 
-import qualified Fission.Web.IPFS.Peer      as Peer
+import           Fission.Prelude
 
 import           Fission.Web.Client
-
-import qualified Network.IPFS.Types         as IPFS
+import qualified Fission.Web.IPFS.Peer      as Peer
 
 import qualified Fission.CLI.Display.Cursor as Cursor
 import qualified Fission.CLI.Display.Wait   as CLI.Wait

diff --git a/library/Fission/Web/Client/Types.hs → ...n-cli/library/Fission/Web/Client/Types.hs b/library/Fission/Web/Client/Types.hs → ...n-cli/library/Fission/Web/Client/Types.hs
diff --git a/library/Fission/Web/Client/User.hs → ...on-cli/library/Fission/Web/Client/User.hs b/library/Fission/Web/Client/User.hs → ...on-cli/library/Fission/Web/Client/User.hs
@@ -5,9 +5,10 @@ module Fission.Web.Client.User
   , UpdatePK
   ) where
 
-import           Servant
-import qualified Fission.Web.User   as User
+import           Servant.API
+
 import           Fission.Web.Routes (UserPrefix)
+import qualified Fission.Web.User   as User
 
 type Register = UserPrefix :> User.RegisterRoute
 type Verify   = UserPrefix :> User.VerifyRoute

diff --git a/lint/Main.hs → fission-cli/lint/Main.hs b/lint/Main.hs → fission-cli/lint/Main.hs