fix click issue on 2fa provider selection

.gitignore

@@ -4,6 +4,7 @@ node_modules
 npm-debug.log
 vwd.webinfo
 dist/
+css/
 *.crx
 *.pem
 build/

gulpfile.js

@@ -0,0 +1,25 @@
+const gulp = require('gulp');
+const googleWebFonts = require('gulp-google-webfonts');
+const del = require('del');
+
+const paths = {
+    cssDir: './src/css/',
+};
+
+function clean() {
+    return del([paths.cssDir]);
+}
+
+function webfonts() {
+    return gulp.src('./webfonts.list')
+        .pipe(googleWebFonts({
+            fontsDir: 'webfonts',
+            cssFilename: 'webfonts.css',
+            format: 'woff',
+        }))
+        .pipe(gulp.dest(paths.cssDir));
+};
+
+gulp.task('clean', clean);
+gulp.task('webfonts', ['clean'], webfonts);
+gulp.task('prebuild:renderer', ['webfonts']);

package.json

@@ -26,8 +26,8 @@
     "lint:fix": "tslint src/**/*.ts --fix",
     "build": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\"",
     "build:main": "webpack --config webpack.main.js",
-    "build:renderer": "webpack --config webpack.renderer.js",
-    "build:renderer:watch": "webpack --config webpack.renderer.js --watch",
+    "build:renderer": "gulp prebuild:renderer && webpack --config webpack.renderer.js",
+    "build:renderer:watch": "gulp prebuild:renderer && webpack --config webpack.renderer.js --watch",
     "electron": "npm run build:main && concurrently -k -n Main,Rend -c yellow,cyan \"electron --inspect=5858 ./build --watch\" \"npm run build:renderer:watch\"",
     "clean:dist": "rimraf ./dist/*",
     "pack:lin": "npm run clean:dist && build --linux --x64 -p never",
@@ -115,12 +115,14 @@
     "@types/lunr": "2.1.5",
     "@types/node": "8.0.19",
     "@types/node-forge": "0.7.1",
+    "@types/papaparse": "4.1.31",
     "@types/semver": "5.5.0",
     "@types/webcrypto": "0.0.28",
     "clean-webpack-plugin": "^0.1.17",
     "concurrently": "3.5.1",
     "copy-webpack-plugin": "^4.2.0",
     "css-loader": "^0.28.7",
+    "del": "^3.0.0",
     "electron": "2.0.5",
     "electron-builder": "^20.25.0",
     "electron-rebuild": "1.8.1",
@@ -128,11 +130,12 @@
     "extract-text-webpack-plugin": "^3.0.1",
     "file-loader": "^1.1.5",
     "font-awesome": "4.7.0",
-    "google-fonts-webpack-plugin": "^0.4.4",
+    "gulp": "^3.9.1",
+    "gulp-google-webfonts": "^2.0.0",
     "html-loader": "^0.5.1",
     "html-webpack-plugin": "^2.30.1",
     "node-loader": "^0.6.0",
-    "node-sass": "^4.7.2",
+    "node-sass": "^4.9.2",
     "rimraf": "^2.6.2",
     "sass-loader": "^6.0.6",
     "ts-loader": "^3.5.0",

src/app/accounts/two-factor-options.component.html

@@ -9,7 +9,7 @@
             </div>
             <div class="modal-body">
                 <p *ngFor="let p of providers">
-                    <a href="#" (click)="choose(p)">
+                    <a href="#" appStopClick (click)="choose(p)">
                         <strong>{{p.name}}</strong>
                     </a>
                     <br /> {{p.description}}

src/package.json

@@ -2,7 +2,7 @@
   "name": "bitwarden-directory-connector",
   "productName": "Bitwarden Directory Connector",
   "description": "Sync your user directory to your Bitwarden organization.",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "author": "8bit Solutions LLC <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",

src/scss/plugins.scss

@@ -35,6 +35,16 @@ $fa-font-path: "~font-awesome/fonts";
             display: none;
         }
 
+        .toast-message {
+            p {
+                margin-bottom: 0.5rem;
+
+                &:last-child {
+                    margin-bottom: 0;
+                }
+            }
+        }
+
         &.toast-danger, &.toast-error {
             background-image: none !important;
             background-color: $danger;

webfonts.list

@@ -0,0 +1 @@
+Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext

webpack.renderer.js

@@ -2,7 +2,6 @@ const path = require('path');
 const webpack = require('webpack');
 const merge = require('webpack-merge');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const GoogleFontsPlugin = require("google-fonts-webpack-plugin");
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin;
 
@@ -101,19 +100,6 @@ const renderer = {
         ]
     },
     plugins: [
-        new GoogleFontsPlugin({
-            fonts: [
-                {
-                    family: 'Open Sans',
-                    variants: ['300', '300italic', '400', '400italic', '600', '600italic',
-                        '700', '700italic', '800', '800italic'],
-                    subsets: ['cyrillic', 'cyrillic-ext', 'greek', 'greek-ext', 'latin', 'latin-ext']
-                }
-            ],
-            formats: ['woff2'],
-            path: 'fonts/',
-            filename: 'css/fonts.css'
-        }),
         new AngularCompilerPlugin({
             tsConfigPath: 'tsconfig.json',
             entryModule: 'src/app/app.module#AppModule',