Upgrade

backend/src/API/Books.hs

@@ -15,24 +15,25 @@
 {-# Language NamedFieldPuns #-}
 module API.Books where
 
-import Servant hiding (contentType)
-import Types
-import ClassyPrelude
-import Server.Auth
-import Servant.Auth as SA
-import Data.Aeson
-import Database.Book
-import Database.Channel
-import Database.Tag
-import Database
-import Control.Lens
-import Data.Generics.Product
+import           ClassyPrelude
+import           Control.Lens
+import           Control.Monad.Catch (throwM, MonadThrow)
+import           Data.Aeson
+import           Data.Generics.Product
+import           Database
+import           Database.Book
+import           Database.Channel
+import           Database.Tag
+import           Servant hiding (contentType)
+import           Servant.Auth as SA
+import           Server.Auth
+import           Types
 
-import Control.Monad.Trans.Maybe
+import           Control.Monad.Trans.Maybe
 
 import qualified Datastore as DS
-import Data.ByteArray (convert)
-import Crypto.Hash (digestFromByteString)
+import           Data.ByteArray (convert)
+import           Crypto.Hash (digestFromByteString)
 
 data JsonBook = JsonBook { identifier :: BookID
                          , contentType :: Text

backend/src/API/Catalogue.hs

@@ -16,17 +16,17 @@
 {-# Language ScopedTypeVariables #-}
 module API.Catalogue (VersionedAPI, handler) where
 
-import Types
-import Servant hiding (contentType)
-import ClassyPrelude
-import GHC.TypeLits
-import Server.Auth
-import Servant.Auth as SA
-import Servant.XML
-import qualified Database.Channel as Channel
-import Database.Book (Book(..))
-import Database
 import qualified API.Books
+import           ClassyPrelude
+import           Database
+import           Database.Book (Book(..))
+import qualified Database.Channel as Channel
+import           GHC.TypeLits
+import           Servant hiding (contentType)
+import           Servant.Auth as SA
+import           Servant.XML
+import           Server.Auth
+import           Types
 
 -- This is my first try on going to versioned apis, things might change
 -- I think my rule of thumb is that you can add new things as you want, but

backend/src/API/Channels.hs

@@ -15,17 +15,18 @@
 {-# Language NamedFieldPuns #-}
 module API.Channels (API, handler, JsonChannel(..)) where
 
-import Servant
-import Types
 import ClassyPrelude
-import Server.Auth
-import Servant.Auth as SA
+import Control.Lens
+import Control.Monad.Catch (throwM, MonadThrow)
 import Control.Monad.Logger
+import Data.Aeson
+import Data.Generics.Product
 import Database
 import Database.Channel
-import Data.Aeson
-import Control.Lens
-import Data.Generics.Product
+import Servant
+import Servant.Auth as SA
+import Server.Auth
+import Types
 
 data JsonChannel = JsonChannel { channel :: Text
                                , visibility :: Visibility }

backend/src/API/Users.hs

@@ -7,17 +7,18 @@
 {-# Language TypeApplications #-}
 module API.Users  where
 
-import Servant
 import ClassyPrelude
-import Types
+import Control.Monad.Catch (throwM, MonadThrow)
 import Data.Aeson
-import Web.FormUrlEncoded
 import Database (runDB)
-import Database.User
 import Database.Schema
-import Server.Auth
-import Servant.Auth.Server as SAS
+import Database.User
+import Servant
 import Servant.Auth as SA
+import Servant.Auth.Server as SAS
+import Server.Auth
+import Types
+import Web.FormUrlEncoded
 
 
 data RegisterForm = RegisterForm { username :: Username