From 19a51f8df71660f784f4664a9836e9a966036952 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 28 Mar 2019 16:37:01 +0800
Subject: [PATCH] Restructure files

---
 resources/assets/src/components/Previewer.vue |   2 +-
 resources/assets/src/index.js                 |   6 +-
 resources/assets/src/route.ts                 | 100 ------------------
 .../src/{js => scripts}/check-updates.ts      |   0
 .../assets/src/{js => scripts}/element.d.ts   |   0
 .../assets/src/{js => scripts}/element.js     |   0
 resources/assets/src/{js => scripts}/event.ts |   0
 resources/assets/src/{js => scripts}/i18n.ts  |   0
 resources/assets/src/{js => scripts}/index.ts |   0
 .../assets/src/{js => scripts}/logout.ts      |   0
 resources/assets/src/{js => scripts}/net.ts   |   0
 .../assets/src/{js => scripts}/notify.ts      |   0
 .../assets/src/{js => scripts}/public-path.js |   0
 resources/assets/src/scripts/route.ts         | 100 ++++++++++++++++++
 resources/assets/src/{js => scripts}/utils.ts |   0
 .../assets/src/{stylus => styles}/admin.styl  |   0
 .../assets/src/{stylus => styles}/auth.styl   |   0
 .../assets/src/{stylus => styles}/common.styl |   0
 .../assets/src/{ => styles}/element.scss      |   0
 .../assets/src/{stylus => styles}/home.styl   |   0
 .../assets/src/{stylus => styles}/setup.styl  |   0
 resources/assets/src/views/admin/Dashboard.ts |   2 +-
 resources/assets/src/views/admin/Users.vue    |   2 +-
 resources/assets/src/views/skinlib/List.vue   |   2 +-
 resources/assets/src/views/user/Bind.vue      |   2 +-
 resources/assets/src/views/user/Closet.vue    |   2 +-
 .../assets/tests/components/Previewer.test.ts |   2 +-
 .../{js => scripts}/check-updates.test.ts     |   4 +-
 .../tests/{js => scripts}/event.test.ts       |   2 +-
 .../assets/tests/{js => scripts}/i18n.test.ts |   2 +-
 .../tests/{js => scripts}/logout.test.ts      |  10 +-
 .../assets/tests/{js => scripts}/net.test.ts  |   8 +-
 .../tests/{js => scripts}/notify.test.ts      |   2 +-
 .../assets/tests/{js => scripts}/types.d.ts   |   0
 .../tests/{js => scripts}/utils.test.ts       |   2 +-
 resources/assets/tests/ts-shims/net.ts        |   2 +-
 resources/assets/tests/ts-shims/notify.ts     |   2 +-
 .../assets/tests/views/admin/Plugins.test.ts  |   2 +-
 .../assets/tests/views/admin/Users.test.ts    |   4 +-
 .../assets/tests/views/user/Closet.test.ts    |   2 +-
 tsconfig.json                                 |   4 +-
 webpack.config.js                             |   6 +-
 42 files changed, 136 insertions(+), 136 deletions(-)
 delete mode 100644 resources/assets/src/route.ts
 rename resources/assets/src/{js => scripts}/check-updates.ts (100%)
 rename resources/assets/src/{js => scripts}/element.d.ts (100%)
 rename resources/assets/src/{js => scripts}/element.js (100%)
 rename resources/assets/src/{js => scripts}/event.ts (100%)
 rename resources/assets/src/{js => scripts}/i18n.ts (100%)
 rename resources/assets/src/{js => scripts}/index.ts (100%)
 rename resources/assets/src/{js => scripts}/logout.ts (100%)
 rename resources/assets/src/{js => scripts}/net.ts (100%)
 rename resources/assets/src/{js => scripts}/notify.ts (100%)
 rename resources/assets/src/{js => scripts}/public-path.js (100%)
 create mode 100644 resources/assets/src/scripts/route.ts
 rename resources/assets/src/{js => scripts}/utils.ts (100%)
 rename resources/assets/src/{stylus => styles}/admin.styl (100%)
 rename resources/assets/src/{stylus => styles}/auth.styl (100%)
 rename resources/assets/src/{stylus => styles}/common.styl (100%)
 rename resources/assets/src/{ => styles}/element.scss (100%)
 rename resources/assets/src/{stylus => styles}/home.styl (100%)
 rename resources/assets/src/{stylus => styles}/setup.styl (100%)
 rename resources/assets/tests/{js => scripts}/check-updates.test.ts (96%)
 rename resources/assets/tests/{js => scripts}/event.test.ts (84%)
 rename resources/assets/tests/{js => scripts}/i18n.test.ts (96%)
 rename resources/assets/tests/{js => scripts}/logout.test.ts (62%)
 rename resources/assets/tests/{js => scripts}/net.test.ts (95%)
 rename resources/assets/tests/{js => scripts}/notify.test.ts (91%)
 rename resources/assets/tests/{js => scripts}/types.d.ts (100%)
 rename resources/assets/tests/{js => scripts}/utils.test.ts (93%)

diff --git a/resources/assets/src/components/Previewer.vue b/resources/assets/src/components/Previewer.vue
index cd190e7c..f8754f7c 100644
--- a/resources/assets/src/components/Previewer.vue
+++ b/resources/assets/src/components/Previewer.vue
@@ -50,7 +50,7 @@
 
 <script>
 import * as skinview3d from 'skinview3d'
-import { emit } from '../js/event'
+import { emit } from '../scripts/event'
 import SkinSteve from '../images/textures/steve.png'
 
 export default {
diff --git a/resources/assets/src/index.js b/resources/assets/src/index.js
index c91d34b2..7cc9137a 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 './route'
+import './scripts'
+import * as emitter from './scripts/event'
+import routes from './scripts/route'
 
 Vue.config.productionTip = false
 
diff --git a/resources/assets/src/route.ts b/resources/assets/src/route.ts
deleted file mode 100644
index eae987b6..00000000
--- a/resources/assets/src/route.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-export default [
-  {
-    path: '/',
-    module: [() => import('./stylus/home.styl')],
-  },
-  {
-    path: 'user',
-    component: () => import('./views/user/Dashboard.vue'),
-    el: '#usage-box',
-  },
-  {
-    path: 'user/closet',
-    component: () => import('./views/user/Closet.vue'),
-    el: '.content',
-  },
-  {
-    path: 'user/player',
-    component: () => import('./views/user/Players.vue'),
-    el: '.content',
-  },
-  {
-    path: 'user/player/bind',
-    component: () => import('./views/user/Bind.vue'),
-    el: 'form',
-  },
-  {
-    path: 'user/profile',
-    component: () => import('./views/user/Profile.vue'),
-    el: '.content',
-  },
-  {
-    path: 'admin',
-    module: [() => import('./views/admin/Dashboard')],
-  },
-  {
-    path: 'admin/users',
-    component: () => import('./views/admin/Users.vue'),
-    el: '.content',
-  },
-  {
-    path: 'admin/players',
-    component: () => import('./views/admin/Players.vue'),
-    el: '.content',
-  },
-  {
-    path: 'admin/customize',
-    component: () => import('./views/admin/Customization.vue'),
-    el: '#change-color',
-  },
-  {
-    path: 'admin/plugins/manage',
-    component: () => import('./views/admin/Plugins.vue'),
-    el: '.content',
-  },
-  {
-    path: 'admin/plugins/market',
-    component: () => import('./views/admin/Market.vue'),
-    el: '.content',
-  },
-  {
-    path: 'admin/update',
-    component: () => import('./views/admin/Update.vue'),
-    el: '#update-button',
-  },
-  {
-    path: 'auth/login',
-    component: () => import('./views/auth/Login.vue'),
-    el: 'form',
-  },
-  {
-    path: 'auth/register',
-    component: () => import('./views/auth/Register.vue'),
-    el: 'form',
-  },
-  {
-    path: 'auth/forgot',
-    component: () => import('./views/auth/Forgot.vue'),
-    el: 'form',
-  },
-  {
-    path: 'auth/reset/(\\d+)',
-    component: () => import('./views/auth/Reset.vue'),
-    el: 'form',
-  },
-  {
-    path: 'skinlib',
-    component: () => import('./views/skinlib/List.vue'),
-    el: '.content-wrapper',
-  },
-  {
-    path: 'skinlib/show/(\\d+)',
-    component: () => import('./views/skinlib/Show.vue'),
-    el: '.content > .row:nth-child(1)',
-  },
-  {
-    path: 'skinlib/upload',
-    component: () => import('./views/skinlib/Upload.vue'),
-    el: '.content',
-  },
-]
diff --git a/resources/assets/src/js/check-updates.ts b/resources/assets/src/scripts/check-updates.ts
similarity index 100%
rename from resources/assets/src/js/check-updates.ts
rename to resources/assets/src/scripts/check-updates.ts
diff --git a/resources/assets/src/js/element.d.ts b/resources/assets/src/scripts/element.d.ts
similarity index 100%
rename from resources/assets/src/js/element.d.ts
rename to resources/assets/src/scripts/element.d.ts
diff --git a/resources/assets/src/js/element.js b/resources/assets/src/scripts/element.js
similarity index 100%
rename from resources/assets/src/js/element.js
rename to resources/assets/src/scripts/element.js
diff --git a/resources/assets/src/js/event.ts b/resources/assets/src/scripts/event.ts
similarity index 100%
rename from resources/assets/src/js/event.ts
rename to resources/assets/src/scripts/event.ts
diff --git a/resources/assets/src/js/i18n.ts b/resources/assets/src/scripts/i18n.ts
similarity index 100%
rename from resources/assets/src/js/i18n.ts
rename to resources/assets/src/scripts/i18n.ts
diff --git a/resources/assets/src/js/index.ts b/resources/assets/src/scripts/index.ts
similarity index 100%
rename from resources/assets/src/js/index.ts
rename to resources/assets/src/scripts/index.ts
diff --git a/resources/assets/src/js/logout.ts b/resources/assets/src/scripts/logout.ts
similarity index 100%
rename from resources/assets/src/js/logout.ts
rename to resources/assets/src/scripts/logout.ts
diff --git a/resources/assets/src/js/net.ts b/resources/assets/src/scripts/net.ts
similarity index 100%
rename from resources/assets/src/js/net.ts
rename to resources/assets/src/scripts/net.ts
diff --git a/resources/assets/src/js/notify.ts b/resources/assets/src/scripts/notify.ts
similarity index 100%
rename from resources/assets/src/js/notify.ts
rename to resources/assets/src/scripts/notify.ts
diff --git a/resources/assets/src/js/public-path.js b/resources/assets/src/scripts/public-path.js
similarity index 100%
rename from resources/assets/src/js/public-path.js
rename to resources/assets/src/scripts/public-path.js
diff --git a/resources/assets/src/scripts/route.ts b/resources/assets/src/scripts/route.ts
new file mode 100644
index 00000000..42e89d2f
--- /dev/null
+++ b/resources/assets/src/scripts/route.ts
@@ -0,0 +1,100 @@
+export default [
+  {
+    path: '/',
+    module: [() => import('../styles/home.styl')],
+  },
+  {
+    path: 'user',
+    component: () => import('../views/user/Dashboard.vue'),
+    el: '#usage-box',
+  },
+  {
+    path: 'user/closet',
+    component: () => import('../views/user/Closet.vue'),
+    el: '.content',
+  },
+  {
+    path: 'user/player',
+    component: () => import('../views/user/Players.vue'),
+    el: '.content',
+  },
+  {
+    path: 'user/player/bind',
+    component: () => import('../views/user/Bind.vue'),
+    el: 'form',
+  },
+  {
+    path: 'user/profile',
+    component: () => import('../views/user/Profile.vue'),
+    el: '.content',
+  },
+  {
+    path: 'admin',
+    module: [() => import('../views/admin/Dashboard')],
+  },
+  {
+    path: 'admin/users',
+    component: () => import('../views/admin/Users.vue'),
+    el: '.content',
+  },
+  {
+    path: 'admin/players',
+    component: () => import('../views/admin/Players.vue'),
+    el: '.content',
+  },
+  {
+    path: 'admin/customize',
+    component: () => import('../views/admin/Customization.vue'),
+    el: '#change-color',
+  },
+  {
+    path: 'admin/plugins/manage',
+    component: () => import('../views/admin/Plugins.vue'),
+    el: '.content',
+  },
+  {
+    path: 'admin/plugins/market',
+    component: () => import('../views/admin/Market.vue'),
+    el: '.content',
+  },
+  {
+    path: 'admin/update',
+    component: () => import('../views/admin/Update.vue'),
+    el: '#update-button',
+  },
+  {
+    path: 'auth/login',
+    component: () => import('../views/auth/Login.vue'),
+    el: 'form',
+  },
+  {
+    path: 'auth/register',
+    component: () => import('../views/auth/Register.vue'),
+    el: 'form',
+  },
+  {
+    path: 'auth/forgot',
+    component: () => import('../views/auth/Forgot.vue'),
+    el: 'form',
+  },
+  {
+    path: 'auth/reset/(\\d+)',
+    component: () => import('../views/auth/Reset.vue'),
+    el: 'form',
+  },
+  {
+    path: 'skinlib',
+    component: () => import('../views/skinlib/List.vue'),
+    el: '.content-wrapper',
+  },
+  {
+    path: 'skinlib/show/(\\d+)',
+    component: () => import('../views/skinlib/Show.vue'),
+    el: '.content > .row:nth-child(1)',
+  },
+  {
+    path: 'skinlib/upload',
+    component: () => import('../views/skinlib/Upload.vue'),
+    el: '.content',
+  },
+]
diff --git a/resources/assets/src/js/utils.ts b/resources/assets/src/scripts/utils.ts
similarity index 100%
rename from resources/assets/src/js/utils.ts
rename to resources/assets/src/scripts/utils.ts
diff --git a/resources/assets/src/stylus/admin.styl b/resources/assets/src/styles/admin.styl
similarity index 100%
rename from resources/assets/src/stylus/admin.styl
rename to resources/assets/src/styles/admin.styl
diff --git a/resources/assets/src/stylus/auth.styl b/resources/assets/src/styles/auth.styl
similarity index 100%
rename from resources/assets/src/stylus/auth.styl
rename to resources/assets/src/styles/auth.styl
diff --git a/resources/assets/src/stylus/common.styl b/resources/assets/src/styles/common.styl
similarity index 100%
rename from resources/assets/src/stylus/common.styl
rename to resources/assets/src/styles/common.styl
diff --git a/resources/assets/src/element.scss b/resources/assets/src/styles/element.scss
similarity index 100%
rename from resources/assets/src/element.scss
rename to resources/assets/src/styles/element.scss
diff --git a/resources/assets/src/stylus/home.styl b/resources/assets/src/styles/home.styl
similarity index 100%
rename from resources/assets/src/stylus/home.styl
rename to resources/assets/src/styles/home.styl
diff --git a/resources/assets/src/stylus/setup.styl b/resources/assets/src/styles/setup.styl
similarity index 100%
rename from resources/assets/src/stylus/setup.styl
rename to resources/assets/src/styles/setup.styl
diff --git a/resources/assets/src/views/admin/Dashboard.ts b/resources/assets/src/views/admin/Dashboard.ts
index c38259d8..ac6e5291 100644
--- a/resources/assets/src/views/admin/Dashboard.ts
+++ b/resources/assets/src/views/admin/Dashboard.ts
@@ -5,7 +5,7 @@ import 'echarts/lib/chart/line'
 import 'echarts/lib/component/dataZoom'
 import 'echarts/lib/component/legend'
 import 'echarts/lib/component/tooltip'
-import { get } from '../../js/net'
+import { get } from '../../scripts/net'
 
 interface ChartData {
   labels: string[]
diff --git a/resources/assets/src/views/admin/Users.vue b/resources/assets/src/views/admin/Users.vue
index 90a4fc6c..23abdf8b 100644
--- a/resources/assets/src/views/admin/Users.vue
+++ b/resources/assets/src/views/admin/Users.vue
@@ -88,7 +88,7 @@
 <script>
 import { VueGoodTable } from 'vue-good-table'
 import 'vue-good-table/dist/vue-good-table.min.css'
-import { trans } from '../../js/i18n'
+import { trans } from '../../scripts/i18n'
 import tableOptions from '../../components/mixins/tableOptions'
 import serverTable from '../../components/mixins/serverTable'
 
diff --git a/resources/assets/src/views/skinlib/List.vue b/resources/assets/src/views/skinlib/List.vue
index ee2c25f9..3f51125c 100644
--- a/resources/assets/src/views/skinlib/List.vue
+++ b/resources/assets/src/views/skinlib/List.vue
@@ -115,7 +115,7 @@ import ButtonGroup from 'element-ui/lib/button-group'
 import 'element-ui/lib/theme-chalk/select.css'
 import Select from 'element-ui/lib/select'
 import Option from 'element-ui/lib/option'
-import { queryString } from '../../js/utils'
+import { queryString } from '../../scripts/utils'
 import SkinLibItem from '../../components/SkinLibItem.vue'
 
 Vue.use(ButtonGroup)
diff --git a/resources/assets/src/views/user/Bind.vue b/resources/assets/src/views/user/Bind.vue
index 2fa8cc19..c8feee84 100644
--- a/resources/assets/src/views/user/Bind.vue
+++ b/resources/assets/src/views/user/Bind.vue
@@ -72,7 +72,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import "../../stylus/auth.styl"
+@import "../../styles/auth.styl"
 
 .player-select
   width 100%
diff --git a/resources/assets/src/views/user/Closet.vue b/resources/assets/src/views/user/Closet.vue
index a5593dd8..42707277 100644
--- a/resources/assets/src/views/user/Closet.vue
+++ b/resources/assets/src/views/user/Closet.vue
@@ -192,7 +192,7 @@
 
 <script>
 import Paginate from 'vuejs-paginate'
-import { debounce, queryString } from '../../js/utils'
+import { debounce, queryString } from '../../scripts/utils'
 import ClosetItem from '../../components/ClosetItem.vue'
 import EmailVerification from '../../components/EmailVerification.vue'
 
diff --git a/resources/assets/tests/components/Previewer.test.ts b/resources/assets/tests/components/Previewer.test.ts
index e23f1a11..673b06c3 100644
--- a/resources/assets/tests/components/Previewer.test.ts
+++ b/resources/assets/tests/components/Previewer.test.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
 import Previewer from '@/components/Previewer.vue'
-import * as emitter from '@/js/event'
+import * as emitter from '@/scripts/event'
 import * as mockedSkinview3d from '../__mocks__/skinview3d'
 
 type Viewer = Vue & { viewer: mockedSkinview3d.SkinViewer }
diff --git a/resources/assets/tests/js/check-updates.test.ts b/resources/assets/tests/scripts/check-updates.test.ts
similarity index 96%
rename from resources/assets/tests/js/check-updates.test.ts
rename to resources/assets/tests/scripts/check-updates.test.ts
index e97de187..d3d71efb 100644
--- a/resources/assets/tests/js/check-updates.test.ts
+++ b/resources/assets/tests/scripts/check-updates.test.ts
@@ -1,8 +1,8 @@
 import {
   checkForUpdates,
   checkForPluginUpdates,
-} from '@/js/check-updates'
-import { init } from '@/js/net'
+} from '@/scripts/check-updates'
+import { init } from '@/scripts/net'
 
 test('check for BS updates', async () => {
   window.fetch = jest.fn()
diff --git a/resources/assets/tests/js/event.test.ts b/resources/assets/tests/scripts/event.test.ts
similarity index 84%
rename from resources/assets/tests/js/event.test.ts
rename to resources/assets/tests/scripts/event.test.ts
index 865a1a9f..7d22375b 100644
--- a/resources/assets/tests/js/event.test.ts
+++ b/resources/assets/tests/scripts/event.test.ts
@@ -1,4 +1,4 @@
-import * as emitter from '@/js/event'
+import * as emitter from '@/scripts/event'
 
 test('add listener and emit event', () => {
   const mockA = jest.fn()
diff --git a/resources/assets/tests/js/i18n.test.ts b/resources/assets/tests/scripts/i18n.test.ts
similarity index 96%
rename from resources/assets/tests/js/i18n.test.ts
rename to resources/assets/tests/scripts/i18n.test.ts
index ab19b528..8fbba8d5 100644
--- a/resources/assets/tests/js/i18n.test.ts
+++ b/resources/assets/tests/scripts/i18n.test.ts
@@ -1,4 +1,4 @@
-import { trans } from '@/js/i18n'
+import { trans } from '@/scripts/i18n'
 import Vue from 'vue'
 
 test('mount to global', () => {
diff --git a/resources/assets/tests/js/logout.test.ts b/resources/assets/tests/scripts/logout.test.ts
similarity index 62%
rename from resources/assets/tests/js/logout.test.ts
rename to resources/assets/tests/scripts/logout.test.ts
index 84489231..f74bcb78 100644
--- a/resources/assets/tests/js/logout.test.ts
+++ b/resources/assets/tests/scripts/logout.test.ts
@@ -1,9 +1,9 @@
-import { logout } from '@/js/logout'
-import { post } from '@/js/net'
-import { MessageBox } from '@/js/element'
+import { logout } from '@/scripts/logout'
+import { post } from '@/scripts/net'
+import { MessageBox } from '@/scripts/element'
 
-jest.mock('@/js/net')
-jest.mock('@/js/element')
+jest.mock('@/scripts/net')
+jest.mock('@/scripts/element')
 
 test('log out', async () => {
   MessageBox.confirm
diff --git a/resources/assets/tests/js/net.test.ts b/resources/assets/tests/scripts/net.test.ts
similarity index 95%
rename from resources/assets/tests/js/net.test.ts
rename to resources/assets/tests/scripts/net.test.ts
index 03171ffe..4a42e9e4 100644
--- a/resources/assets/tests/js/net.test.ts
+++ b/resources/assets/tests/scripts/net.test.ts
@@ -1,9 +1,9 @@
 import Vue from 'vue'
-import * as net from '@/js/net'
-import { on } from '@/js/event'
-import { showAjaxError } from '@/js/notify'
+import * as net from '@/scripts/net'
+import { on } from '@/scripts/event'
+import { showAjaxError } from '@/scripts/notify'
 
-jest.mock('@/js/notify')
+jest.mock('@/scripts/notify')
 
 ;(window as Window & { Request: any }).Request = class {
   headers: Map<string, string>
diff --git a/resources/assets/tests/js/notify.test.ts b/resources/assets/tests/scripts/notify.test.ts
similarity index 91%
rename from resources/assets/tests/js/notify.test.ts
rename to resources/assets/tests/scripts/notify.test.ts
index 1c4cc968..07a0750b 100644
--- a/resources/assets/tests/js/notify.test.ts
+++ b/resources/assets/tests/scripts/notify.test.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import * as notify from '@/js/notify'
+import * as notify from '@/scripts/notify'
 
 test('show AJAX error', () => {
   // @ts-ignore
diff --git a/resources/assets/tests/js/types.d.ts b/resources/assets/tests/scripts/types.d.ts
similarity index 100%
rename from resources/assets/tests/js/types.d.ts
rename to resources/assets/tests/scripts/types.d.ts
diff --git a/resources/assets/tests/js/utils.test.ts b/resources/assets/tests/scripts/utils.test.ts
similarity index 93%
rename from resources/assets/tests/js/utils.test.ts
rename to resources/assets/tests/scripts/utils.test.ts
index c44c3730..7559f843 100644
--- a/resources/assets/tests/js/utils.test.ts
+++ b/resources/assets/tests/scripts/utils.test.ts
@@ -1,4 +1,4 @@
-import * as utils from '@/js/utils'
+import * as utils from '@/scripts/utils'
 
 test('debounce', () => {
   const stub = jest.fn()
diff --git a/resources/assets/tests/ts-shims/net.ts b/resources/assets/tests/ts-shims/net.ts
index 7e204e81..27530a62 100644
--- a/resources/assets/tests/ts-shims/net.ts
+++ b/resources/assets/tests/ts-shims/net.ts
@@ -1,4 +1,4 @@
-import * as net from '../../src/js/net'
+import * as net from '../../src/scripts/net'
 
 export const init = {} as typeof net.init
 
diff --git a/resources/assets/tests/ts-shims/notify.ts b/resources/assets/tests/ts-shims/notify.ts
index 377f2006..a7a5cae8 100644
--- a/resources/assets/tests/ts-shims/notify.ts
+++ b/resources/assets/tests/ts-shims/notify.ts
@@ -1,4 +1,4 @@
-import * as notify from '../../src/js/notify'
+import * as notify from '../../src/scripts/notify'
 
 export const showAjaxError = {} as jest.Mock<
   ReturnType<typeof notify.showAjaxError>,
diff --git a/resources/assets/tests/views/admin/Plugins.test.ts b/resources/assets/tests/views/admin/Plugins.test.ts
index d68acb37..8a1abeff 100644
--- a/resources/assets/tests/views/admin/Plugins.test.ts
+++ b/resources/assets/tests/views/admin/Plugins.test.ts
@@ -3,7 +3,7 @@ import { mount } from '@vue/test-utils'
 import Plugins from '@/views/admin/Plugins.vue'
 import { flushPromises } from '../../utils'
 
-jest.mock('@/js/notify')
+jest.mock('@/scripts/notify')
 
 test('render dependencies', async () => {
   Vue.prototype.$http.get.mockResolvedValue([
diff --git a/resources/assets/tests/views/admin/Users.test.ts b/resources/assets/tests/views/admin/Users.test.ts
index 2eb16596..36a33bb5 100644
--- a/resources/assets/tests/views/admin/Users.test.ts
+++ b/resources/assets/tests/views/admin/Users.test.ts
@@ -1,11 +1,11 @@
 import Vue from 'vue'
 import { mount } from '@vue/test-utils'
 import Users from '@/views/admin/Users.vue'
-import '@/js/i18n'
+import '@/scripts/i18n'
 import { MessageBoxData } from 'element-ui/types/message-box'
 import { flushPromises } from '../../utils'
 
-jest.mock('@/js/i18n', () => ({
+jest.mock('@/scripts/i18n', () => ({
   trans: (key: string) => key,
 }))
 
diff --git a/resources/assets/tests/views/user/Closet.test.ts b/resources/assets/tests/views/user/Closet.test.ts
index 8e17b206..8710a4a4 100644
--- a/resources/assets/tests/views/user/Closet.test.ts
+++ b/resources/assets/tests/views/user/Closet.test.ts
@@ -279,5 +279,5 @@ test('select specified texture initially', async () => {
   const wrapper = mount(Closet)
   jest.runAllTimers()
   await wrapper.vm.$nextTick()
-  jest.unmock('@/js/utils')
+  jest.unmock('@/scripts/utils')
 })
diff --git a/tsconfig.json b/tsconfig.json
index a9d15548..0a972888 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,9 +9,9 @@
     "noEmit": true,
     "baseUrl": ".",
     "paths": {
-      "@/js/*": [
+      "@/scripts/*": [
         "./resources/assets/tests/ts-shims/*",
-        "./resources/assets/src/js/*"
+        "./resources/assets/src/scripts/*"
       ],
       "@/components/*": [
         "./resources/assets/src/components/*"
diff --git a/webpack.config.js b/webpack.config.js
index c9e44901..9b5061f3 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,13 +16,13 @@ const config = {
       'bootstrap/dist/css/bootstrap.min.css',
       'admin-lte/dist/css/alt/AdminLTE-without-plugins.min.css',
       'element-ui/lib/theme-chalk/base.css',
-      './resources/assets/src/element.scss',
+      './resources/assets/src/styles/element.scss',
       '@fortawesome/fontawesome-free/css/fontawesome.min.css',
       '@fortawesome/fontawesome-free/css/regular.min.css',
       '@fortawesome/fontawesome-free/css/solid.min.css',
-      './resources/assets/src/stylus/common.styl',
+      './resources/assets/src/styles/common.styl',
     ],
-    setup: './resources/assets/src/stylus/setup.styl',
+    setup: './resources/assets/src/styles/setup.styl',
   },
   output: {
     path: `${__dirname}/public/app`,