Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
<!DOCTYPE html>
<!doctype html>
<html lang="">
<head>
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>TaskFlow</title>
<meta charset="UTF-8" />
<link
rel="icon"
href="/favicon.ico" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0" />
<title>TaskFlow - 스마트한 업무 관리</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.ts"></script>
<script
type="module"
src="/src/main.ts"></script>
</body>
</html>
Binary file added src/assets/fonts/SUIT-Variable.woff2
Binary file not shown.
13 changes: 8 additions & 5 deletions src/assets/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@

@font-face {
font-family: 'SUIT-Variable';
src: url('@/assets/fonts/SUIT-Variable.ttf') format('truetype');
font-weight: normal;
src:
url('@/assets/fonts/SUIT-Variable.woff2') format('woff2'),
url('@/assets/fonts/SUIT-Variable.ttf') format('truetype');
font-weight: 100 900;
font-style: normal;
font-display: swap;
}

body {
Expand Down Expand Up @@ -108,10 +111,10 @@ body {
}

.request-task-dropdown {
@apply flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black;
@apply flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer;
}
.request-task-dropdown-option-list {
@apply absolute w-full h-40 overflow-y-auto top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow-custom text-black;
@apply absolute w-full h-40 overflow-y-auto top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow-custom;
}
.request-task-dropdown-option {
@apply w-full flex items-center h-11 p-2 rounded hover:bg-background-2 cursor-pointer;
Expand Down Expand Up @@ -140,7 +143,7 @@ body {
@apply w-full flex items-center h-10 p-2 rounded hover:bg-background-2 cursor-pointer;
}
.task-detail-manager-dropdown {
@apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black;
@apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer;
}

.modal-enter-active,
Expand Down
16 changes: 8 additions & 8 deletions src/components/common/EditInformation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
:isOpen="isModalVisible"
:type="'successType'"
@close="handleCancel">
<template #header> 정보가 수정되었습니다 </template>
<template #header>정보가 수정되었습니다</template>
</ModalView>

<ModalView
:isOpen="isWarnningModalVisible"
:type="'warningType'"
@click="changePw"
@close="warningModalToggle">
<template #header> 정보가 저장되지 않았습니다 </template>
<template #body> 수정 사항을 삭제하고 이동하시겠습니까? </template>
<template #header>정보가 저장되지 않았습니다</template>
<template #body>수정 사항을 삭제하고 이동하시겠습니까?</template>
</ModalView>

<div class="profile">
Expand Down Expand Up @@ -51,7 +51,7 @@
<span class="absolute top-1 right-2 text-xs text-gray-500"> {{ name.length }} / 10 </span>
<input
:class="[
'block w-full px-4 py-4 border rounded focus:outline-none h-11 mt-2 text-black',
'block w-full px-4 py-4 border rounded focus:outline-none h-11 mt-2',
isInvalid || isFull ? 'border-red-1' : 'border-border-1'
]"
placeholder="이름을 입력해주세요"
Expand All @@ -74,21 +74,21 @@
</div>
<div class="flex flex-col">
<p class="text-body text-xs font-bold">아이디</p>
<p class="mt-2 text-black">{{ info.nickname }}</p>
<p class="mt-2">{{ info.nickname }}</p>
</div>
<div class="flex flex-col">
<p class="text-body text-xs font-bold">이메일</p>
<p class="mt-2 text-black">{{ info.email }}</p>
<p class="mt-2">{{ info.email }}</p>
</div>
<div class="flex flex-col">
<p class="text-body text-xs font-bold">부서</p>
<p class="mt-2 text-black">{{ info.departmentName }}</p>
<p class="mt-2">{{ info.departmentName }}</p>
</div>
<div
v-if="info.departmentRole"
class="flex flex-col">
<p class="text-body text-xs font-bold">직무</p>
<p class="mt-2 text-black">{{ info.departmentRole }}</p>
<p class="mt-2">{{ info.departmentRole }}</p>
</div>
<div>
<p class="text-body text-xs font-bold">알림 수신 여부</p>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/FormCheckbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{ 'bg-primary1 text-white': isChecked, 'border border-disabled': !isChecked }
]"
:style="isChecked ? { fill: 'white' } : {}" />
<p class="text-black">{{ checkButtonName }}</p>
<p>{{ checkButtonName }}</p>
</div>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/ModalView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
v-if="type == 'warningType'"
:name="warningIcon" />

<div class="flex text-2xl font-bold justify-center text-black">
<div class="flex text-2xl font-bold justify-center">
<slot name="header"></slot>
</div>

Expand Down
8 changes: 3 additions & 5 deletions src/components/common/TaskCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
v-if="data.labelInfo"
:color="data.labelInfo.labelColor"
:content="data.labelInfo.labelName" />
<span class="text-black text-ellipsis overflow-hidden whitespace-nowrap">{{
data.title
}}</span>
<span class="line-clamp-2">{{ data.title }}</span>
</div>
<CommonIcons
v-if="draggable"
Expand All @@ -21,7 +19,7 @@
<span class="text-xs text-body">{{ data.mainCategoryName }} - {{ data.categoryName }}</span>
</div>
<div class="flex justify-between items-end">
<span class="text-xs font-bold text-black whitespace-nowrap overflow-hidden text-ellipsis">
<span class="text-xs font-bold whitespace-nowrap overflow-hidden text-ellipsis">
{{ data.taskCode }}
</span>
<div class="flex flex-col gap-1 items-end">
Expand All @@ -30,7 +28,7 @@
<ImageContainer
:url="data.requesterImageUrl"
:size="16" />
<span class="text-xs font-bold text-black">{{ data.requesterNickname }}</span>
<span class="text-xs font-bold">{{ data.requesterNickname }}</span>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/TitleBar.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="flex justify-between items-center px-6 py-3 border-l-8 border-primary1">
<span class="text-2xl font-bold text-black">{{ title }}</span>
<span class="text-2xl font-bold">{{ title }}</span>
<div
v-if="$slots.button"
class="flex gap-2">
Expand Down
8 changes: 4 additions & 4 deletions src/components/common/TitleContainer.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<div class="flex flex-col gap-2 items-center">
<span class="text-4xl font-bold text-black whitespace-pre-wrap text-center leading-tight">{{
title
}}</span>
<span class="font-bold whitespace-pre-wrap text-body text-center">{{ content }}</span>
<span class="text-4xl font-bold whitespace-pre-wrap text-center leading-tight">
{{ title }}
</span>
<span class="whitespace-pre-wrap text-body text-center">{{ content }}</span>
</div>
</template>

Expand Down
6 changes: 3 additions & 3 deletions src/components/filters/FilterCategory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
:class="
(main as number[]).includes(category.id)
? 'bg-primary1 text-white font-bold'
: 'hover:bg-background-2 text-black'
: 'hover:bg-background-2'
"
@click="() => onMainClick(category)">
{{ category.name }}
Expand All @@ -34,7 +34,7 @@
<div
ref="subRef"
class="filter-dropdown"
:class="isDisabled ? 'bg-background-2 text-disabled' : 'text-black'"
:class="isDisabled ? 'bg-background-2 text-disabled' : ''"
@click="!isDisabled && toggleDropdown('sub')">
<span class="grow text-center">선택</span>
<CommonIcons
Expand Down Expand Up @@ -62,7 +62,7 @@
:class="
(sub as number[]).includes(subCategory.id)
? 'bg-primary1 text-white font-bold'
: 'hover:bg-background-2 text-black'
: 'hover:bg-background-2'
"
@click="() => onSubClick(subCategory.id)">
{{ subCategory.name }}
Expand Down
2 changes: 1 addition & 1 deletion src/components/filters/FilterDropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
v-if="isDropdownOpened"
class="filter-dropdown-option-list">
<li
class="filter-dropdown-option hover:bg-background-2 text-black"
class="filter-dropdown-option hover:bg-background-2"
v-for="option in optionList"
:key="option.value"
@click="() => onOptionClick(option.value)">
Expand Down
2 changes: 1 addition & 1 deletion src/components/filters/FilterDropdownMulti.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
:class="
(value as string[]).includes(option.value)
? 'bg-primary1 text-white font-bold'
: 'hover:bg-background-2 text-black'
: 'hover:bg-background-2'
"
@click="() => onOptionClick(option.value)">
{{ option.content }}
Expand Down
2 changes: 1 addition & 1 deletion src/components/filters/FilterInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="filter-title">{{ title }}</span>
<input
@input="onValueChange"
class="w-full h-8 border-b border-border-1 outline-none text-xs text-black px-2" />
class="w-full h-8 border-b border-border-1 outline-none text-xs px-2" />
</div>
</template>

Expand Down
3 changes: 1 addition & 2 deletions src/components/filters/FilterIpAddress.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<template>
<div class="filter-container w-36">
<span class="filter-title">IP 주소</span>
<div
class="w-full h-8 border-b border-border-1 text-xs text-black flex items-center gap-1 px-2">
<div class="w-full h-8 border-b border-border-1 text-xs flex items-center gap-1 px-2">
<template
v-for="(block, index) in blocks"
:key="index">
Expand Down
2 changes: 1 addition & 1 deletion src/components/icons/NotificationIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</svg>
<div
v-if="newNotification"
class="absolute top-0 right-0 w-5 h-5 rounded-full bg-red-1 text-white font-bold text-xs flex justify-center items-center">
class="absolute top-0 right-0 w-5 h-5 rounded-full bg-red-1 text-white font-bold text-[10px] flex justify-center items-center">
{{ newNotification < 100 ? newNotification : 99 }}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/lists/ListCardTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
:status="content as Status" />
<span
v-else
class="break-all"
:class="`${isTextXs ? 'text-xs font-bold' : 'text-sm'} ${isStatusCode ? (content === '200' ? 'text-green-1' : 'text-red-1') : ''} ${isTextBody ? 'text-body' : 'text-black'}`">
class="break-all line-clamp-2"
:class="`${isTextXs ? 'text-xs' : 'text-sm'} ${isStatusCode ? (content === '200' ? 'text-green-1' : 'text-red-1') : ''} ${isTextBody ? 'text-body' : ''}`">
{{ content ? content : '-' }}
</span>
</div>
Expand Down
4 changes: 1 addition & 3 deletions src/components/lists/ListPagination.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
type="button"
:key="page"
class="w-6 h-6 flex justify-center items-center rounded text-sm"
:class="
page === pageNumber ? 'text-white font-bold bg-primary1' : 'text-black hover:bg-primary2'
"
:class="page === pageNumber ? 'text-white font-bold bg-primary1' : 'hover:bg-primary2'"
@click="onNumClick(page)">
{{ page }}
</button>
Expand Down
7 changes: 0 additions & 7 deletions src/components/login-logs/LoginLogsFilterBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
:option-list="TERM_LIST"
:value="String(store.params.term)"
@update:value="onParamsChange.onTermChange" />
<FilterDropdownMulti
title="구분"
:option-list="LOGIN_LOGS_DIVISION_LIST"
:value="store.params.logStatus"
@update:value="onParamsChange.onLogStatusChange" />
<FilterInput
title="아이디"
width="full"
Expand All @@ -30,8 +25,6 @@ import FilterInput from '../filters/FilterInput.vue'
import { useLogsParamsStore } from '@/stores/params'
import { PAGE_SIZE_LIST, TERM_LIST } from '@/constants/common'
import FilterIpAddress from '../filters/FilterIpAddress.vue'
import FilterDropdownMulti from '../filters/FilterDropdownMulti.vue'
import { LOGIN_LOGS_DIVISION_LIST } from '@/constants/admin'
import { useLogsParamsChange } from '@/hooks/useLogsParamsChange'

const store = useLogsParamsStore()
Expand Down
3 changes: 1 addition & 2 deletions src/components/login-logs/LoginLogsListCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import type { LoginLogsListData } from '@/types/admin'
import { formatFullDateTime } from '@/utils/date'

const logStatus = {
LOGIN: '로그인 시도',
LOGOUT: '로그아웃'
LOGIN: '로그인 시도'
}

const { info } = defineProps<{ info: LoginLogsListData }>()
Expand Down
4 changes: 2 additions & 2 deletions src/components/member-management/MemberManagementAddByCsv.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="py-1 px-2 rounded">
<div class="py-1 px-2 rounded hover:bg-background-2">
<input
class="hidden"
type="file"
Expand All @@ -18,7 +18,7 @@
:isOpen="isModalVisible"
:type="'successType'"
@close="handleCancel">
<template #header> 회원이 추가되었습니다 </template>
<template #header>회원이 추가되었습니다</template>
</ModalView>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/components/request-approve/DueDateInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:type="inputType"
:value="modelValue"
:min="new Date().toISOString().split('T')[0]"
class="w-full border border-gray-300 rounded px-3 py-2 cursor-pointer focus:outline-none text-center text-black"
class="w-full border border-gray-300 rounded px-3 py-2 cursor-pointer focus:outline-none text-center"
@focus="e => (e.target as HTMLInputElement).showPicker()"
@input="updateValue(($event.target as HTMLInputElement).value)" />
</template>
Expand Down
4 changes: 2 additions & 2 deletions src/components/request-approve/LabelDropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
ref="htmlRef"
class="relative flex">
<div
class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black"
class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer"
@click="toggleDropdown">
<p :class="{ 'text-disabled': !modelValue }">
{{ modelValue?.labelName || placeholderText }}
Expand All @@ -16,7 +16,7 @@
</div>
<div
v-if="dropdownOpen"
class="absolute w-full h-40 overflow-y-auto top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow border-t border-t-border-2 text-black">
class="absolute w-full h-40 overflow-y-auto top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow border-t border-t-border-2">
<div
v-for="option in labelArr"
:key="option.labelId"
Expand Down
2 changes: 1 addition & 1 deletion src/components/request-approve/RequestApprove.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:isOpen="isModalVisible"
:type="'successType'"
@close="handleCancel">
<template #header> 요청이 승인되었습니다 </template>
<template #header>요청이 승인되었습니다</template>
</ModalView>
<CategoryDropDown
v-model="category1"
Expand Down
2 changes: 1 addition & 1 deletion src/components/request-history/RequestHistoryFilterBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
:value="store.params.title"
@update:value="onParamsChange.onTitleChange" />
<FilterInput
title="이름"
title="아이디"
:value="store.params.nickName"
@update:value="onParamsChange.onNickNameChange" />
<FilterDropdownMulti
Expand Down
4 changes: 2 additions & 2 deletions src/components/request-task/CategoryDropDown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ref="htmlRef"
class="relative flex">
<div
class="flex w-full h-11 items-center rounded p-4 border border-border-1 text-black"
class="flex w-full h-11 items-center rounded p-4 border border-border-1"
:class="isDisabled ? 'bg-background-2 cursor-default' : 'bg-white cursor-pointer'"
@click="toggleDropdown">
<p :class="{ 'text-disabled': !modelValue?.name }">
Expand All @@ -29,7 +29,7 @@
</div>
<div
v-if="dropdownOpen"
class="absolute w-full max-h-40 overflow-y-auto top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow border-t border-t-border-2 text-black">
class="absolute w-full max-h-40 overflow-y-auto top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow border-t border-t-border-2">
<div
v-for="option in options"
:key="option.id"
Expand Down
Loading
Loading