From bf364c5f5f40b3eee33f2f95d941ceaf8b321ce1 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 18 Mar 2019 15:00:18 +0800
Subject: [PATCH] Reorg views

---
 resources/assets/src/components/{user => }/ClosetItem.vue | 6 +++---
 .../src/components/{user => }/EmailVerification.vue       | 2 +-
 .../assets/src/components/{common => }/Previewer.vue      | 4 ++--
 .../assets/src/components/{skinlib => }/SkinLibItem.vue   | 4 ++--
 resources/assets/src/index.js                             | 2 +-
 .../src/{components => views}/admin/Customization.vue     | 0
 .../assets/src/{components => views}/admin/Market.vue     | 0
 .../assets/src/{components => views}/admin/Players.vue    | 0
 .../assets/src/{components => views}/admin/Plugins.vue    | 0
 .../assets/src/{components => views}/admin/Update.vue     | 0
 .../assets/src/{components => views}/admin/Users.vue      | 0
 .../assets/src/{components => views}/auth/Forgot.vue      | 0
 resources/assets/src/{components => views}/auth/Login.vue | 0
 .../assets/src/{components => views}/auth/Register.vue    | 0
 resources/assets/src/{components => views}/auth/Reset.vue | 0
 resources/assets/src/{components => views}/route.ts       | 0
 .../assets/src/{components => views}/skinlib/List.vue     | 2 +-
 .../assets/src/{components => views}/skinlib/Show.vue     | 8 ++++----
 .../assets/src/{components => views}/skinlib/Upload.vue   | 2 +-
 .../assets/src/{components => views}/user/Closet.vue      | 6 +++---
 .../assets/src/{components => views}/user/Dashboard.vue   | 2 +-
 .../assets/src/{components => views}/user/Players.vue     | 2 +-
 .../assets/src/{components => views}/user/Profile.vue     | 2 +-
 .../assets/tests/components/{user => }/ClosetItem.test.ts | 4 ++--
 .../tests/components/{user => }/EmailVerification.test.ts | 2 +-
 .../tests/components/{common => }/Previewer.test.ts       | 4 ++--
 .../tests/components/{skinlib => }/SkinLibItem.test.ts    | 4 ++--
 .../{components => views}/admin/Customization.test.ts     | 2 +-
 .../tests/{components => views}/admin/Market.test.ts      | 2 +-
 .../tests/{components => views}/admin/Players.test.ts     | 2 +-
 .../tests/{components => views}/admin/Plugins.test.ts     | 2 +-
 .../tests/{components => views}/admin/Update.test.ts      | 2 +-
 .../tests/{components => views}/admin/Users.test.ts       | 2 +-
 .../tests/{components => views}/auth/Forgot.test.ts       | 2 +-
 .../assets/tests/{components => views}/auth/Login.test.ts | 2 +-
 .../tests/{components => views}/auth/Register.test.ts     | 2 +-
 .../assets/tests/{components => views}/auth/Reset.test.ts | 2 +-
 .../tests/{components => views}/skinlib/List.test.ts      | 2 +-
 .../tests/{components => views}/skinlib/Show.test.ts      | 2 +-
 .../tests/{components => views}/skinlib/Upload.test.ts    | 2 +-
 .../tests/{components => views}/user/Closet.test.ts       | 6 +++---
 .../tests/{components => views}/user/Dashboard.test.ts    | 2 +-
 .../tests/{components => views}/user/Players.test.ts      | 2 +-
 .../tests/{components => views}/user/Profile.test.ts      | 2 +-
 tsconfig.json                                             | 3 +++
 45 files changed, 50 insertions(+), 47 deletions(-)
 rename resources/assets/src/components/{user => }/ClosetItem.vue (94%)
 rename resources/assets/src/components/{user => }/EmailVerification.vue (95%)
 rename resources/assets/src/components/{common => }/Previewer.vue (97%)
 rename resources/assets/src/components/{skinlib => }/SkinLibItem.vue (95%)
 rename resources/assets/src/{components => views}/admin/Customization.vue (100%)
 rename resources/assets/src/{components => views}/admin/Market.vue (100%)
 rename resources/assets/src/{components => views}/admin/Players.vue (100%)
 rename resources/assets/src/{components => views}/admin/Plugins.vue (100%)
 rename resources/assets/src/{components => views}/admin/Update.vue (100%)
 rename resources/assets/src/{components => views}/admin/Users.vue (100%)
 rename resources/assets/src/{components => views}/auth/Forgot.vue (100%)
 rename resources/assets/src/{components => views}/auth/Login.vue (100%)
 rename resources/assets/src/{components => views}/auth/Register.vue (100%)
 rename resources/assets/src/{components => views}/auth/Reset.vue (100%)
 rename resources/assets/src/{components => views}/route.ts (100%)
 rename resources/assets/src/{components => views}/skinlib/List.vue (99%)
 rename resources/assets/src/{components => views}/skinlib/Show.vue (97%)
 rename resources/assets/src/{components => views}/skinlib/Upload.vue (98%)
 rename resources/assets/src/{components => views}/user/Closet.vue (98%)
 rename resources/assets/src/{components => views}/user/Dashboard.vue (98%)
 rename resources/assets/src/{components => views}/user/Players.vue (99%)
 rename resources/assets/src/{components => views}/user/Profile.vue (99%)
 rename resources/assets/tests/components/{user => }/ClosetItem.test.ts (97%)
 rename resources/assets/tests/components/{user => }/EmailVerification.test.ts (92%)
 rename resources/assets/tests/components/{common => }/Previewer.test.ts (96%)
 rename resources/assets/tests/components/{skinlib => }/SkinLibItem.test.ts (96%)
 rename resources/assets/tests/{components => views}/admin/Customization.test.ts (92%)
 rename resources/assets/tests/{components => views}/admin/Market.test.ts (98%)
 rename resources/assets/tests/{components => views}/admin/Players.test.ts (99%)
 rename resources/assets/tests/{components => views}/admin/Plugins.test.ts (98%)
 rename resources/assets/tests/{components => views}/admin/Update.test.ts (96%)
 rename resources/assets/tests/{components => views}/admin/Users.test.ts (99%)
 rename resources/assets/tests/{components => views}/auth/Forgot.test.ts (96%)
 rename resources/assets/tests/{components => views}/auth/Login.test.ts (97%)
 rename resources/assets/tests/{components => views}/auth/Register.test.ts (98%)
 rename resources/assets/tests/{components => views}/auth/Reset.test.ts (97%)
 rename resources/assets/tests/{components => views}/skinlib/List.test.ts (99%)
 rename resources/assets/tests/{components => views}/skinlib/Show.test.ts (99%)
 rename resources/assets/tests/{components => views}/skinlib/Upload.test.ts (98%)
 rename resources/assets/tests/{components => views}/user/Closet.test.ts (98%)
 rename resources/assets/tests/{components => views}/user/Dashboard.test.ts (98%)
 rename resources/assets/tests/{components => views}/user/Players.test.ts (99%)
 rename resources/assets/tests/{components => views}/user/Profile.test.ts (99%)

diff --git a/resources/assets/src/components/user/ClosetItem.vue b/resources/assets/src/components/ClosetItem.vue
similarity index 94%
rename from resources/assets/src/components/user/ClosetItem.vue
rename to resources/assets/src/components/ClosetItem.vue
index c0b2dae1..f1e6b013 100644
--- a/resources/assets/src/components/user/ClosetItem.vue
+++ b/resources/assets/src/components/ClosetItem.vue
@@ -34,9 +34,9 @@
 
 <script>
 import toastr from 'toastr'
-import { swal } from '../../js/notify'
-import setAsAvatar from '../mixins/setAsAvatar'
-import removeClosetItem from '../mixins/removeClosetItem'
+import { swal } from '../js/notify'
+import setAsAvatar from './mixins/setAsAvatar'
+import removeClosetItem from './mixins/removeClosetItem'
 
 export default {
   name: 'ClosetItem',
diff --git a/resources/assets/src/components/user/EmailVerification.vue b/resources/assets/src/components/EmailVerification.vue
similarity index 95%
rename from resources/assets/src/components/user/EmailVerification.vue
rename to resources/assets/src/components/EmailVerification.vue
index 21a000da..9160253b 100644
--- a/resources/assets/src/components/user/EmailVerification.vue
+++ b/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',
diff --git a/resources/assets/src/components/common/Previewer.vue b/resources/assets/src/components/Previewer.vue
similarity index 97%
rename from resources/assets/src/components/common/Previewer.vue
rename to resources/assets/src/components/Previewer.vue
index b04b391d..cd190e7c 100644
--- a/resources/assets/src/components/common/Previewer.vue
+++ b/resources/assets/src/components/Previewer.vue
@@ -50,8 +50,8 @@
 
 <script>
 import * as skinview3d from 'skinview3d'
-import { emit } from '../../js/event'
-import SkinSteve from '../../images/textures/steve.png'
+import { emit } from '../js/event'
+import SkinSteve from '../images/textures/steve.png'
 
 export default {
   name: 'Previewer',
diff --git a/resources/assets/src/components/skinlib/SkinLibItem.vue b/resources/assets/src/components/SkinLibItem.vue
similarity index 95%
rename from resources/assets/src/components/skinlib/SkinLibItem.vue
rename to resources/assets/src/components/SkinLibItem.vue
index b5fd7417..3f92809a 100644
--- a/resources/assets/src/components/skinlib/SkinLibItem.vue
+++ b/resources/assets/src/components/SkinLibItem.vue
@@ -32,8 +32,8 @@
 </template>
 
 <script>
-import addClosetItem from '../mixins/addClosetItem'
-import removeClosetItem from '../mixins/removeClosetItem'
+import addClosetItem from './mixins/addClosetItem'
+import removeClosetItem from './mixins/removeClosetItem'
 
 export default {
   name: 'SkinLibItem',
diff --git a/resources/assets/src/index.js b/resources/assets/src/index.js
index af056522..c635a8ef 100644
--- a/resources/assets/src/index.js
+++ b/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
 
diff --git a/resources/assets/src/components/admin/Customization.vue b/resources/assets/src/views/admin/Customization.vue
similarity index 100%
rename from resources/assets/src/components/admin/Customization.vue
rename to resources/assets/src/views/admin/Customization.vue
diff --git a/resources/assets/src/components/admin/Market.vue b/resources/assets/src/views/admin/Market.vue
similarity index 100%
rename from resources/assets/src/components/admin/Market.vue
rename to resources/assets/src/views/admin/Market.vue
diff --git a/resources/assets/src/components/admin/Players.vue b/resources/assets/src/views/admin/Players.vue
similarity index 100%
rename from resources/assets/src/components/admin/Players.vue
rename to resources/assets/src/views/admin/Players.vue
diff --git a/resources/assets/src/components/admin/Plugins.vue b/resources/assets/src/views/admin/Plugins.vue
similarity index 100%
rename from resources/assets/src/components/admin/Plugins.vue
rename to resources/assets/src/views/admin/Plugins.vue
diff --git a/resources/assets/src/components/admin/Update.vue b/resources/assets/src/views/admin/Update.vue
similarity index 100%
rename from resources/assets/src/components/admin/Update.vue
rename to resources/assets/src/views/admin/Update.vue
diff --git a/resources/assets/src/components/admin/Users.vue b/resources/assets/src/views/admin/Users.vue
similarity index 100%
rename from resources/assets/src/components/admin/Users.vue
rename to resources/assets/src/views/admin/Users.vue
diff --git a/resources/assets/src/components/auth/Forgot.vue b/resources/assets/src/views/auth/Forgot.vue
similarity index 100%
rename from resources/assets/src/components/auth/Forgot.vue
rename to resources/assets/src/views/auth/Forgot.vue
diff --git a/resources/assets/src/components/auth/Login.vue b/resources/assets/src/views/auth/Login.vue
similarity index 100%
rename from resources/assets/src/components/auth/Login.vue
rename to resources/assets/src/views/auth/Login.vue
diff --git a/resources/assets/src/components/auth/Register.vue b/resources/assets/src/views/auth/Register.vue
similarity index 100%
rename from resources/assets/src/components/auth/Register.vue
rename to resources/assets/src/views/auth/Register.vue
diff --git a/resources/assets/src/components/auth/Reset.vue b/resources/assets/src/views/auth/Reset.vue
similarity index 100%
rename from resources/assets/src/components/auth/Reset.vue
rename to resources/assets/src/views/auth/Reset.vue
diff --git a/resources/assets/src/components/route.ts b/resources/assets/src/views/route.ts
similarity index 100%
rename from resources/assets/src/components/route.ts
rename to resources/assets/src/views/route.ts
diff --git a/resources/assets/src/components/skinlib/List.vue b/resources/assets/src/views/skinlib/List.vue
similarity index 99%
rename from resources/assets/src/components/skinlib/List.vue
rename to resources/assets/src/views/skinlib/List.vue
index dc5fe9af..3d25f121 100644
--- a/resources/assets/src/components/skinlib/List.vue
+++ b/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',
diff --git a/resources/assets/src/components/skinlib/Show.vue b/resources/assets/src/views/skinlib/Show.vue
similarity index 97%
rename from resources/assets/src/components/skinlib/Show.vue
rename to resources/assets/src/views/skinlib/Show.vue
index 8171e387..3f6d65f6 100644
--- a/resources/assets/src/components/skinlib/Show.vue
+++ b/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 addClosetItem from '../mixins/addClosetItem'
-import removeClosetItem from '../mixins/removeClosetItem'
+import setAsAvatar from '../../components/mixins/setAsAvatar'
+import addClosetItem from '../../components/mixins/addClosetItem'
+import removeClosetItem from '../../components/mixins/removeClosetItem'
 
 export default {
   name: 'Show',
   components: {
-    Previewer: () => import('../common/Previewer'),
+    Previewer: () => import('../../components/Previewer.vue'),
   },
   mixins: [
     addClosetItem,
diff --git a/resources/assets/src/components/skinlib/Upload.vue b/resources/assets/src/views/skinlib/Upload.vue
similarity index 98%
rename from resources/assets/src/components/skinlib/Upload.vue
rename to resources/assets/src/views/skinlib/Upload.vue
index 54bc72b7..fb32bc72 100644
--- a/resources/assets/src/components/skinlib/Upload.vue
+++ b/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() {
diff --git a/resources/assets/src/components/user/Closet.vue b/resources/assets/src/views/user/Closet.vue
similarity index 98%
rename from resources/assets/src/components/user/Closet.vue
rename to resources/assets/src/views/user/Closet.vue
index 7425e17f..097c2488 100644
--- a/resources/assets/src/components/user/Closet.vue
+++ b/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 EmailVerification from './EmailVerification'
+import ClosetItem from '../../components/ClosetItem.vue'
+import EmailVerification from '../../components/EmailVerification.vue'
 
 export default {
   name: 'Closet',
   components: {
     Paginate,
     ClosetItem,
-    Previewer: () => import('../common/Previewer'),
+    Previewer: () => import('../../components/Previewer.vue'),
     EmailVerification,
   },
   data: () => ({
diff --git a/resources/assets/src/components/user/Dashboard.vue b/resources/assets/src/views/user/Dashboard.vue
similarity index 98%
rename from resources/assets/src/components/user/Dashboard.vue
rename to resources/assets/src/views/user/Dashboard.vue
index 1ff55d36..3c4ffd82 100644
--- a/resources/assets/src/components/user/Dashboard.vue
+++ b/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
 
diff --git a/resources/assets/src/components/user/Players.vue b/resources/assets/src/views/user/Players.vue
similarity index 99%
rename from resources/assets/src/components/user/Players.vue
rename to resources/assets/src/views/user/Players.vue
index 85de65ea..73dc275d 100644
--- a/resources/assets/src/components/user/Players.vue
+++ b/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: {
diff --git a/resources/assets/src/components/user/Profile.vue b/resources/assets/src/views/user/Profile.vue
similarity index 99%
rename from resources/assets/src/components/user/Profile.vue
rename to resources/assets/src/views/user/Profile.vue
index 84933ab5..fd658180 100644
--- a/resources/assets/src/components/user/Profile.vue
+++ b/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',
diff --git a/resources/assets/tests/components/user/ClosetItem.test.ts b/resources/assets/tests/components/ClosetItem.test.ts
similarity index 97%
rename from resources/assets/tests/components/user/ClosetItem.test.ts
rename to resources/assets/tests/components/ClosetItem.test.ts
index beb0d177..ab907274 100644
--- a/resources/assets/tests/components/user/ClosetItem.test.ts
+++ b/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 ClosetItem from '@/components/user/ClosetItem.vue'
+import { flushPromises } from '../utils'
+import ClosetItem from '@/components/ClosetItem.vue'
 import { swal } from '@/js/notify'
 
 jest.mock('@/js/notify')
diff --git a/resources/assets/tests/components/user/EmailVerification.test.ts b/resources/assets/tests/components/EmailVerification.test.ts
similarity index 92%
rename from resources/assets/tests/components/user/EmailVerification.test.ts
rename to resources/assets/tests/components/EmailVerification.test.ts
index 35b6494a..59434510 100644
--- a/resources/assets/tests/components/user/EmailVerification.test.ts
+++ b/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')
diff --git a/resources/assets/tests/components/common/Previewer.test.ts b/resources/assets/tests/components/Previewer.test.ts
similarity index 96%
rename from resources/assets/tests/components/common/Previewer.test.ts
rename to resources/assets/tests/components/Previewer.test.ts
index aa48957d..e23f1a11 100644
--- a/resources/assets/tests/components/common/Previewer.test.ts
+++ b/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 }
 
diff --git a/resources/assets/tests/components/skinlib/SkinLibItem.test.ts b/resources/assets/tests/components/SkinLibItem.test.ts
similarity index 96%
rename from resources/assets/tests/components/skinlib/SkinLibItem.test.ts
rename to resources/assets/tests/components/SkinLibItem.test.ts
index 7520e9b4..f7ea94ab 100644
--- a/resources/assets/tests/components/skinlib/SkinLibItem.test.ts
+++ b/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')
diff --git a/resources/assets/tests/components/admin/Customization.test.ts b/resources/assets/tests/views/admin/Customization.test.ts
similarity index 92%
rename from resources/assets/tests/components/admin/Customization.test.ts
rename to resources/assets/tests/views/admin/Customization.test.ts
index ae43882d..f1f981cc 100644
--- a/resources/assets/tests/components/admin/Customization.test.ts
+++ b/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' }
 
diff --git a/resources/assets/tests/components/admin/Market.test.ts b/resources/assets/tests/views/admin/Market.test.ts
similarity index 98%
rename from resources/assets/tests/components/admin/Market.test.ts
rename to resources/assets/tests/views/admin/Market.test.ts
index 4514c8f3..17680219 100644
--- a/resources/assets/tests/components/admin/Market.test.ts
+++ b/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'
 
diff --git a/resources/assets/tests/components/admin/Players.test.ts b/resources/assets/tests/views/admin/Players.test.ts
similarity index 99%
rename from resources/assets/tests/components/admin/Players.test.ts
rename to resources/assets/tests/views/admin/Players.test.ts
index 83c11408..b0468520 100644
--- a/resources/assets/tests/components/admin/Players.test.ts
+++ b/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')
diff --git a/resources/assets/tests/components/admin/Plugins.test.ts b/resources/assets/tests/views/admin/Plugins.test.ts
similarity index 98%
rename from resources/assets/tests/components/admin/Plugins.test.ts
rename to resources/assets/tests/views/admin/Plugins.test.ts
index 648cdbdf..05e357d7 100644
--- a/resources/assets/tests/components/admin/Plugins.test.ts
+++ b/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'
diff --git a/resources/assets/tests/components/admin/Update.test.ts b/resources/assets/tests/views/admin/Update.test.ts
similarity index 96%
rename from resources/assets/tests/components/admin/Update.test.ts
rename to resources/assets/tests/views/admin/Update.test.ts
index f1c02185..f1c119a9 100644
--- a/resources/assets/tests/components/admin/Update.test.ts
+++ b/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')
diff --git a/resources/assets/tests/components/admin/Users.test.ts b/resources/assets/tests/views/admin/Users.test.ts
similarity index 99%
rename from resources/assets/tests/components/admin/Users.test.ts
rename to resources/assets/tests/views/admin/Users.test.ts
index 9100d872..70c6b00a 100644
--- a/resources/assets/tests/components/admin/Users.test.ts
+++ b/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'
diff --git a/resources/assets/tests/components/auth/Forgot.test.ts b/resources/assets/tests/views/auth/Forgot.test.ts
similarity index 96%
rename from resources/assets/tests/components/auth/Forgot.test.ts
rename to resources/assets/tests/views/auth/Forgot.test.ts
index 4605375d..0f4f891a 100644
--- a/resources/assets/tests/components/auth/Forgot.test.ts
+++ b/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')
diff --git a/resources/assets/tests/components/auth/Login.test.ts b/resources/assets/tests/views/auth/Login.test.ts
similarity index 97%
rename from resources/assets/tests/components/auth/Login.test.ts
rename to resources/assets/tests/views/auth/Login.test.ts
index eeaf78dc..7d440582 100644
--- a/resources/assets/tests/components/auth/Login.test.ts
+++ b/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')
diff --git a/resources/assets/tests/components/auth/Register.test.ts b/resources/assets/tests/views/auth/Register.test.ts
similarity index 98%
rename from resources/assets/tests/components/auth/Register.test.ts
rename to resources/assets/tests/views/auth/Register.test.ts
index 6cd36818..a5fdf52b 100644
--- a/resources/assets/tests/components/auth/Register.test.ts
+++ b/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')
diff --git a/resources/assets/tests/components/auth/Reset.test.ts b/resources/assets/tests/views/auth/Reset.test.ts
similarity index 97%
rename from resources/assets/tests/components/auth/Reset.test.ts
rename to resources/assets/tests/views/auth/Reset.test.ts
index 3eb83809..31db534d 100644
--- a/resources/assets/tests/components/auth/Reset.test.ts
+++ b/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')
diff --git a/resources/assets/tests/components/skinlib/List.test.ts b/resources/assets/tests/views/skinlib/List.test.ts
similarity index 99%
rename from resources/assets/tests/components/skinlib/List.test.ts
rename to resources/assets/tests/views/skinlib/List.test.ts
index fbe593ec..405c32af 100644
--- a/resources/assets/tests/components/skinlib/List.test.ts
+++ b/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({
diff --git a/resources/assets/tests/components/skinlib/Show.test.ts b/resources/assets/tests/views/skinlib/Show.test.ts
similarity index 99%
rename from resources/assets/tests/components/skinlib/Show.test.ts
rename to resources/assets/tests/views/skinlib/Show.test.ts
index ee66c1f3..c795b8f2 100644
--- a/resources/assets/tests/components/skinlib/Show.test.ts
+++ b/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'
diff --git a/resources/assets/tests/components/skinlib/Upload.test.ts b/resources/assets/tests/views/skinlib/Upload.test.ts
similarity index 98%
rename from resources/assets/tests/components/skinlib/Upload.test.ts
rename to resources/assets/tests/views/skinlib/Upload.test.ts
index 2edafacb..49fcc1ef 100644
--- a/resources/assets/tests/components/skinlib/Upload.test.ts
+++ b/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'
diff --git a/resources/assets/tests/components/user/Closet.test.ts b/resources/assets/tests/views/user/Closet.test.ts
similarity index 98%
rename from resources/assets/tests/components/user/Closet.test.ts
rename to resources/assets/tests/views/user/Closet.test.ts
index 2ee84c6d..1db3d63d 100644
--- a/resources/assets/tests/components/user/Closet.test.ts
+++ b/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 ClosetItem from '@/components/user/ClosetItem.vue'
-import Previewer from '@/components/common/Previewer.vue'
+import Closet from '@/views/user/Closet.vue'
+import ClosetItem from '@/components/ClosetItem.vue'
+import Previewer from '@/components/Previewer.vue'
 import toastr from 'toastr'
 import { swal } from '@/js/notify'
 
diff --git a/resources/assets/tests/components/user/Dashboard.test.ts b/resources/assets/tests/views/user/Dashboard.test.ts
similarity index 98%
rename from resources/assets/tests/components/user/Dashboard.test.ts
rename to resources/assets/tests/views/user/Dashboard.test.ts
index 1aaaacf1..4a3b6603 100644
--- a/resources/assets/tests/components/user/Dashboard.test.ts
+++ b/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'
 
diff --git a/resources/assets/tests/components/user/Players.test.ts b/resources/assets/tests/views/user/Players.test.ts
similarity index 99%
rename from resources/assets/tests/components/user/Players.test.ts
rename to resources/assets/tests/views/user/Players.test.ts
index c1ccd963..9a3f6fde 100644
--- a/resources/assets/tests/components/user/Players.test.ts
+++ b/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')
diff --git a/resources/assets/tests/components/user/Profile.test.ts b/resources/assets/tests/views/user/Profile.test.ts
similarity index 99%
rename from resources/assets/tests/components/user/Profile.test.ts
rename to resources/assets/tests/views/user/Profile.test.ts
index 25fb5247..1f02e755 100644
--- a/resources/assets/tests/components/user/Profile.test.ts
+++ b/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'
 
diff --git a/tsconfig.json b/tsconfig.json
index 3d8fb613..a9d15548 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,6 +15,9 @@
       ],
       "@/components/*": [
         "./resources/assets/src/components/*"
+      ],
+      "@/views/*": [
+        "./resources/assets/src/views/*"
       ]
     }
   },