From bab6d0c22ba433c91ebf82bcc26e3e069b077892 Mon Sep 17 00:00:00 2001 From: Thiago Moreira Date: Aug 30 2017 15:28:18 +0000 Subject: Keeping only one instance of vue and adjusting files for proper operation --- diff --git a/index.html b/index.html index 713d8dd..6bdc5d0 100644 --- a/index.html +++ b/index.html @@ -1,10 +1,19 @@ - - + + + + Kiskadee + + + + +
+ + -
+ diff --git a/package.json b/package.json index 67a7f7e..8daa5a1 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,11 @@ "lint": "eslint --ext .js,.vue src test/unit/specs" }, "dependencies": { + "moment": "^2.18.1", + "node-sass": "^4.5.3", + "sass-loader": "^6.0.6", "vue": "^2.3.3", + "vue-data-tables": "^2.0.4", "vue-material": "^0.7.4", "vue-router": "^2.6.0", "vue-table-component": "^1.3.0" diff --git a/src/App.vue b/src/App.vue index e9bd7e8..1b90d41 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,31 +1,20 @@ + + diff --git a/src/main.js b/src/main.js index ad059a5..e4ca4c3 100644 --- a/src/main.js +++ b/src/main.js @@ -1,9 +1,8 @@ -// The Vue build version to load with the `import` command -// (runtime-only or standalone) has been set in webpack.base.conf with an alias. import Vue from 'vue' import App from './App' -import Header from './components/Header' -import List from './components/List' + +import VueRouter from 'vue-router' +import { routes } from './router/routes' import DataTables from 'vue-data-tables' import ElementUI from 'element-ui' @@ -15,9 +14,11 @@ locale.use(lang) Vue.use(ElementUI) Vue.use(DataTables) -var VueMaterial = require('vue-material') +import VueMaterial from 'vue-material' Vue.use(VueMaterial) +Vue.use(VueRouter) + Vue.material.registerTheme('default', { primary: { color: 'teal', @@ -31,20 +32,12 @@ Vue.material.registerTheme('default', { Vue.config.productionTip = false /* eslint-disable no-new */ -new Vue({ - el: '#app', - template: '', - components: { App } -}) - -new Vue({ - el: '#header', - template: '
', - components: { Header } +const router = new VueRouter({ + routes: routes }) new Vue({ - el: '#list', - template: '', - components: { List } + el: '#app', + router: router, + render: h => h(App) })