removed unnecessary moduling

exec/Terminal/Main.hs → app/Main.hs

@@ -1,5 +1,5 @@
 module Main (main) where
-import Controller.Terminal (runGame)
+import Controller (runGame)
 
 main :: IO ()
 main = runGame

battlegrounds.cabal

@@ -26,10 +26,10 @@ source-repository head
 library
   exposed-modules:
       Card
-      Controller.Terminal
+      Controller
       Logic
       Model
-      View.Terminal
+      View
   other-modules:
       Paths_battlegrounds
   autogen-modules:
@@ -48,28 +48,14 @@ library
     , uuid ==1.3.15
   default-language: Haskell2010
 
-executable battlegrounds-brick
-  main-is: Main.hs
-  other-modules:
-      Paths_battlegrounds
-  autogen-modules:
-      Paths_battlegrounds
-  hs-source-dirs:
-      exec/Brick
-  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
-  build-depends:
-      base >=4.7 && <5
-    , battlegrounds
-  default-language: Haskell2010
-
 executable battlegrounds-terminal
   main-is: Main.hs
   other-modules:
       Paths_battlegrounds
   autogen-modules:
       Paths_battlegrounds
   hs-source-dirs:
-      exec/Terminal
+      app
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5

package.yaml

@@ -47,23 +47,15 @@ library:
 executables:
   battlegrounds-terminal:
     main:                Main.hs
-    source-dirs:         exec/Terminal
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
-    dependencies:
-    - battlegrounds
-  battlegrounds-brick:
-    main:                Main.hs
-    source-dirs:         exec/Brick
+    source-dirs:         app
     ghc-options:
     - -threaded
     - -rtsopts
     - -with-rtsopts=-N
     dependencies:
     - battlegrounds
 
+
 tests:
   battlegrounds-test:
     main:                Spec.hs

src/Controller/Terminal.hs → src/Controller.hs

@@ -1,4 +1,4 @@
-module Controller.Terminal (module Controller.Terminal) where
+module Controller (module Controller) where
 
 import Card (bigDumbo)
 import Control.Lens
@@ -10,7 +10,7 @@ import Model (Action (..), CardInstance (CardInstance), GameState (..), Phase (H
 import Text.Parsec hiding (Error)
 import Text.Parsec.String (Parser)
 import Text.Read (readMaybe)
-import View.Terminal (render)
+import View (render)
 import Control.Monad.IO.Class (liftIO)
 import qualified Data.Map as Map
 

src/Logic.hs

@@ -7,7 +7,7 @@ import Card (pool)
 import Control.Lens ((^.))
 import Control.Monad.Random
 import Model
-import View.Terminal (helpMenu)
+import View (helpMenu)
 
 -- START: Functions interfacing with Action. --
 

src/Thoughts.md

@@ -0,0 +1,13 @@
+These are random development thoughts/log.
+
+### July 31, 2024
+The current repo has too much structure, I think it will be fine to do without the distinction between Terminal/better GUI.
+
+Claude provided a good roadmap of development:
+1. Work out core functionalities and have a single AI. Forget about servers for now. Implement all the logic.
+2. Still one main player and a single AI, but manage them through servers. I.e., server now controls the phase timers, and AI has
+to issue commands to the server, etc.
+3. flush out server stuff, adding game rooms, authentications, etc.
+
+Note, server and client will be bidirectionally. Server needs to manage phase timers and ping the client when phase changes.
+So, the client needs to `forkIO` twice for a sending and receiving thread. The server can have one `fork` per client.

src/View/Terminal.hs → src/View.hs

@@ -1,4 +1,4 @@
-module View.Terminal (render, helpMenu) where
+module View (render, helpMenu) where
 
 import Data.List (intercalate)
 import Data.Map (toList)