From 348f5e7ef1df3d245738a12b06bbe3280bbc9e42 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 13 Sep 2016 00:14:49 -0400 Subject: [PATCH] added vault search --- src/popup/app/config.js | 8 ++--- src/popup/app/vault/vaultAddSiteController.js | 7 ++++- src/popup/app/vault/vaultController.js | 18 +++++++++-- .../app/vault/vaultEditSiteController.js | 14 +++++++-- .../app/vault/vaultViewSiteController.js | 17 +++++++++- src/popup/app/vault/views/vault.html | 8 +++-- src/popup/app/vault/views/vaultViewSite.html | 2 +- src/popup/less/components.less | 31 +++++++++++++++++++ src/popup/less/mixins.less | 19 ++++++++++++ src/popup/less/popup.less | 1 + 10 files changed, 112 insertions(+), 13 deletions(-) create mode 100644 src/popup/less/mixins.less diff --git a/src/popup/app/config.js b/src/popup/app/config.js index f292d6e4..4948dddb 100644 --- a/src/popup/app/config.js +++ b/src/popup/app/config.js @@ -64,7 +64,7 @@ url: "/vault", templateUrl: "app/vault/views/vault.html", controller: 'vaultController', - params: { scrollY: 0 } + params: { scrollY: 0, searchText: null } }) .state('tabs.settings', { url: "/settings", @@ -82,21 +82,21 @@ templateUrl: "app/vault/views/vaultViewSite.html", controller: 'vaultViewSiteController', data: { authorize: true }, - params: { animation: null, returnScrollY: 0 } + params: { animation: null, returnScrollY: 0, returnSearchText: null } }) .state('addSite', { url: "/add-site", templateUrl: "app/vault/views/vaultAddSite.html", controller: 'vaultAddSiteController', data: { authorize: true }, - params: { animation: null, returnScrollY: 0 } + params: { animation: null, returnScrollY: 0, returnSearchText: null } }) .state('editSite', { url: "/edit-site?siteId", templateUrl: "app/vault/views/vaultEditSite.html", controller: 'vaultEditSiteController', data: { authorize: true }, - params: { animation: null, fromView: true, returnScrollY: 0 } + params: { animation: null, fromView: true, returnScrollY: 0, returnSearchText: null } }); }) .run(function ($rootScope, userService, loginService, tokenService, $state) { diff --git a/src/popup/app/vault/vaultAddSiteController.js b/src/popup/app/vault/vaultAddSiteController.js index 09455357..f6cc1da9 100644 --- a/src/popup/app/vault/vaultAddSiteController.js +++ b/src/popup/app/vault/vaultAddSiteController.js @@ -3,6 +3,7 @@ .controller('vaultAddSiteController', function ($scope, $state, $stateParams, siteService, folderService, cipherService, $q) { var returnScrollY = $stateParams.returnScrollY; + var returnSearchText = $stateParams.returnSearchText; $scope.site = { folderId: null @@ -49,7 +50,11 @@ }; $scope.close = function () { - $state.go('tabs.vault', { animation: 'out-slide-down', scrollY: returnScrollY || 0 }); + $state.go('tabs.vault', { + animation: 'out-slide-down', + scrollY: returnScrollY || 0, + searchText: returnSearchText + }); }; function saveSite(site) { diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js index db34c31f..e6ccb9d4 100644 --- a/src/popup/app/vault/vaultController.js +++ b/src/popup/app/vault/vaultController.js @@ -2,6 +2,8 @@ .module('bit.vault') .controller('vaultController', function ($scope, $rootScope, siteService, folderService, $q, cipherService, $state, $stateParams) { + $('#search').focus(); + var delayLoad = true; if (!$rootScope.vaultSites) { $rootScope.vaultSites = []; @@ -73,6 +75,11 @@ }); } + $scope.searchText = null; + if ($stateParams.searchText) { + $scope.searchText = $stateParams.searchText; + } + $scope.folderSort = function (item) { if (!item.id) { return ''; @@ -81,10 +88,16 @@ return item.name.toLowerCase(); }; + $scope.setFolderFilter = function (folder) { + $scope.folderFilter = {}; + $scope.folderFilter.folderId = folder.id; + } + $scope.addSite = function () { $state.go('addSite', { animation: 'in-slide-up', - returnScrollY: getScrollY() + returnScrollY: getScrollY(), + returnSearchText: $scope.searchText }); }; @@ -92,7 +105,8 @@ $state.go('viewSite', { siteId: site.id, animation: 'in-slide-up', - returnScrollY: getScrollY() + returnScrollY: getScrollY(), + returnSearchText: $scope.searchText }); }; diff --git a/src/popup/app/vault/vaultEditSiteController.js b/src/popup/app/vault/vaultEditSiteController.js index 09c39d22..0ffb422a 100644 --- a/src/popup/app/vault/vaultEditSiteController.js +++ b/src/popup/app/vault/vaultEditSiteController.js @@ -3,6 +3,7 @@ angular .controller('vaultEditSiteController', function ($scope, $state, $stateParams, siteService, folderService, cipherService, $q, toastr) { var returnScrollY = $stateParams.returnScrollY; + var returnSearchText = $stateParams.returnSearchText; $scope.site = { folderId: null @@ -55,10 +56,19 @@ angular $scope.close = function () { if ($stateParams.fromView) { - $state.go('viewSite', { siteId: $stateParams.siteId, animation: 'out-slide-down' }); + $state.go('viewSite', { + siteId: $stateParams.siteId, + animation: 'out-slide-down', + returnScrollY: returnScrollY || 0, + returnSearchText: returnSearchText + }); } else { - $state.go('tabs.vault', { animation: 'out-slide-down', scrollY: returnScrollY || 0 }); + $state.go('tabs.vault', { + animation: 'out-slide-down', + scrollY: returnScrollY || 0, + searchText: returnSearchText + }); } }; diff --git a/src/popup/app/vault/vaultViewSiteController.js b/src/popup/app/vault/vaultViewSiteController.js index f64c1176..6c384ea0 100644 --- a/src/popup/app/vault/vaultViewSiteController.js +++ b/src/popup/app/vault/vaultViewSiteController.js @@ -3,6 +3,7 @@ .controller('vaultViewSiteController', function ($scope, $state, $stateParams, siteService, cipherService, tldjs, toastr) { var returnScrollY = $stateParams.returnScrollY; + var returnSearchText = $stateParams.returnSearchText; $scope.site = null; siteService.get($stateParams.siteId, function (site) { @@ -34,8 +35,22 @@ }); }); + $scope.edit = function (site) { + $state.go('editSite', { + animation: 'in-slide-up', + siteId: site.id, + fromView: true, + returnScrollY: returnScrollY || 0, + returnSearchText: returnSearchText + }); + } + $scope.close = function () { - $state.go('tabs.vault', { animation: 'out-slide-down', scrollY: returnScrollY || 0 }); + $state.go('tabs.vault', { + animation: 'out-slide-down', + scrollY: returnScrollY || 0, + searchText: returnSearchText + }); }; $scope.launchWebsite = function (site) { diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html index 48ae7711..4d1dffc3 100644 --- a/src/popup/app/vault/views/vault.html +++ b/src/popup/app/vault/views/vault.html @@ -2,7 +2,10 @@
-
My Vault
+
+ + +
@@ -10,7 +13,8 @@
{{folder.name}}
- + {{site.name}} {{site.username}} diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewSite.html index c75228be..818f77aa 100644 --- a/src/popup/app/vault/views/vaultViewSite.html +++ b/src/popup/app/vault/views/vaultViewSite.html @@ -3,7 +3,7 @@ Close
- Edit + Edit
View Site
diff --git a/src/popup/less/components.less b/src/popup/less/components.less index 931d5036..820ee923 100644 --- a/src/popup/less/components.less +++ b/src/popup/less/components.less @@ -1,4 +1,5 @@ @import (reference) "variables.less"; +@import (reference) "mixins.less"; .header { min-height: 44px; @@ -52,6 +53,7 @@ display: block; right: 0; position: absolute; + z-index: 99999; a, button { padding: 12px 10px; @@ -65,6 +67,35 @@ float: right; } } + + .search { + text-align: left; + position: relative; + + input { + background: darken(@brand-primary, 8%); + border: none; + color: white; + padding: 5px 10px 5px 30px; + border-radius: 5px; + width: 85%; + margin: 7px 0 0 7px; + .placeholder-color(lighten(@brand-primary, 35%)); + + &:focus { + border-radius: 5px; + outline: none; + background: darken(@brand-primary, 10%); + } + } + + .fa-search { + position: absolute; + top: 15px; + left: 15px; + color: lighten(@brand-primary, 30%); + } + } } .tabs { diff --git a/src/popup/less/mixins.less b/src/popup/less/mixins.less new file mode 100644 index 00000000..fa888edf --- /dev/null +++ b/src/popup/less/mixins.less @@ -0,0 +1,19 @@ +.placeholder-color(@color) { + &:-moz-placeholder { + color: @color; + opacity: 1; + } + + &::-moz-placeholder { + color: @color; + opacity: 1; + } + + &:-ms-input-placeholder { + color: @color; + } + + &::-webkit-input-placeholder { + color: @color; + } +} diff --git a/src/popup/less/popup.less b/src/popup/less/popup.less index 0a2d288f..9f11bcfc 100644 --- a/src/popup/less/popup.less +++ b/src/popup/less/popup.less @@ -1,5 +1,6 @@ @import "../../../node_modules/bootstrap/less/bootstrap.less"; @import "variables.less"; +@import "mixins.less"; @import "components.less"; @import "animations.less"; @import "plugins.less";