Skip to content

Commit 9772fa7

Browse files
hyoseong-Choihyoseong-Choi
committed
Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-FE into develop
# Conflicts: # taskflow.yaml
2 parents 3c03d01 + 773076f commit 9772fa7

103 files changed

Lines changed: 1564 additions & 817 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/CD.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414
steps:
1515
# 저장소 코드를 체크아웃합니다. (PR 올린 코드를 가져오는 행위)
1616
- uses: actions/checkout@v4
17-
with:
18-
ref: release
1917

2018
# Node.js 환경 설정
2119
- name: Use Node.js
@@ -100,4 +98,4 @@ jobs:
10098
key: ${{ secrets.KUBE_HOST_KEY }}
10199
port: ${{ secrets.KUBE_HOST_PORT }}
102100
script: |
103-
kubectl apply --filename taskflow-front.yaml
101+
kubectl apply --filename taskflow-front.yaml

‎index.html‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="">
33
<head>
4-
<meta charset="UTF-8">
5-
<link rel="icon" href="/favicon.ico">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>TaskFlow</title>
4+
<meta charset="UTF-8" />
5+
<link
6+
rel="icon"
7+
href="/favicon.ico" />
8+
<meta
9+
name="viewport"
10+
content="width=device-width, initial-scale=1.0" />
11+
<title>TaskFlow - 스마트한 업무 관리</title>
812
</head>
913
<body>
1014
<div id="app"></div>
11-
<script type="module" src="/src/main.ts"></script>
15+
<script
16+
type="module"
17+
src="/src/main.ts"></script>
1218
</body>
1319
</html>

‎src/api/auth.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { axiosInstance } from '@/utils/axios'
22
import Cookies from 'js-cookie'
3-
import type { loginDataTypes } from '@/types/auth'
3+
44
import { useMemberStore } from '@/stores/member'
55

66
export const postPasswordEmailSend = async (name: string, email: string) => {
@@ -17,8 +17,10 @@ export const postPasswordCheck = async (password: string) => {
1717
return response.data
1818
}
1919

20-
export const postLogin = async (loginData: loginDataTypes) => {
21-
const response = await axiosInstance.post('/api/auths/login', loginData)
20+
export const postLogin = async (nickName: string, password: string) => {
21+
const response = await axiosInstance.post(`/api/auths/login?nickname=${nickName}`, {
22+
password: password
23+
})
2224
Cookies.set('accessToken', response.data.accessToken, {
2325
path: '/',
2426
sameSite: 'strict'
@@ -31,7 +33,7 @@ export const postLogin = async (loginData: loginDataTypes) => {
3133
}
3234

3335
export const patchPassword = async (password: string) => {
34-
const request = { password: password }
36+
const request = { password }
3537
const response = await axiosInstance.patch('/api/members/password', request)
3638
return response.data
3739
}

‎src/api/common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const getNotification = async (pageNum: number, sizeNum: number) => {
1212
}
1313

1414
export const patchNotificationRead = async (notificationId: number) => {
15-
const response = await axiosInstance.patch(`/api/notification/${notificationId}`)
15+
const response = await axiosInstance.patch(`/api/notifications/${notificationId}`)
1616
return response.data
1717
}
1818

‎src/api/user.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const changeProcessor = async (taskID: number, processorId: number) => {
3838
}
3939

4040
export const patchChangeStatus = async (taskID: number, status: Status) => {
41-
const response = await axiosInstance.patch(`/api/tasks/${taskID}/status`, { status })
41+
const response = await axiosInstance.patch(`/api/tasks/${taskID}/status`, { taskStatus: status })
4242
return response.data
4343
}
4444

‎src/assets/fonts/SUIT-Variable.woff2‎

610 KB
Binary file not shown.

‎src/assets/styles.css‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44

55
@font-face {
66
font-family: 'SUIT-Variable';
7-
src: url('@/assets/fonts/SUIT-Variable.ttf') format('truetype');
8-
font-weight: normal;
7+
src:
8+
url('@/assets/fonts/SUIT-Variable.woff2') format('woff2'),
9+
url('@/assets/fonts/SUIT-Variable.ttf') format('truetype');
10+
font-weight: 100 900;
911
font-style: normal;
12+
font-display: swap;
1013
}
1114

1215
body {
@@ -48,19 +51,22 @@ body {
4851
}
4952

5053
.button-medium {
51-
@apply flex items-center justify-center rounded px-4 py-2 font-bold gap-1 text-xs cursor-pointer shrink-0;
54+
@apply flex items-center justify-center rounded px-4 py-2 font-bold gap-1 text-xs cursor-pointer shrink-0 h-full;
5255
}
5356
.button-medium-primary {
5457
@apply button-medium bg-primary1 text-white hover:bg-[#6869DE];
5558
}
5659
.button-medium-secondary {
57-
@apply button-medium bg-white border border-primary1 text-primary1 hover:bg-background-2;
60+
@apply button-medium bg-white border border-primary1 text-primary1 hover:bg-primary2;
5861
}
5962
.button-medium-default {
6063
@apply button-medium bg-white border border-border-1 text-disabled hover:bg-background-2;
6164
}
6265
.button-medium-red {
63-
@apply button-medium bg-white border border-red-1 text-red-1 hover:bg-background-2;
66+
@apply button-medium bg-white border border-red-1 text-red-1 hover:bg-red-2;
67+
}
68+
.button-medium-disabled {
69+
@apply button-medium text-disabled bg-background-1;
6470
}
6571

6672
.button-small {
@@ -93,7 +99,7 @@ body {
9399
@apply flex justify-center items-center w-full h-8 px-2 border-b border-border-1 relative text-xs cursor-pointer;
94100
}
95101
.filter-dropdown-option-list {
96-
@apply w-full max-h-[120px] overflow-y-scroll absolute left-0 top-[calc(100%+8px)] shadow-custom p-2 flex flex-col gap-2 rounded bg-white cursor-auto;
102+
@apply w-full max-h-[160px] overflow-y-scroll absolute left-0 top-[calc(100%+8px)] shadow-custom p-2 flex flex-col gap-2 rounded bg-white cursor-auto;
97103
}
98104
.filter-dropdown-option {
99105
@apply text-xs p-2 rounded text-center cursor-pointer;
@@ -108,10 +114,10 @@ body {
108114
}
109115

110116
.request-task-dropdown {
111-
@apply flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black;
117+
@apply flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer;
112118
}
113119
.request-task-dropdown-option-list {
114-
@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;
120+
@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;
115121
}
116122
.request-task-dropdown-option {
117123
@apply w-full flex items-center h-11 p-2 rounded hover:bg-background-2 cursor-pointer;
@@ -140,7 +146,7 @@ body {
140146
@apply w-full flex items-center h-10 p-2 rounded hover:bg-background-2 cursor-pointer;
141147
}
142148
.task-detail-manager-dropdown {
143-
@apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black;
149+
@apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer;
144150
}
145151

146152
.modal-enter-active,

‎src/components/api-logs/ApiLogsList.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { useQuery } from '@tanstack/vue-query'
3131
import type { ApiLogsResponse } from '@/types/admin'
3232
import { computed } from 'vue'
3333
import { useMemberStore } from '@/stores/member'
34+
import { storeToRefs } from 'pinia'
3435
3536
const { params } = useLogsParamsStore()
3637
const onPageChange = (value: number) => {
@@ -47,7 +48,8 @@ const fetchApiLogsList = async () => {
4748
return response.data
4849
}
4950
50-
const { isLogined } = useMemberStore()
51+
const memberStore = useMemberStore()
52+
const { isLogined } = storeToRefs(memberStore)
5153
const { data } = useQuery<ApiLogsResponse>({
5254
queryKey: ['apiLogs', params],
5355
queryFn: fetchApiLogsList,

0 commit comments

Comments
 (0)