Revise tests
Link to fuzz test docs and Fuzzer docs Move part9 to be part12 Update part11 Update 12, and some other Mains Rearrange things, drop 2 modules Add a new part12 Fix READMEs Move some things up a directory Update part11 Use ! [] Update parts7-9 Fix part12g Swap part11 and part12 Fix readmes for part11 and part12 Add HtmlRunner to part8 Update part8 and part9 READMEs rm part10/test
This commit is contained in:
@@ -3,13 +3,13 @@ module ElmHub exposing (..)
|
||||
import Html exposing (..)
|
||||
import Html.Attributes exposing (..)
|
||||
import Html.Events exposing (..)
|
||||
import Html.App
|
||||
import Http
|
||||
import Auth
|
||||
import Task exposing (Task)
|
||||
import Json.Decode exposing (Decoder)
|
||||
import Json.Encode
|
||||
import Dict exposing (Dict)
|
||||
import SearchResult
|
||||
import SearchResult exposing (ResultId)
|
||||
|
||||
|
||||
searchFeed : String -> Cmd Msg
|
||||
@@ -27,12 +27,13 @@ searchFeed query =
|
||||
|
||||
responseDecoder : Decoder (List SearchResult.Model)
|
||||
responseDecoder =
|
||||
"items" := Json.Decode.list SearchResult.decoder
|
||||
Json.Decode.at [ "items" ] (Json.Decode.list SearchResult.decoder)
|
||||
|
||||
|
||||
type alias Model =
|
||||
{ query : String
|
||||
, results : Dict SearchResult.ResultId SearchResult.Model
|
||||
, results : Dict ResultId SearchResult.Model
|
||||
, errorMessage : Maybe String
|
||||
}
|
||||
|
||||
|
||||
@@ -40,6 +41,7 @@ initialModel : Model
|
||||
initialModel =
|
||||
{ query = "tutorial"
|
||||
, results = Dict.empty
|
||||
, errorMessage = Nothing
|
||||
}
|
||||
|
||||
|
||||
@@ -52,17 +54,28 @@ view model =
|
||||
]
|
||||
, input [ class "search-query", onInput SetQuery, defaultValue model.query ] []
|
||||
, button [ class "search-button", onClick Search ] [ text "Search" ]
|
||||
, viewErrorMessage model.errorMessage
|
||||
, ul [ class "results" ] (viewSearchResults model.results)
|
||||
]
|
||||
|
||||
|
||||
viewSearchResults : Dict SearchResult.ResultId SearchResult.Model -> List (Html a)
|
||||
viewErrorMessage : Maybe String -> Html a
|
||||
viewErrorMessage errorMessage =
|
||||
case errorMessage of
|
||||
Just message ->
|
||||
div [ class "error" ] [ text message ]
|
||||
|
||||
Nothing ->
|
||||
text ""
|
||||
|
||||
|
||||
viewSearchResults : Dict ResultId SearchResult.Model -> List (Html Msg)
|
||||
viewSearchResults results =
|
||||
results
|
||||
|> Dict.values
|
||||
|> List.sortBy (.stars >> negate)
|
||||
|> filterResults
|
||||
|> List.map (SearchResult.view address DeleteById)
|
||||
|> List.map viewSearchResult
|
||||
|
||||
|
||||
filterResults : List SearchResult.Model -> List SearchResult.Model
|
||||
@@ -72,35 +85,62 @@ filterResults results =
|
||||
results
|
||||
|
||||
|
||||
viewSearchResult : SearchResult.Model -> Html Msg
|
||||
viewSearchResult result =
|
||||
result
|
||||
|> SearchResult.view
|
||||
|> Html.App.map (UpdateSearchResult result.id)
|
||||
|
||||
|
||||
type Msg
|
||||
= Search
|
||||
| SetQuery String
|
||||
| DeleteById SearchResult.ResultId
|
||||
| SetResults (List SearchResult.Model)
|
||||
| UpdateSearchResult ResultId SearchResult.Msg
|
||||
| HandleSearchResponse (List SearchResult.Model)
|
||||
| HandleSearchError Http.Error
|
||||
|
||||
|
||||
update : Msg -> Model -> ( Model, Cmd Msg )
|
||||
update msg model =
|
||||
case msg of
|
||||
Search ->
|
||||
( model, searchFeed model.query )
|
||||
model ! [ searchFeed model.query ]
|
||||
|
||||
SetQuery query ->
|
||||
( { model | query = query }, Cmd.none )
|
||||
{ model | query = query, errorMessage = Nothing } ! []
|
||||
|
||||
SetResults results ->
|
||||
HandleSearchError error ->
|
||||
case error of
|
||||
Http.UnexpectedPayload str ->
|
||||
{ model | errorMessage = Just str } ! []
|
||||
|
||||
_ ->
|
||||
{ model | errorMessage = Just "Error loading search results" } ! []
|
||||
|
||||
HandleSearchResponse results ->
|
||||
let
|
||||
resultsById : Dict SearchResult.ResultId SearchResult.Model
|
||||
resultsById : Dict ResultId SearchResult.Model
|
||||
resultsById =
|
||||
results
|
||||
|> List.map (\result -> ( result.id, result ))
|
||||
|> Dict.fromList
|
||||
in
|
||||
( { model | results = resultsById }, Cmd.none )
|
||||
{ model | results = resultsById } ! []
|
||||
|
||||
DeleteById id ->
|
||||
let
|
||||
newModel =
|
||||
{ model | results = Dict.remove id model.results }
|
||||
in
|
||||
( newModel, Cmd.none )
|
||||
UpdateSearchResult id childMsg ->
|
||||
case Dict.get id model.results of
|
||||
Nothing ->
|
||||
model ! []
|
||||
|
||||
Just childModel ->
|
||||
let
|
||||
( newChildModel, childCmd ) =
|
||||
SearchResult.update childMsg childModel
|
||||
|
||||
cmd =
|
||||
Cmd.map (UpdateSearchResult id) childCmd
|
||||
|
||||
newResults =
|
||||
Dict.insert id newChildModel model.results
|
||||
in
|
||||
{ model | results = newResults } ! [ cmd ]
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
module Main exposing (..)
|
||||
|
||||
import ElmHub exposing (..)
|
||||
import Html.App
|
||||
|
||||
|
||||
main : Program Never
|
||||
@@ -9,5 +10,5 @@ main =
|
||||
{ view = view
|
||||
, update = update
|
||||
, init = ( initialModel, searchFeed initialModel.query )
|
||||
, inputs = []
|
||||
, subscriptions = \_ -> Sub.none
|
||||
}
|
||||
|
||||
@@ -1,45 +1,67 @@
|
||||
module SearchResult exposing (..)
|
||||
|
||||
import Html exposing (..)
|
||||
import Html.Attributes exposing (..)
|
||||
import Html.Attributes exposing (class, target, href, property, defaultValue)
|
||||
import Html.Events exposing (..)
|
||||
import Json.Decode exposing (Decoder)
|
||||
import Dict exposing (Dict)
|
||||
import Json.Decode.Pipeline exposing (..)
|
||||
|
||||
|
||||
type alias Model =
|
||||
{ id : Int
|
||||
, name : String
|
||||
, stars : Int
|
||||
, expanded : Bool
|
||||
}
|
||||
|
||||
|
||||
type alias ResultId =
|
||||
Int
|
||||
|
||||
|
||||
type alias Model =
|
||||
{ id : ResultId
|
||||
, name : String
|
||||
, stars : Int
|
||||
}
|
||||
type Msg
|
||||
= Expand
|
||||
| Collapse
|
||||
|
||||
|
||||
decoder : Decoder Model
|
||||
decoder =
|
||||
Json.Decode.object3 Model
|
||||
("id" := Json.Decode.int)
|
||||
("full_name" := Json.Decode.string)
|
||||
("stargazers_count" := Json.Decode.int)
|
||||
decode Model
|
||||
|> required "id" Json.Decode.int
|
||||
|> required "full_name" Json.Decode.string
|
||||
|> required "stargazers_count" Json.Decode.int
|
||||
|> hardcoded True
|
||||
|
||||
|
||||
view : Address a -> (Int -> a) -> Model -> Html
|
||||
view address delete result =
|
||||
update : Msg -> Model -> ( Model, Cmd Msg )
|
||||
update msg model =
|
||||
case msg of
|
||||
Expand ->
|
||||
{ model | expanded = True } ! []
|
||||
|
||||
Collapse ->
|
||||
{ model | expanded = False } ! []
|
||||
|
||||
|
||||
view : Model -> Html Msg
|
||||
view model =
|
||||
li []
|
||||
[ span [ class "star-count" ] [ text (toString result.stars) ]
|
||||
, a
|
||||
[ href
|
||||
("https://github.com/"
|
||||
++ (Debug.log "TODO we should not see this when typing in the search box!"
|
||||
result.name
|
||||
)
|
||||
)
|
||||
, target "_blank"
|
||||
<| if model.expanded then
|
||||
[ span [ class "star-count" ] [ text (toString model.stars) ]
|
||||
, a
|
||||
[ href
|
||||
("https://github.com/"
|
||||
++ (Debug.log "TODO we should not see this when typing in the search box!"
|
||||
model.name
|
||||
)
|
||||
)
|
||||
, target "_blank"
|
||||
]
|
||||
[ text model.name ]
|
||||
, button [ class "hide-result", onClick Collapse ]
|
||||
[ text "X" ]
|
||||
]
|
||||
else
|
||||
[ button [ class "expand-result", onClick Expand ]
|
||||
[ text "Show" ]
|
||||
]
|
||||
[ text result.name ]
|
||||
, button [ class "hide-result", onClick (delete result.id) ]
|
||||
[ text "X" ]
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user