Merge branch 'master' into develop

Author: flyingluscas

client/build/dev-server.js

@@ -66,9 +66,10 @@ module.exports = app.listen(port, function (err) {
   }
   var uri = 'http://localhost:' + port
   console.log('Listening at ' + uri + '\n')
+  console.log('API Url ' + config.dev.env.API_URL + '\n')
 
   // when env is testing, don't need open it
-  if (process.env.NODE_ENV !== 'testing') {
+  if (process.env.NODE_ENV !== 'testing' && config.dev.openBrowser) {
     opn(uri)
   }
 })

client/config/index.js

@@ -19,6 +19,7 @@ module.exports = {
   dev: {
     env: require('./dev.env'),
     port: 8080,
+    openBrowser: true,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {},

client/config/prod.env.js

@@ -1,3 +1,4 @@
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  API_URL: '"http://localhost:8000/api"',
 }

client/src/App.vue client/src/Root.vueclient/src/App.vue renamed to client/src/Root.vue

@@ -1,6 +1,6 @@
 <script>
-import CcNavBar from './modules/general/navbar'
-import CcAlerts from './modules/general/alerts'
+import CcNavBar from './components/root/navbar'
+import CcAlerts from './components/general/alerts'
 
 export default {
   name: 'Codecasts',

client/src/modules/categories/form.vue client/src/app/categories/form.vueclient/src/modules/categories/form.vue renamed to client/src/app/categories/form.vue

@@ -0,0 +1,2 @@
+export { default as routes } from './routes'
+export { default as vuex } from './vuex'

client/src/app/categories/index.js

@@ -2,7 +2,7 @@
 <script>
   import Vue from 'vue'
   import { mapActions, mapState } from 'vuex'
-  import CcPagination from '../general/pagination'
+  import CcPagination from 'components/general/pagination'
 
   export default {
     /**

client/src/modules/categories/main.vue client/src/app/categories/main.vueclient/src/modules/categories/main.vue renamed to client/src/app/categories/main.vue

@@ -0,0 +1,2 @@
+/* eslint-disable import/prefer-default-export */
+export { default as routes } from './routes'