diff --git a/src/images/logo.png b/src/images/logo.png new file mode 100644 index 0000000000..33ced5b12e Binary files /dev/null and b/src/images/logo.png differ diff --git a/src/images/logo@2x.png b/src/images/logo@2x.png new file mode 100644 index 0000000000..2a0ba60b9b Binary files /dev/null and b/src/images/logo@2x.png differ diff --git a/src/images/logo@3x.png b/src/images/logo@3x.png new file mode 100644 index 0000000000..9047316769 Binary files /dev/null and b/src/images/logo@3x.png differ diff --git a/src/popup/app/config.js b/src/popup/app/config.js index 48bad0ceca..7bc93e63bd 100644 --- a/src/popup/app/config.js +++ b/src/popup/app/config.js @@ -105,6 +105,22 @@ controller: 'toolsPasswordGeneratorController', data: { authorize: true }, params: { animation: null, addState: null, editState: null } + }) + + .state('about', { + url: '/about', + templateUrl: 'app/settings/views/settingsAbout.html', + controller: 'settingsAboutController', + data: { authorize: true }, + params: { animation: null } + }) + + .state('help', { + url: '/help', + templateUrl: 'app/settings/views/settingsHelp.html', + controller: 'settingsHelpController', + data: { authorize: true }, + params: { animation: null } }); }) .run(function ($rootScope, userService, loginService, tokenService, $state) { diff --git a/src/popup/app/settings/settingsAboutController.js b/src/popup/app/settings/settingsAboutController.js new file mode 100644 index 0000000000..d368a330ef --- /dev/null +++ b/src/popup/app/settings/settingsAboutController.js @@ -0,0 +1,6 @@ +angular + .module('bit.settings') + + .controller('settingsAboutController', function ($scope) { + $scope.year = (new Date()).getFullYear(); + }); diff --git a/src/popup/app/settings/settingsHelpController.js b/src/popup/app/settings/settingsHelpController.js new file mode 100644 index 0000000000..e0021f78b9 --- /dev/null +++ b/src/popup/app/settings/settingsHelpController.js @@ -0,0 +1,16 @@ +angular + .module('bit.settings') + + .controller('settingsHelpController', function ($scope) { + $scope.email = function () { + chrome.tabs.create({ url: 'mailto:hello@bitwarden.com' }); + }; + + $scope.website = function () { + chrome.tabs.create({ url: 'https://vault.bitwarden.com' }); + }; + + $scope.bug = function () { + chrome.tabs.create({ url: 'https://github.com/bitwarden/browser' }); + }; + }); diff --git a/src/popup/app/settings/views/settings.html b/src/popup/app/settings/views/settings.html index 6feec6a6e9..5799c1e70e 100644 --- a/src/popup/app/settings/views/settings.html +++ b/src/popup/app/settings/views/settings.html @@ -45,11 +45,11 @@ Other
- + About - + Help & Feedback diff --git a/src/popup/app/settings/views/settingsAbout.html b/src/popup/app/settings/views/settingsAbout.html new file mode 100644 index 0000000000..9d0456f133 --- /dev/null +++ b/src/popup/app/settings/views/settingsAbout.html @@ -0,0 +1,13 @@ +
+
+ Settings +
+
About
+
+
+
+ bitwarden + Version 0.0.1
+ © 8bit Solutions LLC 2015-{{year}} +
+
diff --git a/src/popup/app/settings/views/settingsHelp.html b/src/popup/app/settings/views/settingsHelp.html new file mode 100644 index 0000000000..f3e3f58c11 --- /dev/null +++ b/src/popup/app/settings/views/settingsHelp.html @@ -0,0 +1,43 @@ +
+
+ Settings +
+
Help and Feedback
+
+
+
+
+
+ + Email Us + + +
+
+ Email us directly to get help or leave feedback. +
+
+
+
+ + Visit Our Website + + +
+
+ Visit our website to get help, news, email us, and/or learn more about how to use bitwarden. +
+
+
+
+ + File a Bug Report + + +
+
+ Open an issue at our GitHub repository. +
+
+
+
diff --git a/src/popup/index.html b/src/popup/index.html index d136435e50..fccbdd47bc 100644 --- a/src/popup/index.html +++ b/src/popup/index.html @@ -63,6 +63,8 @@ + + diff --git a/src/popup/less/components.less b/src/popup/less/components.less index eaab9ce581..753f8a1ff5 100644 --- a/src/popup/less/components.less +++ b/src/popup/less/components.less @@ -368,3 +368,14 @@ text-overflow: ellipsis; font-family: @font-family-monospace; } + +.about-page { + padding-top: 50px; + text-align: center; + + img { + margin: 0 auto 20px; + width: 220px; + display: block; + } +}