From d69a998a3639bbf1a10452534fcee2d74e32c08e Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Thu, 16 Jun 2016 13:54:10 +0100 Subject: [PATCH] Moved views into view directory. Made the viewer an single page app. --- src/main/webdemo/www/create-deal.html | 24 ---------- src/main/webdemo/www/index.html | 53 ++-------------------- src/main/webdemo/www/js/app.js | 24 ++++++++-- src/main/webdemo/www/party.html | 24 ---------- src/main/webdemo/www/view/create-deal.html | 3 ++ src/main/webdemo/www/{ => view}/deal.html | 32 ++----------- src/main/webdemo/www/view/home.html | 51 +++++++++++++++++++++ src/main/webdemo/www/view/party.html | 3 ++ 8 files changed, 85 insertions(+), 129 deletions(-) delete mode 100644 src/main/webdemo/www/create-deal.html delete mode 100644 src/main/webdemo/www/party.html create mode 100644 src/main/webdemo/www/view/create-deal.html rename src/main/webdemo/www/{ => view}/deal.html (88%) create mode 100644 src/main/webdemo/www/view/home.html create mode 100644 src/main/webdemo/www/view/party.html diff --git a/src/main/webdemo/www/create-deal.html b/src/main/webdemo/www/create-deal.html deleted file mode 100644 index 2eb783a2ca..0000000000 --- a/src/main/webdemo/www/create-deal.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - IRS Create Deal Viewer - - - - - - -
- Home -
-
- -
- - diff --git a/src/main/webdemo/www/index.html b/src/main/webdemo/www/index.html index 0e1b07902b..8a85671b60 100644 --- a/src/main/webdemo/www/index.html +++ b/src/main/webdemo/www/index.html @@ -14,62 +14,15 @@ +
- Home + Home
-
{{httpError}}
-
{{infoMsg}}
-
-
-
Loading
-
-
-
- {{date.year}} - -
-
- {{date.month}} - -
-
- {{date.day}} - -
-
-
- Create Deal -
-
-
- -

Recent deals

- - - - - - - - - - - - - - - - - - - - -
Trade IdFixed Leg PayerAmountFloating Rate PayerAmount
{{deal.ref}}{{deal.fixedLeg.fixedRatePayer}}{{deal.fixedLeg.notional.quantity}} {{deal.fixedLeg.notional.token}}{{deal.floatingLeg.floatingRatePayer}}{{deal.floatingLeg.notional.quantity}} {{deal.floatingLeg.notional.token}}
-
+
diff --git a/src/main/webdemo/www/js/app.js b/src/main/webdemo/www/js/app.js index c8b7446ea1..da7f4cabc2 100644 --- a/src/main/webdemo/www/js/app.js +++ b/src/main/webdemo/www/js/app.js @@ -1,6 +1,24 @@ "use strict" -let irsViewer = angular.module('irsViewer', []); +let irsViewer = angular.module('irsViewer', ['ngRoute']) + .config(($routeProvider, $locationProvider) => { + $routeProvider + .when('/', { + controller: 'HomeController', + templateUrl: 'view/home.html' + }) + .when('/deal/:dealId', { + controller: 'DealController', + templateUrl: 'view/deal.html' + }) + .when('/party/:partyId', { + templateUrl: 'view/party.html' + }) + .when('/create-deal', { + templateUrl: 'view/create-deal.html' + }) + .otherwise({redirectTo: '/'}); + }) let nodeService = irsViewer.factory('nodeService', ($http) => { return new (function() { @@ -86,7 +104,7 @@ let nodeService = irsViewer.factory('nodeService', ($http) => { }); }); -irsViewer.controller('HomeController', ($http, $scope, nodeService) => { +irsViewer.controller('HomeController', function HomeController($http, $scope, nodeService) { let handleHttpFail = (resp) => { console.log(resp.data) $scope.httpError = resp.data @@ -102,7 +120,7 @@ irsViewer.controller('HomeController', ($http, $scope, nodeService) => { nodeService.getDeals().then((deals) => $scope.deals = deals); }); -irsViewer.controller('DealController', ($http, $scope, nodeService) => { +irsViewer.controller('DealController', function DealController($http, $scope, nodeService) { let initSemanticUi = () => { $('.ui.accordion').accordion(); } diff --git a/src/main/webdemo/www/party.html b/src/main/webdemo/www/party.html deleted file mode 100644 index 9acbfe7413..0000000000 --- a/src/main/webdemo/www/party.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - IRS Party Viewer - - - - - - -
- Home -
-
- -
- - diff --git a/src/main/webdemo/www/view/create-deal.html b/src/main/webdemo/www/view/create-deal.html new file mode 100644 index 0000000000..703a40e285 --- /dev/null +++ b/src/main/webdemo/www/view/create-deal.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/src/main/webdemo/www/deal.html b/src/main/webdemo/www/view/deal.html similarity index 88% rename from src/main/webdemo/www/deal.html rename to src/main/webdemo/www/view/deal.html index 3a7e8703d8..08360dc57f 100644 --- a/src/main/webdemo/www/deal.html +++ b/src/main/webdemo/www/view/deal.html @@ -1,25 +1,3 @@ - - - - - - - - - - IRS Deal Viewer - - - - - - - - - -
- Home -
Loading
@@ -41,7 +19,7 @@ Parties - {{party}}, + {{party}}, @@ -78,7 +56,7 @@ Payer - {{deal.fixedLeg.fixedRatePayer}} + {{deal.fixedLeg.fixedRatePayer}} Notional Amount @@ -147,7 +125,7 @@ Payer - {{deal.floatingLeg.floatingRatePayer}} + {{deal.floatingLeg.floatingRatePayer}} Notional Amount @@ -227,6 +205,4 @@
- - - + \ No newline at end of file diff --git a/src/main/webdemo/www/view/home.html b/src/main/webdemo/www/view/home.html new file mode 100644 index 0000000000..1b9fd905d8 --- /dev/null +++ b/src/main/webdemo/www/view/home.html @@ -0,0 +1,51 @@ +
+
{{httpError}}
+
{{infoMsg}}
+
+
+
Loading
+
+
+
+ {{date.year}} + +
+
+ {{date.month}} + +
+
+ {{date.day}} + +
+
+
+ Create Deal +
+
+
+ +

Recent deals

+ + + + + + + + + + + + + + + + + + + + +
Trade IdFixed Leg PayerAmountFloating Rate PayerAmount
{{deal.ref}}{{deal.fixedLeg.fixedRatePayer}}{{deal.fixedLeg.notional.quantity}} {{deal.fixedLeg.notional.token}}{{deal.floatingLeg.floatingRatePayer}}{{deal.floatingLeg.notional.quantity}} {{deal.floatingLeg.notional.token}}
+
+
diff --git a/src/main/webdemo/www/view/party.html b/src/main/webdemo/www/view/party.html new file mode 100644 index 0000000000..703a40e285 --- /dev/null +++ b/src/main/webdemo/www/view/party.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file