From e3c21f17f8cbb9d955fa7dd7693c2308dde34c2f Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 8 Sep 2016 22:23:56 -0400
Subject: [PATCH] view site loaded with siteId parameter

---
 src/popup/app/config.js                        | 18 ++++++++----------
 src/popup/app/vault/vaultController.js         | 12 ------------
 src/popup/app/vault/vaultViewSiteController.js | 12 ++----------
 src/popup/app/vault/views/vault.html           |  2 +-
 src/popup/app/vault/views/vaultViewSite.html   |  4 ++--
 5 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/src/popup/app/config.js b/src/popup/app/config.js
index e928536dcd..3da5f429ab 100644
--- a/src/popup/app/config.js
+++ b/src/popup/app/config.js
@@ -68,19 +68,17 @@
                     templateUrl: "app/tools/views/tools.html",
                     controller: 'toolsController'
                 })
-            .state('empty', {
-                url: "/empty",
-                abstract: true,
-                templateUrl: "app/global/enoty.html",
+            .state('viewSite', {
+                url: "/view-site?siteId",
+                templateUrl: "app/vault/views/vaultViewSite.html",
+                controller: 'vaultViewSiteController',
+                params: {
+                    siteId: null
+                },
                 data: {
                     authorize: true
                 }
-            })
-                .state('empty.viewSite', {
-                    url: "/view-site",
-                    templateUrl: "app/vault/views/vaultViewSite.html",
-                    controller: 'vaultViewSiteController'
-                });
+            });
     })
     .run(function ($rootScope, userService, loginService, tokenService, $state) {
         $rootScope.$on('$stateChangeStart', function (event, toState, toParams) {
diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index 5451850557..0d322f056c 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -2,7 +2,6 @@
     .module('bit.vault')
 
     .controller('vaultController', function ($scope, siteService, folderService, $q, cipherService) {
-        $scope.parentScope = $scope;
         $scope.sites = [];
         $scope.folders = [];
         $scope.focusedSiteId = null;
@@ -69,17 +68,6 @@
         };
 
         /*
-        $scope.viewSite = function (site) {
-            $scope.focusedSiteId = site.id;
-            $ionicModal.fromTemplateUrl('app/vault/views/vaultViewSite.html', {
-                scope: $scope,
-                animation: 'slide-in-up'
-            }).then(function (modal) {
-                $scope.viewSiteModal = modal;
-                modal.show();
-            });
-        };
-
         $scope.editSite = function (site) {
             $scope.focusedSiteId = site.id;
             $ionicModal.fromTemplateUrl('app/vault/views/vaultEditSite.html', {
diff --git a/src/popup/app/vault/vaultViewSiteController.js b/src/popup/app/vault/vaultViewSiteController.js
index 1144f97711..06496c6184 100644
--- a/src/popup/app/vault/vaultViewSiteController.js
+++ b/src/popup/app/vault/vaultViewSiteController.js
@@ -1,19 +1,11 @@
 angular
     .module('bit.vault')
 
-    .controller('vaultViewSiteController', function ($scope, siteService, cipherService) {
+    .controller('vaultViewSiteController', function ($scope, $stateParams, siteService, cipherService) {
         $scope.site = null;
-        siteService.get($scope.parentScope.focusedSiteId, function (site) {
+        siteService.get($stateParams.siteId, function (site) {
             cipherService.decryptSite(site).then(function (model) {
                 $scope.site = model;
             });
         });
-
-        $scope.editSite = function () {
-            // TODO
-        };
-
-        $scope.close = function () {
-            $scope.parentScope.closeViewSite();
-        };
     });
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index f6f3d4e136..ad8ba17fd1 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -9,7 +9,7 @@
             <div class="list-divider">
                 <i class="fa fa-folder-open"></i> {{folder.name}}
             </div>
-            <a ng-click="viewSite(site)" class="list-item" ng-repeat="site in folderSites = (sites | filter: { folderId: folder.id } | orderBy: ['name', 'username'])">
+            <a ui-sref="viewSite({siteId: site.id})" class="list-item" ng-repeat="site in folderSites = (sites | filter: { folderId: folder.id } | orderBy: ['name', 'username'])">
                 <span class="text">{{site.name}}</span>
                 <span class="detail">{{site.username}}</span>
                 <!--<span class="btn btn-link pull-right"><i class="fa fa-ellipsis-h"></i></span>-->
diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewSite.html
index 23d3c7ef7a..826f4ae436 100644
--- a/src/popup/app/vault/views/vaultViewSite.html
+++ b/src/popup/app/vault/views/vaultViewSite.html
@@ -1,6 +1,6 @@
 <div class="header">
-    <a ng-click="close()" class="left">Close</a>
-    <a ng-click="editSite()" class="right">Edit</a>
+    <a ui-sref="tabs.vault" class="left">Close</a>
+    <a href="#" class="right">Edit</a>
     <div class="title">View Site</div>
 </div>
 <div class="content">