diff --git a/bitwarden-web.sln b/bitwarden-web.sln
index 4a374b90f1..2aa96464b1 100644
--- a/bitwarden-web.sln
+++ b/bitwarden-web.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
MinimumVisualStudioVersion = 10.0.40219.1
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "bitwarden-web", ".", "{25BEDEF4-2CAF-445A-807D-63C17FF85694}"
ProjectSection(WebsiteProperties) = preProject
diff --git a/src/app/app.js b/src/app/app.js
index 45492bc59b..6d11648157 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -15,7 +15,7 @@
'bit.global',
'bit.accounts',
'bit.vault',
- 'bit.shared',
+ 'bit.sharing',
'bit.settings',
'bit.tools',
'bit.organization'
diff --git a/src/app/config.js b/src/app/config.js
index b5cd095534..d208ed797a 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -104,17 +104,11 @@ angular
controller: 'toolsController',
data: { pageTitle: 'Tools' }
})
- .state('backend.user.shared', {
- url: '^/shared',
- templateUrl: 'app/shared/views/shared.html',
- controller: 'sharedController',
- data: { pageTitle: 'Shared' }
- })
- .state('backend.user.sharedMe', {
- url: '^/shared/me',
- templateUrl: 'app/shared/views/sharedMe.html',
- controller: 'sharedMeController',
- data: { pageTitle: 'Shared with Me' }
+ .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',
diff --git a/src/app/shared/sharedController.js b/src/app/shared/sharedController.js
deleted file mode 100644
index 7fd51f3370..0000000000
--- a/src/app/shared/sharedController.js
+++ /dev/null
@@ -1,6 +0,0 @@
-angular
- .module('bit.shared')
-
- .controller('sharedController', 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/sharedModule.js b/src/app/shared/sharedModule.js
deleted file mode 100644
index e9eeb1bbbf..0000000000
--- a/src/app/shared/sharedModule.js
+++ /dev/null
@@ -1,2 +0,0 @@
-angular
- .module('bit.shared', ['ui.bootstrap', 'ngclipboard']);
diff --git a/src/app/shared/views/shared.html b/src/app/shared/views/shared.html
deleted file mode 100644
index bdbfed4c06..0000000000
--- a/src/app/shared/views/shared.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
- Loading...
-
-
- No shared folders.
-
-
-
-
-
- |
- Name |
-
-
-
-
-
-
-
- |
- {{folder.name}} |
-
-
-
-
-
-
-
-
-
-
- Loading...
-
-
- No shared logins.
-
-
-
-
-
- |
- Name |
- Username |
-
-
-
-
-
-
-
- |
- {{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 ff827569aa..0000000000
--- a/src/app/shared/views/sharedMe.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
- Loading...
-
-
- No folders shared with me.
-
-
-
-
-
- |
- Name |
-
-
-
-
-
-
-
- |
- {{folder.name}} |
-
-
-
-
-
-
-
-
-
-
- Loading...
-
-
- No logins shared with me.
-
-
-
-
-
- |
- Name |
- Username |
-
-
-
-
-
-
-
- |
- {{login.name}} |
- {{login.username}} |
-
-
-
-
-
-
-
diff --git a/src/app/sharing/sharingController.js b/src/app/sharing/sharingController.js
new file mode 100644
index 0000000000..9bdc0d536a
--- /dev/null
+++ b/src/app/sharing/sharingController.js
@@ -0,0 +1,6 @@
+angular
+ .module('bit.sharing')
+
+ .controller('sharingController', function ($scope, apiService, cryptoService, cipherService, $analytics) {
+
+ });
diff --git a/src/app/sharing/sharingModule.js b/src/app/sharing/sharingModule.js
new file mode 100644
index 0000000000..7bf6be525f
--- /dev/null
+++ b/src/app/sharing/sharingModule.js
@@ -0,0 +1,2 @@
+angular
+ .module('bit.sharing', ['ui.bootstrap', 'ngclipboard']);
diff --git a/src/app/sharing/views/sharing.html b/src/app/sharing/views/sharing.html
new file mode 100644
index 0000000000..4b88f858e4
--- /dev/null
+++ b/src/app/sharing/views/sharing.html
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
No logins in this folder.
+
+
+
+
+
+
+ |
+ Name |
+ Username |
+
+
+
+
+
+
+
+ |
+
+
+ {{login.name}}
+
+
+ |
+
+ {{login.username}}
+ |
+
+
+
+
+
+
+
diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html
index 49ad5e6226..08024cd6e6 100644
--- a/src/app/views/userLayout.html
+++ b/src/app/views/userLayout.html
@@ -55,25 +55,8 @@
-
-
- beta
- Sharing Center
-
-
+
+ Sharing Center
Tools
diff --git a/src/index.html b/src/index.html
index f4b8c189bf..872cfa59a9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -116,9 +116,8 @@
-
-
-
+
+