Merge branch 'feature/update-vue-electron'

gobeli · Nov 12, 2017 · 1e00500 · 1e00500
2 parents b01b535 + 1d15122
commit 1e00500
Show file tree

Hide file tree

Showing 13 changed files with 3,376 additions and 3,483 deletions.
diff --git a/.electron-vue/dev-client.js b/.electron-vue/dev-client.js
@@ -3,10 +3,14 @@ const hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true
 hotClient.subscribe(event => {
   /**
    * Reload browser when HTMLWebpackPlugin emits a new index.html
+   *
+   * Currently disabled until jantimon/html-webpack-plugin#680 is resolved.
+   * https://github.com/SimulatedGREG/electron-vue/issues/437
+   * https://github.com/jantimon/html-webpack-plugin/issues/680
    */
-  if (event.action === 'reload') {
-    window.location.reload()
-  }
+  // if (event.action === 'reload') {
+  //   window.location.reload()
+  // }
 
   /**
    * Notify `mainWindow` when `main` process is compiling,

diff --git a/.electron-vue/webpack.main.config.js b/.electron-vue/webpack.main.config.js
@@ -17,17 +17,6 @@ let mainConfig = {
   ],
   module: {
     rules: [
-      {
-        test: /\.(js)$/,
-        enforce: 'pre',
-        exclude: /node_modules/,
-        // use: {
-          // loader: 'eslint-loader',
-          // options: {
-            // formatter: require('eslint-friendly-formatter')
-          // }
-        // }
-      },
       {
         test: /\.js$/,
         use: 'babel-loader',
@@ -73,10 +62,7 @@ if (process.env.NODE_ENV !== 'production') {
  */
 if (process.env.NODE_ENV === 'production') {
   mainConfig.plugins.push(
-    new BabiliWebpackPlugin({
-      removeConsole: true,
-      removeDebugger: true
-    }),
+    new BabiliWebpackPlugin(),
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': '"production"'
     })

diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js
@@ -30,17 +30,6 @@ let rendererConfig = {
   ],
   module: {
     rules: [
-      {
-        test: /\.(js|vue)$/,
-        enforce: 'pre',
-        exclude: /node_modules/,
-        // use: {
-          // loader: 'eslint-loader',
-          // options: {
-            // formatter: require('eslint-friendly-formatter')
-          // }
-        // }
-      },
       {
         test: /\.css$/,
         use: ExtractTextPlugin.extract({
@@ -80,17 +69,25 @@ let rendererConfig = {
           loader: 'url-loader',
           query: {
             limit: 10000,
-            name: 'imgs/[name].[ext]'
+            name: 'imgs/[name]--[folder].[ext]'
           }
         }
       },
+      {
+        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: 'media/[name]--[folder].[ext]'
+        }
+      },
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
         use: {
           loader: 'url-loader',
           query: {
             limit: 10000,
-            name: 'fonts/[name].[ext]'
+            name: 'fonts/[name]--[folder].[ext]'
           }
         }
       }
@@ -150,10 +147,7 @@ if (process.env.NODE_ENV === 'production') {
   rendererConfig.devtool = ''
 
   rendererConfig.plugins.push(
-    new BabiliWebpackPlugin({
-      removeConsole: true,
-      removeDebugger: true
-    }),
+    new BabiliWebpackPlugin(),
     new CopyWebpackPlugin([
       {
         from: path.join(__dirname, '../static'),

diff --git a/.electron-vue/webpack.web.config.js b/.electron-vue/webpack.web.config.js
@@ -17,17 +17,6 @@ let webConfig = {
   },
   module: {
     rules: [
-      {
-        test: /\.(js|vue)$/,
-        enforce: 'pre',
-        exclude: /node_modules/,
-        use: {
-          loader: 'eslint-loader',
-          options: {
-            formatter: require('eslint-friendly-formatter')
-          }
-        }
-      },
       {
         test: /\.css$/,
         use: ExtractTextPlugin.extract({
@@ -119,10 +108,7 @@ if (process.env.NODE_ENV === 'production') {
   webConfig.devtool = ''
 
   webConfig.plugins.push(
-    new BabiliWebpackPlugin({
-      removeConsole: true,
-      removeDebugger: true
-    }),
+    new BabiliWebpackPlugin(),
     new CopyWebpackPlugin([
       {
         from: path.join(__dirname, '../static'),

diff --git a/README.md b/README.md
@@ -1,13 +1,22 @@
-# pump-and-dump [![Build status](https://ci.appveyor.com/api/projects/status/7o7kpe26ejv5d09j?svg=true)](https://ci.appveyor.com/project/gobeli/pump-and-dump) #
+# pump-and-dump
 
-A pump and dump application for cryptocurrencies using the bittrex API
+> An electron-vue project
 
-Setup generated with [electron-vue](https://github.com/SimulatedGREG/electron-vue)
+#### Build Setup
 
-## [Releases](https://github.com/gobeli/pump-and-dump/releases) ##
+``` bash
+# install dependencies
+npm install
 
-## Screenshots ##
-![alt text](https://raw.githubusercontent.com/gobeli/pump-and-dump/master/static/screen1.png)
+# serve with hot reload at localhost:9080
+npm run dev
 
-![alt text](https://raw.githubusercontent.com/gobeli/pump-and-dump/master/static/screen2.png)
+# build electron application for production
+npm run build
 
+
+```
+
+---
+
+This project was generated with [electron-vue](https://github.com/SimulatedGREG/electron-vue)@[f5d9648](https://github.com/SimulatedGREG/electron-vue/tree/f5d9648e169a3efef53159823cc7a4c7eb7221d1) using [vue-cli](https://github.com/vuejs/vue-cli). Documentation about the original structure can be found [here](https://simulatedgreg.gitbooks.io/electron-vue/content/index.html).
diff --git a/appveyor.yml b/appveyor.yml
@@ -27,7 +27,4 @@ install:
 build_script:
   - yarn build
 
-artifacts:
-  - path: build\*
-
 test: off