fix conflicts

js/app.js

@@ -2,15 +2,24 @@
 
 angular.module('cosign',[
   'ngRoute',
-  'ui.bootstrap',
+  'mm.foundation',
+  'monospaced.qrcode',
   'cosign.header',
+  'cosign.home',
+  'cosign.transactions',
+  'cosign.send',
+  'cosign.backup',
+  'cosign.network',
   'cosign.signin',
-  'cosign.join',
-  'cosign.network'
+  'cosign.join'
 ]);
 
 angular.module('cosign.header', []);
+angular.module('cosign.home', []);
+angular.module('cosign.transactions', []);
+angular.module('cosign.send', []);
+angular.module('cosign.backup', []);
+angular.module('cosign.network', []);
 angular.module('cosign.signin', []);
 angular.module('cosign.join', []);
-angular.module('cosign.network', []);
 

js/config.js

@@ -18,6 +18,15 @@ angular
       .when('/join/:id', {
         templateUrl: 'join.html'
       })
+      .when('/transactions', {
+        templateUrl: 'transactions.html' 
+      })
+      .when('/send', {
+        templateUrl: 'send.html' 
+      })
+      .when('/backup', {
+        templateUrl: 'backup.html' 
+      })
       .otherwise({
         templateUrl: '404.html'
       });

js/controllers/backup.js

@@ -0,0 +1,6 @@
+'use strict';
+
+angular.module('cosign.backup').controller('BackupController',
+  function($scope, $rootScope, $location) {
+    $scope.title = 'Backup';
+  });

js/controllers/header.js

@@ -2,7 +2,27 @@
 
 angular.module('cosign.header').controller('HeaderController',
   function($scope, $rootScope, $location) {
+    $scope.menu = [{
+      'title': 'Home',
+      'link': '#/'
+    }, {
+      'title': 'Transactions',
+      'link': '#/transactions'
+    }, {
+      'title': 'Send',
+      'link': '#/send'
+    }, {
+      'title': 'Backup',
+      'link': '#/backup'
+    }];
 
+    $scope.isActive = function(item) {
+      if (item.link.replace('#','') == $location.path()) {
+        return true;
+      }
+      return false;
+    };
+    
     $scope.init = function() {
       $rootScope.isLogged = false;
     };

js/controllers/home.js

@@ -0,0 +1,13 @@
+'use strict';
+
+angular.module('cosign.home').controller('HomeController',
+  function($scope, $rootScope, $location) {
+    $scope.title = 'Home';
+
+    $scope.oneAtATime = true;
+
+    $scope.addrs = [
+    { addrStr: 'n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb'},
+    { addrStr: 'my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J'}
+    ];
+  });

js/controllers/send.js

@@ -0,0 +1,6 @@
+'use strict';
+
+angular.module('cosign.send').controller('SendController',
+  function($scope, $rootScope, $location) {
+    $scope.title = 'Send';
+  });

js/controllers/transactions.js

@@ -0,0 +1,34 @@
+'use strict';
+
+angular.module('cosign.transactions').controller('TransactionsController',
+  function($scope, $rootScope, $location) {
+    $scope.title = 'Transactions';
+
+    $scope.oneAtATime = true;
+
+    $scope.txsinput = [
+    {
+      fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
+      toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
+      amount: 23.9982
+    },
+    {
+      fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
+      toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
+      amount: 2.22
+    }
+    ];
+
+    $scope.txsoutput = [
+    {
+      fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
+      toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
+      amount: 23.9982
+    },
+    {
+      fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
+      toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
+      amount: 2.22
+    }
+    ];
+  });