diff --git a/index.html b/index.html index a35f738b..1684e948 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + + + TaskFlow - 스마트한 업무 관리 diff --git a/public/MainLogo.svg b/public/MainLogo.svg deleted file mode 100644 index ed01a890..00000000 --- a/public/MainLogo.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/api/common.ts b/src/api/common.ts index 13b673fa..fa7c5253 100644 --- a/src/api/common.ts +++ b/src/api/common.ts @@ -9,7 +9,7 @@ const { isLogined } = storeToRefs(memberStore) export const patchEditInfo = async (formdata: FormData) => { if (!isLogined) return - const response = await formDataAxiosInstance.patch('/api/members/info', formdata) + const response = await formDataAxiosInstance.patch('/api/members/inf', formdata) return response.data } diff --git a/src/assets/styles.css b/src/assets/styles.css index 1abacf02..1288d4cb 100644 --- a/src/assets/styles.css +++ b/src/assets/styles.css @@ -44,17 +44,17 @@ body { @apply button-large bg-white text-disabled border-border-1 hover:bg-background-2; } .button-large-red { - @apply button-large bg-red-1 text-white border-red-1 hover:bg-[#D61E1E]; + @apply button-large bg-red-1 text-white border-red-1 hover:bg-[#CF1B1B]; } .button-large-primary { - @apply button-large bg-primary1 text-white border-primary1 hover:bg-[#6D6EF0]; + @apply button-large bg-primary1 text-white border-primary1 hover:bg-primary3; } .button-medium { @apply flex items-center justify-center rounded px-4 py-2 font-semibold gap-1 text-xs cursor-pointer shrink-0 h-full max-h-[34px]; } .button-medium-primary { - @apply button-medium bg-primary1 text-white hover:bg-[#6869DE]; + @apply button-medium bg-primary1 text-white hover:bg-primary3; } .button-medium-secondary { @apply button-medium bg-white border border-primary1 text-primary1 hover:bg-primary2; @@ -73,7 +73,7 @@ body { @apply flex items-center gap-1 text-xs font-semibold; } .button-small-primary { - @apply text-primary1; + @apply text-primary3; } .button-small-default { @apply text-disabled; @@ -149,6 +149,10 @@ body { @apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer; } +.hidden-text { + @apply absolute text-transparent w-[1px] h-[1px] overflow-hidden top-0 left-0; +} + .modal-enter-active, .modal-leave-active { transition: diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index 336f224c..24603948 100644 --- a/src/components/common/EditInformation.vue +++ b/src/components/common/EditInformation.vue @@ -34,7 +34,7 @@
diff --git a/src/components/lists/ListBarTab.vue b/src/components/lists/ListBarTab.vue index 726ee730..e17a4f18 100644 --- a/src/components/lists/ListBarTab.vue +++ b/src/components/lists/ListBarTab.vue @@ -5,12 +5,14 @@ :class="`${!width && 'grow'} ${justifyCenter && 'justify-center'}`"> {{ content }} diff --git a/src/components/member-management/MemberManagementAddByCsv.vue b/src/components/member-management/MemberManagementAddByCsv.vue index b089e6ae..3429c8f1 100644 --- a/src/components/member-management/MemberManagementAddByCsv.vue +++ b/src/components/member-management/MemberManagementAddByCsv.vue @@ -9,10 +9,10 @@ @change="handleFileUpload" /> -

잔여 작업 : {{ option.remainingTasks }}

+

잔여 작업 : {{ option.remainingTasks }}

diff --git a/src/components/request-task/RequestTaskFileInputAfter.vue b/src/components/request-task/RequestTaskFileInputAfter.vue index 3fc29bb0..1582c311 100644 --- a/src/components/request-task/RequestTaskFileInputAfter.vue +++ b/src/components/request-task/RequestTaskFileInputAfter.vue @@ -32,10 +32,10 @@ diff --git a/src/components/statistics/PeriodButtons.vue b/src/components/statistics/PeriodButtons.vue index 55d5a963..1d7a9546 100644 --- a/src/components/statistics/PeriodButtons.vue +++ b/src/components/statistics/PeriodButtons.vue @@ -1,6 +1,6 @@ diff --git a/src/components/top-bar/NotificationModal.vue b/src/components/top-bar/NotificationModal.vue index 1efb64b2..7083a455 100644 --- a/src/components/top-bar/NotificationModal.vue +++ b/src/components/top-bar/NotificationModal.vue @@ -11,7 +11,7 @@ @click="readAllNotifi" class="flex items-center gap-1 p-1 rounded hover:bg-background-2"> -

모두 읽음

+

모두 읽음

@@ -56,7 +56,7 @@
내 정보 수정 @@ -75,6 +75,7 @@ import { SIDE_USER_MENU, SIDE_MANAGER_MENU, SIDE_ADMIN_MENU } from '@/constants/ import { useMemberStore } from '@/stores/member' import { storeToRefs } from 'pinia' import ImageContainer from '../common/ImageContainer.vue' +import MainLogo from '../common/MainLogo.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 0e79c106..d29efb44 100644 --- a/src/components/top-bar/TopBar.vue +++ b/src/components/top-bar/TopBar.vue @@ -5,13 +5,19 @@
-
{{ department.name }}

+ :class="[department.isManager ? 'text-primary3' : 'text-body', 'text-xs']"> {{ department.isManager ? '담당자 권한 O' : '담당자 권한 X' }}

diff --git a/src/constants/iconPath.ts b/src/constants/iconPath.ts index be8f248c..e851a0c5 100644 --- a/src/constants/iconPath.ts +++ b/src/constants/iconPath.ts @@ -36,7 +36,7 @@ export const successIcon = { path: 'M28.2666 36.8L22.5333 31.0666C22.0444 30.5778 21.4221 30.3333 20.6666 30.3333C19.911 30.3333 19.2888 30.5778 18.7999 31.0666C18.311 31.5555 18.0666 32.1778 18.0666 32.9333C18.0666 33.6889 18.311 34.3111 18.7999 34.8L26.3999 42.4C26.9333 42.9333 27.5555 43.2 28.2666 43.2C28.9777 43.2 29.5999 42.9333 30.1333 42.4L45.1999 27.3333C45.6888 26.8444 45.9333 26.2222 45.9333 25.4666C45.9333 24.7111 45.6888 24.0889 45.1999 23.6C44.711 23.1111 44.0888 22.8666 43.3333 22.8666C42.5777 22.8666 41.9555 23.1111 41.4666 23.6L28.2666 36.8ZM31.9999 58.6666C28.311 58.6666 24.8444 57.9662 21.5999 56.5653C18.3555 55.1644 15.5333 53.2649 13.1333 50.8666C10.7333 48.4684 8.8337 45.6462 7.43459 42.4C6.03548 39.1538 5.33503 35.6871 5.33326 32C5.33148 28.3129 6.03192 24.8462 7.43459 21.6C8.83726 18.3538 10.7368 15.5315 13.1333 13.1333C15.5297 10.7351 18.3519 8.83554 21.5999 7.43465C24.8479 6.03376 28.3146 5.33331 31.9999 5.33331C35.6853 5.33331 39.1519 6.03376 42.3999 7.43465C45.6479 8.83554 48.4701 10.7351 50.8666 13.1333C53.263 15.5315 55.1635 18.3538 56.5679 21.6C57.9724 24.8462 58.6719 28.3129 58.6666 32C58.6613 35.6871 57.9608 39.1538 56.5653 42.4C55.1697 45.6462 53.2701 48.4684 50.8666 50.8666C48.463 53.2649 45.6408 55.1653 42.3999 56.568C39.159 57.9706 35.6924 58.6702 31.9999 58.6666ZM31.9999 53.3333C37.9555 53.3333 42.9999 51.2666 47.1333 47.1333C51.2666 43 53.3333 37.9555 53.3333 32C53.3333 26.0444 51.2666 21 47.1333 16.8666C42.9999 12.7333 37.9555 10.6666 31.9999 10.6666C26.0444 10.6666 20.9999 12.7333 16.8666 16.8666C12.7333 21 10.6666 26.0444 10.6666 32C10.6666 37.9555 12.7333 43 16.8666 47.1333C20.9999 51.2666 26.0444 53.3333 31.9999 53.3333Z', width: 64, height: 64, - fill: '#7879EB' + fill: '#6D6EF0' } export const failIcon = { @@ -64,7 +64,7 @@ export const smallCheckIcon = { path: 'M12.4733 4.80657C12.4114 4.74409 12.3376 4.69449 12.2564 4.66065C12.1752 4.6268 12.088 4.60938 12 4.60938C11.912 4.60938 11.8249 4.6268 11.7436 4.66065C11.6624 4.69449 11.5886 4.74409 11.5267 4.80657L6.56001 9.77991L4.47334 7.68657C4.40899 7.62441 4.33303 7.57554 4.2498 7.54274C4.16656 7.50993 4.07768 7.49385 3.98822 7.49539C3.89877 7.49694 3.8105 7.51609 3.72844 7.55176C3.64639 7.58742 3.57217 7.63889 3.51001 7.70324C3.44785 7.76759 3.39897 7.84355 3.36617 7.92679C3.33337 8.01002 3.31728 8.0989 3.31883 8.18836C3.32038 8.27781 3.33953 8.36609 3.37519 8.44814C3.41085 8.53019 3.46233 8.60441 3.52667 8.66657L6.08667 11.2266C6.14865 11.2891 6.22238 11.3387 6.30362 11.3725C6.38486 11.4063 6.472 11.4238 6.56001 11.4238C6.64802 11.4238 6.73515 11.4063 6.81639 11.3725C6.89763 11.3387 6.97137 11.2891 7.03334 11.2266L12.4733 5.78657C12.541 5.72415 12.595 5.64838 12.632 5.56404C12.6689 5.47971 12.688 5.38864 12.688 5.29657C12.688 5.20451 12.6689 5.11344 12.632 5.0291C12.595 4.94477 12.541 4.869 12.4733 4.80657Z', width: 16, height: 16, - fill: '#7879EB' + fill: '#6061DB' } export const plusIcon = { @@ -85,7 +85,7 @@ export const downloadIcon = { path: 'M6.00008 8.38317C5.91119 8.38317 5.82786 8.3694 5.75008 8.34184C5.6723 8.31428 5.60008 8.26695 5.53341 8.19984L3.13341 5.79984C3.00008 5.66651 2.93608 5.51095 2.94141 5.33317C2.94675 5.1554 3.01075 4.99984 3.13341 4.86651C3.26675 4.73317 3.42519 4.66384 3.60875 4.65851C3.7923 4.65317 3.95053 4.71695 4.08341 4.84984L5.33342 6.09984V1.33317C5.33342 1.14428 5.39742 0.986062 5.52541 0.858506C5.65341 0.730951 5.81164 0.666951 6.00008 0.666506C6.18853 0.666062 6.34697 0.730062 6.47542 0.858506C6.60386 0.986951 6.66764 1.14517 6.66675 1.33317V6.09984L7.91675 4.84984C8.05008 4.71651 8.20853 4.65251 8.39208 4.65784C8.57564 4.66317 8.73386 4.73273 8.86675 4.86651C8.98897 4.99984 9.05297 5.1554 9.05875 5.33317C9.06453 5.51095 9.00053 5.66651 8.86675 5.79984L6.46675 8.19984C6.40008 8.26651 6.32786 8.31384 6.25008 8.34184C6.1723 8.36984 6.08897 8.38362 6.00008 8.38317ZM2.00008 11.3332C1.63341 11.3332 1.31964 11.2027 1.05875 10.9418C0.797859 10.681 0.667192 10.367 0.666748 9.99984V8.66651C0.666748 8.47762 0.730748 8.3194 0.858748 8.19184C0.986748 8.06428 1.14497 8.00028 1.33341 7.99984C1.52186 7.9994 1.6803 8.0634 1.80875 8.19184C1.93719 8.32028 2.00097 8.47851 2.00008 8.66651V9.99984H10.0001V8.66651C10.0001 8.47762 10.0641 8.3194 10.1921 8.19184C10.3201 8.06428 10.4783 8.00028 10.6667 7.99984C10.8552 7.9994 11.0136 8.0634 11.1421 8.19184C11.2705 8.32028 11.3343 8.47851 11.3334 8.66651V9.99984C11.3334 10.3665 11.203 10.6805 10.9421 10.9418C10.6812 11.2032 10.3672 11.3336 10.0001 11.3332H2.00008Z', width: 12, height: 12, - fill: '#7879EB' + fill: '#6061DB' } export const clipIcon = { @@ -152,7 +152,7 @@ export const modificationIcon = { height: 20, fill: 'none', options: { - stroke: '#7879EB', + stroke: '#6D6EF0', 'stroke-width': 1.6, 'stroke-linecap': 'round' as const, 'stroke-linejoin': 'round' as const @@ -170,7 +170,7 @@ export const approveIcon = { path: 'M7.83342 10.5001L6.04175 8.70842C5.88897 8.55564 5.69453 8.47925 5.45842 8.47925C5.2223 8.47925 5.02786 8.55564 4.87508 8.70842C4.7223 8.86119 4.64592 9.05564 4.64592 9.29175C4.64592 9.52786 4.7223 9.7223 4.87508 9.87508L7.25008 12.2501C7.41675 12.4167 7.61119 12.5001 7.83342 12.5001C8.05564 12.5001 8.25008 12.4167 8.41675 12.2501L13.1251 7.54175C13.2779 7.38897 13.3542 7.19453 13.3542 6.95842C13.3542 6.7223 13.2779 6.52786 13.1251 6.37508C12.9723 6.2223 12.7779 6.14592 12.5417 6.14592C12.3056 6.14592 12.1112 6.2223 11.9584 6.37508L7.83342 10.5001ZM9.00008 17.3334C7.8473 17.3334 6.76397 17.1145 5.75008 16.6767C4.73619 16.239 3.85425 15.6454 3.10425 14.8959C2.35425 14.1465 1.76064 13.2645 1.32342 12.2501C0.886194 11.2356 0.667305 10.1523 0.666749 9.00008C0.666194 7.84786 0.885082 6.76453 1.32342 5.75008C1.76175 4.73564 2.35536 3.85369 3.10425 3.10425C3.85314 2.3548 4.73508 1.76119 5.75008 1.32341C6.76508 0.885637 7.84842 0.666748 9.00008 0.666748C10.1517 0.666748 11.2351 0.885637 12.2501 1.32341C13.2651 1.76119 14.147 2.3548 14.8959 3.10425C15.6448 3.85369 16.2387 4.73564 16.6776 5.75008C17.1165 6.76453 17.3351 7.84786 17.3334 9.00008C17.3317 10.1523 17.1129 11.2356 16.6767 12.2501C16.2406 13.2645 15.647 14.1465 14.8959 14.8959C14.1448 15.6454 13.2629 16.2392 12.2501 16.6776C11.2373 17.1159 10.154 17.3345 9.00008 17.3334ZM9.00008 15.6667C10.8612 15.6667 12.4376 15.0209 13.7292 13.7292C15.0209 12.4376 15.6667 10.8612 15.6667 9.00008C15.6667 7.13897 15.0209 5.56258 13.7292 4.27091C12.4376 2.97925 10.8612 2.33341 9.00008 2.33341C7.13897 2.33341 5.56258 2.97925 4.27092 4.27091C2.97925 5.56258 2.33342 7.13897 2.33342 9.00008C2.33342 10.8612 2.97925 12.4376 4.27092 13.7292C5.56258 15.0209 7.13897 15.6667 9.00008 15.6667Z', width: 18, height: 18, - fill: '#7879EB' + fill: '#6D6EF0' } export const checkBoxIcon = { @@ -189,7 +189,7 @@ export const fileIcon = { height: 25, fill: 'none', options: { - stroke: '#7879EB', + stroke: '#6D6EF0', 'stroke-width': 2, 'stroke-linecap': 'round' as const, 'stroke-linejoin': 'round' as const diff --git a/src/stores/params.ts b/src/stores/params.ts index f387f206..569f3308 100644 --- a/src/stores/params.ts +++ b/src/stores/params.ts @@ -134,7 +134,14 @@ export const useTeamBoardParamsStore = defineStore('teamBoardParams', () => { taskTitle: '' }) - return { params } + const $reset = () => { + params.value.sortBy = 'CONTRIBUTE' + params.value.mainCategoryIds = [] + params.value.categoryIds = [] + params.value.taskTitle = '' + } + + return { params, $reset } }) export const useTaskBoardParamsStore = defineStore('taskBoardParams', () => { @@ -146,5 +153,13 @@ export const useTaskBoardParamsStore = defineStore('taskBoardParams', () => { requesterNickname: '' }) - return { params } + const $reset = () => { + params.value.labelId = '' + params.value.mainCategoryIds = [] + params.value.categoryIds = [] + params.value.title = '' + params.value.requesterNickname = '' + } + + return { params, $reset } }) diff --git a/src/views/MemberManagementView.vue b/src/views/MemberManagementView.vue index 9500b3c4..5913b6a7 100644 --- a/src/views/MemberManagementView.vue +++ b/src/views/MemberManagementView.vue @@ -4,14 +4,14 @@