Bump flake, refactor code (#58)

* Bump flake, refactor code

* Add LambdaCase language extension

* Bump hash

* Update nix hash

* Drop initialAction

* Add `id_`

* Remove IDs from plus and minus buttons

Author: dmjio

README.md

@@ -120,13 +120,15 @@ This file contains a simple `miso-lynx` counter application.
 -----------------------------------------------------------------------------
 module Main where
 -----------------------------------------------------------------------------
-import           Miso
+import           Miso hiding (text_)
 import           Miso.Lynx
+import           Miso.Lynx.Element.View.Event (onTap)
 -----------------------------------------------------------------------------
 import           Miso.Lens
 import           Miso.String
-import qualified Miso.Style as CSS
+import qualified Miso.CSS as CSS
 -----------------------------------------------------------------------------
+-- | Application model
 newtype Model = Model { _value :: Int }
   deriving (Show, Eq, ToMisoString)
 -----------------------------------------------------------------------------
@@ -136,15 +138,12 @@ value = lens _value $ \m v -> m { _value = v }
 data Action
   = AddOne
   | SubtractOne
-  | SayHelloWorld
-  | Tap Int
   deriving (Show, Eq)
 -----------------------------------------------------------------------------
--- | Entry point for a miso-lynx application
+-- | Entry point for a miso application
 main :: IO ()
 main = run $ lynx counterComponent
   { events = lynxEvents
-  , initialAction = Just SayHelloWorld
   }
 -----------------------------------------------------------------------------
 counterComponent :: App Model Action
@@ -153,14 +152,11 @@ counterComponent = component (Model 0) updateModel viewModel
 updateModel
   :: Action
   -> Transition Model Action
-updateModel SayHelloWorld =
-  io_ (consoleLog "Hello World!")
-updateModel AddOne =
-  value += 1
-updateModel SubtractOne =
-  value -= 1
-updateModel (Tap x) =
-  io_ $ consoleLog ("Tapped: " <> ms (show x))
+updateModel = \case
+  AddOne ->
+    value += 1
+  SubtractOne ->
+    value -= 1
 -----------------------------------------------------------------------------
 -- | Constructs a virtual DOM from a model
 viewModel :: Model -> View Model Action

cabal.project

@@ -10,4 +10,4 @@ allow-newer:
 source-repository-package
   type: git
   location: https://github.com/dmjio/miso.git
-  tag: 17f1c94aa5c037f230cea023e30e0a22979162a0
+  tag: c85449e47af6581088cb9dde81cfcbf951232cff

examples/counter/Main.hs

@@ -1,4 +1,5 @@
 -----------------------------------------------------------------------------
+{-# LANGUAGE LambdaCase                  #-}
 {-# LANGUAGE RecordWildCards             #-}
 {-# LANGUAGE OverloadedStrings           #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving  #-}
@@ -11,7 +12,7 @@ import           Miso.Lynx.Element.View.Event (onTap)
 -----------------------------------------------------------------------------
 import           Miso.Lens
 import           Miso.String
-import qualified Miso.Style as CSS
+import qualified Miso.CSS as CSS
 -----------------------------------------------------------------------------
 -- | Application model
 newtype Model = Model { _value :: Int }
@@ -23,15 +24,12 @@ value = lens _value $ \m v -> m { _value = v }
 data Action
   = AddOne
   | SubtractOne
-  | SayHelloWorld
-  | Tap Int
   deriving (Show, Eq)
 -----------------------------------------------------------------------------
 -- | Entry point for a miso application
 main :: IO ()
 main = run $ lynx counterComponent
   { events = lynxEvents
-  , initialAction = Just SayHelloWorld
   }
 -----------------------------------------------------------------------------
 counterComponent :: App Model Action
@@ -40,14 +38,11 @@ counterComponent = component (Model 0) updateModel viewModel
 updateModel
   :: Action
   -> Transition Model Action
-updateModel SayHelloWorld =
-  io_ (consoleLog "Hello World!")
-updateModel AddOne =
-  value += 1
-updateModel SubtractOne =
-  value -= 1
-updateModel (Tap x) =
-  io_ $ consoleLog ("Tapped: " <> ms (show x))
+updateModel = \case
+  AddOne ->
+    value += 1
+  SubtractOne ->
+    value -= 1
 -----------------------------------------------------------------------------
 -- | Constructs a virtual DOM from a model
 viewModel :: Model -> View Model Action
@@ -61,7 +56,6 @@ viewModel m = view_
   ]
   [ view_
     [ onTap AddOne
-    , id_ "plus"
     , CSS.style_
         [ CSS.backgroundColor CSS.yellow
         , CSS.width "100px"
@@ -100,7 +94,6 @@ viewModel m = view_
     ]
   , view_
     [ onTap SubtractOne
-    , id_ "minus"
     , CSS.style_
         [ CSS.backgroundColor CSS.pink
         , CSS.width "100px"

flake.lock

@@ -2,7 +2,7 @@ options:
 with (builtins.fromJSON (builtins.readFile ./nixpkgs.json));
 let
   nixpkgs = builtins.fetchTarball {
-    url = "https://github.com/alexfmpe/nixpkgs/archive/${rev}.tar.gz";
+    url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
     inherit sha256;
   };
   config = {

nix/default.nix

@@ -1,4 +1,4 @@
 {
-  "rev" : "b594b289740a2bc917ed9c66fef5d905f389cb96",
-  "sha256" : "sha256:1p25582cbrjlqv4kr64481m776vgppgxghinrdjpfjglkjj3aw2w"
+  "rev" : "9e2e8a7878573d312db421d69e071690ec34e98c",
+  "sha256" : "sha256:1q6fh1mx2b4fxbbh8n1h3888mx4n9p15s92mlcczcryqw09wvs0c"
 }