diff --git a/css/app.css b/css/app.css index 96de7c9f..9efc6c47 100644 --- a/css/app.css +++ b/css/app.css @@ -14,6 +14,23 @@ background: #d83a02; color: #fff; } +.popovermenu { + margin-top: 7px; + height: 100px; + right: -2px !important; } + .popovermenu ul { + display: block; + width: 100px; + height: 75px; } + .popovermenu ul li { + padding: 0px; } + .popovermenu ul .menuitem { + font-size: 12px; + display: inline; } + .popovermenu .action { + padding: 10px; + margin: -10px; } + .vault_wrapper { margin: 0 auto; margin-top: 20px; @@ -59,5 +76,31 @@ @media screen and (max-width: 768px) { .vault_wrapper { width: 90%; } } +.credential-table { + width: 100%; + margin-top: 44px; } + .credential-table tr:hover { + background-color: whitesmoke; } + .credential-table tr td { + cursor: pointer; + padding: 5px; + border-bottom: 1px solid #eeeeee; } + .credential-table tr td .tags { + float: right; } + .credential-table tr td .tags .tag { + background-color: rgba(240, 240, 240, 0.9); + padding: 4px; + font-size: 11px; } + .credential-table tr td .icon-more { + display: inline-block; + float: right; + margin-left: 5px; + margin-top: 1px; + opacity: 0.4; + height: 20px; + width: 32px; + cursor: pointer; } + .credential-table tr td .icon-more:hover { + opacity: 1; } /*# sourceMappingURL=app.css.map */ diff --git a/css/app.css.map b/css/app.css.map index 96ee62fd..745f352b 100644 --- a/css/app.css.map +++ b/css/app.css.map @@ -1,7 +1,7 @@ { "version": 3, -"mappings": "AAAA,YAAY;EACV,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,IAAI;;AAEb,kBAAkB;EAChB,UAAU,EAAE,OAAoB;EAChC,KAAK,EAAE,IAAI;;AAGb,WAAW;EACT,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,IAAI;;AAEb,iBAAiB;EACf,UAAU,EAAE,OAAoB;EAChC,KAAK,EAAE,IAAI;;ACdb,cAAc;EACZ,MAAM,EAAE,MAAM;EACd,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,KAAK;ECMhB,qBAAqB,EDLE,GAAG;ECM1B,aAAa,EDNU,GAAG;ECO1B,eAAe,EAAE,WAAW;EAAG,qDAAqD;EDNpF,UAAU,EAAE,cAAc;EAC1B,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,KAAK;EACd,yBAAU;IAER,OAAO,EAAE,GAAG;IACZ,4HAAiB;MACf,MAAM,EAAE,OAAO;IAEjB,+BAAK;MACH,KAAK,EAAE,OAAO;IAEhB,qCAAW;MACT,gBAAgB,EAAE,kBAAkB;MACpC,KAAK,EAAE,IAAI;IAEb,4BAAE;MACA,aAAa,EAAE,iBAAiB;MAChC,OAAO,EAAE,IAAI;IAEf,kCAAQ;MACN,gBAAgB,EAAE,OAAO;EAG7B,0BAAW;IACT,OAAO,EAAE,IAAI;IACb,iCAAM;MACJ,KAAK,EAAE,OAAO;IAEhB,gGAA0C;MACxC,KAAK,EAAE,IAAI;MC1Bf,qBAAqB,ED2BM,GAAG;MC1B9B,aAAa,ED0Bc,GAAG;MCzB9B,eAAe,EAAE,WAAW;MAAG,qDAAqD;ID4BhF,kDAAO;MACL,KAAK,EAAE,GAAG;MACV,OAAO,EAAE,YAAY;IAGzB,kCAAO;MACL,UAAU,EAAE,IAAI;;AAKtB,oCAAoC;EAClC,cAAc;IACZ,KAAK,EAAE,GAAG", -"sources": ["../sass/partials/button.scss","../sass/vaults.scss","../sass/mixins.scss"], +"mappings": "AAAA,YAAY;EACV,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,IAAI;;AAEb,kBAAkB;EAChB,UAAU,EAAE,OAAoB;EAChC,KAAK,EAAE,IAAI;;AAGb,WAAW;EACT,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,IAAI;;AAEb,iBAAiB;EACf,UAAU,EAAE,OAAoB;EAChC,KAAK,EAAE,IAAI;;ACfb,YAAa;EACX,UAAU,EAAE,GAAG;EACf,MAAM,EAAE,KAAK;EACb,KAAK,EAAE,eAAe;EACtB,eAAG;IACD,OAAO,EAAE,KAAK;IACd,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,IAAI;IACZ,kBAAE;MACA,OAAO,EAAE,GAAG;IAEd,yBAAS;MACL,SAAS,EAAE,IAAI;MACf,OAAO,EAAE,MAAM;EAGrB,oBAAQ;IACN,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,KAAK;;ACjBjB,cAAc;EACZ,MAAM,EAAE,MAAM;EACd,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,KAAK;ECMhB,qBAAqB,EDLE,GAAG;ECM1B,aAAa,EDNU,GAAG;ECO1B,eAAe,EAAE,WAAW;EAAG,qDAAqD;EDNpF,UAAU,EAAE,cAAc;EAC1B,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,KAAK;EACd,yBAAU;IAER,OAAO,EAAE,GAAG;IACZ,4HAAiB;MACf,MAAM,EAAE,OAAO;IAEjB,+BAAK;MACH,KAAK,EAAE,OAAO;IAEhB,qCAAW;MACT,gBAAgB,EAAE,kBAAkB;MACpC,KAAK,EAAE,IAAI;IAEb,4BAAE;MACA,aAAa,EAAE,iBAAiB;MAChC,OAAO,EAAE,IAAI;IAEf,kCAAQ;MACN,gBAAgB,EAAE,OAAO;EAG7B,0BAAW;IACT,OAAO,EAAE,IAAI;IACb,iCAAM;MACJ,KAAK,EAAE,OAAO;IAEhB,gGAA0C;MACxC,KAAK,EAAE,IAAI;MC1Bf,qBAAqB,ED2BM,GAAG;MC1B9B,aAAa,ED0Bc,GAAG;MCzB9B,eAAe,EAAE,WAAW;MAAG,qDAAqD;ID4BhF,kDAAO;MACL,KAAK,EAAE,GAAG;MACV,OAAO,EAAE,YAAY;IAGzB,kCAAO;MACL,UAAU,EAAE,IAAI;;AAKtB,oCAAoC;EAClC,cAAc;IACZ,KAAK,EAAE,GAAG;AEtDd,iBAAiB;EACf,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,IAAI;EAChB,0BAAQ;IACN,gBAAgB,EAAE,UAAgB;EAGlC,uBAAE;IACA,MAAM,EAAE,OAAO;IACf,OAAO,EAAE,GAAG;IACZ,aAAa,EAAE,iBAAiB;IAChC,6BAAK;MACH,KAAK,EAAE,KAAK;MACZ,kCAAI;QACF,gBAAgB,EAAE,wBAAoB;QACtC,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,IAAI;IAGnB,kCAAU;MACR,OAAO,EAAE,YAAY;MACrB,KAAK,EAAE,KAAK;MACZ,WAAW,EAAE,GAAG;MAChB,UAAU,EAAE,GAAG;MACf,OAAO,EAAE,GAAG;MACZ,MAAM,EAAE,IAAI;MACZ,KAAK,EAAE,IAAI;MACX,MAAM,EAAE,OAAO;IAEjB,wCAAgB;MACd,OAAO,EAAE,CAAC", +"sources": ["../sass/partials/button.scss","../sass/partials/popovermenu.scss","../sass/vaults.scss","../sass/mixins.scss","../sass/credentials.scss"], "names": [], "file": "app.css" } diff --git a/js/app/app.js b/js/app/app.js index 3dccbc6e..c70a46ba 100644 --- a/js/app/app.js +++ b/js/app/app.js @@ -17,7 +17,8 @@ angular 'ngSanitize', 'ngTouch', 'templates-main', - 'LocalStorageModule' + 'LocalStorageModule', + 'offClick' ]) .config(function ($routeProvider) { $routeProvider diff --git a/js/templates.js b/js/templates.js index ac8b60b4..036f7cfa 100644 --- a/js/templates.js +++ b/js/templates.js @@ -3,7 +3,7 @@ angular.module('templates-main', ['views/show_vault.html', 'views/vaults.html']) angular.module('views/show_vault.html', []).run(['$templateCache', function($templateCache) { 'use strict'; $templateCache.put('views/show_vault.html', - 'Welcome to the vault! {{active_vault}} Credentials: {{credentials}}'); + '
New
{{credential.label}} Tag 1 Tag 2 Tag 4 Tag 4 Long tag xD
  • Edit
  • Share
  • Delete
'); }]); angular.module('views/vaults.html', []).run(['$templateCache', function($templateCache) { diff --git a/js/vendor/angular-off-click/angular-off-click.min.js b/js/vendor/angular-off-click/angular-off-click.min.js new file mode 100644 index 00000000..2f6f86ad --- /dev/null +++ b/js/vendor/angular-off-click/angular-off-click.min.js @@ -0,0 +1 @@ +"use strict";angular.module("offClick",[]),angular.module("offClick").directive("offClick",["$rootScope","$parse","OffClickFilterCache",function(n,e,t){var c=0,o={},i=!1,r=function(n,e){if(!n||!e)return!1;for(var t=e.length,c=0;c1?n[e].splice(n[e].indexOf(i[0]),1):(n[e]=null,delete n[e])}),i=null})}}}}]),angular.module("offClick").factory("OffClickFilterCache",function(){var n={};return n}); \ No newline at end of file diff --git a/lib/Db/CredentialMapper.php b/lib/Db/CredentialMapper.php index f71284de..293b20f0 100644 --- a/lib/Db/CredentialMapper.php +++ b/lib/Db/CredentialMapper.php @@ -28,7 +28,7 @@ class CredentialMapper extends Mapper { */ public function getCredentialsByVaultId($vault_id, $user_id) { $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . - 'WHERE `user_id` = ? and vault_id = ? LIMIT 1'; + 'WHERE `user_id` = ? and vault_id = ?'; return $this->findEntities($sql, [$user_id, $vault_id]); } diff --git a/sass/app.scss b/sass/app.scss index 242902b5..98a835d4 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -3,5 +3,7 @@ @import 'variables'; @import 'mixins'; @import 'partials/button'; +@import 'partials/popovermenu'; @import 'vaults'; +@import 'credentials'; @import 'menu'; \ No newline at end of file diff --git a/sass/credentials.scss b/sass/credentials.scss new file mode 100644 index 00000000..bb546acb --- /dev/null +++ b/sass/credentials.scss @@ -0,0 +1,35 @@ +.credential-table{ + width: 100%; + margin-top: 44px; + tr:hover{ + background-color: darken(#fff, 4%); + } + tr{ + td{ + cursor: pointer; + padding: 5px; + border-bottom: 1px solid #eeeeee; + .tags{ + float: right; + .tag{ + background-color: rgba(240,240,240,.9); + padding: 4px; + font-size: 11px; + } + } + .icon-more{ + display: inline-block; + float: right; + margin-left: 5px; + margin-top: 1px; + opacity: 0.4; + height: 20px; + width: 32px; + cursor: pointer; + } + .icon-more:hover{ + opacity: 1; + } + } + } +} \ No newline at end of file diff --git a/sass/partials/popovermenu.scss b/sass/partials/popovermenu.scss new file mode 100644 index 00000000..245ab886 --- /dev/null +++ b/sass/partials/popovermenu.scss @@ -0,0 +1,21 @@ +.popovermenu { + margin-top: 7px; + height: 100px; + right: -2px !important; + ul { + display: block; + width: 100px; + height: 75px; + li{ + padding: 0px; + } + .menuitem{ + font-size: 12px; + display: inline; + } + } + .action { + padding: 10px; + margin: -10px; + } +} \ No newline at end of file diff --git a/templates/main.php b/templates/main.php index 67d92c5f..1d6e93a9 100644 --- a/templates/main.php +++ b/templates/main.php @@ -10,6 +10,7 @@ script('passman', 'vendor/angular-route/angular-route.min'); script('passman', 'vendor/angular-sanitize/angular-sanitize.min'); script('passman', 'vendor/angular-touch/angular-touch.min'); script('passman', 'vendor/angular-local-storage/angular-local-storage.min'); +script('passman', 'vendor/angular-off-click/angular-off-click.min'); script('passman', 'vendor/sjcl/sjcl'); diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index dd73aab0..3af982d1 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -1,5 +1,48 @@ -Welcome to the vault! -{{active_vault}} -Credentials: - -{{credentials}} \ No newline at end of file +
+
+ + + + + +
+
+ + + New +
+
+ + + + +
+ {{credential.label}} + + + Tag 1 + Tag 2 + Tag 4 + Tag 4 + Long tag xD + +
+
    +
  • Edit +
    • +
  • Share +
    • +
  • Delete +
    • +
+
+
\ No newline at end of file