Better Url representation

front/elm/CatGifs/Commands.elm

@@ -1,22 +1,24 @@
 module CatGifs.Commands exposing (..)
 
-import CatGifs.Models exposing (CatGif, CatGifsUrl)
+import CatGifs.Models exposing (CatGif, cat500)
+import Decoders exposing (decodeUrl)
 import Http exposing (expectJson)
 import Json.Decode as Decode
 import Json.Decode.Pipeline exposing (requiredAt)
 import Messages exposing (Msg)
 import RemoteData
+import Url exposing (Protocol(..), Url)
 
 
-fetchCatGif : CatGifsUrl -> Cmd Msg
+fetchCatGif : Url -> Cmd Msg
 fetchCatGif url =
     Http.get
-        { url = url
-        , expect = expectJson (RemoteData.fromResult >> Messages.OnFetchCatGif) decodeCatGifUrl
+        { url = url |> Url.toString
+        , expect = expectJson (RemoteData.fromResult >> Messages.OnFetchCatGif) decodeCatGif
         }
 
 
-decodeCatGifUrl : Decode.Decoder CatGif
-decodeCatGifUrl =
+decodeCatGif : Decode.Decoder CatGif
+decodeCatGif =
     Decode.succeed CatGif
-        |> requiredAt [ "data", "images", "original", "url" ] Decode.string
+        |> requiredAt [ "data", "images", "original", "url" ] (Decode.map (Maybe.withDefault cat500) decodeUrl)

front/elm/CatGifs/Models.elm

@@ -1,12 +1,18 @@
-module CatGifs.Models exposing (..)
+module CatGifs.Models exposing (CatGif, cat500, catGifDefaultUrl)
 
--- URL of the source providing GIF URLs.
+import Url exposing (Protocol(..), Url)
 
 
-type alias CatGifsUrl =
-    String
+cat500 : Url
+cat500 =
+    Url Https "http.cat" Nothing "images/500.jpg" Nothing Nothing
+
+
+catGifDefaultUrl : Url
+catGifDefaultUrl =
+    Url Https "api.giphy.com" Nothing "v1/gifs/random" (Just "tag=cat") Nothing
 
 
 type alias CatGif =
-    { gifUrl : String -- URL of the GIF resource on the internet.
+    { gifUrl : Url -- URL of the GIF resource on the internet.
     }

front/elm/CatGifs/View.elm

@@ -6,6 +6,7 @@ import Html.Attributes exposing (class, src)
 import HttpErrorWrapper exposing (buildErrorMessage)
 import Messages exposing (Msg)
 import RemoteData exposing (WebData)
+import Url
 
 
 view : WebData CatGif -> Html Msg
@@ -20,7 +21,7 @@ view currentCatGif =
         RemoteData.Success catGif ->
             div [ class "row" ]
                 [ div [ class "col-md-4 col-md-offset-4" ]
-                    [ img [ src catGif.gifUrl ] []
+                    [ img [ src (catGif.gifUrl |> Url.toString) ] []
                     ]
                 ]
 

front/elm/Commands.elm

@@ -1,14 +1,13 @@
 module Commands exposing (fetchData)
 
 import CatGifs.Commands exposing (fetchCatGif)
-import CatGifs.Models exposing (CatGifsUrl)
 import Messages exposing (Msg(..))
 import Projects.Decoders
-import Projects.Models
 import TiledList
+import Url exposing (Url)
 
 
-fetchData : Projects.Models.Url -> CatGifsUrl -> Cmd Msg
+fetchData : Url -> Url -> Cmd Msg
 fetchData projectsUrl catGifsUrl =
     Cmd.batch
         [ Cmd.map ProjectsMsg (TiledList.fetch Projects.Decoders.decoder projectsUrl)

front/elm/Main.elm

@@ -2,17 +2,37 @@ module Main exposing (initialState, main, subscriptions)
 
 import Browser exposing (application)
 import Browser.Navigation exposing (Key)
+import CatGifs.Models exposing (catGifDefaultUrl)
 import Commands exposing (fetchData)
+import Decoders exposing (decodeUrl)
+import Json.Decode exposing (decodeString)
 import Messages exposing (Msg(..))
 import Models exposing (Flags, Model, initialModel)
+import Projects.Models exposing (projectsDefaultUrl)
 import Update exposing (update)
-import Url exposing (Url)
+import Url exposing (Protocol(..), Url)
 import View exposing (view)
 
 
 initialState : Flags -> Url -> Key -> ( Model, Cmd Msg )
 initialState flags url key =
-    ( initialModel key url flags.catGifsUrl, fetchData flags.projectsUrl flags.catGifsUrl )
+    let
+        wrap v =
+            [ "\"", v, "\"" ] |> String.concat
+
+        toUrl : Url -> String -> Url
+        toUrl default =
+            wrap >> decodeString decodeUrl >> Result.map (Maybe.withDefault default) >> Result.withDefault default
+
+        catGifUrl =
+            flags.catGifsUrl |> toUrl catGifDefaultUrl
+
+        projectsUrl =
+            flags.projectsUrl |> toUrl projectsDefaultUrl
+    in
+    ( initialModel key url catGifUrl
+    , fetchData projectsUrl catGifUrl
+    )
 
 
 subscriptions : Model -> Sub Msg

front/elm/Models.elm

@@ -1,7 +1,7 @@
 module Models exposing (Flags, Model, initialModel)
 
 import Browser.Navigation exposing (Key)
-import CatGifs.Models exposing (CatGif, CatGifsUrl)
+import CatGifs.Models exposing (CatGif)
 import Projects.Models exposing (Project)
 import RemoteData exposing (WebData)
 import Routing exposing (Route)
@@ -13,7 +13,7 @@ import Url.Parser exposing (parse)
 
 type alias Model =
     { socialMedia : List SocialMedium
-    , catGifsUrl : String
+    , catGifsUrl : Url
     , currentCatGif : WebData CatGif
     , key : Key
     , route : Maybe Route
@@ -22,12 +22,12 @@ type alias Model =
 
 
 type alias Flags =
-    { projectsUrl : Projects.Models.Url
-    , catGifsUrl : CatGifsUrl
+    { projectsUrl : String
+    , catGifsUrl : String
     }
 
 
-initialModel : Key -> Url -> String -> Model
+initialModel : Key -> Url -> Url -> Model
 initialModel key url catGifsUrl =
     { catGifsUrl = catGifsUrl
     , currentCatGif = RemoteData.Loading

front/elm/Projects/Models.elm

@@ -1,16 +1,13 @@
-module Projects.Models exposing (Project, Url)
+module Projects.Models exposing (Project, projectsDefaultUrl)
 
 import Link
+import Url exposing (Protocol(..), Url)
 
 
 type alias Id =
     Int
 
 
-type alias Url =
-    String
-
-
 type alias Project =
     { id : Id
     , title : String
@@ -19,3 +16,8 @@ type alias Project =
     , links : List Link.Model
     , description : Maybe String
     }
+
+
+projectsDefaultUrl : Url
+projectsDefaultUrl =
+    Url Https "www.xaviermaso.com" Nothing "api/projects" Nothing Nothing

front/elm/TiledList.elm

@@ -13,6 +13,7 @@ import HttpErrorWrapper exposing (buildErrorMessage)
 import Json.Decode as Decode
 import Link
 import RemoteData exposing (WebData)
+import Url exposing (Url)
 
 
 type alias Listable a =
@@ -34,10 +35,6 @@ type alias Model a =
     }
 
 
-type alias Url =
-    String
-
-
 initialModel : Model a
 initialModel =
     { all = RemoteData.Loading
@@ -48,7 +45,7 @@ initialModel =
 fetch : Decode.Decoder (List (Listable a)) -> Url -> Cmd (Msg (Listable a))
 fetch decoder url =
     Http.get
-        { url = url
+        { url = url |> Url.toString
         , expect = expectJson (RemoteData.fromResult >> OnFetch) decoder
         }