From a8a0d514eedf6cbcfe49ea777f1fec5491e0b83a Mon Sep 17 00:00:00 2001 From: towards-a-new-leftypol Date: Tue, 5 Mar 2024 20:16:27 -0500 Subject: [PATCH] Move Network.ClientTypes into Common --- chandlr.cabal | 2 +- src/Common | 2 +- src/Network/Client.hs | 2 +- src/Network/ClientTypes.hs | 18 ------------------ 4 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 src/Network/ClientTypes.hs diff --git a/chandlr.cabal b/chandlr.cabal index 6215824..7a683fa 100644 --- a/chandlr.cabal +++ b/chandlr.cabal @@ -66,7 +66,7 @@ executable chandlr Common.FrontEnd.Action Network.Http Network.Client - Network.ClientTypes + Common.Network.ClientTypes Common.Network.CatalogPostType Network.BoardType Network.SiteType diff --git a/src/Common b/src/Common index 443f2e3..e332e4b 160000 --- a/src/Common +++ b/src/Common @@ -1 +1 @@ -Subproject commit 443f2e37adcef18a78c9c454594132c05495026d +Subproject commit e332e4bb92e2d2d8ecedec6c25ee143ab5a0fced diff --git a/src/Network/Client.hs b/src/Network/Client.hs index 374069f..5b3d76c 100644 --- a/src/Network/Client.hs +++ b/src/Network/Client.hs @@ -32,7 +32,7 @@ import qualified Network.Http as Http import Common.Network.CatalogPostType (CatalogPost) import Network.SiteType (Site) import qualified Common.FrontEnd.Action as A -import Network.ClientTypes +import Common.Network.ClientTypes update diff --git a/src/Network/ClientTypes.hs b/src/Network/ClientTypes.hs deleted file mode 100644 index d0fafa2..0000000 --- a/src/Network/ClientTypes.hs +++ /dev/null @@ -1,18 +0,0 @@ -module Network.ClientTypes where - -import qualified Network.Http as Http -import GHCJS.DOM.Types (JSString) - -data Action a = Connect (Http.HttpActionResult a) - -data Interface a b = Interface - { passAction :: Action b -> a - , returnResult :: Http.HttpResult b -> a - } - -data Model = Model - { pgApiRoot :: JSString - , fetchCount :: Int - } deriving Eq - -