Remove ElixirFM dep, rip out Lua-related nonsense.

The GameState type and such are now gone.

Author: srhoulam

babel-cards.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 8a344dcc26aef96c7290cf75ca42ad8bcfb97dbaef4eed426e446c9ea3d8be76
+-- hash: 6f7185888cb6f6b8d75f48b073a27cc2471605c905e4bef74ae01af8f7dd6ac1
 
 name:           babel-cards
 version:        0.1.0
@@ -43,7 +43,6 @@ library
       Model
       Settings
       Types
-      Types.Free
       Types.Review
       Types.TUI
       Util.String
@@ -53,8 +52,7 @@ library
       src
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wpartial-fields -Wredundant-constraints
   build-depends:
-      ElixirFM
-    , aeson
+      aeson
     , base >=4.11 && <10
     , brick
     , bytestring

package.yaml

@@ -54,7 +54,6 @@ library:
   - bytestring
   - containers
   - directory
-  - ElixirFM
   - edit-distance
   - esqueleto
   - file-embed

src/Application/TUI.hs

@@ -7,10 +7,7 @@ module Types.TUI where
 import           Brick.BChan            (BChan)
 import           Brick.Forms            (Form)
 import           Brick.Widgets.List     (GenericList)
-import           Data.IntMap.Strict     (IntMap)
-import           Data.Map.Strict        (Map)
-import           Data.Sequence          (Seq)
-import           Data.Text              (Text)
+import RIO.Time (UTCTime)
 import           Database.Persist.Types (Entity)
 import           Lens.Micro.TH
 import           Model
@@ -22,7 +19,13 @@ data BabelTUI = BabelTUI
   , babelTUIView                   :: !BabelView
   , babelTUIChan                   :: !(BChan BabelEvent)
 
-  , babelTUIGameState              :: !(Maybe GameState)
+  -- Review state
+  , babelTUIMatchMode              :: !(Maybe BabelMode)
+  , babelTUIActiveCard             :: !(Maybe (Entity Card))
+  , babelTUIUserAnswer             :: !(Maybe Text)
+  , babelTUIAnswerDistance         :: !(Maybe Int)
+  , babelTUIReviewStartTimestamp   :: !(Maybe UTCTime)
+  , babelTUIReviewEndTimestamp   :: !(Maybe UTCTime)
 
   , babelTUIFocusX                 :: !Int
   -- ^ Left-to-right focus.
@@ -81,28 +84,10 @@ data BabelEvent =
   | LoadTagCards
 
 
--- TODO: we can't delegate quite as much responsibility to Lua
---       as we thought.
---       - init will have to get a few constants: number of cards
---         to draw, what display mode (once implemented)
---       - state transition will have to be managed by haskell. Lua
---         will provide hooks into it, such as how to compare user
---         input to the card to ascertain correctness
---       - I don't know how to make many types of game possible! thus
---         LUA is on hold until this is hammered out through the
---         built-in modes!
 data BabelMode =
   Standard
   | Reverse
   deriving Show
-  -- NOTE: Lua scripting is on hold until I learn the requirements
-  --       of modes of operation in order to better architect the
-  --       interface
-  -- | BabelMode
-  --   { babelModeInitGame        :: !(Lua ())
-  --   , babelModeStateTransition :: !(Lua ())
-  --   , babelModeDetermineEnd    :: !(Lua Bool)
-  --   }
 
 data BabelView =
   Start
@@ -126,24 +111,6 @@ data BabelView =
   | TagManagement
   | Credits
 
--- | TODO
-data GameState = GameState
-  { gameStateMode           :: !BabelMode
-  , gameStateCards          :: ![Maybe (Entity Card)]
-    -- ^ Cards in play. A @Nothing@ indicates an empty
-    -- slot for purposes where many cards are shown at
-    -- once.
-  , gameStateScore          :: !Int
-    -- ^ Fun! :D
-  , gameStateDict           :: !(Map Text Text)
-    -- ^ A dictionary for more complex scripts to store
-    -- and retrieve data.
-  , gameStateUserInputStack :: ![UserInput]
-    -- ^ User input. This will be consulted to determine
-    -- whether the user answered correctly.
-  , gameStateMessagesStack :: ![String]
-  }
-
 data CardFormState = CardFormState
   { cardFormStateObverse :: Text
   , cardFormStateReverse :: Text
@@ -158,15 +125,4 @@ data UserInput =
 makeFields ''CardFormState
 makeFields ''CardMetadata
 makeFields ''DeckMetadata
-makeFields ''GameState
 makeFields ''BabelTUI
-
--- emptyGameState :: GameState
--- emptyGameState = GameState
---   { gameStateMode = Standard
---   , gameStateCards = mempty
---   , gameStateScore = 0
---   , gameStateDict  = mempty
---   , gameStateUserInputStack = mempty
---   , gameStateMessagesStack = mempty
---   }

src/Types/Free.hs

@@ -40,10 +40,6 @@ packages:
 #   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
 #
 extra-deps:
-- git: https://github.com/otakar-smrz/elixir-fm.git
-  commit: 08bc422191d2d376015109207cbf82bf5196adae
-  subdirs:
-  - Haskell/ElixirFM
 - Encode-1.3.8@sha256:a93798e8ae38b3616468249eee4ce15b7cc995a04b182213bfe1292e1a0baf33,7757
 - wl-pprint-1.2.1@sha256:aea676cff4a062d7d912149d270e33f5bb0c01b68a9db46ff13b438141ff4b7c,734