diff --git a/src/action_popup.html b/src/action_popup.html deleted file mode 100644 index 3d27b8ca20..0000000000 --- a/src/action_popup.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - diff --git a/src/browser_action/app/app.js b/src/browser_action/app/app.js new file mode 100644 index 0000000000..7e3fbbab72 --- /dev/null +++ b/src/browser_action/app/app.js @@ -0,0 +1,9 @@ +angular + .module('bit', [ + 'ionic', + + 'bit.current', + 'bit.vault', + 'bit.settings', + 'bit.tools' + ]); diff --git a/src/browser_action/app/config.js b/src/browser_action/app/config.js new file mode 100644 index 0000000000..05eecef30e --- /dev/null +++ b/src/browser_action/app/config.js @@ -0,0 +1,51 @@ +angular + .module('bit') + + .config(function ($stateProvider, $urlRouterProvider) { + + $stateProvider + .state('tabs', { + url: "/tab", + abstract: true, + templateUrl: "app/global/tabs.html" + }) + .state('tabs.current', { + url: "/current", + views: { + 'current-tab': { + templateUrl: "app/current/views/current.html", + controller: 'currentController' + } + } + }) + .state('tabs.vault', { + url: "/vault", + views: { + 'vault-tab': { + templateUrl: "app/vault/views/vault.html", + controller: 'vaultController' + } + } + }) + .state('tabs.settings', { + url: "/settings", + views: { + 'settings-tab': { + templateUrl: "app/settings/views/settings.html", + controller: 'settingsController' + } + } + }) + .state('tabs.tools', { + url: "/tools", + views: { + 'tools-tab': { + templateUrl: "app/tools/views/tools.html", + controller: 'toolsController' + } + } + }); + + + $urlRouterProvider.otherwise("/tab/current"); + }); diff --git a/src/browser_action/app/current/currentController.js b/src/browser_action/app/current/currentController.js new file mode 100644 index 0000000000..d20a187ed3 --- /dev/null +++ b/src/browser_action/app/current/currentController.js @@ -0,0 +1,6 @@ +angular + .module('bit.current') + + .controller('currentController', function ($scope) { + + }); diff --git a/src/browser_action/app/current/currentModule.js b/src/browser_action/app/current/currentModule.js new file mode 100644 index 0000000000..8adaee27b3 --- /dev/null +++ b/src/browser_action/app/current/currentModule.js @@ -0,0 +1,2 @@ +angular + .module('bit.current', []); diff --git a/src/browser_action/app/current/views/current.html b/src/browser_action/app/current/views/current.html new file mode 100644 index 0000000000..8ba133f0bf --- /dev/null +++ b/src/browser_action/app/current/views/current.html @@ -0,0 +1,7 @@ + + +

+ Some content for your current sites. +

+ + diff --git a/src/browser_action/app/global/tabs.html b/src/browser_action/app/global/tabs.html new file mode 100644 index 0000000000..1e7a34a846 --- /dev/null +++ b/src/browser_action/app/global/tabs.html @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/browser_action/app/settings/settingsController.js b/src/browser_action/app/settings/settingsController.js new file mode 100644 index 0000000000..ad0c63ebca --- /dev/null +++ b/src/browser_action/app/settings/settingsController.js @@ -0,0 +1,6 @@ +angular + .module('bit.settings') + + .controller('settingsController', function ($scope) { + + }); diff --git a/src/browser_action/app/settings/settingsModule.js b/src/browser_action/app/settings/settingsModule.js new file mode 100644 index 0000000000..efddc81eb8 --- /dev/null +++ b/src/browser_action/app/settings/settingsModule.js @@ -0,0 +1,2 @@ +angular + .module('bit.settings', []); diff --git a/src/browser_action/app/settings/views/settings.html b/src/browser_action/app/settings/views/settings.html new file mode 100644 index 0000000000..51f7e748f4 --- /dev/null +++ b/src/browser_action/app/settings/views/settings.html @@ -0,0 +1,7 @@ + + +

+ Some content for your settings. +

+ + diff --git a/src/browser_action/app/tools/toolsController.js b/src/browser_action/app/tools/toolsController.js new file mode 100644 index 0000000000..d49da82fbf --- /dev/null +++ b/src/browser_action/app/tools/toolsController.js @@ -0,0 +1,6 @@ +angular + .module('bit.tools') + + .controller('toolsController', function ($scope) { + + }); diff --git a/src/browser_action/app/tools/toolsModule.js b/src/browser_action/app/tools/toolsModule.js new file mode 100644 index 0000000000..510df97574 --- /dev/null +++ b/src/browser_action/app/tools/toolsModule.js @@ -0,0 +1,2 @@ +angular + .module('bit.tools', []); diff --git a/src/browser_action/app/tools/views/tools.html b/src/browser_action/app/tools/views/tools.html new file mode 100644 index 0000000000..3febfcd9a4 --- /dev/null +++ b/src/browser_action/app/tools/views/tools.html @@ -0,0 +1,7 @@ + + +

+ Some content for your tools. +

+ + diff --git a/src/browser_action/app/vault/vaultController.js b/src/browser_action/app/vault/vaultController.js new file mode 100644 index 0000000000..d48d058ae4 --- /dev/null +++ b/src/browser_action/app/vault/vaultController.js @@ -0,0 +1,6 @@ +angular + .module('bit.vault') + + .controller('vaultController', function ($scope) { + + }); diff --git a/src/browser_action/app/vault/vaultModule.js b/src/browser_action/app/vault/vaultModule.js new file mode 100644 index 0000000000..f223546912 --- /dev/null +++ b/src/browser_action/app/vault/vaultModule.js @@ -0,0 +1,2 @@ +angular + .module('bit.vault', []); diff --git a/src/browser_action/app/vault/views/vault.html b/src/browser_action/app/vault/views/vault.html new file mode 100644 index 0000000000..d703621fb2 --- /dev/null +++ b/src/browser_action/app/vault/views/vault.html @@ -0,0 +1,7 @@ + + +

+ Some content for your vault. +

+ + diff --git a/src/browser_action/index.html b/src/browser_action/index.html new file mode 100644 index 0000000000..e397905071 --- /dev/null +++ b/src/browser_action/index.html @@ -0,0 +1,40 @@ + + + + + + bitwarden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/manifest.json b/src/manifest.json index 29bd1fe089..c28db0f92d 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -20,6 +20,6 @@ "38": "images/icon38.png" }, "default_title": "bitwarden", - "default_popup": "action_popup.html" + "default_popup": "browser_action/index.html" } } \ No newline at end of file diff --git a/src/package.json b/src/package.json index 3822300e4e..afcd1a1851 100644 --- a/src/package.json +++ b/src/package.json @@ -2,6 +2,6 @@ "name": "bitwarden", "version": "0.0.1", "devDependencies": { - + "ionic-framework-v1": "1.3.1" } }