diff --git a/src/App.vue b/src/App.vue index ea564a2..8d63d3e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -28,13 +28,7 @@ import Header from './components/Header.vue' - const store: Store = storeBuilder.vuexStore({ - strict: DebugMode - }) - sync(store, router) - @Component({ - store: store, components: { appHeader: Header, }, diff --git a/src/store/Modules/GlobalStore.ts b/src/store/Modules/GlobalStore.ts index eaf674e..9503aa0 100644 --- a/src/store/Modules/GlobalStore.ts +++ b/src/store/Modules/GlobalStore.ts @@ -1,5 +1,6 @@ import { IGlobalState } from '@types' -import { storeBuilder } from '@store' +import { storeBuilder } from './Store/Store' + const state: IGlobalState = { conta: 0, diff --git a/src/store/Modules/UserStore.ts b/src/store/Modules/UserStore.ts index 6d808c7..4934c04 100644 --- a/src/store/Modules/UserStore.ts +++ b/src/store/Modules/UserStore.ts @@ -2,7 +2,7 @@ import Api from '@api' import { ISignupOptions, IUserState } from 'model' import { ILinkReg, IResult, IIdToken } from 'model/other' -import { storeBuilder } from '@store' +import { storeBuilder } from './Store/Store' import router from '@router' import { serv_constants } from '../Modules/serv_constants' diff --git a/src/store/index.ts b/src/store/index.ts index 2bf5b9a..b202434 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -1,11 +1,9 @@ import Vue from 'vue' -import Vuex from 'vuex' +import Vuex, { Store } from 'vuex' - -import { IUserState, IGlobState } from 'model' -import {Route} from 'vue-router' - -Vue.use(Vuex) +import { IGlobState } from 'model' +import { Route } from 'vue-router' +import { getStoreBuilder } from 'vuex-typex' export interface RootState { @@ -13,11 +11,26 @@ export interface RootState { route: Route } +Vue.use(Vuex) + export const DebugMode = true export * from './Modules' -export {default as EventBus} from './EventBus' -export {default as Api} from './Api' -export default new Vuex.Store({ -}) +export { default as EventBus } from './EventBus' +export { default as Api } from './Api' + +const store: Store = getStoreBuilder().vuexStore() +export default store + +// export function createStore() { +// const store: Store = storeBuilder.vuexStore({ +// strict: DebugMode +// }) +// +// return store +// +// } +// export default new Vuex.Store({ + +// }) diff --git a/src/validation/registereduser.ts b/src/validation/registereduser.ts index 379843f..c58fe2c 100644 --- a/src/validation/registereduser.ts +++ b/src/validation/registereduser.ts @@ -1,5 +1,5 @@ import { default as Axios, AxiosResponse } from 'axios' -import { IPayload } from '@/model' +import { IPayload } from 'model' import { GlobalConfig, PayloadMessageTypes } from '../common' // const SITE_URL = GlobalConfig.uri.site