cleanup

Author: mwunderl

public/app/xray-controller.js

@@ -2,8 +2,8 @@ var module = angular.module('scorekeep');
 
 module.controller('XRayController', XRayController);
 function XRayController($scope, $http, $location, SessionCollection, UserCollection, GameCollection, GameHistoryModel, api, $sce) {
-  var ddbOutput = "Click the button above to generate traces to AWS DynamoDB.";
-  var rdsDefaultOutput = "Click the button above to populate the table and generate traces to AWS RDS.";
+  var ddbOutput = "Simulate game sessions to generate trace data for AWS X-Ray.";
+  var rdsDefaultOutput = "Generate session records and store them in a PostgreSQL database in Amazon RDS.";
   var rdsRunningOutput = "Populating table...";
   var ddbRunning = false;
   var rdsRunning = false;
@@ -147,21 +147,21 @@ function XRayController($scope, $http, $location, SessionCollection, UserCollect
 
   $scope.getDdbDemoPrompt = function() {
     if (shouldRunDdbDemo) {
-        return "Stop AWS DynamoDB Demo";
+        return "Stop";
     } else if (ddbRunning) {
-        return "Finishing AWS DynamoDB Demo";
+        return "Finishing game";
     } else {
-        return "Start AWS DynamoDB Demo";
+        return "Generate traffic";
     }
   };
 
   $scope.getRdsDemoPrompt = function() {
     if (shouldRunRdsDemo) {
-        return "Stop AWS RDS Demo";
+        return "Stop";
     } else if (rdsRunning) {
-        return "Finishing AWS RDS Demo";
+        return "Finishing game";
     } else {
-        return "Start AWS RDS Demo";
+        return "Generate DB queries";
     }
   };
 

public/xray.html

@@ -1,16 +1,10 @@
-<div class="jumbotron">
-    <div class="container">
-        <h1 class="display-3">AWS X-Ray Demo</h1>
-        <p class="lead"></p>
-    </div>
-</div>
 <div class="container">
     <div class="row">
         <div class="col-md-6">
             <div class="row">
                 <div class="col-md-10 offset-md-1">
                     <button type="button" class="btn btn-outline-primary btn-lg btn-block" ng-click="toggleDdbDemo()">{{ getDdbDemoPrompt() }}</button>
-                    <p class="text-xs-center"><a href="https://console.aws.amazon.com/xray/home">View Traces</a></p>
+                    <p class="text-xs-center"><a href="https://console.aws.amazon.com/xray/home">View traces in AWS X-Ray</a></p>
                     <hr>
                     <p ng-bind-html="getDdbOutput()"></p>
                 </div>
@@ -20,7 +14,7 @@ <h1 class="display-3">AWS X-Ray Demo</h1>
             <div class="row">
                 <div class="col-md-10 offset-md-1" ng-show="isRdsConfigured">
                     <button type="button" class="btn btn-outline-primary btn-lg btn-block" ng-click="toggleRdsDemo()">{{ getRdsDemoPrompt() }}</button>
-                    <p class="text-xs-center"><a href="https://console.aws.amazon.com/xray/home#/traces?filter=http.url%20CONTAINS%20%22history%22">View Traces</a></p>
+                    <p class="text-xs-center"><a href="https://console.aws.amazon.com/xray/home#/traces?filter=http.url%20CONTAINS%20%22history%22">View traces in AWS X-Ray</a></p>
                     <hr>
                     <p ng-bind-html="getRdsOutput()"></p>
                     <table class="table">
@@ -47,12 +41,3 @@ <h1 class="display-3">AWS X-Ray Demo</h1>
         </div>
     </div>
 </div>
-<nav class="navbar navbar-fixed-bottom navbar-light bg-faded">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-4 offset-md-4">
-                <a class="navbar-brand" href="https://console.aws.amazon.com/xray/home">Go to AWS X-Ray Console</a>
-            </div>
-        </div>
-    </div>
-</nav>