diff --git a/karma.conf.js b/karma.conf.js index 0367ec7a..bbe3e089 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -12,7 +12,6 @@ module.exports = function (config) { "node_modules/angular/angular.min.js", "node_modules/angular-animate/angular-animate.min.js", "node_modules/angular-aria/angular-aria.min.js", - "node_modules/angular-ui-router/release/angular-ui-router.min.js", "node_modules/angular-material/angular-material.min.js", "node_modules/ngSocket/dist/ngSocket.js", "node_modules/angular-local-storage/dist/angular-local-storage.min.js", diff --git a/src/client/app/app.module.js b/src/client/app/app.module.js index f9fe7b29..76b54000 100644 --- a/src/client/app/app.module.js +++ b/src/client/app/app.module.js @@ -3,7 +3,6 @@ angular .module("argo", [ "ngMaterial", - "ui.router", "ngSocket", "LocalStorageModule" ]); diff --git a/src/client/app/app.routes.js b/src/client/app/app.routes.js deleted file mode 100644 index 768f0e9d..00000000 --- a/src/client/app/app.routes.js +++ /dev/null @@ -1,63 +0,0 @@ -"use strict"; - -(function () { - angular - .module("argo") - .config(config) - .run(setup); - - config.$inject = ["$stateProvider", "$urlRouterProvider"]; - function config($stateProvider, $urlRouterProvider) { - $stateProvider - .state("default", { - abstract: true, - url: "/", - template: "" - }) - .state("default.subs", { - views: { - "header": { - template: "
" - }, - "trades": { - template: "" - }, - "orders": { - template: "" - }, - "positions": { - template: "" - }, - "exposure": { - template: "" - }, - "activity": { - template: "" - }, - "news": { - template: "" - }, - "plugins": { - template: "" - }, - "account": { - template: "" - }, - "quotes": { - template: "" - }, - "charts": { - template: "" - } - } - }); - - $urlRouterProvider.otherwise("/"); - } - - setup.$inject = ["$state"]; - function setup($state) { - $state.transitionTo("default.subs"); - } - -}()); diff --git a/src/client/app/layout/default.html b/src/client/app/layout/default.html index cc98efa2..7abf1989 100644 --- a/src/client/app/layout/default.html +++ b/src/client/app/layout/default.html @@ -1,4 +1,4 @@ -
+
@@ -18,7 +18,7 @@ md-swipe-left="$ctrl.next()" md-swipe-right="$ctrl.previous()"> -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+ +
-
+
diff --git a/src/client/index.html b/src/client/index.html index 2579b2cb..c9ffc0d6 100644 --- a/src/client/index.html +++ b/src/client/index.html @@ -18,12 +18,11 @@ -
+ - @@ -32,7 +31,6 @@ -