Move BoardType, ThreadType and SiteType modules into Common.Network

chandlr.cabal

@@ -69,10 +69,10 @@ executable chandlr
                       Network.Client
                       Common.Network.ClientTypes
                       Common.Network.CatalogPostType
-                      Network.BoardType
-                      Network.SiteType
+                      Common.Network.BoardType
+                      Common.Network.SiteType
                       Common.Network.PostType
-                      Network.ThreadType
+                      Common.Network.ThreadType
                       Common.Component.ThreadView
                       Component.Thread.Files
                       Component.Thread.Intro

src/Common

@@ -1 +1 @@
-Subproject commit a97152853d42a4d334d6ab659f9a38792d648cda
+Subproject commit 5a418494d53a23792a458f85d7aa397928786e3b

src/Component/Thread/Files.hs

@@ -28,10 +28,10 @@ import qualified Data.Text as Text
 import Miso.String (append, toMisoString)
 import qualified Data.Map as Map
 import GHCJS.DOM.Types (JSString)
-import Network.SiteType (Site)
-import qualified Network.SiteType as Site
-import qualified Network.BoardType as Board
-import qualified Network.ThreadType as Thread
+import Common.Network.SiteType (Site)
+import qualified Common.Network.SiteType as Site
+import qualified Common.Network.BoardType as Board
+import qualified Common.Network.ThreadType as Thread
 import qualified Common.Network.PostType as Post
 import Common.Network.PostType (Post)
 import Common.AttachmentType (Attachment, Dimension (..))

src/Component/Thread/Intro.hs

@@ -24,12 +24,12 @@ import Data.Time.Format (formatTime, defaultTimeLocale)
 
 import Common.Network.PostType (Post)
 import qualified Common.Network.PostType as Post
-import Network.SiteType (Site)
-import qualified Network.SiteType as Site
-import Network.BoardType (Board)
-import qualified Network.BoardType as Board
-import qualified Network.ThreadType as Thread
-import Network.ThreadType (Thread)
+import Common.Network.SiteType (Site)
+import qualified Common.Network.SiteType as Site
+import Common.Network.BoardType (Board)
+import qualified Common.Network.BoardType as Board
+import qualified Common.Network.ThreadType as Thread
+import Common.Network.ThreadType (Thread)
 import Parsing.BodyParser (Backlinks)
 
 

src/Component/Thread/Model.hs

@@ -1,7 +1,7 @@
 module Component.Thread.Model where
 
 import GHCJS.DOM.Types (JSString)
-import Network.SiteType (Site)
+import Common.Network.SiteType (Site)
 import Common.Network.PostType (Post)
 import Parsing.PostPartType (PostPart)
 import Data.Time.Clock (UTCTime)

src/Network/BoardType.hs

@@ -1,18 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-
-module Network.BoardType where
-
-import GHC.Generics
-import Data.Text (Text)
-import Data.Aeson (FromJSON, ToJSON)
-import Network.ThreadType (Thread)
-
-data Board = Board
-  { board_id :: Int
-  , name     :: Maybe Text
-  , pathpart :: Text
-  , site_id  :: Int
-  , threads  :: [ Thread ]
-  } deriving (Show, Generic, FromJSON, ToJSON, Eq)
-

src/Network/Client.hs

@@ -30,7 +30,7 @@ import Miso.String (toMisoString)
 
 import qualified Network.Http as Http
 import Common.Network.CatalogPostType (CatalogPost)
-import Network.SiteType (Site)
+import Common.Network.SiteType (Site)
 import qualified Common.FrontEnd.Action as A
 import Common.Network.ClientTypes
 

src/Network/SiteType.hs

@@ -1,16 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-
-module Network.SiteType where
-
-import GHC.Generics
-import Data.Text (Text)
-import Data.Aeson (FromJSON, ToJSON)
-import Network.BoardType (Board)
-
-data Site = Site
-  { site_id :: Int
-  , name    :: Text
-  , url     :: Text
-  , boards  :: [ Board ]
-  } deriving (Show, Generic, FromJSON, ToJSON, Eq)

src/Network/ThreadType.hs

@@ -1,17 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-
-module Network.ThreadType where
-
-import GHC.Generics
-import Data.Time.Clock (UTCTime)
-import Data.Aeson (FromJSON, ToJSON)
-import Common.Network.PostType (Post)
-
-data Thread = Thread
-  { thread_id       :: Integer
-  , board_thread_id :: Integer
-  , creation_time   :: UTCTime
-  , board_id        :: Int
-  , posts           :: [ Post ]
-  } deriving (Show, Generic, FromJSON, ToJSON, Eq)