Implemented issue Particular/ServiceControl#40

johnsimons · johnsimons · commit 507a2e92ff08 · 2013-09-03T15:53:53.000+10:00
diff --git a/src/Pulse.Host/PulseBootstrapper.cs b/src/Pulse.Host/PulseBootstrapper.cs
@@ -1,5 +1,6 @@
 ﻿namespace Pulse.Host
 {
+    using System;
     using System.IO;
     using Nancy;
     using Nancy.Conventions;
@@ -35,9 +36,25 @@ protected override void ConfigureConventions(NancyConventions conventions)
             });
         }
 
+        protected override IRootPathProvider RootPathProvider
+        {
+            get { return new CustomRootPathProvider(); }
+        }
+
         protected override DiagnosticsConfiguration DiagnosticsConfiguration
         {
             get { return new DiagnosticsConfiguration {Password = @"Welcome1"}; }
         }
+
+        class CustomRootPathProvider : IRootPathProvider
+        {
+            public string GetRootPath()
+            {
+#if DEBUG
+                return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..\\..\\"));
+#endif
+                return AppDomain.CurrentDomain.BaseDirectory;
+            }
+        }
     }
 }
diff --git a/src/Pulse.Host/app/index.html b/src/Pulse.Host/app/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html ng-app="myApp">
+<html lang="en" ng-app="myApp">
 <head>
-    <title>Bootstrap 101 Template</title>
+    <title>ServicePulse</title>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -15,28 +15,36 @@
     <![endif]-->
 </head>
 <body>
-    <div class="container">
-        <div class="header">
-            <ul class="nav nav-pills pull-right">
-                <li class="active"><a href="#">Home</a></li>
-                <li><a href="#">About</a></li>
-                <li><a href="#">Contact</a></li>
-            </ul>
-            <h3 class="text-muted">Project name</h3>
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">ServicePulse</a>
         </div>
 
-        <div class="footer">
-            <p>Copyright 2013 Particular Software Limited. All rights reserved</p>
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse navbar-ex1-collapse">
+            <ul class="nav navbar-nav">
+                <li class="active"><a href="#">Dashboard</a></li>
+                <li><a href="#">Another Link</a></li>
+            </ul>
+        </div>
+        <!-- /.navbar-collapse -->
+    </nav>
+    <div class="row">
+        <div class="col-md-2">
+            <ul class="nav nav-pills nav-stacked">
+                <li><a href="#/view1">Issue 40</a></li>
+                <li><a href="#/view2">view2</a></li>
+            </ul>
         </div>
+        <div class="col-md-10" ng-view></div>
     </div>
-    <ul class="menu">
-        <li><a href="#/view1">view1</a></li>
-        <li><a href="#/view2">view2</a></li>
-    </ul>
-
-    <div ng-view></div>
-
-    <div>Angular seed app: v</div>
 
     <script src="lib/jquery-1.10.2.min.js"></script>
     <script src="lib/jquery.signalR-1.1.3.min.js"></script>
diff --git a/src/Pulse.Host/app/js/controllers.js b/src/Pulse.Host/app/js/controllers.js
@@ -5,17 +5,15 @@
 angular.module('myApp.controllers', [])
     .controller('MyCtrl1', ['$scope', 'streamService', function ($scope, streamService) {
 
-        $scope.pings = [];
-        $scope.callSignalR = function() {
-            streamService.send('Ping', { name: 'John' });
-        };
-        streamService.subscribe($scope, 'Pong', function (message) {
-            $scope.$apply(function(scope) {
-                scope.pings.push(message);
+        $scope.model = {success: 0, fail: 0};
+        
+        streamService.subscribe($scope, 'HeartbeatSummary', function (message) {
+            $scope.$apply(function (scope) {
+                scope.model.success = message.active_endpoints;
+                scope.model.fail = message.number_of_failing_endpoints;
             });
         });
         
-        
   }])
   .controller('MyCtrl2', ['$scope', 'serviceControlService', function($scope, serviceControlService) {
       serviceControlService.getEndpointsWithSla().then(function(endpoints) {
diff --git a/src/Pulse.Host/app/js/services.js b/src/Pulse.Host/app/js/services.js
@@ -13,7 +13,7 @@ angular.module('myApp.services', [])
         connection.received(function(data) {
             $log.info('SignalR data received');
             $log.info(data);
-            $rootScope.$broadcast(data.Type, data.Message);
+            $rootScope.$broadcast(data.type, data.message);
         });
 
         connection.start().done(function() {
@@ -22,7 +22,6 @@ angular.module('myApp.services', [])
 
         var onSubscribe = function($scope, messageType, handler) {
             $scope.$on(messageType, function(event, message) {
-                // note that the handler is passed the problem domain parameters 
                 handler(message);
             });
         };
diff --git a/src/Pulse.Host/app/partials/partial1.html b/src/Pulse.Host/app/partials/partial1.html
@@ -1,7 +1,7 @@
 <div ng-controller="MyCtrl1">
-    <p>This is the partial for view 1.</p>
-    <a class="btn btn-default" ng-click="callSignalR()">Click me</a>
-<ul ng-repeat="ping in pings">
-    <li>{{ping.Message}}</li>
-</ul>
+    <h2>Heartbeats indicators</h2>
+    <div class="well">
+        <a href="#/view2" class="btn btn-success btn-lg">{{model.success}} active endpoints</a>
+        <a href="#/view2" class="btn btn-danger btn-lg">{{model.fail}} failing endpoints</a>
+    </div>
 </div>
diff --git a/src/Pulse.Host/app/partials/partial2.html b/src/Pulse.Host/app/partials/partial2.html
@@ -1,5 +1,5 @@
 <div ng-controller="MyCtrl2">
-   
+   Hello!
 <ul ng-repeat="e in endpoints">
     <li>{{e.name}}@{{e.machine}} <strong>{{e.sla}}</strong></li>
 </ul>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace Pulse.Host`
`2`	`2`	`{`
	`3`	`+ using System;`
`3`	`4`	`using System.IO;`
`4`	`5`	`using Nancy;`
`5`	`6`	`using Nancy.Conventions;`
`@@ -35,9 +36,25 @@ protected override void ConfigureConventions(NancyConventions conventions)`
`35`	`36`	`});`
`36`	`37`	`}`
`37`	`38`
	`39`	`+ protected override IRootPathProvider RootPathProvider`
	`40`	`+ {`
	`41`	`+ get { return new CustomRootPathProvider(); }`
	`42`	`+ }`
	`43`	`+`
`38`	`44`	`protected override DiagnosticsConfiguration DiagnosticsConfiguration`
`39`	`45`	`{`
`40`	`46`	`get { return new DiagnosticsConfiguration {Password = @"Welcome1"}; }`
`41`	`47`	`}`
	`48`	`+`
	`49`	`+ class CustomRootPathProvider : IRootPathProvider`
	`50`	`+ {`
	`51`	`+ public string GetRootPath()`
	`52`	`+ {`
	`53`	`+#if DEBUG`
	`54`	`+ return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..\\..\\"));`
	`55`	`+#endif`
	`56`	`+ return AppDomain.CurrentDomain.BaseDirectory;`
	`57`	`+ }`
	`58`	`+ }`
`42`	`59`	`}`
`43`	`60`	`}`