From 5a1af1e7c93b904f85fdecf2d803e5c7fb674f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Thu, 18 Jul 2024 16:49:08 +0900 Subject: [PATCH] Revert "wip" This reverts commit 07257345659953cafdfdac2505d03c9282e7fd9f. --- src/store/accountState/actions.ts | 23 ----------- src/store/accountState/getters.ts | 0 src/store/accountState/index.ts | 0 src/store/accountState/mutation.ts | 19 --------- src/store/accountState/state.ts | 9 ---- src/store/accountState/types.ts | 11 ----- src/store/index.ts | 66 ++++++++++++++++++++---------- 7 files changed, 44 insertions(+), 84 deletions(-) delete mode 100644 src/store/accountState/actions.ts delete mode 100644 src/store/accountState/getters.ts delete mode 100644 src/store/accountState/index.ts delete mode 100644 src/store/accountState/mutation.ts delete mode 100644 src/store/accountState/state.ts delete mode 100644 src/store/accountState/types.ts diff --git a/src/store/accountState/actions.ts b/src/store/accountState/actions.ts deleted file mode 100644 index 650edbb..0000000 --- a/src/store/accountState/actions.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ActionTree } from 'vuex'; -import { UserState, Task } from './types'; -import { StateInterface } from '../index'; - -const actions: ActionTree = { - updateToken({ commit }, token: string) { - commit('setToken', token); - }, - updateUsername({ commit }, username: string) { - commit('setUsername', username); - }, - updateTaskList({ commit }, taskList: Task[]) { - commit('setTaskList', taskList); - }, - addTask({ commit }, task: Task) { - commit('addTask', task); - }, - completeTask({ commit }, taskId: number) { - commit('completeTask', taskId); - }, -}; - -export default actions; diff --git a/src/store/accountState/getters.ts b/src/store/accountState/getters.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/store/accountState/index.ts b/src/store/accountState/index.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/store/accountState/mutation.ts b/src/store/accountState/mutation.ts deleted file mode 100644 index 577cea1..0000000 --- a/src/store/accountState/mutation.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { MutationTree } from 'vuex'; -import { UserState, Task } from './types'; - -const mutations: MutationTree = { - setToken(state, token: string) { - state.token = token; - }, - setUsername(state, username: string) { - state.username = username; - }, - setTaskList(state, taskList: Task[]) { - state.taskList = taskList; - }, - addTask(state, task: Task) { - state.taskList.push(task); - }, -}; - -export default mutations; diff --git a/src/store/accountState/state.ts b/src/store/accountState/state.ts deleted file mode 100644 index 90d3b32..0000000 --- a/src/store/accountState/state.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { UserState } from './types'; - -const state: UserState = { - token: '', - username: '', - taskList: [], -}; - -export default state; diff --git a/src/store/accountState/types.ts b/src/store/accountState/types.ts deleted file mode 100644 index be9c785..0000000 --- a/src/store/accountState/types.ts +++ /dev/null @@ -1,11 +0,0 @@ -export interface Task { - id: string; - name: string; - reward: number; -} - -export interface UserState { - token: string; - username: string; - taskList: Task[]; -} diff --git a/src/store/index.ts b/src/store/index.ts index 5eb57ba..8cc387e 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -1,39 +1,61 @@ -import { store } from 'quasar/wrappers'; -import { InjectionKey } from 'vue'; -import { createStore, Store as VuexStore, useStore as vuexUseStore } from 'vuex'; -import user from './accountState'; -import { UserState } from './user/types'; +import { store } from 'quasar/wrappers' +import { InjectionKey } from 'vue' +import { Router } from 'vue-router' +import { + createStore, + Store as VuexStore, + useStore as vuexUseStore, +} from 'vuex' -export interface StateInterface { - user: UserState; +// import example from './module-example' +// import { ExampleStateInterface } from './module-example/state'; + +/* + * If not building with SSR mode, you can + * directly export the Store instantiation; + * + * The function below can be async too; either use + * async/await or return a Promise which resolves + * with the Store instance. + */ + +export interface AccountStateInterface { + account: { + username: string + token: string + } + isLogin: boolean + taskList: any[] } -// Provide typings for `this.$store` +// provide typings for `this.$store` declare module '@vue/runtime-core' { interface ComponentCustomProperties { - $store: VuexStore; + $store: VuexStore } } -// Provide typings for `useStore` helper -export const storeKey: InjectionKey> = Symbol('vuex-key'); +// provide typings for `useStore` helper +export const storeKey: InjectionKey> = Symbol('vuex-key') // Provide typings for `this.$router` inside Vuex stores -declare module 'vuex' { +declare module "vuex" { + // eslint-disable-next-line @typescript-eslint/no-unused-vars export interface Store { readonly $router: Router; } } -export default store(function() { - const Store = createStore({ - modules: { - user, - }, - plugins: [createPersistedState({ - paths: ['user.token', 'user.username', 'user.taskList'], - })], - }); +export default store(function(/* { ssrContext } */) { + const Store = createStore({ + // enable strict mode (adds overhead!) + // for dev mode and --debug builds only + strict: !!process.env.DEBUGGING + }) return Store; -}); +}) + +export function useStore() { + return vuexUseStore(storeKey) +}