diff --git a/app/src/plugins/app/_config/main.ts b/app/src/plugins/app/_config/main.ts index deb87a6..6519dce 100644 --- a/app/src/plugins/app/_config/main.ts +++ b/app/src/plugins/app/_config/main.ts @@ -44,13 +44,13 @@ const options: Options = { }, moxios: { routes: { - 'GET v1/auth/info': true, - 'POST v1/auth/forgot': true, - 'POST v1/auth/reset': true, - 'POST v1/auth/info': true, - 'POST v1/auth/invalidate': true, - 'POST v1/auth/login': true, - 'POST v1/auth/post': true, + // 'GET v1/auth/info': true, + // 'POST v1/auth/forgot': true, + // 'POST v1/auth/reset': true, + // 'POST v1/auth/info': true, + // 'POST v1/auth/invalidate': true, + // 'POST v1/auth/login': true, + // 'POST v1/auth/post': true, 'GET v1/overview/teams': true, 'GET v1/overview/tasks': true, diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue index dc98c18..7687d26 100644 --- a/app/src/plugins/tm@dashboard/tasks/tasks.vue +++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue @@ -11,6 +11,7 @@ import ZTimeline from '@/plugins/tm@dashboard/_components/z-timeline.vue import { addDays, subDays } from 'date-fns' import moment from 'moment' import timelineUtils from './_utils/timeline.utils' +import { mapGetters } from 'vuex' export default { components: { @@ -30,6 +31,10 @@ export default { }, computed: { + ...mapGetters('auth', [ + 'user' + ]), + splitDays() { const days = [] const workingHours = {} @@ -89,8 +94,7 @@ export default { }, unmounted() { - this.$events.off('on-subtask-edited') - this.$events.off('on-subtask-deleted') + this.$events.off('on-user-updated') }, methods: { diff --git a/app/src/plugins/tm@profile/profile/my-profile.vue b/app/src/plugins/tm@profile/profile/my-profile.vue index 7ddb45d..03a7fb6 100644 --- a/app/src/plugins/tm@profile/profile/my-profile.vue +++ b/app/src/plugins/tm@profile/profile/my-profile.vue @@ -1,61 +1,13 @@ diff --git a/app/src/plugins/w/auth/auth.store.ts b/app/src/plugins/w/auth/auth.store.ts index 59aa035..1ae8445 100644 --- a/app/src/plugins/w/auth/auth.store.ts +++ b/app/src/plugins/w/auth/auth.store.ts @@ -135,7 +135,7 @@ export default { }, updateUserInfo({commit}: {commit: any}, data: any) { return new Promise((resolve, reject) => { - axios.post_auth_data('v1/auth/info', data) + axios.put_auth(`v1/users/${data.id}`, {data: data}) .then((response: any) => { const user = response.user