Update part4 and part5

This commit is contained in:
Richard Feldman
2018-05-05 05:36:30 -04:00
parent 4ad5a6d7c9
commit e6ec9a6584
359 changed files with 161 additions and 44513 deletions

View File

@@ -3,7 +3,7 @@ module Data.Article.Author exposing (Author, decoder)
import Data.User as User exposing (Username)
import Data.UserPhoto as UserPhoto exposing (UserPhoto)
import Json.Decode as Decode exposing (Decoder)
import Json.Decode.Pipeline exposing (custom, decode, required)
import Json.Decode.Pipeline exposing (custom, decode, optional, required)
decoder : Decoder Author
@@ -12,7 +12,7 @@ decoder =
|> required "username" User.usernameDecoder
|> required "bio" (Decode.nullable Decode.string)
|> required "image" UserPhoto.decoder
|> required "following" Decode.bool
|> optional "following" Decode.bool False
type alias Author =

View File

@@ -4,7 +4,7 @@ import Data.AuthToken as AuthToken exposing (AuthToken)
import Data.UserPhoto as UserPhoto exposing (UserPhoto)
import Html exposing (Html)
import Json.Decode as Decode exposing (Decoder)
import Json.Decode.Pipeline exposing (decode, required)
import Json.Decode.Pipeline exposing (decode, optional, required)
import Json.Encode as Encode exposing (Value)
import Json.Encode.Extra as EncodeExtra
import UrlParser
@@ -16,8 +16,6 @@ type alias User =
, username : Username
, bio : Maybe String
, image : UserPhoto
, createdAt : String
, updatedAt : String
}
@@ -33,8 +31,6 @@ decoder =
|> required "username" usernameDecoder
|> required "bio" (Decode.nullable Decode.string)
|> required "image" UserPhoto.decoder
|> required "createdAt" Decode.string
|> required "updatedAt" Decode.string
encode : User -> Value
@@ -45,8 +41,6 @@ encode user =
, ( "username", encodeUsername user.username )
, ( "bio", EncodeExtra.maybe Encode.string user.bio )
, ( "image", UserPhoto.encode user.image )
, ( "createdAt", Encode.string user.createdAt )
, ( "updatedAt", Encode.string user.updatedAt )
]

View File

@@ -39,7 +39,15 @@ photoToUrl : UserPhoto -> String
photoToUrl (UserPhoto maybeUrl) =
case maybeUrl of
Nothing ->
"https://static.productionready.io/images/smiley-cyrus.jpg"
defaultPhotoUrl
Just "" ->
defaultPhotoUrl
Just url ->
url
defaultPhotoUrl : String
defaultPhotoUrl =
"/assets/images/smiley-cyrus.jpg"