From 24862f31b3198a30ccf2310faed4a79a66bd6dae Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 20 Feb 2017 23:29:00 -0500 Subject: [PATCH] tab layout for sharing center --- src/app/config.js | 16 +++-- src/app/shared/sharedFoldersMeController.js | 6 ++ src/app/shared/sharedLoginsMeController.js | 6 ++ src/app/shared/sharedMeController.js | 6 -- src/app/shared/views/sharedFolders.html | 70 ++++++++++--------- src/app/shared/views/sharedFoldersMe.html | 47 +++++++++++++ src/app/shared/views/sharedLogins.html | 74 ++++++++++++--------- src/app/shared/views/sharedLoginsMe.html | 49 ++++++++++++++ src/app/shared/views/sharedMe.html | 9 --- src/app/views/backendLayout.html | 8 +-- src/index.html | 3 +- 11 files changed, 203 insertions(+), 91 deletions(-) create mode 100644 src/app/shared/sharedFoldersMeController.js create mode 100644 src/app/shared/sharedLoginsMeController.js delete mode 100644 src/app/shared/sharedMeController.js create mode 100644 src/app/shared/views/sharedFoldersMe.html create mode 100644 src/app/shared/views/sharedLoginsMe.html delete mode 100644 src/app/shared/views/sharedMe.html diff --git a/src/app/config.js b/src/app/config.js index 09048de71e..020d45e4da 100644 --- a/src/app/config.js +++ b/src/app/config.js @@ -105,17 +105,23 @@ angular controller: 'sharedLoginsController', data: { pageTitle: 'Shared Logins' } }) + .state('backend.sharedLoginsMe', { + url: '^/shared/logins/me', + templateUrl: 'app/shared/views/sharedLoginsMe.html', + controller: 'sharedLoginsMeController', + data: { pageTitle: 'Logins Shared with Me' } + }) .state('backend.sharedFolders', { url: '^/shared/folders', templateUrl: 'app/shared/views/sharedFolders.html', controller: 'sharedFoldersController', data: { pageTitle: 'Shared Folders' } }) - .state('backend.sharedMe', { - url: '^/shared/me', - templateUrl: 'app/shared/views/sharedMe.html', - controller: 'sharedMeController', - data: { pageTitle: 'Shared with Me' } + .state('backend.sharedFoldersMe', { + url: '^/shared/folders/me', + templateUrl: 'app/shared/views/sharedFoldersMe.html', + controller: 'sharedFoldersMeController', + data: { pageTitle: 'Folders Shared with Me' } }) // Frontend diff --git a/src/app/shared/sharedFoldersMeController.js b/src/app/shared/sharedFoldersMeController.js new file mode 100644 index 0000000000..1f59d62612 --- /dev/null +++ b/src/app/shared/sharedFoldersMeController.js @@ -0,0 +1,6 @@ +angular + .module('bit.shared') + + .controller('sharedFoldersMeController', function ($scope, apiService, cryptoService, cipherService, $analytics) { + + }); diff --git a/src/app/shared/sharedLoginsMeController.js b/src/app/shared/sharedLoginsMeController.js new file mode 100644 index 0000000000..ada21c48b4 --- /dev/null +++ b/src/app/shared/sharedLoginsMeController.js @@ -0,0 +1,6 @@ +angular + .module('bit.shared') + + .controller('sharedLoginsMeController', function ($scope, apiService, cryptoService, cipherService, $analytics) { + + }); diff --git a/src/app/shared/sharedMeController.js b/src/app/shared/sharedMeController.js deleted file mode 100644 index c11ea2a689..0000000000 --- a/src/app/shared/sharedMeController.js +++ /dev/null @@ -1,6 +0,0 @@ -angular - .module('bit.shared') - - .controller('sharedMeController', function ($scope, apiService, cryptoService, cipherService, $analytics) { - - }); diff --git a/src/app/shared/views/sharedFolders.html b/src/app/shared/views/sharedFolders.html index b8e481a9fc..bdfd5d93a3 100644 --- a/src/app/shared/views/sharedFolders.html +++ b/src/app/shared/views/sharedFolders.html @@ -1,39 +1,47 @@ 

Sharing Center - folders I've shared + folders

-
-

Loading...

-
-
-

No shared folders.

-
-
- - - - - - - - - - - - - -
Name
- - - {{folder.name}}
+
+ +
+
+ Loading... +
+
+ No shared folders. +
+
+ + + + + + + + + + + + + +
Name
+ + + {{folder.name}}
+
+
diff --git a/src/app/shared/views/sharedFoldersMe.html b/src/app/shared/views/sharedFoldersMe.html new file mode 100644 index 0000000000..06410575ba --- /dev/null +++ b/src/app/shared/views/sharedFoldersMe.html @@ -0,0 +1,47 @@ +
+

+ Sharing Center + folders +

+
+
+
+ +
+
+ Loading... +
+
+ No shared folders. +
+
+ + + + + + + + + + + + + +
Name
+ + + {{folder.name}}
+
+
+
+
diff --git a/src/app/shared/views/sharedLogins.html b/src/app/shared/views/sharedLogins.html index a7d6a5cb1b..9e7e579969 100644 --- a/src/app/shared/views/sharedLogins.html +++ b/src/app/shared/views/sharedLogins.html @@ -1,41 +1,49 @@ 

Sharing Center - logins I've shared + logins

-
-

Loading...

-
-
-

No shared logins.

-
-
- - - - - - - - - - - - - - - -
NameUsername
- - - {{login.name}}{{login.username}}
+
+ +
+
+ Loading... +
+
+ No shared logins. +
+
+ + + + + + + + + + + + + + + +
NameUsername
+ + + {{login.name}}{{login.username}}
+
+
diff --git a/src/app/shared/views/sharedLoginsMe.html b/src/app/shared/views/sharedLoginsMe.html new file mode 100644 index 0000000000..0f999ff221 --- /dev/null +++ b/src/app/shared/views/sharedLoginsMe.html @@ -0,0 +1,49 @@ +
+

+ Sharing Center + logins +

+
+
+
+ +
+
+ Loading... +
+
+ No shared logins. +
+
+ + + + + + + + + + + + + + + +
NameUsername
+ + + {{login.name}}{{login.username}}
+
+
+
+
diff --git a/src/app/shared/views/sharedMe.html b/src/app/shared/views/sharedMe.html deleted file mode 100644 index f74925bade..0000000000 --- a/src/app/shared/views/sharedMe.html +++ /dev/null @@ -1,9 +0,0 @@ -
-

- Sharing Center - shared with me -

-
-
- TODO -
diff --git a/src/app/views/backendLayout.html b/src/app/views/backendLayout.html index 8a804f96a4..b1be93360c 100644 --- a/src/app/views/backendLayout.html +++ b/src/app/views/backendLayout.html @@ -57,7 +57,8 @@
  • + ng-class="{active: $state.includes('backend.sharedLogins') || $state.includes('backend.sharedLoginsMe') || + $state.includes('backend.sharedFolders') || $state.includes('backend.sharedFoldersMe')}"> Sharing Center
  • + - +