Move enums to enum folder, change home page using namespaced store "home".

anotherKyleFrom1994 · anotherKyleFrom1994 · commit 41f0ab5e3ef7 · 2019-12-25T11:18:05.000+08:00
diff --git a/src/components/home/feed/Feed.ts b/src/components/home/feed/Feed.ts
@@ -9,7 +9,7 @@ export default class Feed extends Vue {
   private layout: number[] = [2, 2, 1, 2, 2, 3, 3, 3, 3, 3, 3];
   private page: number = 1;
 
-  @namespace('app').State('articles') articles!: IArticle[];
+  @namespace('home').State('articles') articles!: IArticle[];
 
   get pages() {
     return Math.ceil(this.articles.length / 11);
diff --git a/src/components/home/newest_posts/NewestPosts.ts b/src/components/home/newest_posts/NewestPosts.ts
@@ -4,5 +4,5 @@ import { IArticle } from '@/data/articles';
 
 @Component({})
 export default class NewestPosts extends Vue {
-  @namespace('app').State('articles') articles!: IArticle[];
+  @namespace('home').State('articles') articles!: IArticle[];
 };
diff --git a/src/components/home/tags/Tags.ts b/src/components/home/tags/Tags.ts
@@ -3,5 +3,5 @@ import { namespace, State, Getter } from 'vuex-class';
 
 @Component({})
 export default class Tags extends Vue {
-  @namespace('app').Getter('categories') categories!: any;
+  @namespace('home').Getter('categories') categories!: any;
 };
diff --git a/src/enums/iconType.ts b/src/enums/iconType.ts
@@ -0,0 +1,8 @@
+// You can refer to this
+// https://materialdesignicons.com/
+enum IconType {
+  Person = 'person',
+    Lock = 'lock'
+}
+
+export default IconType;
diff --git a/src/main.ts b/src/main.ts
@@ -1,9 +1,9 @@
 import Vue from 'vue';
 import App from './App.vue';
 import router from './plugins/router';
-import vuetify from './plugins/vuetify/vuetify';
+import vuetify from './plugins/vuetify';
 import store from './plugins/store';
-import './plugins/base_components/baseComponents';
+import './plugins/global-components';
 
 Vue.config.productionTip = false;
 
diff --git a/src/pages/generic/drawer/Drawer.ts b/src/pages/generic/drawer/Drawer.ts
@@ -3,9 +3,9 @@ import { namespace, State, Getter, Mutation } from 'vuex-class';
 
 @Component({ name: 'CoreDrawer' })
 export default class Drawer extends Vue {
-  @namespace('app').Getter('links') links: any;
-  @namespace('app').State('drawer') drawer: any;
-  @namespace('app').Mutation('setDrawer') setDrawer: any;
+  @namespace('home').Getter('links') links: any;
+  @namespace('home').State('drawer') drawer: any;
+  @namespace('home').Mutation('setDrawer') setDrawer: any;
 
   private onClickListItem(e: any, item: any) {
     e.stopPropagation();
diff --git a/src/pages/generic/nav_bar/NavBar.ts b/src/pages/generic/nav_bar/NavBar.ts
@@ -1,5 +1,5 @@
 import { Component, Vue, Prop, Watch, Emit } from 'vue-property-decorator';
-import { IconType } from '@/utils/enums';
+import IconType from '@/enums/iconType';
 
 @Component({})
 export default class NavBar extends Vue {
diff --git a/src/pages/generic/toolbar/Toolbar.ts b/src/pages/generic/toolbar/Toolbar.ts
@@ -3,8 +3,8 @@ import { namespace, State, Getter, Mutation } from 'vuex-class';
 
 @Component({})
 export default class Toolbar extends Vue {
-  @namespace('app').Getter('links') links!: any;
-  @namespace('app').Mutation('toggleDrawer') toggleDrawer!: any;
+  @namespace('home').Getter('links') links!: any;
+  @namespace('home').Mutation('toggleDrawer') toggleDrawer!: any;
 
   private onClickButton(e: Event, item: any) {
     e.stopPropagation();
diff --git a/src/plugins/global-components/index.ts b/src/plugins/global-components/index.ts
diff --git a/src/plugins/store/index.ts b/src/plugins/store/index.ts
@@ -1,16 +1,21 @@
 import Vue from 'vue';
 import Vuex, { StoreOptions } from 'vuex';
 import app from './modules/app';
+import home from './modules/home';
 
 // register VUEX
 Vue.use(Vuex);
 
+export interface State {
+  [key: string]: any
+}
+
 let opt: StoreOptions < any > = {
   // strict mode
   strict: true,
 
   // module states
-  modules: { app },
+  modules: { app, home },
 
   // root states
   state: {},
diff --git a/src/plugins/store/modules/app/modules/actions.ts b/src/plugins/store/modules/app/modules/actions.ts
@@ -1,5 +1,5 @@
 import { Store } from 'vuex';
-import { State } from './state';
+import { State } from '@/plugins/store';
 
 const actions = {
 
diff --git a/src/plugins/store/modules/app/modules/getters.ts b/src/plugins/store/modules/app/modules/getters.ts
@@ -1,38 +1,6 @@
-import { State } from './state';
 import { GetterTree, Getter } from 'vuex';
+import { State } from '@/plugins/store';
 
-export interface IGetters {
-  [key: string]: any
-}
-
-export interface Category {
-  text: any;
-  to: string;
-}
-
-const getters: GetterTree < State, Getter < string, any > > = {
-  categories: (state: State) => {
-    const categories: Category[] = [];
-
-    for (const article of state.articles) {
-      if (
-        !article.category ||
-        categories.find(category => category.text === article.category)
-      ) continue;
-
-      const text = article.category;
-
-      categories.push({
-        text,
-        to: `/category/${text}`
-      });
-    }
-
-    return categories.sort().slice(0, 4);
-  },
-  links: (state: State, getters: IGetters) => {
-    return state.items.concat(getters.categories);
-  }
-};
+const getters: GetterTree < State, Getter < string, any > > = {};
 
 export default getters;
diff --git a/src/plugins/store/modules/app/modules/mutations.ts b/src/plugins/store/modules/app/modules/mutations.ts
@@ -1,9 +1,8 @@
-import { State } from './state';
 import { MutationTree, Mutation } from 'vuex';
+import { State } from '@/plugins/store';
 
 const mutations: MutationTree < Mutation < any > > = {
-  setDrawer: (state: State, payload: boolean) => (state.drawer = payload),
-  toggleDrawer: (state: State) => (state.drawer = !state.drawer)
+
 };
 
 export default mutations;
diff --git a/src/plugins/store/modules/app/modules/state.ts b/src/plugins/store/modules/app/modules/state.ts
@@ -1,27 +1,8 @@
 import { articles } from '@/data/articles';
-
-export interface State {
-  [key: string]: any
-}
-
-export interface Item {
-  [key: string]: string
-}
-
-let items: Item[] = [{
-    text: 'Home',
-    to: '/'
-  },
-  {
-    text: 'About',
-    href: '#about'
-  }
-];
+import { State } from '@/plugins/store';
 
 const state: State = {
-  articles: articles,
-  drawer: false,
-  items: items
+
 };
 
 export default state;
diff --git a/src/plugins/store/modules/home/modules/actions.ts b/src/plugins/store/modules/home/modules/actions.ts
@@ -1,5 +1,5 @@
 import { Store } from 'vuex';
-import { State } from './state';
+import { State } from '@/plugins/store';
 
 const actions = {
 
diff --git a/src/plugins/store/modules/home/modules/getters.ts b/src/plugins/store/modules/home/modules/getters.ts
@@ -1,10 +1,6 @@
-import { State } from './state';
+import { State } from '@/plugins/store';
 import { GetterTree, Getter } from 'vuex';
 
-export interface IGetters {
-  [key: string]: any
-}
-
 export interface Category {
   text: any;
   to: string;
@@ -30,7 +26,7 @@ const getters: GetterTree < State, Getter < string, any > > = {
 
     return categories.sort().slice(0, 4);
   },
-  links: (state: State, getters: IGetters) => {
+  links: (state: State, getters: any) => {
     return state.items.concat(getters.categories);
   }
 };
diff --git a/src/plugins/store/modules/home/modules/mutations.ts b/src/plugins/store/modules/home/modules/mutations.ts
@@ -1,4 +1,4 @@
-import { State } from './state';
+import { State } from '@/plugins/store';
 import { MutationTree, Mutation } from 'vuex';
 
 const mutations: MutationTree < Mutation < any > > = {
diff --git a/src/plugins/store/modules/home/modules/state.ts b/src/plugins/store/modules/home/modules/state.ts
@@ -1,8 +1,5 @@
 import { articles } from '@/data/articles';
-
-export interface State {
-  [key: string]: any
-}
+import { State } from '@/plugins/store';
 
 export interface Item {
   [key: string]: string
diff --git a/src/plugins/vuetify/index.ts b/src/plugins/vuetify/index.ts
@@ -41,9 +41,9 @@ const theme: Theme = {
   currentTheme: baseTheme
 };
 
-const opts = {
+const vuetify = new Vuetify({
   theme: theme,
   icons: icons
-};
+});
 
-export default new Vuetify(opts);
+export default vuetify;
diff --git a/src/types/shims-json.d.ts b/src/types/shims-json.d.ts
diff --git a/src/utils/enums.ts b/src/utils/enums.ts
