Merge branch 'template' into develop

# Conflicts:
#	src/components/global/footer/footer.vue
#	src/components/global/header/header.vue
#	src/css/_index.scss
#	src/css/core/_core.scss
#	src/index.js
#	src/index.scss
#	src/pages/index.vue
#	src/web.vue
#	webpack.config.js

Author: mimosafa

src/index.js

@@ -1,19 +1,10 @@
 import './index.scss';
+
 import Vue from 'vue';
-import VueRouter from 'vue-router';
-import routes from './routes/index';
+import router from './router';
 import Web from './web.vue';
 
-Vue.use(VueRouter);
-
-const router = new VueRouter({
-  mode: 'history',
-  routes
-});
-
 new Vue({
-  el: '#app',
-  components: { Web },
-  template: '<web/>',
+  render: h => h(Web),
   router
-});
+}).$mount('#app');

src/pages/404.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <h1>404 Page Not Found</h1>
+  </div>
+</template>

src/pages/routes.js

@@ -0,0 +1,13 @@
+import Root from './index.vue';
+import NotFound from './404.vue';
+
+export default [
+  {
+    path: '/',
+    component: Root
+  },
+  {
+    path: '*',
+    component: NotFound
+  }
+];

src/router.js

@@ -0,0 +1,10 @@
+import Vue from 'vue';
+import Router from 'vue-router';
+import routes from './pages/routes';
+
+Vue.use(Router);
+
+export default new Router({
+  mode: 'history',
+  routes
+});

src/routes/index.js

@@ -12,7 +12,8 @@ module.exports = {
   entry: './src/index.js',
   output: {
     filename: 'bundle.js',
-    path: dist
+    path: dist,
+    publicPath: '/'
   },
   module: {
     rules: [
@@ -79,6 +80,7 @@ module.exports = {
   devServer: {
     open: true,
     contentBase: dist,
-    watchContentBase: true
+    watchContentBase: true,
+    historyApiFallback: true
   }
 };