diff --git a/.gitignore b/.gitignore
index 7ddf7d4eb57..ce2d286c21d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
.DS_Store
node_modules
npm-debug.log
+vwd.webinfo
css/
dist/
webfonts/
@@ -10,6 +11,5 @@ webfonts/
*.pem
*.zip
build/
-build2/
build.safariextension/
coverage/
diff --git a/README.md b/README.md
index 2c1672e8b51..fb6bf7aba20 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ By default the extension is targeting the production API. If you are running the
```
npm install
-npm run dev:watch
+npm run build:watch
```
You can now load the extension into your browser through the browser's extension tools page:
diff --git a/gulpfile.js b/gulpfile.js
index c72a095899f..890d6efaeba 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,8 +17,7 @@ const paths = {
coverage: './coverage/',
npmDir: './node_modules/',
popupDir: './src/popup/',
- cssDir: './src/popup/css/',
- cssDir2: './src/css/'
+ cssDir: './src/css/'
};
const filters = {
@@ -180,9 +179,7 @@ function safariZip(buildPath) {
});
}
-gulp.task('build', ['lint', 'webfonts']);
-
-gulp.task('build2', ['webfonts2']);
+gulp.task('build', ['webfonts']);
gulp.task('webfonts', () => {
return gulp.src('./webfonts.list')
@@ -193,15 +190,6 @@ gulp.task('webfonts', () => {
.pipe(gulp.dest(paths.cssDir));
});
-gulp.task('webfonts2', () => {
- return gulp.src('./webfonts.list')
- .pipe(googleWebFonts({
- fontsDir: 'webfonts',
- cssFilename: 'webfonts.css'
- }))
- .pipe(gulp.dest(paths.cssDir2));
-});
-
gulp.task('ci', ['ci:coverage']);
gulp.task('ci:coverage', (cb) => {
@@ -219,16 +207,3 @@ function copy(source, dest) {
.on('end', resolve);
});
}
-
-// LEGACY CODE!
-
-gulp.task('lint', () => {
- return gulp.src([
- paths.popupDir + '**/*.js',
- './src/notification/**/*.js',
- './src/scripts/**/*.js'
- //'./src/content/**/*.js'
- ]).pipe(jshint({
- esversion: 6
- })).pipe(jshint.reporter('default'));
-});
diff --git a/package.json b/package.json
index bee25e90577..2f658f23838 100644
--- a/package.json
+++ b/package.json
@@ -7,15 +7,12 @@
"sub:pull": "git submodule foreach git pull",
"postinstall": "npm run sub:init",
"start:firefox": "web-ext run --source-dir ./dist/",
- "dev": "gulp build && webpack --config webpack.dev.js",
- "dev:watch": "gulp build && webpack --config webpack.dev.js --watch",
- "dev2": "gulp build2 && webpack --config webpack.config.js",
- "dev2:watch": "gulp build2 && webpack --config webpack.config.js --watch",
- "prod": "gulp build && webpack --config webpack.prod.js",
- "dist": "npm run prod && gulp dist",
- "dist:firefox": "npm run prod && gulp dist:firefox",
- "dist:opera": "npm run prod && gulp dist:opera",
- "dist:safari": "npm run prod && gulp dist:safari",
+ "build": "gulp build && webpack --config webpack.config.js",
+ "build:watch": "gulp build && webpack --config webpack.config.js --watch",
+ "dist": "npm run build && gulp dist",
+ "dist:firefox": "npm run build && gulp dist:firefox",
+ "dist:opera": "npm run build && gulp dist:opera",
+ "dist:safari": "npm run build && gulp dist:safari",
"lint": "tslint src/**/*.ts || true",
"lint:fix": "tslint src/**/*.ts --fix",
"test": "karma start --single-run",
diff --git a/src/popup/app/accounts/accountsHintController.js b/src/popup-old/app/accounts/accountsHintController.js
similarity index 100%
rename from src/popup/app/accounts/accountsHintController.js
rename to src/popup-old/app/accounts/accountsHintController.js
diff --git a/src/popup/app/accounts/accountsLoginController.js b/src/popup-old/app/accounts/accountsLoginController.js
similarity index 100%
rename from src/popup/app/accounts/accountsLoginController.js
rename to src/popup-old/app/accounts/accountsLoginController.js
diff --git a/src/popup/app/accounts/accountsLoginTwoFactorController.js b/src/popup-old/app/accounts/accountsLoginTwoFactorController.js
similarity index 100%
rename from src/popup/app/accounts/accountsLoginTwoFactorController.js
rename to src/popup-old/app/accounts/accountsLoginTwoFactorController.js
diff --git a/src/popup/app/accounts/accountsModule.js b/src/popup-old/app/accounts/accountsModule.js
similarity index 100%
rename from src/popup/app/accounts/accountsModule.js
rename to src/popup-old/app/accounts/accountsModule.js
diff --git a/src/popup/app/accounts/accountsRegisterController.js b/src/popup-old/app/accounts/accountsRegisterController.js
similarity index 100%
rename from src/popup/app/accounts/accountsRegisterController.js
rename to src/popup-old/app/accounts/accountsRegisterController.js
diff --git a/src/popup/app/accounts/accountsTwoFactorMethodsController.js b/src/popup-old/app/accounts/accountsTwoFactorMethodsController.js
similarity index 100%
rename from src/popup/app/accounts/accountsTwoFactorMethodsController.js
rename to src/popup-old/app/accounts/accountsTwoFactorMethodsController.js
diff --git a/src/popup/app/accounts/views/accountsHint.html b/src/popup-old/app/accounts/views/accountsHint.html
similarity index 100%
rename from src/popup/app/accounts/views/accountsHint.html
rename to src/popup-old/app/accounts/views/accountsHint.html
diff --git a/src/popup/app/accounts/views/accountsLogin.html b/src/popup-old/app/accounts/views/accountsLogin.html
similarity index 100%
rename from src/popup/app/accounts/views/accountsLogin.html
rename to src/popup-old/app/accounts/views/accountsLogin.html
diff --git a/src/popup/app/accounts/views/accountsLoginTwoFactor.html b/src/popup-old/app/accounts/views/accountsLoginTwoFactor.html
similarity index 100%
rename from src/popup/app/accounts/views/accountsLoginTwoFactor.html
rename to src/popup-old/app/accounts/views/accountsLoginTwoFactor.html
diff --git a/src/popup/app/accounts/views/accountsRegister.html b/src/popup-old/app/accounts/views/accountsRegister.html
similarity index 100%
rename from src/popup/app/accounts/views/accountsRegister.html
rename to src/popup-old/app/accounts/views/accountsRegister.html
diff --git a/src/popup/app/accounts/views/accountsTwoFactorMethods.html b/src/popup-old/app/accounts/views/accountsTwoFactorMethods.html
similarity index 100%
rename from src/popup/app/accounts/views/accountsTwoFactorMethods.html
rename to src/popup-old/app/accounts/views/accountsTwoFactorMethods.html
diff --git a/src/popup/app/app.d.ts b/src/popup-old/app/app.d.ts
similarity index 100%
rename from src/popup/app/app.d.ts
rename to src/popup-old/app/app.d.ts
diff --git a/src/popup/app/app.js b/src/popup-old/app/app.js
similarity index 100%
rename from src/popup/app/app.js
rename to src/popup-old/app/app.js
diff --git a/src/popup/app/components/action-buttons.component.html b/src/popup-old/app/components/action-buttons.component.html
similarity index 100%
rename from src/popup/app/components/action-buttons.component.html
rename to src/popup-old/app/components/action-buttons.component.html
diff --git a/src/popup/app/components/action-buttons.component.ts b/src/popup-old/app/components/action-buttons.component.ts
similarity index 100%
rename from src/popup/app/components/action-buttons.component.ts
rename to src/popup-old/app/components/action-buttons.component.ts
diff --git a/src/popup/app/components/cipher-items.component.html b/src/popup-old/app/components/cipher-items.component.html
similarity index 100%
rename from src/popup/app/components/cipher-items.component.html
rename to src/popup-old/app/components/cipher-items.component.html
diff --git a/src/popup/app/components/cipher-items.component.ts b/src/popup-old/app/components/cipher-items.component.ts
similarity index 100%
rename from src/popup/app/components/cipher-items.component.ts
rename to src/popup-old/app/components/cipher-items.component.ts
diff --git a/src/popup/app/components/components.module.ts b/src/popup-old/app/components/components.module.ts
similarity index 100%
rename from src/popup/app/components/components.module.ts
rename to src/popup-old/app/components/components.module.ts
diff --git a/src/popup/app/components/icon.component.html b/src/popup-old/app/components/icon.component.html
similarity index 100%
rename from src/popup/app/components/icon.component.html
rename to src/popup-old/app/components/icon.component.html
diff --git a/src/popup/app/components/icon.component.ts b/src/popup-old/app/components/icon.component.ts
similarity index 100%
rename from src/popup/app/components/icon.component.ts
rename to src/popup-old/app/components/icon.component.ts
diff --git a/src/popup/app/components/pop-out.component.html b/src/popup-old/app/components/pop-out.component.html
similarity index 100%
rename from src/popup/app/components/pop-out.component.html
rename to src/popup-old/app/components/pop-out.component.html
diff --git a/src/popup/app/components/pop-out.component.ts b/src/popup-old/app/components/pop-out.component.ts
similarity index 100%
rename from src/popup/app/components/pop-out.component.ts
rename to src/popup-old/app/components/pop-out.component.ts
diff --git a/src/popup/app/config.js b/src/popup-old/app/config.js
similarity index 100%
rename from src/popup/app/config.js
rename to src/popup-old/app/config.js
diff --git a/src/popup/app/current/current.component.html b/src/popup-old/app/current/current.component.html
similarity index 100%
rename from src/popup/app/current/current.component.html
rename to src/popup-old/app/current/current.component.html
diff --git a/src/popup/app/current/current.component.ts b/src/popup-old/app/current/current.component.ts
similarity index 100%
rename from src/popup/app/current/current.component.ts
rename to src/popup-old/app/current/current.component.ts
diff --git a/src/popup/app/current/current.module.ts b/src/popup-old/app/current/current.module.ts
similarity index 100%
rename from src/popup/app/current/current.module.ts
rename to src/popup-old/app/current/current.module.ts
diff --git a/src/popup/app/directives/bit-form.directive.ts b/src/popup-old/app/directives/bit-form.directive.ts
similarity index 100%
rename from src/popup/app/directives/bit-form.directive.ts
rename to src/popup-old/app/directives/bit-form.directive.ts
diff --git a/src/popup/app/directives/directives.module.ts b/src/popup-old/app/directives/directives.module.ts
similarity index 100%
rename from src/popup/app/directives/directives.module.ts
rename to src/popup-old/app/directives/directives.module.ts
diff --git a/src/popup/app/directives/fallback-src.directive.ts b/src/popup-old/app/directives/fallback-src.directive.ts
similarity index 100%
rename from src/popup/app/directives/fallback-src.directive.ts
rename to src/popup-old/app/directives/fallback-src.directive.ts
diff --git a/src/popup/app/directives/stop-click.directive.ts b/src/popup-old/app/directives/stop-click.directive.ts
similarity index 100%
rename from src/popup/app/directives/stop-click.directive.ts
rename to src/popup-old/app/directives/stop-click.directive.ts
diff --git a/src/popup/app/directives/stop-prop.directive.ts b/src/popup-old/app/directives/stop-prop.directive.ts
similarity index 100%
rename from src/popup/app/directives/stop-prop.directive.ts
rename to src/popup-old/app/directives/stop-prop.directive.ts
diff --git a/src/popup/app/global/base.controller.ts b/src/popup-old/app/global/base.controller.ts
similarity index 100%
rename from src/popup/app/global/base.controller.ts
rename to src/popup-old/app/global/base.controller.ts
diff --git a/src/popup/app/global/empty.html b/src/popup-old/app/global/empty.html
similarity index 100%
rename from src/popup/app/global/empty.html
rename to src/popup-old/app/global/empty.html
diff --git a/src/popup/app/global/global.module.ts b/src/popup-old/app/global/global.module.ts
similarity index 100%
rename from src/popup/app/global/global.module.ts
rename to src/popup-old/app/global/global.module.ts
diff --git a/src/popup/app/global/home.html b/src/popup-old/app/global/home.html
similarity index 100%
rename from src/popup/app/global/home.html
rename to src/popup-old/app/global/home.html
diff --git a/src/popup/app/global/main.controller.ts b/src/popup-old/app/global/main.controller.ts
similarity index 100%
rename from src/popup/app/global/main.controller.ts
rename to src/popup-old/app/global/main.controller.ts
diff --git a/src/popup/app/global/private-mode.controller.ts b/src/popup-old/app/global/private-mode.controller.ts
similarity index 100%
rename from src/popup/app/global/private-mode.controller.ts
rename to src/popup-old/app/global/private-mode.controller.ts
diff --git a/src/popup/app/global/private-mode.html b/src/popup-old/app/global/private-mode.html
similarity index 100%
rename from src/popup/app/global/private-mode.html
rename to src/popup-old/app/global/private-mode.html
diff --git a/src/popup/app/global/splash.html b/src/popup-old/app/global/splash.html
similarity index 100%
rename from src/popup/app/global/splash.html
rename to src/popup-old/app/global/splash.html
diff --git a/src/popup/app/global/tabs.controller.ts b/src/popup-old/app/global/tabs.controller.ts
similarity index 100%
rename from src/popup/app/global/tabs.controller.ts
rename to src/popup-old/app/global/tabs.controller.ts
diff --git a/src/popup/app/global/tabs.html b/src/popup-old/app/global/tabs.html
similarity index 100%
rename from src/popup/app/global/tabs.html
rename to src/popup-old/app/global/tabs.html
diff --git a/src/popup/app/lock/lock.component.html b/src/popup-old/app/lock/lock.component.html
similarity index 100%
rename from src/popup/app/lock/lock.component.html
rename to src/popup-old/app/lock/lock.component.html
diff --git a/src/popup/app/lock/lock.component.ts b/src/popup-old/app/lock/lock.component.ts
similarity index 100%
rename from src/popup/app/lock/lock.component.ts
rename to src/popup-old/app/lock/lock.component.ts
diff --git a/src/popup/app/lock/lock.module.ts b/src/popup-old/app/lock/lock.module.ts
similarity index 100%
rename from src/popup/app/lock/lock.module.ts
rename to src/popup-old/app/lock/lock.module.ts
diff --git a/src/popup/app/services/background.service.ts b/src/popup-old/app/services/background.service.ts
similarity index 100%
rename from src/popup/app/services/background.service.ts
rename to src/popup-old/app/services/background.service.ts
diff --git a/src/popup/app/services/popupUtils.service.ts b/src/popup-old/app/services/popupUtils.service.ts
similarity index 100%
rename from src/popup/app/services/popupUtils.service.ts
rename to src/popup-old/app/services/popupUtils.service.ts
diff --git a/src/popup/app/services/services.module.ts b/src/popup-old/app/services/services.module.ts
similarity index 100%
rename from src/popup/app/services/services.module.ts
rename to src/popup-old/app/services/services.module.ts
diff --git a/src/popup/app/services/state.service.ts b/src/popup-old/app/services/state.service.ts
similarity index 100%
rename from src/popup/app/services/state.service.ts
rename to src/popup-old/app/services/state.service.ts
diff --git a/src/popup/app/services/validation.service.ts b/src/popup-old/app/services/validation.service.ts
similarity index 100%
rename from src/popup/app/services/validation.service.ts
rename to src/popup-old/app/services/validation.service.ts
diff --git a/src/popup/app/settings/about.component.html b/src/popup-old/app/settings/about.component.html
similarity index 100%
rename from src/popup/app/settings/about.component.html
rename to src/popup-old/app/settings/about.component.html
diff --git a/src/popup/app/settings/about.component.ts b/src/popup-old/app/settings/about.component.ts
similarity index 100%
rename from src/popup/app/settings/about.component.ts
rename to src/popup-old/app/settings/about.component.ts
diff --git a/src/popup/app/settings/credits.component.html b/src/popup-old/app/settings/credits.component.html
similarity index 100%
rename from src/popup/app/settings/credits.component.html
rename to src/popup-old/app/settings/credits.component.html
diff --git a/src/popup/app/settings/credits.component.ts b/src/popup-old/app/settings/credits.component.ts
similarity index 100%
rename from src/popup/app/settings/credits.component.ts
rename to src/popup-old/app/settings/credits.component.ts
diff --git a/src/popup/app/settings/environment.component.html b/src/popup-old/app/settings/environment.component.html
similarity index 100%
rename from src/popup/app/settings/environment.component.html
rename to src/popup-old/app/settings/environment.component.html
diff --git a/src/popup/app/settings/environment.component.ts b/src/popup-old/app/settings/environment.component.ts
similarity index 100%
rename from src/popup/app/settings/environment.component.ts
rename to src/popup-old/app/settings/environment.component.ts
diff --git a/src/popup/app/settings/folders/add-folder.component.html b/src/popup-old/app/settings/folders/add-folder.component.html
similarity index 100%
rename from src/popup/app/settings/folders/add-folder.component.html
rename to src/popup-old/app/settings/folders/add-folder.component.html
diff --git a/src/popup/app/settings/folders/add-folder.component.ts b/src/popup-old/app/settings/folders/add-folder.component.ts
similarity index 100%
rename from src/popup/app/settings/folders/add-folder.component.ts
rename to src/popup-old/app/settings/folders/add-folder.component.ts
diff --git a/src/popup/app/settings/folders/edit-folder.component.html b/src/popup-old/app/settings/folders/edit-folder.component.html
similarity index 100%
rename from src/popup/app/settings/folders/edit-folder.component.html
rename to src/popup-old/app/settings/folders/edit-folder.component.html
diff --git a/src/popup/app/settings/folders/edit-folder.component.ts b/src/popup-old/app/settings/folders/edit-folder.component.ts
similarity index 100%
rename from src/popup/app/settings/folders/edit-folder.component.ts
rename to src/popup-old/app/settings/folders/edit-folder.component.ts
diff --git a/src/popup/app/settings/folders/folders.component.html b/src/popup-old/app/settings/folders/folders.component.html
similarity index 100%
rename from src/popup/app/settings/folders/folders.component.html
rename to src/popup-old/app/settings/folders/folders.component.html
diff --git a/src/popup/app/settings/folders/folders.component.ts b/src/popup-old/app/settings/folders/folders.component.ts
similarity index 100%
rename from src/popup/app/settings/folders/folders.component.ts
rename to src/popup-old/app/settings/folders/folders.component.ts
diff --git a/src/popup/app/settings/help.component.html b/src/popup-old/app/settings/help.component.html
similarity index 100%
rename from src/popup/app/settings/help.component.html
rename to src/popup-old/app/settings/help.component.html
diff --git a/src/popup/app/settings/help.component.ts b/src/popup-old/app/settings/help.component.ts
similarity index 100%
rename from src/popup/app/settings/help.component.ts
rename to src/popup-old/app/settings/help.component.ts
diff --git a/src/popup/app/settings/options.component.html b/src/popup-old/app/settings/options.component.html
similarity index 100%
rename from src/popup/app/settings/options.component.html
rename to src/popup-old/app/settings/options.component.html
diff --git a/src/popup/app/settings/options.component.ts b/src/popup-old/app/settings/options.component.ts
similarity index 100%
rename from src/popup/app/settings/options.component.ts
rename to src/popup-old/app/settings/options.component.ts
diff --git a/src/popup/app/settings/premium.component.html b/src/popup-old/app/settings/premium.component.html
similarity index 100%
rename from src/popup/app/settings/premium.component.html
rename to src/popup-old/app/settings/premium.component.html
diff --git a/src/popup/app/settings/premium.component.ts b/src/popup-old/app/settings/premium.component.ts
similarity index 100%
rename from src/popup/app/settings/premium.component.ts
rename to src/popup-old/app/settings/premium.component.ts
diff --git a/src/popup/app/settings/settings.component.html b/src/popup-old/app/settings/settings.component.html
similarity index 100%
rename from src/popup/app/settings/settings.component.html
rename to src/popup-old/app/settings/settings.component.html
diff --git a/src/popup/app/settings/settings.component.ts b/src/popup-old/app/settings/settings.component.ts
similarity index 100%
rename from src/popup/app/settings/settings.component.ts
rename to src/popup-old/app/settings/settings.component.ts
diff --git a/src/popup/app/settings/settings.module.ts b/src/popup-old/app/settings/settings.module.ts
similarity index 100%
rename from src/popup/app/settings/settings.module.ts
rename to src/popup-old/app/settings/settings.module.ts
diff --git a/src/popup/app/settings/sync.component.html b/src/popup-old/app/settings/sync.component.html
similarity index 100%
rename from src/popup/app/settings/sync.component.html
rename to src/popup-old/app/settings/sync.component.html
diff --git a/src/popup/app/settings/sync.component.ts b/src/popup-old/app/settings/sync.component.ts
similarity index 100%
rename from src/popup/app/settings/sync.component.ts
rename to src/popup-old/app/settings/sync.component.ts
diff --git a/src/popup/app/tools/export.component.html b/src/popup-old/app/tools/export.component.html
similarity index 100%
rename from src/popup/app/tools/export.component.html
rename to src/popup-old/app/tools/export.component.html
diff --git a/src/popup/app/tools/export.component.ts b/src/popup-old/app/tools/export.component.ts
similarity index 100%
rename from src/popup/app/tools/export.component.ts
rename to src/popup-old/app/tools/export.component.ts
diff --git a/src/popup/app/tools/password-generator-history.component.html b/src/popup-old/app/tools/password-generator-history.component.html
similarity index 100%
rename from src/popup/app/tools/password-generator-history.component.html
rename to src/popup-old/app/tools/password-generator-history.component.html
diff --git a/src/popup/app/tools/password-generator-history.component.ts b/src/popup-old/app/tools/password-generator-history.component.ts
similarity index 100%
rename from src/popup/app/tools/password-generator-history.component.ts
rename to src/popup-old/app/tools/password-generator-history.component.ts
diff --git a/src/popup/app/tools/password-generator.component.html b/src/popup-old/app/tools/password-generator.component.html
similarity index 100%
rename from src/popup/app/tools/password-generator.component.html
rename to src/popup-old/app/tools/password-generator.component.html
diff --git a/src/popup/app/tools/password-generator.component.ts b/src/popup-old/app/tools/password-generator.component.ts
similarity index 100%
rename from src/popup/app/tools/password-generator.component.ts
rename to src/popup-old/app/tools/password-generator.component.ts
diff --git a/src/popup/app/tools/tools.component.html b/src/popup-old/app/tools/tools.component.html
similarity index 100%
rename from src/popup/app/tools/tools.component.html
rename to src/popup-old/app/tools/tools.component.html
diff --git a/src/popup/app/tools/tools.component.ts b/src/popup-old/app/tools/tools.component.ts
similarity index 100%
rename from src/popup/app/tools/tools.component.ts
rename to src/popup-old/app/tools/tools.component.ts
diff --git a/src/popup/app/tools/tools.module.ts b/src/popup-old/app/tools/tools.module.ts
similarity index 100%
rename from src/popup/app/tools/tools.module.ts
rename to src/popup-old/app/tools/tools.module.ts
diff --git a/src/popup/app/vault/vaultAddCipherController.js b/src/popup-old/app/vault/vaultAddCipherController.js
similarity index 100%
rename from src/popup/app/vault/vaultAddCipherController.js
rename to src/popup-old/app/vault/vaultAddCipherController.js
diff --git a/src/popup/app/vault/vaultAttachmentsController.js b/src/popup-old/app/vault/vaultAttachmentsController.js
similarity index 100%
rename from src/popup/app/vault/vaultAttachmentsController.js
rename to src/popup-old/app/vault/vaultAttachmentsController.js
diff --git a/src/popup/app/vault/vaultController.js b/src/popup-old/app/vault/vaultController.js
similarity index 100%
rename from src/popup/app/vault/vaultController.js
rename to src/popup-old/app/vault/vaultController.js
diff --git a/src/popup/app/vault/vaultEditCipherController.js b/src/popup-old/app/vault/vaultEditCipherController.js
similarity index 100%
rename from src/popup/app/vault/vaultEditCipherController.js
rename to src/popup-old/app/vault/vaultEditCipherController.js
diff --git a/src/popup/app/vault/vaultModule.js b/src/popup-old/app/vault/vaultModule.js
similarity index 100%
rename from src/popup/app/vault/vaultModule.js
rename to src/popup-old/app/vault/vaultModule.js
diff --git a/src/popup/app/vault/vaultViewCipherController.js b/src/popup-old/app/vault/vaultViewCipherController.js
similarity index 100%
rename from src/popup/app/vault/vaultViewCipherController.js
rename to src/popup-old/app/vault/vaultViewCipherController.js
diff --git a/src/popup/app/vault/vaultViewGroupingController.js b/src/popup-old/app/vault/vaultViewGroupingController.js
similarity index 100%
rename from src/popup/app/vault/vaultViewGroupingController.js
rename to src/popup-old/app/vault/vaultViewGroupingController.js
diff --git a/src/popup/app/vault/views/vault.html b/src/popup-old/app/vault/views/vault.html
similarity index 100%
rename from src/popup/app/vault/views/vault.html
rename to src/popup-old/app/vault/views/vault.html
diff --git a/src/popup/app/vault/views/vaultAddCipher.html b/src/popup-old/app/vault/views/vaultAddCipher.html
similarity index 100%
rename from src/popup/app/vault/views/vaultAddCipher.html
rename to src/popup-old/app/vault/views/vaultAddCipher.html
diff --git a/src/popup/app/vault/views/vaultAttachments.html b/src/popup-old/app/vault/views/vaultAttachments.html
similarity index 100%
rename from src/popup/app/vault/views/vaultAttachments.html
rename to src/popup-old/app/vault/views/vaultAttachments.html
diff --git a/src/popup/app/vault/views/vaultEditCipher.html b/src/popup-old/app/vault/views/vaultEditCipher.html
similarity index 100%
rename from src/popup/app/vault/views/vaultEditCipher.html
rename to src/popup-old/app/vault/views/vaultEditCipher.html
diff --git a/src/popup/app/vault/views/vaultViewCipher.html b/src/popup-old/app/vault/views/vaultViewCipher.html
similarity index 100%
rename from src/popup/app/vault/views/vaultViewCipher.html
rename to src/popup-old/app/vault/views/vaultViewCipher.html
diff --git a/src/popup/app/vault/views/vaultViewGrouping.html b/src/popup-old/app/vault/views/vaultViewGrouping.html
similarity index 100%
rename from src/popup/app/vault/views/vaultViewGrouping.html
rename to src/popup-old/app/vault/views/vaultViewGrouping.html
diff --git a/src/popup2/images/loading.svg b/src/popup-old/images/loading.svg
similarity index 100%
rename from src/popup2/images/loading.svg
rename to src/popup-old/images/loading.svg
diff --git a/src/popup2/images/logo.png b/src/popup-old/images/logo.png
similarity index 100%
rename from src/popup2/images/logo.png
rename to src/popup-old/images/logo.png
diff --git a/src/popup2/images/logo@2x.png b/src/popup-old/images/logo@2x.png
similarity index 100%
rename from src/popup2/images/logo@2x.png
rename to src/popup-old/images/logo@2x.png
diff --git a/src/popup2/images/logo@3x.png b/src/popup-old/images/logo@3x.png
similarity index 100%
rename from src/popup2/images/logo@3x.png
rename to src/popup-old/images/logo@3x.png
diff --git a/src/popup2/images/u2fkey.jpg b/src/popup-old/images/u2fkey.jpg
similarity index 100%
rename from src/popup2/images/u2fkey.jpg
rename to src/popup-old/images/u2fkey.jpg
diff --git a/src/popup2/images/yubikey.jpg b/src/popup-old/images/yubikey.jpg
similarity index 100%
rename from src/popup2/images/yubikey.jpg
rename to src/popup-old/images/yubikey.jpg
diff --git a/src/popup-old/index.html b/src/popup-old/index.html
new file mode 100644
index 00000000000..27d50b53dfe
--- /dev/null
+++ b/src/popup-old/index.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+ Bitwarden
+
+
+
+
+
diff --git a/src/popup/less/animations.less b/src/popup-old/less/animations.less
similarity index 100%
rename from src/popup/less/animations.less
rename to src/popup-old/less/animations.less
diff --git a/src/popup/less/components.less b/src/popup-old/less/components.less
similarity index 100%
rename from src/popup/less/components.less
rename to src/popup-old/less/components.less
diff --git a/src/popup/less/libs.less b/src/popup-old/less/libs.less
similarity index 100%
rename from src/popup/less/libs.less
rename to src/popup-old/less/libs.less
diff --git a/src/popup/less/mixins.less b/src/popup-old/less/mixins.less
similarity index 100%
rename from src/popup/less/mixins.less
rename to src/popup-old/less/mixins.less
diff --git a/src/popup/less/pages.less b/src/popup-old/less/pages.less
similarity index 100%
rename from src/popup/less/pages.less
rename to src/popup-old/less/pages.less
diff --git a/src/popup/less/plugins.less b/src/popup-old/less/plugins.less
similarity index 100%
rename from src/popup/less/plugins.less
rename to src/popup-old/less/plugins.less
diff --git a/src/popup/less/popup.less b/src/popup-old/less/popup.less
similarity index 100%
rename from src/popup/less/popup.less
rename to src/popup-old/less/popup.less
diff --git a/src/popup/less/variables.less b/src/popup-old/less/variables.less
similarity index 100%
rename from src/popup/less/variables.less
rename to src/popup-old/less/variables.less
diff --git a/src/popup2/accounts/environment.component.html b/src/popup/accounts/environment.component.html
similarity index 100%
rename from src/popup2/accounts/environment.component.html
rename to src/popup/accounts/environment.component.html
diff --git a/src/popup2/accounts/environment.component.ts b/src/popup/accounts/environment.component.ts
similarity index 100%
rename from src/popup2/accounts/environment.component.ts
rename to src/popup/accounts/environment.component.ts
diff --git a/src/popup2/accounts/hint.component.html b/src/popup/accounts/hint.component.html
similarity index 100%
rename from src/popup2/accounts/hint.component.html
rename to src/popup/accounts/hint.component.html
diff --git a/src/popup2/accounts/hint.component.ts b/src/popup/accounts/hint.component.ts
similarity index 100%
rename from src/popup2/accounts/hint.component.ts
rename to src/popup/accounts/hint.component.ts
diff --git a/src/popup2/accounts/home.component.html b/src/popup/accounts/home.component.html
similarity index 100%
rename from src/popup2/accounts/home.component.html
rename to src/popup/accounts/home.component.html
diff --git a/src/popup2/accounts/home.component.ts b/src/popup/accounts/home.component.ts
similarity index 100%
rename from src/popup2/accounts/home.component.ts
rename to src/popup/accounts/home.component.ts
diff --git a/src/popup2/accounts/lock.component.html b/src/popup/accounts/lock.component.html
similarity index 100%
rename from src/popup2/accounts/lock.component.html
rename to src/popup/accounts/lock.component.html
diff --git a/src/popup2/accounts/lock.component.ts b/src/popup/accounts/lock.component.ts
similarity index 100%
rename from src/popup2/accounts/lock.component.ts
rename to src/popup/accounts/lock.component.ts
diff --git a/src/popup2/accounts/login.component.html b/src/popup/accounts/login.component.html
similarity index 100%
rename from src/popup2/accounts/login.component.html
rename to src/popup/accounts/login.component.html
diff --git a/src/popup2/accounts/login.component.ts b/src/popup/accounts/login.component.ts
similarity index 100%
rename from src/popup2/accounts/login.component.ts
rename to src/popup/accounts/login.component.ts
diff --git a/src/popup2/accounts/register.component.html b/src/popup/accounts/register.component.html
similarity index 100%
rename from src/popup2/accounts/register.component.html
rename to src/popup/accounts/register.component.html
diff --git a/src/popup2/accounts/register.component.ts b/src/popup/accounts/register.component.ts
similarity index 100%
rename from src/popup2/accounts/register.component.ts
rename to src/popup/accounts/register.component.ts
diff --git a/src/popup2/accounts/two-factor-options.component.html b/src/popup/accounts/two-factor-options.component.html
similarity index 100%
rename from src/popup2/accounts/two-factor-options.component.html
rename to src/popup/accounts/two-factor-options.component.html
diff --git a/src/popup2/accounts/two-factor-options.component.ts b/src/popup/accounts/two-factor-options.component.ts
similarity index 100%
rename from src/popup2/accounts/two-factor-options.component.ts
rename to src/popup/accounts/two-factor-options.component.ts
diff --git a/src/popup2/accounts/two-factor.component.html b/src/popup/accounts/two-factor.component.html
similarity index 100%
rename from src/popup2/accounts/two-factor.component.html
rename to src/popup/accounts/two-factor.component.html
diff --git a/src/popup2/accounts/two-factor.component.ts b/src/popup/accounts/two-factor.component.ts
similarity index 100%
rename from src/popup2/accounts/two-factor.component.ts
rename to src/popup/accounts/two-factor.component.ts
diff --git a/src/popup2/app-routing.animations.ts b/src/popup/app-routing.animations.ts
similarity index 100%
rename from src/popup2/app-routing.animations.ts
rename to src/popup/app-routing.animations.ts
diff --git a/src/popup2/app-routing.module.ts b/src/popup/app-routing.module.ts
similarity index 100%
rename from src/popup2/app-routing.module.ts
rename to src/popup/app-routing.module.ts
diff --git a/src/popup2/app.component.ts b/src/popup/app.component.ts
similarity index 100%
rename from src/popup2/app.component.ts
rename to src/popup/app.component.ts
diff --git a/src/popup2/app.module.ts b/src/popup/app.module.ts
similarity index 100%
rename from src/popup2/app.module.ts
rename to src/popup/app.module.ts
diff --git a/src/popup2/components/action-buttons.component.html b/src/popup/components/action-buttons.component.html
similarity index 100%
rename from src/popup2/components/action-buttons.component.html
rename to src/popup/components/action-buttons.component.html
diff --git a/src/popup2/components/action-buttons.component.ts b/src/popup/components/action-buttons.component.ts
similarity index 100%
rename from src/popup2/components/action-buttons.component.ts
rename to src/popup/components/action-buttons.component.ts
diff --git a/src/popup2/components/ciphers-list.component.html b/src/popup/components/ciphers-list.component.html
similarity index 100%
rename from src/popup2/components/ciphers-list.component.html
rename to src/popup/components/ciphers-list.component.html
diff --git a/src/popup2/components/ciphers-list.component.ts b/src/popup/components/ciphers-list.component.ts
similarity index 100%
rename from src/popup2/components/ciphers-list.component.ts
rename to src/popup/components/ciphers-list.component.ts
diff --git a/src/popup2/components/pop-out.component.html b/src/popup/components/pop-out.component.html
similarity index 100%
rename from src/popup2/components/pop-out.component.html
rename to src/popup/components/pop-out.component.html
diff --git a/src/popup2/components/pop-out.component.ts b/src/popup/components/pop-out.component.ts
similarity index 100%
rename from src/popup2/components/pop-out.component.ts
rename to src/popup/components/pop-out.component.ts
diff --git a/src/popup/index.html b/src/popup/index.html
index 27d50b53dfe..ab5f5d55a48 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -1,11 +1,14 @@
-
+
-
-
+
+
Bitwarden
+
-
-
+
+
+
+
diff --git a/src/popup2/main.ts b/src/popup/main.ts
similarity index 100%
rename from src/popup2/main.ts
rename to src/popup/main.ts
diff --git a/src/popup2/services/launch-guard.service.ts b/src/popup/services/launch-guard.service.ts
similarity index 100%
rename from src/popup2/services/launch-guard.service.ts
rename to src/popup/services/launch-guard.service.ts
diff --git a/src/popup2/services/popup-utils.service.ts b/src/popup/services/popup-utils.service.ts
similarity index 100%
rename from src/popup2/services/popup-utils.service.ts
rename to src/popup/services/popup-utils.service.ts
diff --git a/src/popup2/services/services.module.ts b/src/popup/services/services.module.ts
similarity index 100%
rename from src/popup2/services/services.module.ts
rename to src/popup/services/services.module.ts
diff --git a/src/popup2/settings/settings.component.html b/src/popup/settings/settings.component.html
similarity index 100%
rename from src/popup2/settings/settings.component.html
rename to src/popup/settings/settings.component.html
diff --git a/src/popup2/settings/settings.component.ts b/src/popup/settings/settings.component.ts
similarity index 100%
rename from src/popup2/settings/settings.component.ts
rename to src/popup/settings/settings.component.ts
diff --git a/src/popup2/tabs.component.html b/src/popup/tabs.component.html
similarity index 100%
rename from src/popup2/tabs.component.html
rename to src/popup/tabs.component.html
diff --git a/src/popup2/tabs.component.ts b/src/popup/tabs.component.ts
similarity index 100%
rename from src/popup2/tabs.component.ts
rename to src/popup/tabs.component.ts
diff --git a/src/popup2/tools/export.component.html b/src/popup/tools/export.component.html
similarity index 100%
rename from src/popup2/tools/export.component.html
rename to src/popup/tools/export.component.html
diff --git a/src/popup2/tools/export.component.ts b/src/popup/tools/export.component.ts
similarity index 100%
rename from src/popup2/tools/export.component.ts
rename to src/popup/tools/export.component.ts
diff --git a/src/popup2/tools/password-generator-history.component.html b/src/popup/tools/password-generator-history.component.html
similarity index 100%
rename from src/popup2/tools/password-generator-history.component.html
rename to src/popup/tools/password-generator-history.component.html
diff --git a/src/popup2/tools/password-generator-history.component.ts b/src/popup/tools/password-generator-history.component.ts
similarity index 100%
rename from src/popup2/tools/password-generator-history.component.ts
rename to src/popup/tools/password-generator-history.component.ts
diff --git a/src/popup2/tools/password-generator.component.html b/src/popup/tools/password-generator.component.html
similarity index 100%
rename from src/popup2/tools/password-generator.component.html
rename to src/popup/tools/password-generator.component.html
diff --git a/src/popup2/tools/password-generator.component.ts b/src/popup/tools/password-generator.component.ts
similarity index 100%
rename from src/popup2/tools/password-generator.component.ts
rename to src/popup/tools/password-generator.component.ts
diff --git a/src/popup2/tools/tools.component.html b/src/popup/tools/tools.component.html
similarity index 100%
rename from src/popup2/tools/tools.component.html
rename to src/popup/tools/tools.component.html
diff --git a/src/popup2/tools/tools.component.ts b/src/popup/tools/tools.component.ts
similarity index 100%
rename from src/popup2/tools/tools.component.ts
rename to src/popup/tools/tools.component.ts
diff --git a/src/popup2/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
similarity index 100%
rename from src/popup2/vault/add-edit.component.html
rename to src/popup/vault/add-edit.component.html
diff --git a/src/popup2/vault/add-edit.component.ts b/src/popup/vault/add-edit.component.ts
similarity index 100%
rename from src/popup2/vault/add-edit.component.ts
rename to src/popup/vault/add-edit.component.ts
diff --git a/src/popup2/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html
similarity index 100%
rename from src/popup2/vault/ciphers.component.html
rename to src/popup/vault/ciphers.component.html
diff --git a/src/popup2/vault/ciphers.component.ts b/src/popup/vault/ciphers.component.ts
similarity index 100%
rename from src/popup2/vault/ciphers.component.ts
rename to src/popup/vault/ciphers.component.ts
diff --git a/src/popup2/vault/current-tab.component.html b/src/popup/vault/current-tab.component.html
similarity index 100%
rename from src/popup2/vault/current-tab.component.html
rename to src/popup/vault/current-tab.component.html
diff --git a/src/popup2/vault/current-tab.component.ts b/src/popup/vault/current-tab.component.ts
similarity index 100%
rename from src/popup2/vault/current-tab.component.ts
rename to src/popup/vault/current-tab.component.ts
diff --git a/src/popup2/vault/groupings.component.html b/src/popup/vault/groupings.component.html
similarity index 100%
rename from src/popup2/vault/groupings.component.html
rename to src/popup/vault/groupings.component.html
diff --git a/src/popup2/vault/groupings.component.ts b/src/popup/vault/groupings.component.ts
similarity index 100%
rename from src/popup2/vault/groupings.component.ts
rename to src/popup/vault/groupings.component.ts
diff --git a/src/popup2/vault/view.component.html b/src/popup/vault/view.component.html
similarity index 100%
rename from src/popup2/vault/view.component.html
rename to src/popup/vault/view.component.html
diff --git a/src/popup2/vault/view.component.ts b/src/popup/vault/view.component.ts
similarity index 100%
rename from src/popup2/vault/view.component.ts
rename to src/popup/vault/view.component.ts
diff --git a/src/popup2/index.html b/src/popup2/index.html
deleted file mode 100644
index ab5f5d55a48..00000000000
--- a/src/popup2/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- Bitwarden
-
-
-
-
-
-
-
-
diff --git a/src/scss/misc.scss b/src/scss/misc.scss
index b6e2ffe4836..1afd46df733 100644
--- a/src/scss/misc.scss
+++ b/src/scss/misc.scss
@@ -76,7 +76,7 @@ small {
}
#duo-frame {
- background: url('../popup2/images/loading.svg') 0 0 no-repeat;
+ background: url('../popup/images/loading.svg') 0 0 no-repeat;
width: 100%;
height: 470px;
margin-bottom: -10px;
diff --git a/webpack.config.js b/webpack.config.js
index 2e2a42984e5..57306efccc9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -21,7 +21,7 @@ const extractCss = new ExtractTextPlugin({
const config = {
entry: {
- 'popup/main': './src/popup2/main.ts',
+ 'popup/main': './src/popup/main.ts',
'background': './src/background.ts',
'content/autofill': './src/content/autofill.js',
'content/autofiller': './src/content/autofiller.js',
@@ -40,7 +40,7 @@ const config = {
},
output: {
filename: '[name].js',
- path: path.resolve(__dirname, 'build2'),
+ path: path.resolve(__dirname, 'build'),
},
module: {
rules: [
@@ -99,11 +99,11 @@ const config = {
},
plugins: [
new CleanWebpackPlugin([
- path.resolve(__dirname, 'build2/*'),
+ path.resolve(__dirname, 'build/*'),
]),
new AngularCompilerPlugin({
tsConfigPath: 'tsconfig.json',
- entryModule: 'src/popup2/app.module#AppModule',
+ entryModule: 'src/popup/app.module#AppModule',
sourceMap: true,
}),
// ref: https://github.com/angular/angular/issues/20357
@@ -122,7 +122,7 @@ const config = {
minChunks: isVendorModule,
}),
new HtmlWebpackPlugin({
- template: './src/popup2/index.html',
+ template: './src/popup/index.html',
filename: 'popup/index.html',
chunks: ['popup/vendor', 'popup/main'],
}),