levels + view ok (first draw to be fixed)

Author: Julien Dehos

src/Component.hs

@@ -8,6 +8,7 @@ import Data.IntSet qualified as IS
 import Language.Javascript.JSaddle (liftJSM, FromJSVal(..), ToJSVal(..))
 import Miso
 import Miso.Canvas as Canvas
+import Miso.CSS qualified as CSS
 import Miso.Lens
 import Miso.Html.Element as H
 import Miso.Html.Event as E
@@ -40,9 +41,8 @@ data Action
 
 updateModel :: Action -> Transition Model Action
 
-updateModel (ActionSetLevel n) = do
+updateModel (ActionSetLevel n) = 
   put $ mkModel n
-  io_ $ consoleLog $ "level " <> ms (show n)
 
 updateModel (ActionKey keys)
   | IS.member 37 keys = doPlayMove $ playMove MoveLeft
@@ -96,21 +96,23 @@ instance FromJSVal Resources where
 -------------------------------------------------------------------------------
 
 viewModel :: Model -> View Model Action
-viewModel m@Model{..} = 
-  div_ []
+viewModel m@Model{..} =
+  div_ [ id_ "main div" ]
     [ p_ [] 
-       [ select_ [ onChange ActionAskLevel ] (map fmtOption [1 .. length allWorlds])
-        , button_ [ onClick (ActionSetLevel $ getLevel _modelGame) ] [ "new game" ] 
+        [ select_ [ onChange ActionAskLevel ] (map fmtOption [1 .. length allWorlds])
+        , button_ [ onClick (ActionSetLevel $ getLevel _modelGame) ] [ "reset" ] 
         , button_ [ onClick (ActionSetLevel $ 1 + getLevel _modelGame) ] [ "next level" ] 
         ]
     , p_ [] [ text ("nb moves: " <> ms (show _modelNbMoves) <> status) ]
     , Canvas.canvas
         [ width_ $ ms $ show w
         , height_ $ ms $ show h
+        , CSS.style_ [ CSS.border "1px solid black" ]
         ]
         initCanvas
         (drawCanvas m w h)
     ]
+
   where
     (w, h) = ij2xy $ getNiNj _modelGame
 
@@ -166,9 +168,8 @@ ij2xy (i, j) = (fromIntegral (assetSize*j), fromIntegral (assetSize*i))
 
 mkComponent :: App Model Action
 mkComponent = 
-  let initialMode = mkModel 1
-  in (component initialMode updateModel viewModel)
-      { subs = [ keyboardSub ActionKey ]
-      -- , logLevel = DebugAll
-      }
+  (component initialModel updateModel viewModel)
+    { subs = [ keyboardSub ActionKey ]
+    -- , logLevel = DebugAll
+    }
 

src/Game.hs

@@ -42,7 +42,7 @@ getLevel = _gameWorldIdx
 mkGame :: Int -> Game
 mkGame n = Game w (k + 1) (w ^. worldPlayer) (w ^. worldBoxes)
   where
-    k = n-1 `mod` length allWorlds
+    k = mod (n-1) (length allWorlds)
     w = allWorlds !! k
 
 playMove :: Move -> Game -> Maybe Game

src/GeneratedWorlds.hs

@@ -14,7 +14,7 @@ allWorlds =
   , World { _worldNiNj = (13,22), _worldBoard = V.fromList [CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE], _worldBoxes = S.fromList [(3,11),(3,13),(4,5),(4,6),(4,7),(4,9),(4,12),(5,6),(5,12),(6,5),(6,6),(6,9),(6,11),(6,13),(7,6),(9,5),(10,2),(10,3),(10,5),(10,6)], _worldPlayer = (10,8)}
   , World { _worldNiNj = (13,17), _worldBoard = V.fromList [CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellE,CellW,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellE,CellE,CellE,CellW,CellW,CellT,CellT,CellT,CellT,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellT,CellT,CellT,CellT,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellE,CellW,CellT,CellT,CellT,CellT,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellE,CellW,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellE], _worldBoxes = S.fromList [(2,11),(3,14),(5,10),(5,13),(6,9),(6,11),(6,12),(7,9),(7,12),(8,11),(9,10),(9,12)], _worldPlayer = (7,14)}
   , World { _worldNiNj = (11,12), _worldBoard = V.fromList [CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellW,CellW,CellW,CellE,CellW,CellT,CellT,CellE,CellE,CellW,CellE,CellW,CellW,CellE,CellW,CellW,CellW,CellT,CellT,CellE,CellE,CellW,CellW,CellW,CellE,CellE,CellE,CellW,CellW,CellT,CellT,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellT,CellT,CellE,CellE,CellW,CellE,CellW,CellE,CellE,CellE,CellW,CellW,CellT,CellT,CellW,CellW,CellW,CellE,CellW,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW], _worldBoxes = S.fromList [(3,8),(3,9),(4,9),(5,9),(6,5),(6,8),(7,6),(7,9),(8,5),(8,8)], _worldPlayer = (1,9)}
-  , World { _worldNiNj = (12,13), _worldBoard = V.fromList [CellE,CellE,CellE,CellE,CellE,CellE,CellT,CellW,CellW,CellW,CellW,CellW,CellE,CellT,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellT,CellW,CellW,CellW,CellW,CellT,CellW,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellT,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellT,CellW,CellW,CellE,CellE,CellE,CellE,CellT,CellW,CellW,CellW,CellE,CellE,CellT,CellW,CellW,CellW,CellW,CellT,CellW,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellT,CellW,CellW,CellW,CellE,CellT,CellT,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellT,CellT,CellT,CellW,CellE,CellW,CellE,CellE,CellE,CellT,CellW,CellW,CellW,CellT,CellT,CellT,CellW,CellE,CellW,CellE,CellE,CellE,CellT,CellW,CellT,CellW,CellT,CellT,CellT,CellW,CellE,CellW,CellE,CellT,CellW,CellW,CellW,CellT,CellW,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE], _worldBoxes = S.fromList [(2,9),(2,10),(3,5),(4,3),(5,9),(6,2),(7,2),(7,4),(7,6),(9,2),(9,3)], _worldPlayer = (2,5)}
+  , World { _worldNiNj = (12,13), _worldBoard = V.fromList [CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellT,CellW,CellW,CellW,CellW,CellT,CellW,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellT,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellT,CellW,CellW,CellE,CellE,CellE,CellE,CellT,CellW,CellW,CellW,CellE,CellE,CellT,CellW,CellW,CellW,CellW,CellT,CellW,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellT,CellW,CellW,CellW,CellE,CellT,CellT,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellT,CellT,CellT,CellW,CellE,CellW,CellE,CellE,CellE,CellT,CellW,CellW,CellW,CellT,CellT,CellT,CellW,CellE,CellW,CellE,CellE,CellE,CellT,CellW,CellT,CellW,CellT,CellT,CellT,CellW,CellE,CellW,CellE,CellT,CellW,CellW,CellW,CellT,CellW,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE], _worldBoxes = S.fromList [(2,9),(2,10),(3,5),(4,3),(5,9),(6,2),(7,2),(7,4),(7,6),(9,2),(9,3)], _worldPlayer = (2,5)}
   , World { _worldNiNj = (17,16), _worldBoard = V.fromList [CellE,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellW,CellE,CellW,CellE,CellE,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellW,CellW,CellW,CellE,CellE,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellT,CellT,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellT,CellT,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellT,CellT,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE], _worldBoxes = S.fromList [(2,7),(2,11),(2,13),(3,4),(3,7),(3,12),(4,5),(4,7),(5,4),(6,3),(6,5),(6,7),(7,5),(7,8),(8,4),(8,9),(8,11),(8,13)], _worldPlayer = (6,1)}
   , World { _worldNiNj = (18,17), _worldBoard = V.fromList [CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellW,CellW,CellE,CellE,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellE,CellW,CellW,CellE,CellE,CellT,CellT,CellT,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE], _worldBoxes = S.fromList [(7,7),(7,8),(7,9),(8,8),(8,10),(9,6),(9,8),(10,3),(10,6),(10,11),(10,14),(11,7),(11,8),(11,10),(12,7)], _worldPlayer = (10,1)}
   , World { _worldNiNj = (20,21), _worldBoard = V.fromList [CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellE,CellE,CellW,CellW,CellW,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellW,CellE,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellT,CellT,CellT,CellT,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellT,CellT,CellT,CellT,CellT,CellW,CellW,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellT,CellT,CellT,CellT,CellT,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellT,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellT,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellW,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellW,CellW,CellW,CellT,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellW,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellT,CellT,CellT,CellT,CellT,CellW,CellE,CellE,CellW,CellW,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellE,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellW,CellE,CellE,CellE,CellE], _worldBoxes = S.fromList [(5,10),(5,11),(5,12),(6,2),(6,3),(6,7),(6,8),(6,10),(7,3),(7,4),(7,5),(7,11),(8,2),(8,8),(8,9),(8,11),(8,12),(9,9),(10,8),(10,10),(10,12),(12,9),(12,11),(13,8),(13,9),(13,11),(13,13),(14,9),(15,8),(15,9),(15,10),(15,12),(15,13),(15,14)], _worldPlayer = (5,2)}

src/Model.hs

@@ -1,7 +1,6 @@
 
 module Model where
 
--- import Miso
 import Miso.Lens
 import Miso.Lens.TH
 
@@ -10,10 +9,14 @@ import Game
 data Model = Model
   { _modelGame :: Game
   , _modelNbMoves :: Int
+  , _modelStarted :: Bool
   } deriving (Eq)
 
 makeLenses ''Model
 
+initialModel :: Model
+initialModel = Model (mkGame 1) 0 False
+
 mkModel :: Int -> Model
-mkModel n = Model (mkGame n) 0
+mkModel n = Model (mkGame n) 0 True