Swap 7 and 8

2016-03-27 05:51:04 -07:00
parent c6da992cce
commit 087ae3bd09
6 changed files with 87 additions and 87 deletions
--- a/stages/7/ElmHub.elm
+++ b/stages/7/ElmHub.elm
@@ -11,8 +11,8 @@ import Json.Encode
 import Signal exposing (Address)


-searchFeed : String -> Task x Action
-searchFeed query =
+searchFeed : Address String -> String -> Task x Action
+searchFeed address query =
  let
    -- See https://developer.github.com/v3/search/#example for how to customize!
    url =
@@ -20,11 +20,13 @@ searchFeed query =
        ++ query
        ++ "+language:elm&sort=stars&order=desc"

+    -- These only talk to JavaScript ports now. They don't
+    -- actually do any actions themselves.
    task =
-      Http.get responseDecoder url
-        |> Task.map SetResults
+      Signal.send address query
+        |> Task.map (\_ -> DoNothing)
  in
-    Task.onError task (\_ -> Task.succeed (SetResults []))
+    Task.onError task (\_ -> Task.succeed DoNothing)


 responseDecoder : Decoder (List SearchResult)
@@ -109,13 +111,14 @@ type Action
  | SetQuery String
  | DeleteById ResultId
  | SetResults (List SearchResult)
+  | DoNothing


-update : Action -> Model -> ( Model, Effects Action )
-update action model =
+update : Address String -> Action -> Model -> ( Model, Effects Action )
+update searchAddress action model =
  case action of
    Search ->
-      ( model, Effects.task (searchFeed model.query) )
+      ( model, Effects.task (searchFeed searchAddress model.query) )

    SetQuery query ->
      ( { model | query = query }, Effects.none )
@@ -137,3 +140,6 @@ update action model =
          { model | results = newResults }
      in
        ( newModel, Effects.none )
+
+    DoNothing ->
+      ( model, Effects.none )
--- a/stages/7/Main.elm
+++ b/stages/7/Main.elm
@@ -5,6 +5,9 @@ import ElmHub exposing (..)
 import Effects exposing (Effects)
 import Task exposing (Task)
 import Html exposing (Html)
+import Signal
+import Json.Encode
+import Json.Decode


 main : Signal Html
@@ -16,12 +19,40 @@ app : StartApp.App Model
 app =
  StartApp.start
    { view = view
-    , update = update
-    , init = ( initialModel, Effects.task (searchFeed initialModel.query) )
-    , inputs = []
+    , update = update search.address
+    , init = ( initialModel, Effects.task (searchFeed search.address initialModel.query) )
+    , inputs = [ responseActions ]
    }


 port tasks : Signal (Task Effects.Never ())
 port tasks =
  app.tasks
+
+
+search : Signal.Mailbox String
+search =
+  Signal.mailbox ""
+
+
+port githubSearch : Signal String
+port githubSearch =
+  search.signal
+
+
+responseActions : Signal Action
+responseActions =
+  Signal.map decodeGithubResponse githubResponse
+
+
+decodeGithubResponse : Json.Encode.Value -> Action
+decodeGithubResponse value =
+  case Json.Decode.decodeValue responseDecoder value of
+    Ok results ->
+      SetResults results
+
+    Err _ ->
+      DoNothing
+
+
+port githubResponse : Signal Json.Encode.Value
--- a/stages/7/index.html
+++ b/stages/7/index.html
@@ -4,23 +4,37 @@
 <head>
  <meta charset="UTF-8">
  <title>ElmHub</title>
+  <script type="text/javascript" src="github.js"></script>
  <script type="text/javascript" src="elm.js"></script>
-
-  <!-- Uncomment the below line to enable elm-reactor support. -->
-  <!-- <script type="text/javascript" src="/_reactor/debug.js"></script> -->
-
  <link rel="stylesheet" href="style.css">
  <link rel="icon" type="image/png" href="elm-hub.png">
 </head>

 <body>
+  <div id="elm-landing-pad"></div>
 </body>

 <script type="text/javascript">
-  var app = Elm.fullscreen(Elm.Main, {});
+  // documentation: https://github.com/michael/github
+  var github = new Github();

-  // Uncomment this line and comment out the above to enable elm-reactor support.
-  // var app = Elm.fullscreenDebug("ElmHub", "Main.elm");
+  var app = Elm.embed(
+    Elm.Main,
+    document.getElementById("elm-landing-pad"),
+    {githubResponse: []});
+
+  function searchGithub(query) {
+    console.log("Searching for", query);
+    var search = github.getSearch(query);
+
+    search.repositories({}, function (err, repositories) {
+      console.log("Got response", repositories);
+
+      // TODO: app.ports.portNameGoesHere.send(repositories);
+    });
+  }
+
+  // TODO app.ports.portNameGoesHere.subscribe(searchGithub);
 </script>

 </html>
--- a/stages/8/ElmHub.elm
+++ b/stages/8/ElmHub.elm
@@ -11,8 +11,8 @@ import Json.Encode
 import Signal exposing (Address)


-searchFeed : Address String -> String -> Task x Action
-searchFeed address query =
+searchFeed : String -> Task x Action
+searchFeed query =
  let
    -- See https://developer.github.com/v3/search/#example for how to customize!
    url =
@@ -20,13 +20,11 @@ searchFeed address query =
        ++ query
        ++ "+language:elm&sort=stars&order=desc"

-    -- These only talk to JavaScript ports now. They don't
-    -- actually do any actions themselves.
    task =
-      Signal.send address query
-        |> Task.map (\_ -> DoNothing)
+      Http.get responseDecoder url
+        |> Task.map SetResults
  in
-    Task.onError task (\_ -> Task.succeed DoNothing)
+    Task.onError task (\_ -> Task.succeed (SetResults []))


 responseDecoder : Decoder (List SearchResult)
@@ -111,14 +109,13 @@ type Action
  | SetQuery String
  | DeleteById ResultId
  | SetResults (List SearchResult)
-  | DoNothing


-update : Address String -> Action -> Model -> ( Model, Effects Action )
-update searchAddress action model =
+update : Action -> Model -> ( Model, Effects Action )
+update action model =
  case action of
    Search ->
-      ( model, Effects.task (searchFeed searchAddress model.query) )
+      ( model, Effects.task (searchFeed model.query) )

    SetQuery query ->
      ( { model | query = query }, Effects.none )
@@ -140,6 +137,3 @@ update searchAddress action model =
          { model | results = newResults }
      in
        ( newModel, Effects.none )
-
-    DoNothing ->
-      ( model, Effects.none )
--- a/stages/8/Main.elm
+++ b/stages/8/Main.elm
@@ -5,9 +5,6 @@ import ElmHub exposing (..)
 import Effects exposing (Effects)
 import Task exposing (Task)
 import Html exposing (Html)
-import Signal
-import Json.Encode
-import Json.Decode


 main : Signal Html
@@ -19,40 +16,12 @@ app : StartApp.App Model
 app =
  StartApp.start
    { view = view
-    , update = update search.address
-    , init = ( initialModel, Effects.task (searchFeed search.address initialModel.query) )
-    , inputs = [ responseActions ]
+    , update = update
+    , init = ( initialModel, Effects.task (searchFeed initialModel.query) )
+    , inputs = []
    }


 port tasks : Signal (Task Effects.Never ())
 port tasks =
  app.tasks
-
-
-search : Signal.Mailbox String
-search =
-  Signal.mailbox ""
-
-
-port githubSearch : Signal String
-port githubSearch =
-  search.signal
-
-
-responseActions : Signal Action
-responseActions =
-  Signal.map decodeGithubResponse githubResponse
-
-
-decodeGithubResponse : Json.Encode.Value -> Action
-decodeGithubResponse value =
-  case Json.Decode.decodeValue responseDecoder value of
-    Ok results ->
-      SetResults results
-
-    Err _ ->
-      DoNothing
-
-
-port githubResponse : Signal Json.Encode.Value
--- a/stages/8/index.html
+++ b/stages/8/index.html
@@ -4,37 +4,23 @@
 <head>
  <meta charset="UTF-8">
  <title>ElmHub</title>
-  <script type="text/javascript" src="github.js"></script>
  <script type="text/javascript" src="elm.js"></script>
+
+  <!-- Uncomment the below line to enable elm-reactor support. -->
+  <!-- <script type="text/javascript" src="/_reactor/debug.js"></script> -->
+
  <link rel="stylesheet" href="style.css">
  <link rel="icon" type="image/png" href="elm-hub.png">
 </head>

 <body>
-  <div id="elm-landing-pad"></div>
 </body>

 <script type="text/javascript">
-  // documentation: https://github.com/michael/github
-  var github = new Github();
+  var app = Elm.fullscreen(Elm.Main, {});

-  var app = Elm.embed(
-    Elm.Main,
-    document.getElementById("elm-landing-pad"),
-    {githubResponse: []});
-
-  function searchGithub(query) {
-    console.log("Searching for", query);
-    var search = github.getSearch(query);
-
-    search.repositories({}, function (err, repositories) {
-      console.log("Got response", repositories);
-
-      // TODO: app.ports.portNameGoesHere.send(repositories);
-    });
-  }
-
-  // TODO app.ports.portNameGoesHere.subscribe(searchGithub);
+  // Uncomment this line and comment out the above to enable elm-reactor support.
+  // var app = Elm.fullscreenDebug("ElmHub", "Main.elm");
 </script>

 </html>