Refactor, use app tokens

12 files changed, 14 insertions, 13 deletions

diff --git a/fig-web/src/Fig/Web/Module/Advent.hs b/fig-web/src/Fig/Web/Module/Advent.hs
index d1bfe1c..dff11e3 100644
--- a/fig-web/src/Fig/Web/Module/Advent.hs
+++ b/fig-web/src/Fig/Web/Module/Advent.hs
@@ -8,7 +8,7 @@ import Text.HTML.SanitizeXSS (sanitize)
 import Fig.Web.Utils
 import Fig.Web.Types
 import Fig.Web.Auth
-import Fig.Web.DB as DB
+import Fig.Utils.DB as DB
 import qualified Fig.Utils.FFI as FFI
 
 keybase :: Integer -> Text -> Text -> ByteString
diff --git a/fig-web/src/Fig/Web/Module/Bells.hs b/fig-web/src/Fig/Web/Module/Bells.hs
index f4f8112..ba2d9cf 100644
--- a/fig-web/src/Fig/Web/Module/Bells.hs
+++ b/fig-web/src/Fig/Web/Module/Bells.hs
@@ -7,7 +7,7 @@ import Fig.Prelude
 import Fig.Utils.SExpr
 import Fig.Web.Utils
 import Fig.Web.Types
-import qualified Fig.Web.DB as DB
+import qualified Fig.Utils.DB as DB
 
 public :: PublicModule
 public a = do
diff --git a/fig-web/src/Fig/Web/Module/Debt.hs b/fig-web/src/Fig/Web/Module/Debt.hs
index 643f99f..60f1ab7 100644
--- a/fig-web/src/Fig/Web/Module/Debt.hs
+++ b/fig-web/src/Fig/Web/Module/Debt.hs
@@ -9,7 +9,7 @@ import qualified Data.Map.Strict as Map
 
 import Fig.Web.Utils
 import Fig.Web.Types
-import qualified Fig.Web.DB as DB
+import qualified Fig.Utils.DB as DB
 
 public :: PublicModule
 public a = do
diff --git a/fig-web/src/Fig/Web/Module/Exchange.hs b/fig-web/src/Fig/Web/Module/Exchange.hs
index 11af071..aacf207 100644
--- a/fig-web/src/Fig/Web/Module/Exchange.hs
+++ b/fig-web/src/Fig/Web/Module/Exchange.hs
@@ -5,8 +5,6 @@ module Fig.Web.Module.Exchange
 
 import Fig.Prelude
 
-import Control.Error.Util (hush)
-
 import qualified Database.Redis as Redis
 
 import Data.Maybe (mapMaybe)
@@ -20,6 +18,8 @@ import Fig.Web.Utils
 import Fig.Web.Types
 import Fig.Web.Auth
 
+import qualified Fig.Utils.DB as DB
+
 public :: PublicModule
 public a = do
   onGet "/api/exchange" do
diff --git a/fig-web/src/Fig/Web/Module/Gizmo.hs b/fig-web/src/Fig/Web/Module/Gizmo.hs
index 70078fb..b7f0248 100644
--- a/fig-web/src/Fig/Web/Module/Gizmo.hs
+++ b/fig-web/src/Fig/Web/Module/Gizmo.hs
@@ -14,7 +14,7 @@ import qualified Network.WebSockets as WS
 
 import Fig.Web.Utils
 import Fig.Web.Types
-import qualified Fig.Web.DB as DB
+import qualified Fig.Utils.DB as DB
 
 public :: PublicModule
 public a = do
diff --git a/fig-web/src/Fig/Web/Module/HLS.hs b/fig-web/src/Fig/Web/Module/HLS.hs
index 66242e5..fb3a717 100644
--- a/fig-web/src/Fig/Web/Module/HLS.hs
+++ b/fig-web/src/Fig/Web/Module/HLS.hs
@@ -8,7 +8,7 @@ import Data.Functor ((<&>))
 
 import Fig.Web.Utils
 import Fig.Web.Types
-import qualified Fig.Web.DB as DB
+import qualified Fig.Utils.DB as DB
 
 public :: PublicModule
 public a = do
diff --git a/fig-web/src/Fig/Web/Module/Misc.hs b/fig-web/src/Fig/Web/Module/Misc.hs
index c7ca250..3163b3f 100644
--- a/fig-web/src/Fig/Web/Module/Misc.hs
+++ b/fig-web/src/Fig/Web/Module/Misc.hs
@@ -10,7 +10,7 @@ import Control.Lens ((^?), Ixed (..))
 
 import Fig.Web.Utils
 import Fig.Web.Types
-import qualified Fig.Web.DB as DB
+import qualified Fig.Utils.DB as DB
 
 public :: PublicModule
 public a = do
diff --git a/fig-web/src/Fig/Web/Module/Puzzle.hs b/fig-web/src/Fig/Web/Module/Puzzle.hs
index b8e469b..5278721 100644
--- a/fig-web/src/Fig/Web/Module/Puzzle.hs
+++ b/fig-web/src/Fig/Web/Module/Puzzle.hs
@@ -17,7 +17,7 @@ import Fig.Utils.FFI (checkAnswer)
 import Fig.Web.Utils
 import Fig.Web.Types
 import Fig.Web.Auth
-import Fig.Web.DB
+import Fig.Utils.DB
 
 data Puzzle = Puzzle
   { pid :: Text
diff --git a/fig-web/src/Fig/Web/Module/Sentiment.hs b/fig-web/src/Fig/Web/Module/Sentiment.hs
index 41f90f3..2bf1edb 100644
--- a/fig-web/src/Fig/Web/Module/Sentiment.hs
+++ b/fig-web/src/Fig/Web/Module/Sentiment.hs
@@ -6,7 +6,7 @@ import Fig.Prelude
 
 import Fig.Web.Utils
 import Fig.Web.Types
-import qualified Fig.Web.DB as DB
+import qualified Fig.Utils.DB as DB
 
 public :: PublicModule
 public a = do
diff --git a/fig-web/src/Fig/Web/Module/Shader.hs b/fig-web/src/Fig/Web/Module/Shader.hs
index e5dfc95..a0773a7 100644
--- a/fig-web/src/Fig/Web/Module/Shader.hs
+++ b/fig-web/src/Fig/Web/Module/Shader.hs
@@ -6,7 +6,7 @@ import Fig.Prelude
 
 import Fig.Web.Utils
 import Fig.Web.Types
-import qualified Fig.Web.DB as DB
+import qualified Fig.Utils.DB as DB
 
 public :: PublicModule
 public a = do
diff --git a/fig-web/src/Fig/Web/Module/TCG.hs b/fig-web/src/Fig/Web/Module/TCG.hs
index e57cb28..4f7c094 100644
--- a/fig-web/src/Fig/Web/Module/TCG.hs
+++ b/fig-web/src/Fig/Web/Module/TCG.hs
@@ -11,7 +11,7 @@ import qualified Data.ByteString as BS
 
 import Fig.Web.Utils
 import Fig.Web.Types
-import qualified Fig.Web.DB as DB
+import qualified Fig.Utils.DB as DB
 
 public :: PublicModule
 public a = do
diff --git a/fig-web/src/Fig/Web/Module/User.hs b/fig-web/src/Fig/Web/Module/User.hs
index 1e82e0b..550130c 100644
--- a/fig-web/src/Fig/Web/Module/User.hs
+++ b/fig-web/src/Fig/Web/Module/User.hs
@@ -16,7 +16,8 @@ import qualified Database.Redis as Redis
 import Fig.Web.Utils
 import Fig.Web.Types
 import Fig.Web.Auth
-import qualified Fig.Web.DB as DB
+import Fig.Utils.DB (DB)
+import qualified Fig.Utils.DB as DB
 
 getText :: MonadIO m => DB -> ByteString -> m (Maybe Text)
 getText db key = do