From 786927ccbdac63cba59fe961a6f6359739e9a890 Mon Sep 17 00:00:00 2001 From: Mats Rauhala Date: Wed, 29 Aug 2018 23:17:32 +0300 Subject: [PATCH] Move server api behind the server namespace --- backend/backend.cabal | 12 ++++++------ backend/src/Server.hs | 2 +- backend/src/{ => Server}/API.hs | 10 +++++----- backend/src/{ => Server}/API/Books.hs | 2 +- backend/src/{ => Server}/API/Catalogue.hs | 4 ++-- backend/src/{ => Server}/API/Channels.hs | 2 +- backend/src/{ => Server}/API/Users.hs | 2 +- project.nix | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) rename backend/src/{ => Server}/API.hs (83%) rename backend/src/{ => Server}/API/Books.hs (99%) rename backend/src/{ => Server}/API/Catalogue.hs (98%) rename backend/src/{ => Server}/API/Channels.hs (97%) rename backend/src/{ => Server}/API/Users.hs (98%) diff --git a/backend/backend.cabal b/backend/backend.cabal index 7b0d575..7a2648b 100644 --- a/backend/backend.cabal +++ b/backend/backend.cabal @@ -18,20 +18,20 @@ cabal-version: >=1.10 executable backend main-is: Main.hs other-modules: Devel.Main - , API - , API.Books - , API.Catalogue - , API.Channels - , API.Users , Database , Database.Book , Database.Channel - , Database.Tag , Database.Schema + , Database.Tag , Database.User , Datastore , Servant.XML , Server + , Server.API + , Server.API.Books + , Server.API.Catalogue + , Server.API.Channels + , Server.API.Users , Server.Auth , Types , View diff --git a/backend/src/Server.hs b/backend/src/Server.hs index 7461b55..47d3952 100644 --- a/backend/src/Server.hs +++ b/backend/src/Server.hs @@ -12,7 +12,7 @@ {-# Language TypeApplications #-} module Server where -import qualified API as API +import qualified Server.API as API import Server.Auth (authCheck) import Servant import Types diff --git a/backend/src/API.hs b/backend/src/Server/API.hs similarity index 83% rename from backend/src/API.hs rename to backend/src/Server/API.hs index 3186b6a..aa4f9db 100644 --- a/backend/src/API.hs +++ b/backend/src/Server/API.hs @@ -9,7 +9,7 @@ {-# Language RecordWildCards #-} {-# Language DeriveGeneric #-} {-# Language FlexibleInstances #-} -module API (API, handler) where +module Server.API (API, handler) where import Servant @@ -18,10 +18,10 @@ import Types import View -import qualified API.Users as Users -import qualified API.Channels as Channels -import qualified API.Books as Books -import qualified API.Catalogue as Catalogue +import qualified Server.API.Users as Users +import qualified Server.API.Channels as Channels +import qualified Server.API.Books as Books +import qualified Server.API.Catalogue as Catalogue data Index = Index diff --git a/backend/src/API/Books.hs b/backend/src/Server/API/Books.hs similarity index 99% rename from backend/src/API/Books.hs rename to backend/src/Server/API/Books.hs index 6a9ebdb..b847a67 100644 --- a/backend/src/API/Books.hs +++ b/backend/src/Server/API/Books.hs @@ -13,7 +13,7 @@ {-# Language TypeApplications #-} {-# Language DataKinds #-} {-# Language NamedFieldPuns #-} -module API.Books where +module Server.API.Books where import Servant hiding (contentType) import Types diff --git a/backend/src/API/Catalogue.hs b/backend/src/Server/API/Catalogue.hs similarity index 98% rename from backend/src/API/Catalogue.hs rename to backend/src/Server/API/Catalogue.hs index 9a36699..66b8c77 100644 --- a/backend/src/API/Catalogue.hs +++ b/backend/src/Server/API/Catalogue.hs @@ -14,7 +14,7 @@ {-# Language TemplateHaskell #-} {-# Language MultiParamTypeClasses #-} {-# Language ScopedTypeVariables #-} -module API.Catalogue (VersionedAPI, handler) where +module Server.API.Catalogue (VersionedAPI, handler) where import Types import Servant hiding (contentType) @@ -26,7 +26,7 @@ import Servant.XML import qualified Database.Channel as Channel import Database.Book (Book(..)) import Database -import qualified API.Books +import qualified Server.API.Books as API.Books -- 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 diff --git a/backend/src/API/Channels.hs b/backend/src/Server/API/Channels.hs similarity index 97% rename from backend/src/API/Channels.hs rename to backend/src/Server/API/Channels.hs index 13507f0..ae942c7 100644 --- a/backend/src/API/Channels.hs +++ b/backend/src/Server/API/Channels.hs @@ -13,7 +13,7 @@ {-# Language DataKinds #-} {-# Language DuplicateRecordFields #-} {-# Language NamedFieldPuns #-} -module API.Channels (API, handler, JsonChannel(..)) where +module Server.API.Channels (API, handler, JsonChannel(..)) where import Servant import Types diff --git a/backend/src/API/Users.hs b/backend/src/Server/API/Users.hs similarity index 98% rename from backend/src/API/Users.hs rename to backend/src/Server/API/Users.hs index 9c2ea4e..e225c10 100644 --- a/backend/src/API/Users.hs +++ b/backend/src/Server/API/Users.hs @@ -5,7 +5,7 @@ {-# Language TypeOperators #-} {-# Language DuplicateRecordFields #-} {-# Language TypeApplications #-} -module API.Users where +module Server.API.Users where import Servant import ClassyPrelude diff --git a/project.nix b/project.nix index 5e9adde..d3754e0 100644 --- a/project.nix +++ b/project.nix @@ -21,13 +21,13 @@ let mkShell = name: pkg: let n = "${name}-shell"; - deps = haskellPackages.ghcWithPackages (pkgs: pkg.nativeBuildInputs); + deps = haskellPackages.ghcWithPackages (pkgs: pkg.buildInputs); in { name = "${n}"; value = nixpkgs.buildEnv { name = "${n}"; - paths = tools; + paths = tools ++ [deps]; buildInputs = tools ++ [deps]; }; };