Skip to content

Commit 7943d1e

Browse files
Minkyu0424Minkyu0424
authored
Merge pull request #205 from TaskFlow-CLAP/CLAP-450
CLAP-450 QA 사항 반영 Tony.tsx 4차
2 parents 047c73f + 7f8dd8d commit 7943d1e

33 files changed

+119
-65
lines changed

‎index.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="">
2+
<html lang="ko">
33
<head>
44
<meta charset="UTF-8" />
55
<link
@@ -8,6 +8,10 @@
88
<meta
99
name="viewport"
1010
content="width=device-width, initial-scale=1.0" />
11+
<meta
12+
name="description"
13+
content="TaskFlow, 업무 관리의 혁신을 이끄는 스마트한 서비스" />
14+
1115
<title>TaskFlow - 스마트한 업무 관리</title>
1216
</head>
1317
<body>

‎public/MainLogo.svg‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/api/common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const { isLogined } = storeToRefs(memberStore)
99

1010
export const patchEditInfo = async (formdata: FormData) => {
1111
if (!isLogined) return
12-
const response = await formDataAxiosInstance.patch('/api/members/info', formdata)
12+
const response = await formDataAxiosInstance.patch('/api/members/inf', formdata)
1313
return response.data
1414
}
1515

‎src/assets/styles.css‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ body {
4444
@apply button-large bg-white text-disabled border-border-1 hover:bg-background-2;
4545
}
4646
.button-large-red {
47-
@apply button-large bg-red-1 text-white border-red-1 hover:bg-[#D61E1E];
47+
@apply button-large bg-red-1 text-white border-red-1 hover:bg-[#CF1B1B];
4848
}
4949
.button-large-primary {
50-
@apply button-large bg-primary1 text-white border-primary1 hover:bg-[#6D6EF0];
50+
@apply button-large bg-primary1 text-white border-primary1 hover:bg-primary3;
5151
}
5252

5353
.button-medium {
5454
@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];
5555
}
5656
.button-medium-primary {
57-
@apply button-medium bg-primary1 text-white hover:bg-[#6869DE];
57+
@apply button-medium bg-primary1 text-white hover:bg-primary3;
5858
}
5959
.button-medium-secondary {
6060
@apply button-medium bg-white border border-primary1 text-primary1 hover:bg-primary2;
@@ -73,7 +73,7 @@ body {
7373
@apply flex items-center gap-1 text-xs font-semibold;
7474
}
7575
.button-small-primary {
76-
@apply text-primary1;
76+
@apply text-primary3;
7777
}
7878
.button-small-default {
7979
@apply text-disabled;
@@ -149,6 +149,10 @@ body {
149149
@apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer;
150150
}
151151

152+
.hidden-text {
153+
@apply absolute text-transparent w-[1px] h-[1px] overflow-hidden top-0 left-0;
154+
}
155+
152156
.modal-enter-active,
153157
.modal-leave-active {
154158
transition:

‎src/components/common/EditInformation.vue‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<div class="flex gap-6">
3535
<label
3636
for="fileInput"
37-
class="mt-3 text-xs text-primary1 font-semibold cursor-pointer hover:underline"
37+
class="mt-3 text-xs text-primary3 font-semibold cursor-pointer hover:underline"
3838
>변경</label
3939
>
4040
<label
@@ -286,12 +286,12 @@ const handleFileDelete = () => {
286286
}
287287
288288
const handleSubmit = async () => {
289-
modalHeader.value = '정보 수정 중 입니다...'
290-
modalBody.value = '잠시만 기다려주세요'
291-
modalType.value = 'loadingType'
292-
isModalVisible.value = true
293-
294289
if (isInvalid.value == false && isFull.value == false) {
290+
modalHeader.value = '정보 수정 중 입니다...'
291+
modalBody.value = '잠시만 기다려주세요'
292+
modalType.value = 'loadingType'
293+
isModalVisible.value = true
294+
295295
const formData = new FormData()
296296
const memberInfo = {
297297
name: DOMPurify.sanitize(name.value),
@@ -310,10 +310,14 @@ const handleSubmit = async () => {
310310
selectedFile.value = null
311311
}
312312
313-
await patchEditInfo(formData)
314-
isModalVisible.value = false
315-
isSuccessModalVisible.value = true
316-
await memberStore.updateMemberInfoWithToken()
313+
try {
314+
await patchEditInfo(formData)
315+
isModalVisible.value = false
316+
isSuccessModalVisible.value = true
317+
await memberStore.updateMemberInfoWithToken()
318+
} catch {
319+
isModalVisible.value = false
320+
}
317321
}
318322
}
319323
</script>

‎src/components/common/MainLogo.vue‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<template>
2+
<svg
3+
width="134"
4+
height="48"
5+
viewBox="0 0 134 48"
6+
fill="none"
7+
xmlns="http://www.w3.org/2000/svg">
8+
<path
9+
d="M0 10.7411C0 9.99958 0.601128 9.39844 1.34266 9.39844H106.741V42.9649H1.34266C0.601128 42.9649 0 42.3637 0 41.6222V10.7411Z"
10+
fill="#6D6EF0" />
11+
<path
12+
d="M131.9 40.7961C132.589 41.6779 131.961 42.9655 130.842 42.9655H101.371C100.629 42.9655 100.028 42.3643 100.028 41.6229V3.9C100.028 2.62302 101.643 2.06711 102.429 3.07338L131.9 40.7961Z"
13+
fill="#6D6EF0" />
14+
<path
15+
d="M9.46257 18.9313H5.75684V15.709H16.7129V18.9313H13.0072V38.2656H9.46257V18.9313ZM19.6891 15.709H24.4904L28.1639 38.2656H24.6193L23.9748 33.7865V33.8509H19.9469L19.3024 38.2656H16.0156L19.6891 15.709ZM23.5559 30.7897L21.977 19.6403H21.9125L20.3658 30.7897H23.5559ZM34.3974 38.5878C32.6786 38.5878 31.3789 38.1045 30.4981 37.1378C29.6174 36.1496 29.177 34.7425 29.177 32.9165V31.6275H32.5282V33.1742C32.5282 34.6351 33.1405 35.3655 34.3652 35.3655C34.9667 35.3655 35.4178 35.1936 35.7186 34.8499C36.0408 34.4847 36.2019 33.9046 36.2019 33.1098C36.2019 32.1646 35.9871 31.3375 35.5575 30.6286C35.1278 29.8982 34.3329 29.0281 33.1727 28.0184C31.7119 26.7295 30.6915 25.5694 30.1115 24.5383C29.5314 23.4856 29.2414 22.3041 29.2414 20.9937C29.2414 19.2106 29.6926 17.8357 30.5948 16.869C31.4971 15.8808 32.8075 15.3867 34.5263 15.3867C36.2234 15.3867 37.5016 15.8808 38.3609 16.869C39.2417 17.8357 39.6821 19.2321 39.6821 21.0581V21.9926H36.3308V20.8325C36.3308 20.0592 36.1804 19.5006 35.8797 19.1569C35.5789 18.7917 35.1385 18.6091 34.5585 18.6091C33.3768 18.6091 32.786 19.3288 32.786 20.7681C32.786 21.5844 33.0009 22.3471 33.4305 23.056C33.8818 23.7649 34.6874 24.6242 35.8475 25.6339C37.3298 26.9228 38.3502 28.0936 38.9087 29.1463C39.4673 30.1989 39.7465 31.4342 39.7465 32.852C39.7465 34.6995 39.2847 36.1173 38.3609 37.1055C37.4587 38.0937 36.1375 38.5878 34.3974 38.5878ZM41.7787 15.709H45.3233V25.215L49.8346 15.709H53.3792L49.1579 23.9905L53.4437 38.2656H49.7379L46.7411 28.2118L45.3233 31.0797V38.2656H41.7787V15.709ZM55.1213 15.709H64.4984V18.9313H58.6659V25.215H63.2417V28.4373H58.6659V38.2656H55.1213V15.709ZM66.1982 15.709H69.7428V35.0432H75.5754V38.2656H66.1982V15.709ZM82.2729 38.5878C80.5328 38.5878 79.2009 38.0937 78.2771 37.1055C77.3534 36.1173 76.8915 34.721 76.8915 32.9165V21.0581C76.8915 19.2536 77.3534 17.8572 78.2771 16.869C79.2009 15.8808 80.5328 15.3867 82.2729 15.3867C84.0129 15.3867 85.3449 15.8808 86.2686 16.869C87.1924 17.8572 87.6542 19.2536 87.6542 21.0581V32.9165C87.6542 34.721 87.1924 36.1173 86.2686 37.1055C85.3449 38.0937 84.0129 38.5878 82.2729 38.5878ZM82.2729 35.3655C83.4974 35.3655 84.1096 34.6243 84.1096 33.142V20.8325C84.1096 19.3502 83.4974 18.6091 82.2729 18.6091C81.0484 18.6091 80.4361 19.3502 80.4361 20.8325V33.142C80.4361 34.6243 81.0484 35.3655 82.2729 35.3655ZM89.2137 15.709H92.6294L94.2084 33.0453H94.2729L95.9485 15.709H99.8154L101.491 33.0453H101.555L103.134 15.709H106.196L103.908 38.2656H99.4931L97.8819 23.056H97.8175L96.2063 38.2656H91.5016L89.2137 15.709ZM107.17 34.8499H110.586V38.2656H107.17V34.8499Z"
16+
fill="white" />
17+
</svg>
18+
</template>

‎src/components/common/OrderIcon.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
xmlns="http://www.w3.org/2000/svg">
88
<path
99
d="M11 9.83984H5.00003C4.90108 9.83977 4.80433 9.86905 4.72204 9.92398C4.63974 9.97892 4.57559 10.057 4.53772 10.1484C4.49984 10.2399 4.48994 10.3405 4.50926 10.4375C4.52859 10.5345 4.57627 10.6237 4.64628 10.6936L7.64628 13.6936C7.69271 13.7401 7.74786 13.777 7.80856 13.8021C7.86926 13.8273 7.93432 13.8402 8.00003 13.8402C8.06574 13.8402 8.1308 13.8273 8.1915 13.8021C8.2522 13.777 8.30734 13.7401 8.35378 13.6936L11.3538 10.6936C11.4238 10.6237 11.4715 10.5345 11.4908 10.4375C11.5101 10.3405 11.5002 10.2399 11.4623 10.1484C11.4245 10.057 11.3603 9.97892 11.278 9.92398C11.1957 9.86905 11.099 9.83977 11 9.83984Z"
10-
:fill="isActive ? '#7879EB' : '#D4D4D8'" />
10+
:fill="isActive ? '#6061DB' : '#D4D4D8'" />
1111
<path
1212
d="M4.50919 5.5629C4.48995 5.65991 4.4999 5.76045 4.5378 5.8518C4.57563 5.94317 4.6397 6.02127 4.72191 6.07623C4.80412 6.13118 4.90079 6.16053 4.99968 6.16055H10.9997C11.0986 6.16063 11.1954 6.13134 11.2777 6.07641C11.36 6.02147 11.4241 5.94336 11.462 5.85194C11.4999 5.76053 11.5098 5.65994 11.4904 5.5629C11.4711 5.46585 11.4234 5.37673 11.3534 5.3068L8.35343 2.3068C8.30699 2.26031 8.25185 2.22343 8.19115 2.19827C8.13045 2.17311 8.06538 2.16016 7.99968 2.16016C7.93397 2.16016 7.86891 2.17311 7.80821 2.19827C7.74751 2.22343 7.69236 2.26031 7.64593 2.3068L4.64593 5.3068C4.57602 5.37676 4.52844 5.46589 4.50919 5.5629Z"
1313
fill="#D4D4D8" />

‎src/components/filters/FilterInput.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
:class="width === 'full' && 'grow'">
66
<span class="filter-title">{{ title }}</span>
77
<input
8+
:aria-label="title"
89
@input="onValueChange"
910
class="w-full h-8 border-b border-border-1 outline-none text-xs px-2" />
1011
</div>

‎src/components/lists/ListBarTab.vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
:class="`${!width && 'grow'} ${justifyCenter && 'justify-center'}`">
66
{{ content }}
77
<button
8+
class="relative"
89
type="button"
910
v-if="sortBy"
1011
@click="$emit('toggleSortBy', sortBy)">
1112
<OrderIcon
1213
:is-active="isActive"
1314
:class="isASC && 'rotate-180'" />
15+
<span class="hidden-text">정렬</span>
1416
</button>
1517
</div>
1618
</template>

‎src/components/member-management/MemberManagementAddByCsv.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
@change="handleFileUpload" />
1010
<label
1111
for="file"
12-
class="cursor-pointer flex items-center gap-1 text-xs font-semibold text-primary1">
12+
class="cursor-pointer flex items-center gap-1 text-xs font-semibold text-primary3">
1313
<CommonIcons
1414
:name="plusIcon"
15-
:style="{ fill: '#7879EB' }" />
15+
:style="{ fill: '#6061DB' }" />
1616
파일로 일괄 추가
1717
</label>
1818
<ModalView

0 commit comments

Comments
 (0)