Merge pull request #722 from nextcloud/router
Move router to appropriate place
This commit is contained in:
commit
63a2b0a92d
5 changed files with 7 additions and 7 deletions
|
@ -24,7 +24,7 @@ import Vue from 'vue'
|
|||
|
||||
import App from './app'
|
||||
|
||||
import router from './components/TheRouter'
|
||||
import router from './router'
|
||||
import store from './store/store'
|
||||
import { sync } from 'vuex-router-sync'
|
||||
import VTooltip from 'v-tooltip'
|
||||
|
|
|
@ -22,9 +22,9 @@
|
|||
import Vue from 'vue'
|
||||
import VueRouter from 'vue-router'
|
||||
|
||||
import Collections from './TheCollections/Collections'
|
||||
import Calendar from './TheCollections/Calendar'
|
||||
import TheDetails from './TheDetails'
|
||||
import Collections from './components/TheCollections/Collections'
|
||||
import Calendar from './components/TheCollections/Calendar'
|
||||
import TheDetails from './components/TheDetails'
|
||||
|
||||
const routes = [
|
||||
// using
|
|
@ -26,7 +26,7 @@ import Task from '../models/task'
|
|||
import { isParentInList, momentToICALTime } from './storeHelper'
|
||||
import ICAL from 'ical.js'
|
||||
import TaskStatus from '../models/taskStatus'
|
||||
import router from '../components/TheRouter'
|
||||
import router from '../router'
|
||||
import { findVTODObyUid } from './cdav-requests'
|
||||
|
||||
Vue.use(Vuex)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { mount } from '@vue/test-utils'
|
||||
import General from '../../../../../src/components/TheCollections/General'
|
||||
import router from '../../../../../src/components/TheRouter'
|
||||
import router from '../../../../../src/router'
|
||||
|
||||
import { store, localVue } from '../../setupStore'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { mount } from '@vue/test-utils'
|
||||
import Week from '../../../../../src/components/TheCollections/Week'
|
||||
import router from '../../../../../src/components/TheRouter'
|
||||
import router from '../../../../../src/router'
|
||||
|
||||
import { store, localVue } from '../../setupStore'
|
||||
|
||||
|
|
Loading…
Reference in a new issue