swap 12 and 13

part13/ElmHub.elm

@@ -1,4 +1,4 @@
-module Component.ElmHub (..) where
+module ElmHub (..) where
 
 import Html exposing (..)
 import Html.Attributes exposing (..)
@@ -11,7 +11,8 @@ import Effects exposing (Effects)
 import Json.Decode exposing (Decoder, (:=))
 import Json.Encode
 import Signal exposing (Address)
-import Component.SearchResult exposing (ResultId)
+import Dict exposing (Dict)
+import SearchResult
 
 
 searchFeed : String -> Task x Action
@@ -32,31 +33,21 @@ searchFeed query =
     Task.onError task (\_ -> Task.succeed (SetResults []))
 
 
-responseDecoder : Decoder (List Component.SearchResult.Model)
+responseDecoder : Decoder (List SearchResult.Model)
 responseDecoder =
-  "items" := Json.Decode.list searchResultDecoder
-
-
-searchResultDecoder : Decoder Component.SearchResult.Model
-searchResultDecoder =
-  Json.Decode.object4
-    Component.SearchResult.Model
-    ("id" := Json.Decode.int)
-    ("full_name" := Json.Decode.string)
-    ("stargazers_count" := Json.Decode.int)
-    (Json.Decode.succeed True)
+  "items" := Json.Decode.list SearchResult.decoder
 
 
 type alias Model =
   { query : String
-  , results : List Component.SearchResult.Model
+  , results : Dict SearchResult.ResultId SearchResult.Model
   }
 
 
 initialModel : Model
 initialModel =
   { query = "tutorial"
-  , results = []
+  , results = Dict.empty
   }
 
 
@@ -77,22 +68,24 @@ view address model =
     ]
 
 
-viewSearchResults : Address Action -> List Component.SearchResult.Model -> List Html
+viewSearchResults : Address Action -> Dict SearchResult.ResultId SearchResult.Model -> List Html
 viewSearchResults address results =
   results
+    |> Dict.values
+    |> List.sortBy (.stars >> negate)
     |> filterResults
-    |> List.map (lazy2 viewSearchResult address)
+    |> List.map (lazy3 SearchResult.view address DeleteById)
 
 
-filterResults : List Component.SearchResult.Model -> List Component.SearchResult.Model
+filterResults : List SearchResult.Model -> List SearchResult.Model
 filterResults results =
   case results of
     [] ->
       []
 
-    first :: rest ->
-      if first.stars > 0 then
-        first :: (filterResults rest)
+    result :: rest ->
+      if result.stars > 0 then
+        result :: (filterResults rest)
       else
         filterResults rest
 
@@ -105,18 +98,11 @@ defaultValue str =
   property "defaultValue" (Json.Encode.string str)
 
 
-viewSearchResult : Address Action -> Component.SearchResult.Model -> Html
-viewSearchResult address result =
-  Component.SearchResult.view
-    (Signal.forwardTo address (UpdateSearchResult result.id))
-    (Debug.log "rendering result..." result)
-
-
 type Action
   = Search
   | SetQuery String
-  | SetResults (List Component.SearchResult.Model)
-  | UpdateSearchResult ResultId Component.SearchResult.Action
+  | DeleteById SearchResult.ResultId
+  | SetResults (List SearchResult.Model)
 
 
 update : Action -> Model -> ( Model, Effects Action )
@@ -129,32 +115,18 @@ update action model =
       ( { model | query = query }, Effects.none )
 
     SetResults results ->
+      let
+        resultsById : Dict SearchResult.ResultId SearchResult.Model
+        resultsById =
+          results
+            |> List.map (\result -> ( result.id, result ))
+            |> Dict.fromList
+      in
+        ( { model | results = resultsById }, Effects.none )
+
+    DeleteById id ->
       let
         newModel =
-          { model | results = results }
+          { model | results = Dict.remove id model.results }
       in
         ( newModel, Effects.none )
-
-    UpdateSearchResult id childAction ->
-      let
-        updateResult childModel =
-          if childModel.id == id then
-            let
-              ( newChildModel, childEffects ) =
-                Component.SearchResult.update childAction childModel
-            in
-              ( newChildModel
-              , Effects.map (UpdateSearchResult id) childEffects
-              )
-          else
-            ( childModel, Effects.none )
-
-        ( newResults, effects ) =
-          model.results
-            |> List.map updateResult
-            |> List.unzip
-
-        newModel =
-          { model | results = newResults }
-      in
-        ( newModel, Effects.batch effects )

part13/ElmHub/Css.elm

@@ -0,0 +1,14 @@
+module ElmHub.Css (..) where
+
+import Css exposing (..)
+
+
+css =
+  stylesheet
+    [ ((.) "content")
+        [ width (px 960)
+        , margin2 zero auto
+        , padding (px 30)
+        , fontFamilies [ "Helvetica", "Arial", "serif" ]
+        ]
+    ]

part13/Main.elm

@@ -1,7 +1,7 @@
 module Main (..) where
 
 import StartApp
-import Component.ElmHub exposing (..)
+import ElmHub exposing (..)
 import Effects exposing (Effects)
 import Task exposing (Task)
 import Html exposing (Html)

part13/README.md

@@ -15,3 +15,9 @@ to fail; in that case, just run `elm package install` again.)
 ```bash
 elm live Main.elm --open -- --output=elm.js
 ```
+
+## Compiling CSS
+
+```bash
+elm css Stylesheets.elm
+```

part13/SearchResult.elm

@@ -0,0 +1,44 @@
+module SearchResult (..) where
+
+import Html exposing (..)
+import Html.Attributes exposing (..)
+import Html.Events exposing (..)
+import Json.Decode exposing (Decoder, (:=))
+import Signal exposing (Address)
+import Dict exposing (Dict)
+
+
+type alias ResultId =
+  Int
+
+
+type alias Model =
+  { id : ResultId
+  , name : String
+  , stars : Int
+  }
+
+
+decoder : Decoder Model
+decoder =
+  Json.Decode.object3
+    Model
+    ("id" := Json.Decode.int)
+    ("full_name" := Json.Decode.string)
+    ("stargazers_count" := Json.Decode.int)
+
+
+view : Address a -> (Int -> a) -> Model -> Html
+view address delete result =
+  li
+    []
+    [ span [ class "star-count" ] [ text (toString result.stars) ]
+    , a
+        [ href ("https://github.com/" ++ result.name)
+        , target "_blank"
+        ]
+        [ text result.name ]
+    , button
+        [ class "hide-result", onClick address (delete result.id) ]
+        [ text "X" ]
+    ]

part13/Stylesheets.elm

@@ -0,0 +1,10 @@
+module Stylesheets (..) where
+
+import Css.File exposing (..)
+import ElmHub.Css
+
+
+port files : CssFileStructure
+port files =
+  toFileStructure
+    [ ( "style.css", compile ElmHub.Css.css ) ]

part13/asdf/elm-package.json

@@ -4,10 +4,12 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        ".", ".."
+        ".",
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {
+        "NoRedInk/elm-decode-pipeline": "1.0.0 <= v < 2.0.0",
         "elm-lang/core": "3.0.0 <= v < 4.0.0",
         "evancz/elm-effects": "2.0.0 <= v < 3.0.0",
         "evancz/elm-html": "4.0.0 <= v < 5.0.0",

part13/asdf/style.css

@@ -90,3 +90,12 @@ a:hover {
 button:focus, input:focus {
   outline: none;
 }
+
+.error {
+  background-color: #FF9632;
+  padding: 20px;
+  box-sizing: border-box;
+  overflow-x: auto;
+  font-family: monospace;
+  font-size: 18px;
+}

part13/part12/Component/SearchResult.elm

@@ -1,52 +0,0 @@
-module Component.SearchResult (..) where
-
-import Html exposing (..)
-import Html.Attributes exposing (..)
-import Html.Events exposing (..)
-import Signal exposing (Address)
-import Effects exposing (Effects)
-
-
-type alias Model =
-  { id : Int
-  , name : String
-  , stars : Int
-  , expanded : Bool
-  }
-
-
-type alias ResultId =
-  Int
-
-
-type Action
-  = Expand
-  | Collapse
-
-
-update : Action -> Model -> ( Model, Effects Action )
-update action model =
-  -- TODO make expand and collapse work
-  ( model, Effects.none )
-
-
-view : Address Action -> Model -> Html
-view address model =
-  li
-    []
-    <| if model.expanded then
-        [ span [ class "star-count" ] [ text (toString model.stars) ]
-        , a
-            [ href ("https://github.com/" ++ model.name), target "_blank" ]
-            [ text model.name ]
-        , button
-            -- TODO when the user clicks, send a Collapse action
-            [ class "hide-result" ]
-            [ text "X" ]
-        ]
-       else
-        [ button
-            -- TODO when the user clicks, send an Expand action
-            [ class "expand-result" ]
-            [ text "Show" ]
-        ]