Merge branch 'updateOHURL' into 'develop'

Code Reviewed

See merge request !148

frontend/osmybiz/build/dev-server.js

@@ -12,7 +12,7 @@ var webpack = require('webpack')
 var proxyMiddleware = require('http-proxy-middleware')
 var webpackConfig = (process.env.NODE_ENV === 'testing' || process.env.NODE_ENV === 'production')
   ? require('./webpack.prod.conf')
-: require('./webpack.dev.conf')
+  : require('./webpack.dev.conf')
 
 // default port where dev server listens for incoming traffic
 var port = process.env.PORT || config.dev.port

frontend/osmybiz/build/webpack.base.conf.js

@@ -44,7 +44,7 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel-loader',
-        include: [resolve('src'), resolve('test'), resolve('static/converter.js')/* , resolve('node_modules') */]
+        include: [resolve('src'), resolve('test'), resolve('static/converter.js')]
       },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,

frontend/osmybiz/src/main.js

@@ -3,7 +3,6 @@ import Vue from 'vue';
 import VueCookies from 'vue-cookies';
 import VueI18n from 'vue-i18n';
 import { sync } from 'vuex-router-sync';
-// import VueWorker from 'vue-worker';
 import store from './store';
 import App from './App.vue';
 import router from './router';
@@ -24,9 +23,6 @@ import { FALLBACKLOCALE } from './store/locale';
 
 Vue.use(VueCookies);
 Vue.use(VueI18n);
-// Vue.use(VueWorker);
-// Object.defineProperty(Vue.prototype, '$worker', {value:VueWorker,configurable: true});
-// Vue.prototype.$worker = vueWorker;
 
 const messages = ({
   de,

frontend/osmybiz/static/worker.js

-
-onmessage = (event) => {
-  // const result = isURL(event.data[0]);
-
-  console.log(event.data);
-  // alert('Started Webworker');
-  // const answere = ['no', 'not', 'yes', 'but', 'maybe'];
-  postMessage('answere');
-};
-