Remove some code from common package

dfordivam · Feb 8, 2018 · 8f729c4 · 8f729c4
1 parent 4fad50b
commit 8f729c4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 31 deletions.
diff --git a/common/src/Common.hs b/common/src/Common.hs
@@ -190,25 +190,6 @@ newtype BookId = BookId { unBookId :: Int }
 newtype ArticleId = ArticleId { unArticleId :: Int }
   deriving (Eq, Ord, Generic, Show, Typeable, ToJSON, FromJSON)
 
-type family ReaderDocument t
-type instance ReaderDocument t = ReaderDocumentTree t
-
-data ReaderDocumentTree t = ReaderDocument
-  { _readerDocId :: ReaderDocumentId
-  , _readerDoc :: ReaderDocumentType t
-  , _readerDocProgress :: (Int, Maybe Int) -- (Para, offset)
-  }
-  deriving (Generic, Show, ToJSON, FromJSON)
-
-type family ReaderDocumentType t
-type instance ReaderDocumentType t = ReaderDocumentTypeCurrent
-
-data ReaderDocumentTypeCurrent
-  = MyDocument Text AnnotatedDocument
-  | Book BookId
-  | Article ArticleId
-  deriving (Generic, Show, ToJSON, FromJSON)
-
 type family ReaderSettings t
 type instance ReaderSettings t
   = ReaderSettingsTree t
@@ -345,7 +326,6 @@ testMakeFurigana = map (\(a,b) -> makeFurigana (KanjiPhrase a) (ReadingPhrase b)
 makeLenses ''SrsReviewStats
 makeLenses ''VocabDetails
 makeLenses ''KanjiDetails
-makeLenses ''ReaderDocumentTree
 
 makePrisms ''SrsEntryState
 makeLenses ''SrsEntryStats

diff --git a/common/src/Message.hs b/common/src/Message.hs
@@ -65,11 +65,6 @@ type AppRequest
   :<|> GetReaderSettings
   :<|> SaveReaderSettings
   :<|> SaveReadingProgress
-  -- :<|> CreateT ReaderDocument
-  -- :<|> EditT ReaderDocument
-  -- :<|> ReadT ReaderDocument
-  -- :<|> ListT ReaderDocument
-  -- :<|> DeleteT ReaderDocument
 
   :<|> GetVocabDetails
   :<|> GetVocabSentences

diff --git a/frontend/src/ReadingPane.hs b/frontend/src/ReadingPane.hs
@@ -78,14 +78,13 @@ checkVerticalOverflow (ie,oe) r action = do
 
 readingPane :: AppMonad t m
   => Event t (ReaderDocumentData)
-  -> AppMonadT t m (Event t (), Event t (ReaderDocument CurrentDb))
+  -> AppMonadT t m (Event t ())
 readingPane docEv = do
   ev <- getPostBuild
   s <- getWebSocketResponse (GetReaderSettings <$ ev)
   v <- widgetHold (readingPaneInt docEv def)
     (readingPaneInt docEv <$> s)
-  return (switchPromptlyDyn (fst <$> v)
-         , switchPromptlyDyn (snd <$> v))
+  return (switchPromptlyDyn v)
 
 readerSettingsControls rsDef = divClass "col-sm-12 well-lg form-inline" $ divClass "" $ do
   let
@@ -128,7 +127,7 @@ divWrap rs fullscreenDyn w = do
 readingPaneInt :: AppMonad t m
   => Event t (ReaderDocumentData)
   -> ReaderSettings CurrentDb
-  -> AppMonadT t m (Event t (), Event t (ReaderDocument CurrentDb))
+  -> AppMonadT t m (Event t ())
 readingPaneInt docEv rsDef = do
   (closeEv,fullScrEv, rsDyn) <- divClass "row" $ do
     rsDyn <- divClass "col-sm-9" $ readerSettingsControls rsDef
@@ -144,7 +143,7 @@ readingPaneInt docEv rsDef = do
     -- (readingPaneView <$> docEv)
     -- (paginatedReader rsDyn fullScrEv <$> docEv)
     (verticalReader rsDyn fullScrEv <$> docEv)
-  return (closeEv, never)
+  return (closeEv)
 
 ----------------------------------------------------------------------------------
 -- Vertical rendering

diff --git a/frontend/src/TextReader.hs b/frontend/src/TextReader.hs
@@ -47,7 +47,7 @@ textReaderTop = do
     (viewEv2, cancelEv) <- handleVisibility EditDocumentView vis $
       documentEditor editEv
 
-    (closeEv, editEv2) <- handleVisibility ReadingView vis $
+    (closeEv) <- handleVisibility ReadingView vis $
       readingPane viewEv
   return ()