diff --git a/src/api/auth.ts b/src/api/auth.ts index 58720fdf..7ec7a9eb 100644 --- a/src/api/auth.ts +++ b/src/api/auth.ts @@ -3,11 +3,8 @@ import Cookies from 'js-cookie' import type { loginDataTypes } from '@/types/auth' import { useMemberStore } from '@/stores/member' -export const postLogin = async (loginData: loginDataTypes, sessionId: string) => { - const memberStore = useMemberStore() - const response = await axiosInstance.post('/api/auths/login', loginData, { - headers: { sessionId: sessionId } - }) +export const postLogin = async (loginData: loginDataTypes) => { + const response = await axiosInstance.post('/api/auths/login', loginData) Cookies.set('accessToken', response.data.accessToken, { path: '/', sameSite: 'strict' @@ -16,7 +13,6 @@ export const postLogin = async (loginData: loginDataTypes, sessionId: string) => path: '/', sameSite: 'strict' }) - await memberStore.updateMemberInfoWithToken() return response.data } @@ -26,16 +22,8 @@ export const patchPassword = async (password: string) => { } export const deleteLogout = async () => { - const refreshToken = Cookies.get('refreshToken') - const accessToken = Cookies.get('accessToken') - - const response = await axiosInstance.delete('/api/auths/logout', { - headers: { - Authorization: `Bearer ${accessToken}`, - refreshToken: refreshToken - } - }) - Cookies.remove('accessToken', { path: '/' }) - Cookies.remove('refreshToken', { path: '/' }) - return response + const memberStore = useMemberStore() + memberStore.$reset() + Cookies.remove('accessToken') + Cookies.remove('refreshToken') } diff --git a/src/components/LineChart.vue b/src/components/LineChart.vue index d0f3fe06..16cd703f 100644 --- a/src/components/LineChart.vue +++ b/src/components/LineChart.vue @@ -5,7 +5,7 @@ :options="options" /> + :content="`집계된 ${periodText[periodType]} 데이터가 없습니다`" /> diff --git a/src/components/icons/NotificationIcon.vue b/src/components/icons/NotificationIcon.vue index c3ddc046..7fb6b58d 100644 --- a/src/components/icons/NotificationIcon.vue +++ b/src/components/icons/NotificationIcon.vue @@ -19,7 +19,7 @@
- {{ newNotification }} + {{ newNotification < 100 ? newNotification : 99 }}
diff --git a/src/components/lists/NoContent.vue b/src/components/lists/NoContent.vue index c92585f8..79354acc 100644 --- a/src/components/lists/NoContent.vue +++ b/src/components/lists/NoContent.vue @@ -1,9 +1,9 @@ diff --git a/src/components/login-logs/LoginLogsListCard.vue b/src/components/login-logs/LoginLogsListCard.vue index d8346563..9624fbec 100644 --- a/src/components/login-logs/LoginLogsListCard.vue +++ b/src/components/login-logs/LoginLogsListCard.vue @@ -16,7 +16,7 @@ import type { ListCardProps } from '@/types/common' import ListCardTab from '../lists/ListCardTab.vue' import type { LoginLogsListData } from '@/types/admin' -import { formatDate } from '@/utils/date' +import { formatFullDateTime } from '@/utils/date' const logStatus = { LOGIN: '로그인 시도', @@ -31,7 +31,7 @@ const myRequestTabList: ListCardProps[] = [ isTextXs: true, isTextBody: true }, - { content: formatDate(info.requestAt), width: 180, isTextXs: true }, + { content: formatFullDateTime(info.requestAt), width: 180, isTextXs: true }, { content: info.nickName, width: 80 }, { content: info.clientIp, width: 120, isTextXs: true }, { content: String(info.statusCode), width: 40, isTextXs: true, isStatusCode: true }, diff --git a/src/components/member-management/MemberManagementListCard.vue b/src/components/member-management/MemberManagementListCard.vue index f0573174..44f0a470 100644 --- a/src/components/member-management/MemberManagementListCard.vue +++ b/src/components/member-management/MemberManagementListCard.vue @@ -35,25 +35,11 @@ - - - - - - - - - - + diff --git a/src/components/my-request/MyRequestListCard.vue b/src/components/my-request/MyRequestListCard.vue index 9d838b34..390a61a5 100644 --- a/src/components/my-request/MyRequestListCard.vue +++ b/src/components/my-request/MyRequestListCard.vue @@ -1,8 +1,9 @@