Merge pull request #190 from paywteam/refactor

Refactor plugins and modules
payw-org · Oct 10, 2019 · 479e555 · 479e555
2 parents aad5790 + 1db89bc
commit 479e555
Show file tree

Hide file tree

Showing 24 changed files with 14 additions and 42 deletions.
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -92,7 +92,6 @@ export default {
 
   css: [
     '~/assets/styles/css/fonts.css',
-    '~/plugins/eodiro-dialog/style.scss',
     '~/assets/styles/scss/global/globalstyle.scss',
     '~/assets/styles/stylus/spring.styl'
   ],
@@ -102,7 +101,7 @@ export default {
   buildModules: [
     '@nuxtjs/eslint-module',
     '@nuxt/typescript-build',
-    '~/modules/extend-route'
+    '~/modules/nuxt/extend-route'
   ],
 
   // Nuxt.js modules

diff --git a/src/components/global/Banner.vue b/src/components/global/Banner.vue
@@ -58,7 +58,7 @@
 
 <script>
 import disableScroll from 'disable-scroll'
-import { CEM } from '~/plugins/custom-event-manager'
+import { CEM } from '~/modules/custom-event-manager'
 import HomeBgTile from '~/components/home/HomeBgTile.vue'
 
 export default {

diff --git a/src/components/global/GoBack.vue b/src/components/global/GoBack.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { CEM } from '~/plugins/custom-event-manager'
+import { CEM } from '~/modules/custom-event-manager'
 export default {
   data() {
     return {

diff --git a/src/layouts/default.vue b/src/layouts/default.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { CEM } from '../plugins/custom-event-manager'
+import { CEM } from '~/modules/custom-event-manager'
 import Banner from '~/components/global/Banner'
 import GoBack from '~/components/global/GoBack'
 

diff --git a/src/mixins/page-base.js b/src/mixins/page-base.js
@@ -1,5 +1,5 @@
 import disableScroll from 'disable-scroll'
-import { CEM } from '~/plugins/custom-event-manager'
+import { CEM } from '~/modules/custom-event-manager'
 
 /**
  * Add this mixin from every page component.

diff --git a/src/plugins/ApiUrl.ts → src/modules/ApiUrl.ts b/src/plugins/ApiUrl.ts → src/modules/ApiUrl.ts
diff --git a/src/plugins/custom-event-manager.ts → src/modules/custom-event-manager.ts b/src/plugins/custom-event-manager.ts → src/modules/custom-event-manager.ts
diff --git a/src/plugins/DayToString.js → src/modules/day-to-string.js b/src/plugins/DayToString.js → src/modules/day-to-string.js
diff --git a/src/plugins/eodiro-dialog/index.ts → src/modules/eodiro-dialog/index.ts b/src/plugins/eodiro-dialog/index.ts → src/modules/eodiro-dialog/index.ts
diff --git a/src/plugins/eodiro-dialog/style.scss → src/modules/eodiro-dialog/style.scss b/src/plugins/eodiro-dialog/style.scss → src/modules/eodiro-dialog/style.scss
diff --git a/src/plugins/eodiro-dialog/template.html → src/modules/eodiro-dialog/template.html b/src/plugins/eodiro-dialog/template.html → src/modules/eodiro-dialog/template.html
diff --git a/src/plugins/EodiroStorage.ts → src/modules/eodiro-storage.ts b/src/plugins/EodiroStorage.ts → src/modules/eodiro-storage.ts
diff --git a/src/plugins/ExpireCounter.js → src/modules/expire-counter.js b/src/plugins/ExpireCounter.js → src/modules/expire-counter.js
diff --git a/src/modules/extend-route.js → src/modules/nuxt/extend-route.js b/src/modules/extend-route.js → src/modules/nuxt/extend-route.js
@@ -1,4 +1,5 @@
-/* 'extend-route' module for Nuxt.js
+/**
+ * 'extend-route' module for Nuxt.js
  *
  * It automatically assigns page depth, hamlet name
  * and previous page's route for each route.

diff --git a/src/plugins/Stagger.js → src/modules/stagger.js b/src/plugins/Stagger.js → src/modules/stagger.js
diff --git a/src/plugins/topbar.js → src/modules/topbar.js b/src/plugins/topbar.js → src/modules/topbar.js
diff --git a/src/pages/community/_postId/index.vue b/src/pages/community/_postId/index.vue
@@ -55,7 +55,7 @@ import dayjs from 'dayjs'
 // import axios from 'axios'
 import pageBase from '~/mixins/page-base'
 import NewComment from '~/components/community/NewComment'
-// import { CEM } from '~/plugins/custom-event-manager'
+// import { CEM } from '~/modules/custom-event-manager'
 
 const lorem = new LoremIpsum()
 

diff --git a/src/pages/community/index.vue b/src/pages/community/index.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { CEM } from '~/plugins/custom-event-manager'
+import { CEM } from '~/modules/custom-event-manager'
 import pageBase from '~/mixins/page-base'
 import PostItem from '~/components/community/PostItem'
 

diff --git a/src/pages/donation.vue b/src/pages/donation.vue
@@ -86,7 +86,7 @@
 
 <script>
 import pageBase from '~/mixins/page-base'
-import Dialog from '~/plugins/eodiro-dialog'
+import Dialog from '~/modules/eodiro-dialog'
 
 export default {
   name: 'donation',

diff --git a/src/pages/index.vue b/src/pages/index.vue
@@ -130,7 +130,7 @@
 
 <script>
 import pageBase from '~/mixins/page-base'
-import EodiroDialog from '~/plugins/eodiro-dialog'
+import EodiroDialog from '~/modules/eodiro-dialog'
 import { Grid, ArrowBlock } from '~/components/ui'
 
 export default {

diff --git a/src/pages/inquiry.vue b/src/pages/inquiry.vue
@@ -35,7 +35,7 @@
 import axios from 'axios'
 import pageBase from '~/mixins/page-base'
 import { Button } from '~/components/ui'
-// import Dialog from '~/plugins/eodiro-dialog'
+// import Dialog from '~/modules/eodiro-dialog'
 
 export default {
   name: 'inquiry',

diff --git a/src/pages/vacant/_buildingId/_floorId/index.vue b/src/pages/vacant/_buildingId/_floorId/index.vue
@@ -151,7 +151,7 @@ import axios from 'axios'
 import { disableBodyScroll, enableBodyScroll } from 'body-scroll-lock'
 import pageBase from '~/mixins/page-base'
 import modalScroll from '~/mixins/modal-scroll'
-import ExpireCounter from '~/plugins/ExpireCounter'
+import ExpireCounter from '~/modules/expire-counter'
 import { Grid, ArrowBlock } from '~/components/ui'
 
 export default {

diff --git a/src/plugins/RouteLocation.ts b/src/plugins/RouteLocation.ts
diff --git a/src/plugins/init.ts b/src/plugins/init.ts
@@ -57,7 +57,7 @@ export default (context: Context) => {
     })
 
     // Assign topbar to window
-    const topbar = require('./topbar').default
+    const topbar = require('~/modules/topbar').default
     window.topbar = topbar
   }
 }