Bumping version to 1.1.14

forki · Mar 17, 2019 · 40c6590 · 40c6590
1 parent 03239af
commit 40c6590
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,6 @@
 # Release Notes
 
-## 1.1.13 - 2019-03-17
+## 1.1.14 - 2019-03-17
 * Upgrade Raspbian
 
 ## 1.1.0 - 2019-01-20

diff --git a/src/Client/Client.fs b/src/Client/Client.fs
@@ -41,8 +41,6 @@ type Msg =
 | FirmwareLoaded of Result<Firmware, exn>
 | Err of exn
 
-
-
 let fetchData (userID) = promise {
     let! res = Fetch.fetch (sprintf "api/usertags/%s" userID) []
     let! txt = res.text()
@@ -86,8 +84,8 @@ let fetchFirmwareCmd = Cmd.ofPromise fetchFirmware () (Ok >> FirmwareLoaded) (Er
 let fetchTagsCmd userID = Cmd.ofPromise fetchData userID (Ok >> TagsLoaded) (Error >> TagsLoaded)
 
 let init () : Model * Cmd<Msg> =
-    let userID = "9bb2b109-bf08-4342-9e09-f4ce3fb01c0f" // TODO:
-    let hsitoryModel,historyCmd = TagHistory.init userID
+    let userID = "B827EB8E6CA5" // TODO:
+    let historyModel,historyCmd = TagHistory.init userID
 
     let initialModel = {
         Tags = None
@@ -98,7 +96,7 @@ let init () : Model * Cmd<Msg> =
         Message = ""
         ShownTags = [||]
         UserID = userID
-        TagHistory = hsitoryModel
+        TagHistory = historyModel
     }
 
     initialModel,
@@ -274,7 +272,8 @@ let view (model : Model) (dispatch : Msg -> unit) =
                            [ Heading.IsSubtitle
                              Heading.Is4 ]
                            [ audioHubComponents ]
-                          tagsTable model dispatch ]
+                          tagsTable model dispatch
+                          TagHistory.view (dispatch << TagHistoryMsg) model.TagHistory ]
                       Column.column
                         [ Column.Width (Screen.All, Column.Is5) ]
                         [
@@ -294,7 +293,7 @@ let view (model : Model) (dispatch : Msg -> unit) =
                     [ ul [ ]
                         [ li [ ]
                             [ a [ ]
-                                [ str "AudioHub - 2018" ] ] ] ] ] ] ]
+                                [ str "AudioHub - 2019" ] ] ] ] ] ] ]
 
 
 

diff --git a/src/Client/ReleaseNotes.fs b/src/Client/ReleaseNotes.fs
@@ -1,13 +1,13 @@
 module internal ReleaseNotes
 
-let Version = "1.1.13"
+let Version = "1.1.14"
 
 let IsPrerelease = false
 
 let Notes = """
 # Release Notes
 
-## 1.1.13 - 2019-03-17
+## 1.1.14 - 2019-03-17
 * Upgrade Raspbian
 
 ## 1.1.0 - 2019-01-20

diff --git a/src/Client/TagHistory.fs b/src/Client/TagHistory.fs
@@ -95,7 +95,5 @@ let update (msg : Msg) (model : Model) : Model * Cmd<Msg> =
                     Cmd.ofMsg (RetrySocketConnection (TimeSpan.FromSeconds 10.))
                 ]
 
-
-
 let view (dispatch: Msg -> unit) (model:Model) =
     div [][ ]
diff --git a/src/Client/webpack.config.js b/src/Client/webpack.config.js
@@ -14,7 +14,7 @@ var CONFIG = {
     outputDir: resolve("./public"),
     devServerProxy: {
         '/api/*': {
-            target: 'http://localhost:' + (process.env.SUAVE_FABLE_PORT || "8085"),
+            target: 'http://localhost:' + (process.env.SUAVE_FABLE_PORT || "5000"),
             changeOrigin: true
         }
     },

diff --git a/src/Server/Server.fs b/src/Server/Server.fs
@@ -65,7 +65,7 @@ let mapBlobMusikTag (tag:Tag) = task {
 let discoverYoutubeLink (youtubeURL:string) = task {
     let lines = System.Collections.Generic.List<_>()
     let proc = new Process ()
-    let startInfo = new ProcessStartInfo()
+    let startInfo = ProcessStartInfo()
     startInfo.FileName <- "/usr/local/bin/youtube-dl"
     startInfo.Arguments <- sprintf " -g \"%s\"" youtubeURL
     startInfo.UseShellExecute <- false
@@ -273,8 +273,9 @@ let tagHistoryBroadcaster = ConnectionManager()
 let t = task {
     while true do
         let body = Encode.Auto.toString(0, TagHistorySocketEvent.ToDo)
-        do! tagHistoryBroadcaster.BroadcastTextAsync(body,key = "9bb2b109-bf08-4342-9e09-f4ce3fb01c0f")
-        do! Task.Delay 10000
+        printfn "Sending"
+        do! tagHistoryBroadcaster.BroadcastTextAsync(body,key = "B827EB8E6CA5")
+        do! Task.Delay (1000 * 60 * 20)
 }
 
 let webApp =
@@ -293,7 +294,6 @@ let webApp =
 let configureSerialization (services:IServiceCollection) =
     services
 
-
 let configureApp (app : IApplicationBuilder) =
     app.UseWebSockets(Giraffe.WebSocket.DefaultWebSocketOptions)
 

diff --git a/src/Shared/Shared.fs b/src/Shared/Shared.fs
@@ -191,7 +191,7 @@ type TagHistorySocketEvent =
 | ToDo
 
 module URLs =
-    let serverPort = 8085us
+    let serverPort = 5000us
 
 #if DEBUG
     let mediaServer = sprintf "http://localhost:%d" serverPort
@@ -204,7 +204,7 @@ module URLs =
 
     let websocketURL =
 #if DEBUG
-        "ws://localhost:8087"
+        "ws://localhost:5000"
 #else
         "wss:/audio-hub.azurewebsites.net"
 #endif