From 7ed518b6e73a38194d016b4e0a87f845d52f0eb2 Mon Sep 17 00:00:00 2001 From: seorang42 Date: Fri, 7 Feb 2025 18:11:52 +0900 Subject: [PATCH 1/3] =?UTF-8?q?:sparkles:=20[feat]=20:=20ImageContainer=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/deafultProfile.png | Bin 0 -> 1765 bytes src/components/EditInformation.vue | 10 ++++----- src/components/TaskCard.vue | 7 +++--- src/components/api-logs/ApiLogsList.vue | 5 ++++- src/components/common/ImageContainer.vue | 16 ++++++++++++++ src/components/login-logs/LoginLogsList.vue | 5 ++++- .../MemberManagementList.vue | 5 ++++- .../my-request/MyRequestFilterBar.vue | 2 +- src/components/my-request/MyRequestList.vue | 2 +- src/components/my-task/MyTaskFilterBar.vue | 5 ++++- src/components/my-task/MyTaskList.vue | 2 +- .../RequestHistoryFilterBar.vue | 5 ++++- .../request-history/RequestHistoryList.vue | 2 +- .../requested/RequestedFilterBar.vue | 5 ++++- src/components/requested/RequestedList.vue | 2 +- src/components/statistics/StatisticsCard.vue | 2 +- .../statistics/StatisticsCategoryCard.vue | 4 ++-- src/components/task-board/TaskBoard.vue | 5 ++++- .../task-board/TaskBoardFilterBar.vue | 8 +++++-- src/components/task-detail/TaskDetail.vue | 8 ++++++- .../task-detail/TaskDetailManagerDropdown.vue | 17 ++++++--------- .../task-detail/TaskDetailRight.vue | 8 +++---- .../task-management/CategoryManagement.vue | 5 ++++- src/components/team-board/TeamBoard.vue | 5 ++++- src/components/team-board/TeamBoardCard.vue | 7 +++--- .../team-board/TeamBoardFilterBar.vue | 5 ++++- src/components/top-bar/ProfileModal.vue | 15 +++++-------- src/components/top-bar/SideBar.vue | 12 ++++------- src/components/top-bar/TopBar.vue | 16 ++++++-------- src/stores/params.ts | 3 +-- src/types/stores.ts | 1 - src/utils/axios.ts | 20 +++++++++++------- 32 files changed, 130 insertions(+), 84 deletions(-) create mode 100644 src/assets/deafultProfile.png create mode 100644 src/components/common/ImageContainer.vue diff --git a/src/assets/deafultProfile.png b/src/assets/deafultProfile.png new file mode 100644 index 0000000000000000000000000000000000000000..7536854f956470305a46a2c817ce8691ab61e998 GIT binary patch literal 1765 zcmchY`#0MO8pgj#BcdpgC~YV;!)Ui!293J35{X3X7Sy_IcW62&6=o#Trg14lh$33n zrPWs5tC1=hgSdr>*{*AX^rXSKbb<<|Dq6JG{11EfoaggC=Xrm5&v}1&vVFY?+6Rvw z1OPzWgNXCn_prZ!LHFle3Eg4eG~$WD2>_sp_zMtF_Rw&D2}~c`ihu&A+Vp_q#?%^3>a6+q z;$N#h2<^Yv)?am8JVp0Yua{sl~tnjj2+EWN^*J@?-CI4S#`Ubyx_P*FZTAl^K7d8;lG+H2+H&QR2OS1RIrNUi* zVp5nCJ&-$RXxblzYHP~o{QE5~-MUS_&=Xlz#pj>n?yNN=f8&CYgoZG>y$la=557%!4jBmSu8k$47F zbRs~KBJ6L!aJNKKigAMzS-ygvHOHeJfp)SMY9YtQ`sF*QyUBF|BI~f{EjE^_)92v4 zZUk1aBokinWW+Viht2#_+qK6lR9fNVcc~7xCm>7k$4-rCi`Ls?-P4-`Z$suEJnlZ$ zu-@k=lT1-AWZl!d4Gm-a*%kgr@_7x`alwLYQ`AWwD?e?fpV>F2>uhCNmJ>*IOorUI z`Z`fc7btIR1iyLPj_Em`;eKZ)tm5p-N6V`tCf`E6&F3HR(&}2Z>!c%|tw8Oegy#)8 zxznv|LR z?XcD5>U&;tV*lYDZ%iJ73Q?w{55r<*f8_Uy^dp2`X1eHd@{dh>7ZDu|7&HrdU}iJ2 z^$`e3ZQFmW+OZ|{>85DFtX)}aO7I~>+m2a{Z9!_x*m^XmE=a-36}oOX>Qv^tGu&D- zYTJuL6M7X$^dY6d`#P)_Z+k#_Vu)R}sSyLQ0|y!8noX962JY#Q3ucT5I$Dei&I`*y z?~@EYC#qjj_Z}spP+bO{;>^jDLlM3+Q4vpElqC4@ua_`qXSjo+kgxg?J<;er#_7TW%G)7l2Mqss>k+y7KdCaIg&VP%1u7_!z8R} z)iYE#{; zS2V$ML>|K+`u?)kb;(R~laoWVMcqv8)l1U!HM~OF5+= z3>)vGJ9yFY40kTS$2C6lfP3;i0a+OH)hGN)UN3ft;$y3B6Zj0vc%2i%Ifn!V6(IZX e!g~Ja8YJY_&kgKI=-~ZU0zB~ExJGPP+J6DTOe<6X literal 0 HcmV?d00001 diff --git a/src/components/EditInformation.vue b/src/components/EditInformation.vue index b5eceec3..d33d9bbb 100644 --- a/src/components/EditInformation.vue +++ b/src/components/EditInformation.vue @@ -18,11 +18,10 @@

프로필 사진

- 프로필 이미지 +
@@ -41,6 +41,7 @@ import type { TaskCardProps } from '@/types/manager' import CommonIcons from './common/CommonIcons.vue' import { statusAsColor } from '@/utils/statusAsColor' import TaskLabel from './common/TaskLabel.vue' +import ImageContainer from './common/ImageContainer.vue' const { data } = defineProps<{ data: TaskCardProps; draggable?: boolean }>() diff --git a/src/components/api-logs/ApiLogsList.vue b/src/components/api-logs/ApiLogsList.vue index c8c67368..c35f9c81 100644 --- a/src/components/api-logs/ApiLogsList.vue +++ b/src/components/api-logs/ApiLogsList.vue @@ -30,6 +30,7 @@ import { axiosInstance } from '@/utils/axios' import { useQuery } from '@tanstack/vue-query' import type { ApiLogsResponse } from '@/types/admin' import { computed } from 'vue' +import { useMemberStore } from '@/stores/member' const { params } = useLogsParamsStore() const onPageChange = (value: number) => { @@ -46,9 +47,11 @@ const fetchApiLogsList = async () => { return response.data } +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['apiLogs', params], - queryFn: fetchApiLogsList + queryFn: fetchApiLogsList, + enabled: !!isLogined }) const totalPage = computed(() => { diff --git a/src/components/common/ImageContainer.vue b/src/components/common/ImageContainer.vue new file mode 100644 index 00000000..44d19f0b --- /dev/null +++ b/src/components/common/ImageContainer.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/components/login-logs/LoginLogsList.vue b/src/components/login-logs/LoginLogsList.vue index 930abfe7..e795599d 100644 --- a/src/components/login-logs/LoginLogsList.vue +++ b/src/components/login-logs/LoginLogsList.vue @@ -32,6 +32,7 @@ import { useQuery } from '@tanstack/vue-query' import { computed } from 'vue' import type { LoginLogsResponse } from '@/types/admin' import NoContent from '../lists/NoContent.vue' +import { useMemberStore } from '@/stores/member' const { params } = useLogsParamsStore() const onPageChange = (value: number) => { @@ -48,9 +49,11 @@ const fetchLoginLogsList = async () => { return response.data } +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['loginLogs', params], - queryFn: fetchLoginLogsList + queryFn: fetchLoginLogsList, + enabled: isLogined }) const totalPage = computed(() => { diff --git a/src/components/member-management/MemberManagementList.vue b/src/components/member-management/MemberManagementList.vue index bda06767..5a625600 100644 --- a/src/components/member-management/MemberManagementList.vue +++ b/src/components/member-management/MemberManagementList.vue @@ -32,6 +32,7 @@ import ListPagination from '../lists/ListPagination.vue' import NoContent from '../lists/NoContent.vue' import MemberManagementListBar from './MemberManagementListBar.vue' import MemberManagementListCard from './MemberManagementListCard.vue' +import { useMemberStore } from '@/stores/member' const { params } = useMemberManagementParamsStore() const onPageChange = (value: number) => { @@ -42,9 +43,11 @@ const fetchMemberList = async () => { return response.data } +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['member', params], - queryFn: fetchMemberList + queryFn: fetchMemberList, + enabled: isLogined }) const totalPage = computed(() => { diff --git a/src/components/my-request/MyRequestFilterBar.vue b/src/components/my-request/MyRequestFilterBar.vue index f8980594..be47173e 100644 --- a/src/components/my-request/MyRequestFilterBar.vue +++ b/src/components/my-request/MyRequestFilterBar.vue @@ -53,6 +53,6 @@ const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['category'], queryFn: getCategory, - enabled: !!isLogined + enabled: isLogined }) diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue index a2f2bc88..eb8b3032 100644 --- a/src/components/my-request/MyRequestList.vue +++ b/src/components/my-request/MyRequestList.vue @@ -51,7 +51,7 @@ const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['myRequest', params], queryFn: fetchMyRequestList, - enabled: !!isLogined + enabled: isLogined }) const totalPage = computed(() => { diff --git a/src/components/my-task/MyTaskFilterBar.vue b/src/components/my-task/MyTaskFilterBar.vue index da9deb32..aba9560d 100644 --- a/src/components/my-task/MyTaskFilterBar.vue +++ b/src/components/my-task/MyTaskFilterBar.vue @@ -42,14 +42,17 @@ import { PAGE_SIZE_LIST, TASK_STATUS_LIST, TERM_LIST } from '@/constants/common' import { useRequestParamsChange } from '../hooks/useRequestParamsChange' import { useQuery } from '@tanstack/vue-query' import { getCategory } from '@/api/common' +import { useMemberStore } from '@/stores/member' const store = useRequestParamsStore() store.$reset() const onParamsChange = useRequestParamsChange() +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['category'], - queryFn: getCategory + queryFn: getCategory, + enabled: isLogined }) diff --git a/src/components/my-task/MyTaskList.vue b/src/components/my-task/MyTaskList.vue index 017e3417..fc9c45eb 100644 --- a/src/components/my-task/MyTaskList.vue +++ b/src/components/my-task/MyTaskList.vue @@ -51,7 +51,7 @@ const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['myTask', params], queryFn: fetchMyTaskList, - enabled: !!isLogined + enabled: isLogined }) const totalPage = computed(() => { diff --git a/src/components/request-history/RequestHistoryFilterBar.vue b/src/components/request-history/RequestHistoryFilterBar.vue index df5c3496..7ead99e5 100644 --- a/src/components/request-history/RequestHistoryFilterBar.vue +++ b/src/components/request-history/RequestHistoryFilterBar.vue @@ -42,14 +42,17 @@ import FilterDropdownMulti from '../filters/FilterDropdownMulti.vue' import FilterInput from '../filters/FilterInput.vue' import { useRequestParamsChange } from '../hooks/useRequestParamsChange' import { getCategory } from '@/api/common' +import { useMemberStore } from '@/stores/member' const store = useRequestParamsStore() store.$reset() const onParamsChange = useRequestParamsChange() +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['category'], - queryFn: getCategory + queryFn: getCategory, + enabled: isLogined }) diff --git a/src/components/request-history/RequestHistoryList.vue b/src/components/request-history/RequestHistoryList.vue index 9acf0b90..e10d0b1e 100644 --- a/src/components/request-history/RequestHistoryList.vue +++ b/src/components/request-history/RequestHistoryList.vue @@ -51,7 +51,7 @@ const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['requestHistory', params], queryFn: fetchRequestHistoryList, - enabled: !!isLogined + enabled: isLogined }) const totalPage = computed(() => { diff --git a/src/components/requested/RequestedFilterBar.vue b/src/components/requested/RequestedFilterBar.vue index ab432350..07b22d35 100644 --- a/src/components/requested/RequestedFilterBar.vue +++ b/src/components/requested/RequestedFilterBar.vue @@ -36,14 +36,17 @@ import { useRequestParamsStore } from '@/stores/params' import { useRequestParamsChange } from '../hooks/useRequestParamsChange' import { useQuery } from '@tanstack/vue-query' import { getCategory } from '@/api/common' +import { useMemberStore } from '@/stores/member' const store = useRequestParamsStore() store.$reset() const onParamsChange = useRequestParamsChange() +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['category'], - queryFn: getCategory + queryFn: getCategory, + enabled: isLogined }) diff --git a/src/components/requested/RequestedList.vue b/src/components/requested/RequestedList.vue index 06f509fa..1c52172d 100644 --- a/src/components/requested/RequestedList.vue +++ b/src/components/requested/RequestedList.vue @@ -51,7 +51,7 @@ const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['requested', params], queryFn: fetchRequestedList, - enabled: !!isLogined + enabled: isLogined }) const totalPage = computed(() => { diff --git a/src/components/statistics/StatisticsCard.vue b/src/components/statistics/StatisticsCard.vue index 351b8330..3fd49fc9 100644 --- a/src/components/statistics/StatisticsCard.vue +++ b/src/components/statistics/StatisticsCard.vue @@ -69,7 +69,7 @@ const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: computed(() => [statisticsType, periodType]), queryFn: fetchStatistics, - enabled: !!isLogined + enabled: isLogined }) const labels = computed(() => { diff --git a/src/components/statistics/StatisticsCategoryCard.vue b/src/components/statistics/StatisticsCategoryCard.vue index e99036ff..5b4a25e3 100644 --- a/src/components/statistics/StatisticsCategoryCard.vue +++ b/src/components/statistics/StatisticsCategoryCard.vue @@ -61,7 +61,7 @@ const { isLogined } = useMemberStore() const { data: mainData } = useQuery({ queryKey: computed(() => ['REQUEST_BY_CATEGORY', periodType]), queryFn: fetchMainStatistics, - enabled: !!isLogined + enabled: isLogined }) const mainLabels = computed(() => { return mainData.value?.map(el => el.key) || [] @@ -83,7 +83,7 @@ const fetchSubStatistics = async () => { const { data: subData } = useQuery({ queryKey: computed(() => [mainCategory.value, periodType]), queryFn: fetchSubStatistics, - enabled: computed(() => mainCategory.value !== '') + enabled: computed(() => mainCategory.value !== '') && isLogined }) const subLabels = computed(() => { return subData.value?.map(el => el.key) || [] diff --git a/src/components/task-board/TaskBoard.vue b/src/components/task-board/TaskBoard.vue index c7cd4823..587f8444 100644 --- a/src/components/task-board/TaskBoard.vue +++ b/src/components/task-board/TaskBoard.vue @@ -107,6 +107,7 @@ import { useTaskBoardParamsStore } from '@/stores/params' import { useQuery, useQueryClient } from '@tanstack/vue-query' import type { Status } from '@/types/common' import { computed } from 'vue' +import { useMemberStore } from '@/stores/member' const queryClient = useQueryClient() @@ -165,9 +166,11 @@ const fetchTaskBoard = async () => { const response = await axiosInstance.get('/api/task-board', { params: parsedParams }) return response.data } +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['taskBoard', params], - queryFn: fetchTaskBoard + queryFn: fetchTaskBoard, + enabled: isLogined }) const tasksInProgress = computed(() => [...(data.value?.tasksInProgress || [])]) diff --git a/src/components/task-board/TaskBoardFilterBar.vue b/src/components/task-board/TaskBoardFilterBar.vue index 7429391f..b0b34dba 100644 --- a/src/components/task-board/TaskBoardFilterBar.vue +++ b/src/components/task-board/TaskBoardFilterBar.vue @@ -31,6 +31,7 @@ import { useQuery } from '@tanstack/vue-query' import { computed } from 'vue' import type { LabelDataTypes } from '@/types/common' import { getCategory, getLabels } from '@/api/common' +import { useMemberStore } from '@/stores/member' const { params } = useTaskBoardParamsStore() @@ -55,14 +56,17 @@ const onTitleChange = (value: string) => { params.title = value } +const { isLogined } = useMemberStore() const { data: categoryList } = useQuery({ queryKey: ['category'], - queryFn: getCategory + queryFn: getCategory, + enabled: isLogined }) const { data: labelList } = useQuery({ queryKey: ['label'], - queryFn: getLabels + queryFn: getLabels, + enabled: isLogined }) const labelOptionList = computed(() => { const list = [{ value: '', content: '전체' }] diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue index 1ca080c0..78b8143b 100644 --- a/src/components/task-detail/TaskDetail.vue +++ b/src/components/task-detail/TaskDetail.vue @@ -73,7 +73,7 @@ const { data, refetch } = useQuery({ enabled: false }) -const { data: historyData } = useQuery({ +const { data: historyData, refetch: refetchHistory } = useQuery({ queryKey: ['historyData', selectedId], queryFn: () => getHistory(selectedId), enabled: isDataFetched.value @@ -89,4 +89,10 @@ watch( }, { immediate: true } ) + +watch(isDataFetched, async newValue => { + if (newValue) { + await refetchHistory() + } +}) diff --git a/src/components/task-detail/TaskDetailManagerDropdown.vue b/src/components/task-detail/TaskDetailManagerDropdown.vue index df36a88d..725936b9 100644 --- a/src/components/task-detail/TaskDetailManagerDropdown.vue +++ b/src/components/task-detail/TaskDetailManagerDropdown.vue @@ -6,11 +6,9 @@ class="task-detail-manager-dropdown" @click="toggleDropdown">
-
- userProfile -
+

{{ modelValue?.nickname }}

@@ -28,11 +26,9 @@ class="request-task-dropdown-option justify-between" @click="selectOption(option)">
-
- userProfile -
+

{{ option.nickname }}

@@ -50,6 +46,7 @@ import type { ManagerTypes } from '@/types/manager' import { onMounted, ref } from 'vue' import CommonIcons from '../common/CommonIcons.vue' import { useOutsideClick } from '../hooks/useOutsideClick' +import ImageContainer from '../common/ImageContainer.vue' const { modelValue } = defineProps<{ modelValue: ManagerTypes; taskId: number }>() const emit = defineEmits(['update:modelValue']) diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue index 39ac8724..87bff206 100644 --- a/src/components/task-detail/TaskDetailRight.vue +++ b/src/components/task-detail/TaskDetailRight.vue @@ -31,10 +31,9 @@

요청자

- requesterImg +

{{ data.requesterNickName }}

@@ -96,6 +95,7 @@ import TaskStatus from '../TaskStatus.vue' import TaskDetailLabelDropdown from './TaskDetailLabelDropdown.vue' import TaskDetailManagerDropdown from './TaskDetailManagerDropdown.vue' import TaskStatusList from './TaskStatusList.vue' +import ImageContainer from '../common/ImageContainer.vue' const { data, isProcessor } = defineProps<{ data: TaskDetailDatas; isProcessor: boolean }>() diff --git a/src/components/task-management/CategoryManagement.vue b/src/components/task-management/CategoryManagement.vue index b32f45ec..7e9ab725 100644 --- a/src/components/task-management/CategoryManagement.vue +++ b/src/components/task-management/CategoryManagement.vue @@ -37,12 +37,15 @@ import CommonIcons from '../common/CommonIcons.vue' import CategoryLine from './CategoryLine.vue' import CategoryLineSub from './CategoryLineSub.vue' import { getCategory } from '@/api/common' +import { useMemberStore } from '@/stores/member' const router = useRouter() +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['category'], - queryFn: getCategory + queryFn: getCategory, + enabled: isLogined }) const MovetoAddCategory = () => { diff --git a/src/components/team-board/TeamBoard.vue b/src/components/team-board/TeamBoard.vue index ac193f4c..1795e718 100644 --- a/src/components/team-board/TeamBoard.vue +++ b/src/components/team-board/TeamBoard.vue @@ -25,6 +25,7 @@ import { useParseParams } from '../hooks/useParseParams' import type { TeamBoardResponse } from '@/types/manager' import { computed } from 'vue' import NoContent from '../lists/NoContent.vue' +import { useMemberStore } from '@/stores/member' const { params } = useTeamBoardParamsStore() @@ -34,9 +35,11 @@ const fetchTeamStatus = async () => { const response = await axiosInstance.get('/api/team-status/filter', { params: parsedParams }) return response.data } +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['teamStatus', params], - queryFn: fetchTeamStatus + queryFn: fetchTeamStatus, + enabled: isLogined }) const teamSummary = computed(() => { diff --git a/src/components/team-board/TeamBoardCard.vue b/src/components/team-board/TeamBoardCard.vue index fcab5c61..ca7d9986 100644 --- a/src/components/team-board/TeamBoardCard.vue +++ b/src/components/team-board/TeamBoardCard.vue @@ -2,9 +2,9 @@
-
- -
+ {{ info.nickname }}
{{ info.department }} @@ -30,6 +30,7 @@ diff --git a/src/components/team-board/TeamBoardFilterBar.vue b/src/components/team-board/TeamBoardFilterBar.vue index 22495375..de52abb0 100644 --- a/src/components/team-board/TeamBoardFilterBar.vue +++ b/src/components/team-board/TeamBoardFilterBar.vue @@ -29,13 +29,16 @@ import FilterDropdown from '../filters/FilterDropdown.vue' import FilterInput from '../filters/FilterInput.vue' import { useTeamBoardParamsChange } from '../hooks/useTeamBoardParamsChange' import { getCategory } from '@/api/common' +import { useMemberStore } from '@/stores/member' const { params } = useTeamBoardParamsStore() const onParamsChange = useTeamBoardParamsChange() +const { isLogined } = useMemberStore() const { data } = useQuery({ queryKey: ['category'], - queryFn: getCategory + queryFn: getCategory, + enabled: isLogined }) diff --git a/src/components/top-bar/ProfileModal.vue b/src/components/top-bar/ProfileModal.vue index d2c3551d..82de3e14 100644 --- a/src/components/top-bar/ProfileModal.vue +++ b/src/components/top-bar/ProfileModal.vue @@ -5,15 +5,10 @@ class="absolute w-60 bg-white right-6 top-[calc(100%+16px)] rounded-lg shadow-custom overflow-hidden">
-
- 프로필 이미지 -
+
+

{{ name }}

@@ -52,13 +47,13 @@ import ModalView from '../ModalView.vue' import { useMemberStore } from '@/stores/member' import { storeToRefs } from 'pinia' import { computed } from 'vue' +import ImageContainer from '../common/ImageContainer.vue' const isModalVisible = ref(false) const memberStore = useMemberStore() const { isLogined, info } = storeToRefs(memberStore) -const imgUrl = computed(() => info.value.profileImageUrl) const name = computed(() => info.value.name) const nickname = computed(() => info.value.nickname) diff --git a/src/components/top-bar/SideBar.vue b/src/components/top-bar/SideBar.vue index 3b6aca1e..8a67b73d 100644 --- a/src/components/top-bar/SideBar.vue +++ b/src/components/top-bar/SideBar.vue @@ -43,14 +43,9 @@
- 프로필 이미지 -
+

{{ name }}

{{ nickname }}

@@ -77,6 +72,7 @@ import { hamburgerIcon } from '@/constants/iconPath' import { SIDE_USER_MENU, SIDE_MANAGER_MENU, SIDE_ADMIN_MENU } from '@/constants/menu' import { useMemberStore } from '@/stores/member' import { storeToRefs } from 'pinia' +import ImageContainer from '../common/ImageContainer.vue' const memberStore = useMemberStore() const { info } = storeToRefs(memberStore) diff --git a/src/components/top-bar/TopBar.vue b/src/components/top-bar/TopBar.vue index 7afd9e7e..ce9b5532 100644 --- a/src/components/top-bar/TopBar.vue +++ b/src/components/top-bar/TopBar.vue @@ -31,15 +31,11 @@ class="flex"> { + if (!info.value.role) return try { const data = await getNotifiCount() countNotifi.value = data.count @@ -122,7 +120,7 @@ const onCloseSide = () => { watch( () => info.value, async newInfo => { - if (newInfo.name) { + if (newInfo.role) { await fetchNotificationCount() } }, diff --git a/src/stores/params.ts b/src/stores/params.ts index bfaba7b8..a5db7b07 100644 --- a/src/stores/params.ts +++ b/src/stores/params.ts @@ -82,8 +82,7 @@ export const useTeamBoardParamsStore = defineStore('teamBoardParams', () => { sortBy: 'CONTRIBUTE', mainCategoryIds: [], categoryIds: [], - taskTitle: '', - valid: true + taskTitle: '' }) return { params } diff --git a/src/types/stores.ts b/src/types/stores.ts index 3b0453ca..5c25dc74 100644 --- a/src/types/stores.ts +++ b/src/types/stores.ts @@ -39,7 +39,6 @@ export interface TeamBoardParams { mainCategoryIds: number[] categoryIds: number[] taskTitle: string - valid?: boolean } export interface TaskBoardParams { diff --git a/src/utils/axios.ts b/src/utils/axios.ts index afbac70d..6adf2d25 100644 --- a/src/utils/axios.ts +++ b/src/utils/axios.ts @@ -19,10 +19,11 @@ const getNewAccessToken = async () => { return response.data.accessToken } catch (e) { - console.error('토큰 발행 실패', e) - Cookies.remove('accessToken') - Cookies.remove('refreshToken') - window.location.href = 'login' + console.log(e) + // console.error('토큰 발행 실패', e) + // Cookies.remove('accessToken') + // Cookies.remove('refreshToken') + // window.location.href = 'login' } } const setInterceptors = (instance: AxiosInstance) => { @@ -48,13 +49,16 @@ const setInterceptors = (instance: AxiosInstance) => { console.log('상태확인 에러메세지:', error.response) switch (error.response.status) { case 401: - Cookies.remove('accessToken') - Cookies.remove('refreshToken') - window.location.href = 'login' + if (error.response.data === 'AUTH_003') { + console.log('잡았다') + // Cookies.remove('accessToken') + // Cookies.remove('refreshToken') + // window.location.href = 'login' + } break case 403: { if (error.response.data !== 'AUTH_002') { - Cookies.remove('accessToken') + // Cookies.remove('accessToken') const originalRequest = error.config if (!originalRequest._retry) { originalRequest._retry = true From c65eb727ee85cc370ed96c1620247c7dbf7e57b6 Mon Sep 17 00:00:00 2001 From: seorang42 Date: Fri, 7 Feb 2025 19:07:24 +0900 Subject: [PATCH 2/3] =?UTF-8?q?:bug:=20[fix]=20TaskDetail=20=EC=A0=95?= =?UTF-8?q?=EC=83=81=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TaskCard.vue | 10 +- .../my-request/MyRequestListCard.vue | 1 + src/components/my-task/MyTaskListCard.vue | 1 + .../request-approve/LabelDropdown.vue | 7 +- .../request-approve/ManagerDropdown.vue | 26 ++--- .../RequestHistoryListCard.vue | 1 + .../requested/RequestedListCard.vue | 1 + .../statistics/StatisticsCategoryCard.vue | 2 +- src/components/task-detail/TaskDetail.vue | 103 ++++++------------ .../task-detail/TaskDetailHistoryChat.vue | 7 +- src/components/task-detail/TaskDetailLeft.vue | 2 +- .../task-detail/TaskDetailRight.vue | 7 +- src/components/top-bar/NotificationModal.vue | 8 +- src/layout/TheView.vue | 1 + src/stores/member.ts | 4 +- src/types/common.ts | 2 +- src/types/user.ts | 2 +- src/utils/axios.ts | 5 +- 18 files changed, 85 insertions(+), 105 deletions(-) diff --git a/src/components/TaskCard.vue b/src/components/TaskCard.vue index 0c1c2524..da9e277d 100644 --- a/src/components/TaskCard.vue +++ b/src/components/TaskCard.vue @@ -5,12 +5,14 @@ @click="onTaskClick">
-
+
- {{ data.title }} + {{ + data.title + }}
{{ data.mainCategoryName }} - {{ data.categoryName }}
- {{ data.taskCode }} + {{ + data.taskCode + }}
{{ data.requesterDepartment }}
diff --git a/src/components/my-request/MyRequestListCard.vue b/src/components/my-request/MyRequestListCard.vue index c277f2ad..390a61a5 100644 --- a/src/components/my-request/MyRequestListCard.vue +++ b/src/components/my-request/MyRequestListCard.vue @@ -12,6 +12,7 @@ :is-status="tab.isStatus" />
diff --git a/src/components/my-task/MyTaskListCard.vue b/src/components/my-task/MyTaskListCard.vue index be9594a9..d9d24c9c 100644 --- a/src/components/my-task/MyTaskListCard.vue +++ b/src/components/my-task/MyTaskListCard.vue @@ -12,6 +12,7 @@ :is-status="tab.isStatus" />
diff --git a/src/components/request-approve/LabelDropdown.vue b/src/components/request-approve/LabelDropdown.vue index ea8c599b..14ab5def 100644 --- a/src/components/request-approve/LabelDropdown.vue +++ b/src/components/request-approve/LabelDropdown.vue @@ -1,7 +1,9 @@