From 6a3879b1c77c33b4ea67b330a8b427ed399fd6c8 Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Sun, 5 Aug 2018 06:17:34 -0400 Subject: [PATCH] Use local URLs etc --- advanced/part1/src/Api.elm | 4 +--- advanced/part1/src/Author.elm | 5 +++-- advanced/part1/src/Avatar.elm | 2 +- advanced/server/public/images/smiley-cyrus.jpg | Bin 0 -> 1343 bytes 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 advanced/server/public/images/smiley-cyrus.jpg diff --git a/advanced/part1/src/Api.elm b/advanced/part1/src/Api.elm index 0ce8753..2ac50a0 100644 --- a/advanced/part1/src/Api.elm +++ b/advanced/part1/src/Api.elm @@ -16,9 +16,7 @@ url : List String -> String url paths = -- NOTE: Url.Builder takes care of percent-encoding special URL characters. -- See https://package.elm-lang.org/packages/elm/url/latest/Url#percentEncode - Url.Builder.crossOrigin "https://conduit.productionready.io" - ("api" :: paths) - [] + Url.Builder.relative ("api" :: paths) [] diff --git a/advanced/part1/src/Author.elm b/advanced/part1/src/Author.elm index e369edc..6685cb7 100644 --- a/advanced/part1/src/Author.elm +++ b/advanced/part1/src/Author.elm @@ -208,7 +208,7 @@ decoder : Maybe Cred -> Decoder Author decoder maybeCred = Decode.succeed Tuple.pair |> custom Profile.decoder - |> required "uname" Username.decoder + |> required "username" Username.decoder |> Decode.andThen (decodeFromPair maybeCred) @@ -216,7 +216,8 @@ decodeFromPair : Maybe Cred -> ( Profile, Username ) -> Decoder Author decodeFromPair maybeCred ( prof, uname ) = case maybeCred of Nothing -> - nonViewerDecoder prof uname + -- If you're logged out, you can't be following anyone! + Decode.succeed (IsNotFollowing (UnfollowedAuthor uname prof)) Just cred -> if uname == Cred.username cred then diff --git a/advanced/part1/src/Avatar.elm b/advanced/part1/src/Avatar.elm index 125709a..9317b79 100644 --- a/advanced/part1/src/Avatar.elm +++ b/advanced/part1/src/Avatar.elm @@ -63,4 +63,4 @@ avatarToUrl (Avatar maybeUrl) = defaultPhotoUrl : String defaultPhotoUrl = - "https://static.productionready.io/images/smiley-cyrus.jpg" + "http://localhost:3000/images/smiley-cyrus.jpg" diff --git a/advanced/server/public/images/smiley-cyrus.jpg b/advanced/server/public/images/smiley-cyrus.jpg new file mode 100644 index 0000000000000000000000000000000000000000..784a6b9f904a72c7f9712f84748c5f0023e6e9ff GIT binary patch literal 1343 zcma))dpOez7{`A<+gK)<%XnPoG|r>smM$zIwOppBQ#&2E>Xe8_%xx}}Tx#W36tc`U zXBu^Qa>+KficC~vXfaGIHk??9<$88>{^_stJm>R#|9GG0eV_09$M>rcD#ic}ysL*R z0B&LdS^$7z7&rnzl$5?}6X>R3a2N~+@QQM}ghtk&5)Yj2fv;YV=kOHKDAQDh;0Yd-;Ko|%DKTrmtFcmmNX>+?*0|23* z5)`Tof?NK*00E`Vx5`MB?YmvznkW6Ww4<))loL#JFt`iRq#L>QiXj00-Od>(#{6Hb zo0lX^|9jqAwp1^ zMPEwg1=(%HnU5fKq-KbF{GpYwiwLX%q&oJ3EplnNawK?WuFUV(lrAgE8+eO|!bKli z-J7?1(z~t~zg!VO%TEh_EvGb9_Kq^t-9Bb4gZ3!3BgL#<7HuCcEWkF&R;i!qFFVP$S>DpopmIi#jmIwq@QCCtinwU3!-z1^NrantdY9V_fi7yo{a zFsJSu{Aulpla0k4NAgNOMAiFbQ7VIdK3Rd?=wi0~FE;*6cAnU^AZ=AJ$4YUoFp&m1 z!~)^dhKX0IUORKM)7X)RKQpG4;AQ_-HA%~t?0rjcEqN$7$R(InDmfyujCQR+sg{ z-bw`t;S;*jC$3T!N6ReVW(0p7SaJ>O_cp^eTz$vs^I){y69NvKl}xa>`lDu+REwD!w5YMl7|EMp{fqi+4I_%7*EFcOn}PG4SmJYOJ>Cr!pwBo=;5&Toi`NKJIS zPI16yR0#GLx*+lVG#_Jm>(8SLrU^TZk(Zxe7uPsHAW=!?dQiP)u2SzXpSfdrZ4nmj zRsDhLNGvY1q?C>OJyX z&7On^33;j6%-&*v;h0bQM_A785qB|H2M1)Tg;M1& literal 0 HcmV?d00001