move new app into popup folder

.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/

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:

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'));
-});

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",