remove sharing module. move subvaults
This commit is contained in:
parent
d51eab779c
commit
1818dad0d1
|
@ -15,7 +15,6 @@
|
|||
'bit.global',
|
||||
'bit.accounts',
|
||||
'bit.vault',
|
||||
'bit.sharing',
|
||||
'bit.settings',
|
||||
'bit.tools',
|
||||
'bit.organization'
|
||||
|
|
|
@ -91,6 +91,12 @@ angular
|
|||
controller: 'vaultController',
|
||||
data: { pageTitle: 'My Vault' }
|
||||
})
|
||||
.state('backend.user.subvaults', {
|
||||
url: '^/subvaults',
|
||||
templateUrl: 'app/vault/views/vaultSubvaults.html',
|
||||
controller: 'vaultSubvaultsController',
|
||||
data: { pageTitle: 'Subvaults' }
|
||||
})
|
||||
.state('backend.user.settings', {
|
||||
url: '^/settings',
|
||||
templateUrl: 'app/settings/views/settings.html',
|
||||
|
@ -109,12 +115,6 @@ angular
|
|||
controller: 'toolsController',
|
||||
data: { pageTitle: 'Tools' }
|
||||
})
|
||||
.state('backend.user.sharing', {
|
||||
url: '^/sharing',
|
||||
templateUrl: 'app/sharing/views/sharing.html',
|
||||
controller: 'sharingController',
|
||||
data: { pageTitle: 'Sharing Center' }
|
||||
})
|
||||
.state('backend.org', {
|
||||
templateUrl: 'app/views/organizationLayout.html',
|
||||
abstract: true
|
||||
|
|
|
@ -83,14 +83,42 @@
|
|||
var users = [];
|
||||
|
||||
for (var i = 0; i < list.Data.length; i++) {
|
||||
users.push({
|
||||
var user = {
|
||||
id: list.Data[i].Id,
|
||||
userId: list.Data[i].UserId,
|
||||
name: list.Data[i].Name,
|
||||
email: list.Data[i].Email,
|
||||
status: list.Data[i].Status,
|
||||
type: list.Data[i].Type
|
||||
});
|
||||
};
|
||||
|
||||
switch (user.type) {
|
||||
case 0:
|
||||
user.typeName = 'Owner';
|
||||
break;
|
||||
case 1:
|
||||
user.typeName = 'Admin';
|
||||
break;
|
||||
case 2:
|
||||
default:
|
||||
user.typeName = 'User';
|
||||
break;
|
||||
}
|
||||
|
||||
switch (user.status) {
|
||||
case 0:
|
||||
user.statusName = 'Invited';
|
||||
break;
|
||||
case 1:
|
||||
user.statusName = 'Accepted';
|
||||
break;
|
||||
case 2:
|
||||
default:
|
||||
user.statusName = 'Confirmed';
|
||||
break;
|
||||
}
|
||||
|
||||
users.push(user);
|
||||
}
|
||||
|
||||
$scope.users = users;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<section class="content">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">Organization Users</h3>
|
||||
<h3 class="box-title"></h3>
|
||||
<div class="box-tools">
|
||||
<button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="invite()">
|
||||
Invite user
|
||||
|
@ -44,11 +44,11 @@
|
|||
<a href="javascript:void(0)" ng-click="edit(user.id)">{{user.email}}</a>
|
||||
<div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
|
||||
</td>
|
||||
<td style="width: 80px;" valign="middle">
|
||||
{{user.type}}
|
||||
<td style="width: 100px;" valign="middle">
|
||||
{{user.typeName}}
|
||||
</td>
|
||||
<td style="width: 80px;" valign="middle">
|
||||
{{user.status}}
|
||||
<td style="width: 100px;" valign="middle">
|
||||
{{user.statusName}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
|
@ -7,7 +7,9 @@
|
|||
<section class="content">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">Subvaults</h3>
|
||||
<h3 class="box-title">
|
||||
|
||||
</h3>
|
||||
<div class="box-tools">
|
||||
<button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="add()">
|
||||
New Subvault
|
||||
|
@ -26,22 +28,10 @@
|
|||
<table class="table table-striped table-hover">
|
||||
<tbody>
|
||||
<tr ng-repeat="subvault in subvaults | orderBy: ['name']">
|
||||
<td style="width: 70px;" valign="middle">
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
|
||||
<i class="fa fa-cog"></i> <span class="caret"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a href="javascript:void(0)" ng-click="delete(subvault)" class="text-danger">
|
||||
Delete
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
<td valign="middle">
|
||||
{{subvault.name}}
|
||||
<a href="javascript:void(0)" ng-click="edit(subvault)">
|
||||
{{subvault.name}}
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
angular
|
||||
.module('bit.sharing', ['ui.bootstrap', 'ngclipboard']);
|
|
@ -178,7 +178,6 @@
|
|||
animation: true,
|
||||
templateUrl: 'app/vault/views/vaultShare.html',
|
||||
controller: 'vaultShareController',
|
||||
size: 'sm',
|
||||
resolve: {
|
||||
loginId: function () { return login.id; }
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
angular
|
||||
.module('bit.sharing')
|
||||
.module('bit.vault')
|
||||
|
||||
.controller('sharingController', function ($scope, apiService, cipherService, $analytics, $q) {
|
||||
.controller('vaultSubvaultsController', function ($scope, apiService, cipherService, $analytics, $q) {
|
||||
$scope.logins = [];
|
||||
$scope.subvaults = [];
|
||||
$scope.loading = true;
|
|
@ -47,7 +47,7 @@
|
|||
<table class="table table-striped table-hover table-selectable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 110px; min-width: 110px;"></th>
|
||||
<th style="width: 75px; min-width: 75px;"></th>
|
||||
<th>Name</th>
|
||||
<th style="width: 300px;">Username</th>
|
||||
</tr>
|
||||
|
@ -60,10 +60,6 @@
|
|||
uib-tooltip="Delete">
|
||||
<i class="fa fa-lg fa-trash"></i>
|
||||
</button>
|
||||
<button type="button" ng-click="editLogin(login)" class="btn btn-link btn-table"
|
||||
uib-tooltip="View/Edit">
|
||||
<i class="fa fa-lg fa-pencil"></i>
|
||||
</button>
|
||||
<button type="button" ng-click="share(login)" class="btn btn-link btn-table"
|
||||
uib-tooltip="Share">
|
||||
<i class="fa fa-lg fa-share-alt"></i>
|
||||
|
@ -71,7 +67,7 @@
|
|||
</td>
|
||||
<td ng-click="editLogin(login)">
|
||||
<span ng-click="$event.stopPropagation()">
|
||||
{{login.name}}
|
||||
<a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
|
||||
<i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="login.favorite"></i>
|
||||
</span>
|
||||
</td>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<section class="content-header">
|
||||
<h1>
|
||||
Sharing Center
|
||||
Subvaults
|
||||
<small>{{subvaults.length}} subvaults, {{logins.length}} logins</small>
|
||||
</h1>
|
||||
</section>
|
|
@ -55,8 +55,8 @@
|
|||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="treeview" ng-class="{active: $state.is('backend.user.sharing')}">
|
||||
<a ui-sref="backend.user.sharing"><i class="fa fa-share-alt fa-fw"></i> <span>Sharing Center</span></a>
|
||||
<li class="treeview" ng-class="{active: $state.is('backend.user.subvaults')}">
|
||||
<a ui-sref="backend.user.subvaults"><i class="fa fa-share-alt fa-fw"></i> <span>Subvaults</span></a>
|
||||
</li>
|
||||
<li class="treeview" ng-class="{active: $state.is('backend.user.tools')}">
|
||||
<a ui-sref="backend.user.tools"><i class="fa fa-wrench fa-fw"></i> <span>Tools</span></a>
|
||||
|
|
|
@ -117,9 +117,7 @@
|
|||
<script src="app/vault/vaultEditFolderController.js"></script>
|
||||
<script src="app/vault/vaultAddFolderController.js"></script>
|
||||
<script src="app/vault/vaultShareController.js"></script>
|
||||
|
||||
<script src="app/sharing/sharingModule.js"></script>
|
||||
<script src="app/sharing/sharingController.js"></script>
|
||||
<script src="app/vault/vaultSubvaultsController.js"></script>
|
||||
|
||||
<script src="app/organization/organizationModule.js"></script>
|
||||
<script src="app/organization/organizationDashboardController.js"></script>
|
||||
|
|
Loading…
Reference in New Issue