Merge branch 'recipe-versions'
This commit is contained in:
commit
338da444d8
|
@ -37,7 +37,7 @@ type alias App =
|
||||||
{ name : String
|
{ name : String
|
||||||
, category : String
|
, category : String
|
||||||
, repository : Maybe String
|
, repository : Maybe String
|
||||||
, versions : Maybe (List String)
|
, versions : List String
|
||||||
, icon : Maybe String
|
, icon : Maybe String
|
||||||
, status : Int
|
, status : Int
|
||||||
, slug : String
|
, slug : String
|
||||||
|
@ -271,7 +271,10 @@ viewApp app readme =
|
||||||
[ div [] (Markdown.toHtml Nothing readme)
|
[ div [] (Markdown.toHtml Nothing readme)
|
||||||
]
|
]
|
||||||
, div [ class "card-footer" ]
|
, div [ class "card-footer" ]
|
||||||
[]
|
[ h5 [] [ text "Versions" ]
|
||||||
|
, ul [] (
|
||||||
|
List.map (\version -> li [] [ text (version) ]) app.versions
|
||||||
|
)]
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -316,13 +319,28 @@ featuresDecoder =
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
versionsDecoder : Decode.Decoder (List String)
|
||||||
|
versionsDecoder =
|
||||||
|
Decode.list (Decode.keyValuePairs Decode.value)
|
||||||
|
|> Decode.map buildVersions
|
||||||
|
|
||||||
|
|
||||||
|
buildVersions : List (List ( String, Decode.Value )) -> List String
|
||||||
|
buildVersions versions =
|
||||||
|
List.concatMap (List.map (\( version, _ ) -> version)) versions
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
appDecoder : Decode.Decoder App
|
appDecoder : Decode.Decoder App
|
||||||
appDecoder =
|
appDecoder =
|
||||||
Decode.succeed App
|
Decode.succeed App
|
||||||
|> andMap (Decode.field "name" Decode.string)
|
|> andMap (Decode.field "name" Decode.string)
|
||||||
|> andMap (Decode.field "category" Decode.string)
|
|> andMap (Decode.field "category" Decode.string)
|
||||||
|> andMap (Decode.maybe (Decode.field "repository" Decode.string))
|
|> andMap (Decode.maybe (Decode.field "repository" Decode.string))
|
||||||
|> andMap (Decode.succeed Nothing)
|
|> andMap (Decode.at [ "versions" ] versionsDecoder)
|
||||||
|
-- |> andMap (Decode.succeed Nothing)
|
||||||
|> andMap (Decode.maybe (Decode.field "icon" Decode.string))
|
|> andMap (Decode.maybe (Decode.field "icon" Decode.string))
|
||||||
|> andMap (Decode.at [ "features" ] featuresDecoder)
|
|> andMap (Decode.at [ "features" ] featuresDecoder)
|
||||||
|> andMap (Decode.succeed "")
|
|> andMap (Decode.succeed "")
|
||||||
|
|
Loading…
Reference in New Issue