diff --git a/src/app/login/components/LoginBaseCard.vue b/src/app/login/components/LoginBaseCard.vue index 4ada1fa..f790211 100644 --- a/src/app/login/components/LoginBaseCard.vue +++ b/src/app/login/components/LoginBaseCard.vue @@ -4,7 +4,7 @@ - + @@ -32,7 +32,8 @@ export default class LoginBaseCard extends Vue { @State('login') private login!: LoginState; @Action('fetchData', {namespace}) private fetchData: any; - @Getter('userEmail', {namespace}) private userEmail!: string; + @Getter('name', {namespace}) private name!: string; + @Getter('email', {namespace}) private email!: string; private data() { return { @@ -44,15 +45,5 @@ private mounted() { this.fetchData(); } - - get email() { - const user = this.login && this.login.user; - return user && user.email; - } - - get name() { - const user = this.login && this.login.user; - return user && user.name; - } } \ No newline at end of file diff --git a/src/app/login/vuex/getters.ts b/src/app/login/vuex/getters.ts index 60ed64f..9567214 100644 --- a/src/app/login/vuex/getters.ts +++ b/src/app/login/vuex/getters.ts @@ -3,10 +3,16 @@ import { LoginState } from './types'; import { RootState } from '../../types'; export const getters: GetterTree = { - userEmail(state): string { + + email(state): string { const { user } = state; - const name = (user && user.name) || ''; const email = (user && user.email) || ''; - return `${name}<${email}>`; + return email; + }, + + name(state): string { + const { user } = state; + const name = (user && user.name) || ''; + return name; }, }; diff --git a/src/app/sample/components/SampleComponent.vue b/src/app/sample/components/SampleComponent.vue index 978f2fa..2febc2b 100644 --- a/src/app/sample/components/SampleComponent.vue +++ b/src/app/sample/components/SampleComponent.vue @@ -4,7 +4,7 @@ style="max-width: 100%;" class="mb-2">

- {{sample.message}} + {{message}}

Second Module @@ -22,6 +22,7 @@ export default class SampleComponent extends Vue { @Action('sampleData', {namespace}) private sampleData: any; @State('sample') private sample!: SampleState; + @Getter('message', {namespace}) private message!: string; private mounted() { this.sampleData(); diff --git a/tests/unit/sample.spec.ts b/tests/unit/sample.spec.ts index 0416cb4..fb0186e 100644 --- a/tests/unit/sample.spec.ts +++ b/tests/unit/sample.spec.ts @@ -1,8 +1,11 @@ import { expect } from 'chai'; +import { ComponentOptions } from 'vue/types/options'; import { shallowMount } from '@vue/test-utils'; import { SampleComponent } from '@/app/sample/components'; +import Vue from 'vue'; describe('SampleComponent.vue', () => { + it('truthy test', () => { expect(true).eq(true); });