Reorg views

resources/assets/src/components/ClosetItem.vue

@@ -34,9 +34,9 @@
 
 <script>
 import toastr from 'toastr'
-import { swal } from '../../js/notify'
+import { swal } from '../js/notify'
-import setAsAvatar from '../mixins/setAsAvatar'
+import setAsAvatar from './mixins/setAsAvatar'
-import removeClosetItem from '../mixins/removeClosetItem'
+import removeClosetItem from './mixins/removeClosetItem'
 
 export default {
   name: 'ClosetItem',

resources/assets/src/components/EmailVerification.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { swal } from '../../js/notify'
+import { swal } from '../js/notify'
 
 export default {
   name: 'EmailVerification',

resources/assets/src/components/Previewer.vue

@@ -50,8 +50,8 @@
 
 <script>
 import * as skinview3d from 'skinview3d'
-import { emit } from '../../js/event'
+import { emit } from '../js/event'
-import SkinSteve from '../../images/textures/steve.png'
+import SkinSteve from '../images/textures/steve.png'
 
 export default {
   name: 'Previewer',

resources/assets/src/components/SkinLibItem.vue

@@ -32,8 +32,8 @@
 </template>
 
 <script>
-import addClosetItem from '../mixins/addClosetItem'
+import addClosetItem from './mixins/addClosetItem'
-import removeClosetItem from '../mixins/removeClosetItem'
+import removeClosetItem from './mixins/removeClosetItem'
 
 export default {
   name: 'SkinLibItem',

resources/assets/src/index.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import './js'
 import * as emitter from './js/event'
-import routes from './components/route'
+import routes from './views/route'
 
 Vue.config.productionTip = false
 

resources/assets/src/views/skinlib/List.vue

@@ -156,7 +156,7 @@
 <script>
 import Paginate from 'vuejs-paginate'
 import { queryString } from '../../js/utils'
-import SkinLibItem from './SkinLibItem'
+import SkinLibItem from '../../components/SkinLibItem.vue'
 
 export default {
   name: 'SkinLibrary',

resources/assets/src/views/skinlib/Show.vue

@@ -141,14 +141,14 @@
 <script>
 import toastr from 'toastr'
 import { swal } from '../../js/notify'
-import setAsAvatar from '../mixins/setAsAvatar'
+import setAsAvatar from '../../components/mixins/setAsAvatar'
-import addClosetItem from '../mixins/addClosetItem'
+import addClosetItem from '../../components/mixins/addClosetItem'
-import removeClosetItem from '../mixins/removeClosetItem'
+import removeClosetItem from '../../components/mixins/removeClosetItem'
 
 export default {
   name: 'Show',
   components: {
-    Previewer: () => import('../common/Previewer'),
+    Previewer: () => import('../../components/Previewer.vue'),
   },
   mixins: [
     addClosetItem,

resources/assets/src/views/skinlib/Upload.vue

@@ -115,7 +115,7 @@ import { swal } from '../../js/notify'
 export default {
   name: 'Upload',
   components: {
-    Previewer: () => import('../common/Previewer'),
+    Previewer: () => import('../../components/Previewer.vue'),
     FileUpload,
   },
   data() {

resources/assets/src/views/user/Closet.vue

@@ -195,15 +195,15 @@ import toastr from 'toastr'
 import Paginate from 'vuejs-paginate'
 import { debounce, queryString } from '../../js/utils'
 import { swal } from '../../js/notify'
-import ClosetItem from './ClosetItem'
+import ClosetItem from '../../components/ClosetItem.vue'
-import EmailVerification from './EmailVerification'
+import EmailVerification from '../../components/EmailVerification.vue'
 
 export default {
   name: 'Closet',
   components: {
     Paginate,
     ClosetItem,
-    Previewer: () => import('../common/Previewer'),
+    Previewer: () => import('../../components/Previewer.vue'),
     EmailVerification,
   },
   data: () => ({

resources/assets/src/views/user/Dashboard.vue

@@ -67,7 +67,7 @@
 <script>
 import toastr from 'toastr'
 import { swal } from '../../js/notify'
-import EmailVerification from './EmailVerification'
+import EmailVerification from '../../components/EmailVerification.vue'
 
 const ONE_DAY = 24 * 3600 * 1000
 

resources/assets/src/views/user/Players.vue

@@ -225,7 +225,7 @@ import { swal } from '../../js/notify'
 export default {
   name: 'Players',
   components: {
-    Previewer: () => import('../common/Previewer'),
+    Previewer: () => import('../../components/Previewer.vue'),
   },
   props: {
     baseUrl: {

resources/assets/src/views/user/Profile.vue

@@ -203,7 +203,7 @@
 <script>
 import toastr from 'toastr'
 import { swal } from '../../js/notify'
-import EmailVerification from './EmailVerification'
+import EmailVerification from '../../components/EmailVerification.vue'
 
 export default {
   name: 'Profile',

resources/assets/tests/components/ClosetItem.test.ts

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import { flushPromises } from '../../utils'
+import { flushPromises } from '../utils'
-import ClosetItem from '@/components/user/ClosetItem.vue'
+import ClosetItem from '@/components/ClosetItem.vue'
 import { swal } from '@/js/notify'
 
 jest.mock('@/js/notify')

resources/assets/tests/components/EmailVerification.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import EmailVerification from '@/components/user/EmailVerification.vue'
+import EmailVerification from '@/components/EmailVerification.vue'
 import { swal } from '@/js/notify'
 
 jest.mock('@/js/notify')

resources/assets/tests/components/Previewer.test.ts

@@ -1,8 +1,8 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Previewer from '@/components/common/Previewer.vue'
+import Previewer from '@/components/Previewer.vue'
 import * as emitter from '@/js/event'
-import * as mockedSkinview3d from '../../__mocks__/skinview3d'
+import * as mockedSkinview3d from '../__mocks__/skinview3d'
 
 type Viewer = Vue & { viewer: mockedSkinview3d.SkinViewer }
 

resources/assets/tests/components/SkinLibItem.test.ts

@@ -1,8 +1,8 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import SkinLibItem from '@/components/skinlib/SkinLibItem.vue'
+import SkinLibItem from '@/components/SkinLibItem.vue'
 import toastr from 'toastr'
-import { flushPromises } from '../../utils'
+import { flushPromises } from '../utils'
 import { swal } from '@/js/notify'
 
 jest.mock('@/js/notify')

resources/assets/tests/views/admin/Customization.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Customization from '@/components/admin/Customization.vue'
+import Customization from '@/views/admin/Customization.vue'
 
 window.blessing.extra = { currentSkin: 'skin-blue' }
 

resources/assets/tests/views/admin/Market.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Market from '@/components/admin/Market.vue'
+import Market from '@/views/admin/Market.vue'
 import { flushPromises } from '../../utils'
 import { swal } from '@/js/notify'
 

resources/assets/tests/views/admin/Players.test.ts

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
 import { flushPromises } from '../../utils'
-import Players from '@/components/admin/Players.vue'
+import Players from '@/views/admin/Players.vue'
 import { swal } from '@/js/notify'
 
 jest.mock('@/js/notify')

resources/assets/tests/views/admin/Plugins.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Plugins from '@/components/admin/Plugins.vue'
+import Plugins from '@/views/admin/Plugins.vue'
 import toastr from 'toastr'
 import { flushPromises } from '../../utils'
 import { swal } from '@/js/notify'

resources/assets/tests/views/admin/Update.test.ts

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
 import { flushPromises } from '../../utils'
-import Update from '@/components/admin/Update.vue'
+import Update from '@/views/admin/Update.vue'
 import '@/js/notify'
 
 jest.mock('@/js/notify')

resources/assets/tests/views/admin/Users.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Users from '@/components/admin/Users.vue'
+import Users from '@/views/admin/Users.vue'
 import toastr from 'toastr'
 import { swal } from '@/js/notify'
 import '@/js/i18n'

resources/assets/tests/views/auth/Forgot.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Forgot from '@/components/auth/Forgot.vue'
+import Forgot from '@/views/auth/Forgot.vue'
 
 test('click to refresh captcha', () => {
   jest.spyOn(Date, 'now')

resources/assets/tests/views/auth/Login.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Login from '@/components/auth/Login.vue'
+import Login from '@/views/auth/Login.vue'
 import { swal } from '@/js/notify'
 
 jest.mock('@/js/notify')

resources/assets/tests/views/auth/Register.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Register from '@/components/auth/Register.vue'
+import Register from '@/views/auth/Register.vue'
 import { swal } from '@/js/notify'
 
 jest.mock('@/js/notify')

resources/assets/tests/views/auth/Reset.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Reset from '@/components/auth/Reset.vue'
+import Reset from '@/views/auth/Reset.vue'
 import { swal } from '@/js/notify'
 
 jest.mock('@/js/notify')

resources/assets/tests/views/skinlib/List.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import List from '@/components/skinlib/List.vue'
+import List from '@/views/skinlib/List.vue'
 
 test('fetch data before mounting', () => {
   Vue.prototype.$http.get.mockResolvedValue({

resources/assets/tests/views/skinlib/Show.test.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Show from '@/components/skinlib/Show.vue'
+import Show from '@/views/skinlib/Show.vue'
 import toastr from 'toastr'
 import { flushPromises } from '../../utils'
 import { swal } from '@/js/notify'

resources/assets/tests/views/skinlib/Upload.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable accessor-pairs */
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Upload from '@/components/skinlib/Upload.vue'
+import Upload from '@/views/skinlib/Upload.vue'
 import { flushPromises } from '../../utils'
 import toastr from 'toastr'
 import { swal } from '@/js/notify'

resources/assets/tests/views/user/Closet.test.ts

@@ -1,8 +1,8 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Closet from '@/components/user/Closet.vue'
+import Closet from '@/views/user/Closet.vue'
-import ClosetItem from '@/components/user/ClosetItem.vue'
+import ClosetItem from '@/components/ClosetItem.vue'
-import Previewer from '@/components/common/Previewer.vue'
+import Previewer from '@/components/Previewer.vue'
 import toastr from 'toastr'
 import { swal } from '@/js/notify'
 

resources/assets/tests/views/user/Dashboard.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-mixed-operators */
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
-import Dashboard from '@/components/user/Dashboard.vue'
+import Dashboard from '@/views/user/Dashboard.vue'
 import toastr from 'toastr'
 import { swal } from '@/js/notify'
 

resources/assets/tests/views/user/Players.test.ts

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
 import { flushPromises } from '../../utils'
-import Players from '@/components/user/Players.vue'
+import Players from '@/views/user/Players.vue'
 import { swal } from '@/js/notify'
 
 jest.mock('toastr')

resources/assets/tests/views/user/Profile.test.ts

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
 import { flushPromises } from '../../utils'
-import Profile from '@/components/user/Profile.vue'
+import Profile from '@/views/user/Profile.vue'
 import toastr from 'toastr'
 import { swal } from '@/js/notify'
 

tsconfig.json

@@ -15,6 +15,9 @@
       ],
       "@/components/*": [
         "./resources/assets/src/components/*"
+      ],
+      "@/views/*": [
+        "./resources/assets/src/views/*"
       ]
     }
   },