fix sync and vault listing bugs

src/popup/app/services/backgroundService.js

@@ -18,4 +18,7 @@
     })
     .factory('siteService', function () {
         return chrome.extension.getBackgroundPage().siteService;
+    })
+    .factory('syncService', function () {
+        return chrome.extension.getBackgroundPage().syncService;
     });

src/popup/app/settings/settingsController.js

@@ -1,7 +1,13 @@
 angular
     .module('bit.settings')
 
-    .controller('settingsController', function ($scope, loginService, $state) {
+    .controller('settingsController', function ($scope, loginService, $state, syncService) {
+        $scope.sync = function () {
+            syncService.fullSync(function () {
+                alert('Sync done!');
+            });
+        };
+
         $scope.logOut = function (model) {
             loginService.logOut(function () {
                 $state.go('login');

src/popup/app/settings/views/settings.html

@@ -1,6 +1,15 @@
 <ion-view view-title="Settings">
     <ion-content>
         <div class="list">
+            <div class="item item-divider">
+                Manage
+            </div>
+            <a class="item" href="#">
+                Folders
+            </a>
+            <a class="item" ng-click="sync()">
+                Sync
+            </a>
             <div class="item item-divider">
                 Current Session
             </div>

src/popup/app/vault/vaultController.js

@@ -7,14 +7,11 @@
         $scope.folders = [];
         $scope.focusedSiteId = null;
 
-        $scope.$on("$ionicView.enter", function (event, data) {
+        $scope.$on('$ionicView.enter', function (event, data) {
             loadVault();
         });
 
         function loadVault() {
-            $scope.sites = [];
-            $scope.folders = [];
-
             var decSites = [];
             var decFolders = [{
                 id: null,
@@ -25,12 +22,12 @@
                 siteService.getAll(function (sites) {
                     var promises = [];
 
-                    for (var i = 0; i < folders.length; i++) {
+                    for (var i = 1; i < folders.length; i++) {
                         decFolders.push({
                             id: folders[i].id
                         });
 
-                        var folderNamePromise = cipherService.decrypt(sites[i].name, i);
+                        var folderNamePromise = cipherService.decrypt(folders[i].name, i);
                         promises.push(folderNamePromise);
                         folderNamePromise.then(function (obj) {
                             decFolders[obj.index].name = obj.val;
@@ -65,6 +62,14 @@
             });
         }
 
+        $scope.folderSort = function (item) {
+            if (!item.id) {
+                return '';
+            }
+
+            return item.name.toLowerCase();
+        };
+
         $scope.viewSite = function (site) {
             $scope.focusedSiteId = site.id;
             $ionicModal.fromTemplateUrl('app/vault/views/vaultViewSite.html', {
@@ -111,7 +116,7 @@
             $scope.focusedSiteId = null;
         };
 
-        $scope.$on('modal.hidden', function () {
+        $scope.$on('closeViewSite.hidden', function () {
             console.log('modal hidden');
             loadVault();
         });