diff --git a/frontend/src/components/AdminProjectSidebar/index.tsx b/frontend/src/components/AdminProjectSidebar/index.tsx index d6bf1b1..6d36739 100644 --- a/frontend/src/components/AdminProjectSidebar/index.tsx +++ b/frontend/src/components/AdminProjectSidebar/index.tsx @@ -65,7 +65,7 @@ export default function AdminProjectSidebar(): JSX.Element { diff --git a/frontend/src/components/Header/UserProfileForm.tsx b/frontend/src/components/Header/UserProfileForm.tsx index 584290b..b4e7214 100644 --- a/frontend/src/components/Header/UserProfileForm.tsx +++ b/frontend/src/components/Header/UserProfileForm.tsx @@ -35,7 +35,7 @@ export default function UserProfileForm({ onClose }: { onClose: () => void }) { diff --git a/frontend/src/components/ImageSelection/index.tsx b/frontend/src/components/ImageSelection/index.tsx index 062e38c..13331ce 100644 --- a/frontend/src/components/ImageSelection/index.tsx +++ b/frontend/src/components/ImageSelection/index.tsx @@ -35,7 +35,7 @@ export default function ImageSelection({ projectId, selectedImages, setSelectedI 이미지 선택 (파일 목록) {image.imageTitle} handleImageSelect(image.id)} className="px-3 py-1" diff --git a/frontend/src/components/ImageUploadFileModal/ImageUploadFileForm.tsx b/frontend/src/components/ImageUploadFileModal/ImageUploadFileForm.tsx index 916d223..e93b577 100644 --- a/frontend/src/components/ImageUploadFileModal/ImageUploadFileForm.tsx +++ b/frontend/src/components/ImageUploadFileModal/ImageUploadFileForm.tsx @@ -182,12 +182,7 @@ export default function ImageUploadFileForm({ {isUploading ? ( {isFailed ? '업로드 실패 (닫기)' : isUploaded ? '업로드 완료 (닫기)' : `업로드 중... ${progress}%`} @@ -195,7 +190,7 @@ export default function ImageUploadFileForm({ ) : ( 업로드 diff --git a/frontend/src/components/ImageUploadFolderFileModal/ImageUploadFolderFileForm.tsx b/frontend/src/components/ImageUploadFolderFileModal/ImageUploadFolderFileForm.tsx index 04bd592..84e62dc 100644 --- a/frontend/src/components/ImageUploadFolderFileModal/ImageUploadFolderFileForm.tsx +++ b/frontend/src/components/ImageUploadFolderFileModal/ImageUploadFolderFileForm.tsx @@ -166,12 +166,7 @@ export default function ImageUploadFolderFileForm({ {isUploading ? ( {isFailed ? '업로드 실패 (닫기)' : isUploaded ? '업로드 완료 (닫기)' : `업로드 중... ${progress}%`} @@ -179,7 +174,7 @@ export default function ImageUploadFolderFileForm({ ) : ( 업로드 diff --git a/frontend/src/components/ImageUploadFolderModal/ImageUploadFolderForm.tsx b/frontend/src/components/ImageUploadFolderModal/ImageUploadFolderForm.tsx index be704f9..4b749e4 100644 --- a/frontend/src/components/ImageUploadFolderModal/ImageUploadFolderForm.tsx +++ b/frontend/src/components/ImageUploadFolderModal/ImageUploadFolderForm.tsx @@ -166,12 +166,7 @@ export default function ImageUploadFolderForm({ {isUploading ? ( {isFailed ? '업로드 실패 (닫기)' : isUploaded ? '업로드 완료 (닫기)' : `업로드 중... ${progress}%`} @@ -179,7 +174,7 @@ export default function ImageUploadFolderForm({ ) : ( 업로드 diff --git a/frontend/src/components/ImageUploadZipModal/ImageUploadZipForm.tsx b/frontend/src/components/ImageUploadZipModal/ImageUploadZipForm.tsx index de2ae79..2ad8fe5 100644 --- a/frontend/src/components/ImageUploadZipModal/ImageUploadZipForm.tsx +++ b/frontend/src/components/ImageUploadZipModal/ImageUploadZipForm.tsx @@ -166,12 +166,7 @@ export default function ImageUploadZipForm({ {isUploading ? ( {isFailed ? '업로드 실패 (닫기)' : isUploaded ? '업로드 완료 (닫기)' : `업로드 중... ${progress}%`} @@ -179,7 +174,7 @@ export default function ImageUploadZipForm({ ) : ( 업로드 diff --git a/frontend/src/components/MemberAddModal/MemberAddForm.tsx b/frontend/src/components/MemberAddModal/MemberAddForm.tsx index 544fa57..acccf29 100644 --- a/frontend/src/components/MemberAddModal/MemberAddForm.tsx +++ b/frontend/src/components/MemberAddModal/MemberAddForm.tsx @@ -132,7 +132,7 @@ export default function MemberAddForm({ onSubmit }: { onSubmit: (data: MemberAdd 멤버 초대하기 diff --git a/frontend/src/components/MemberAddModal/index.tsx b/frontend/src/components/MemberAddModal/index.tsx index f3d2796..169c1cf 100644 --- a/frontend/src/components/MemberAddModal/index.tsx +++ b/frontend/src/components/MemberAddModal/index.tsx @@ -38,7 +38,7 @@ export default function MemberAddModal({ projectId, buttonClass = '' }: MemberAd > diff --git a/frontend/src/components/MemberManageModal/MemberManageForm.tsx b/frontend/src/components/MemberManageModal/MemberManageForm.tsx index 6732701..7cce455 100644 --- a/frontend/src/components/MemberManageModal/MemberManageForm.tsx +++ b/frontend/src/components/MemberManageModal/MemberManageForm.tsx @@ -128,7 +128,7 @@ export default function MemberManageForm({ members, onSubmit }: MemberManageForm 역할 설정 diff --git a/frontend/src/components/ModelManage/TrainingSettings.tsx b/frontend/src/components/ModelManage/TrainingSettings.tsx index 016c4f6..b6c5c6e 100644 --- a/frontend/src/components/ModelManage/TrainingSettings.tsx +++ b/frontend/src/components/ModelManage/TrainingSettings.tsx @@ -127,7 +127,7 @@ export default function TrainingSettings({ /> diff --git a/frontend/src/components/ProjectCreateModal/ProjectCreateForm.tsx b/frontend/src/components/ProjectCreateModal/ProjectCreateForm.tsx index 81c0efa..de8d0c6 100644 --- a/frontend/src/components/ProjectCreateModal/ProjectCreateForm.tsx +++ b/frontend/src/components/ProjectCreateModal/ProjectCreateForm.tsx @@ -51,7 +51,7 @@ export default function ProjectCreateForm({ onSubmit }: { onSubmit: (data: Proje ( - <> + 카테고리 @@ -114,40 +114,42 @@ export default function ProjectCreateForm({ onSubmit }: { onSubmit: (data: Proje /> handleAddCategory(event, field.onChange)} > 추가 {categories.length > 0 && ( - - {categories.map((category: string, index: number) => ( - - {category} - { - const newCategories = categories.filter((_, i) => i !== index); - field.onChange(newCategories); - setCategories(newCategories); - }} - /> - - ))} - + + + {categories.map((category: string, index: number) => ( + + {category} + { + const newCategories = categories.filter((_, i) => i !== index); + field.onChange(newCategories); + setCategories(newCategories); + }} + /> + + ))} + + )} - > + )} /> 프로젝트 만들기 diff --git a/frontend/src/components/ProjectCreateModal/index.tsx b/frontend/src/components/ProjectCreateModal/index.tsx index 3c3f077..58f912a 100644 --- a/frontend/src/components/ProjectCreateModal/index.tsx +++ b/frontend/src/components/ProjectCreateModal/index.tsx @@ -22,8 +22,8 @@ export default function ProjectCreateModal({ onSubmit, buttonClass = '' }: Proje > diff --git a/frontend/src/components/ReviewForm/index.tsx b/frontend/src/components/ReviewForm/index.tsx index ee733ef..cc581af 100644 --- a/frontend/src/components/ReviewForm/index.tsx +++ b/frontend/src/components/ReviewForm/index.tsx @@ -115,14 +115,14 @@ export default function ReviewForm({ projects, onSubmit }: ReviewFormProps): JSX navigate(-1)} > 취소 리뷰 요청 diff --git a/frontend/src/components/WorkSpaceCreateModal/WorkSpaceCreateForm.tsx b/frontend/src/components/WorkSpaceCreateModal/WorkSpaceCreateForm.tsx index f9aec7e..2fc6448 100644 --- a/frontend/src/components/WorkSpaceCreateModal/WorkSpaceCreateForm.tsx +++ b/frontend/src/components/WorkSpaceCreateModal/WorkSpaceCreateForm.tsx @@ -75,7 +75,7 @@ export default function WorkSpaceCreateForm({ onSubmit }: WorkSpaceCreateFormPro /> 워크스페이스 만들기 diff --git a/frontend/src/components/WorkspaceMemberAddModal/MemberAddForm.tsx b/frontend/src/components/WorkspaceMemberAddModal/MemberAddForm.tsx index 4374389..2ce8549 100644 --- a/frontend/src/components/WorkspaceMemberAddModal/MemberAddForm.tsx +++ b/frontend/src/components/WorkspaceMemberAddModal/MemberAddForm.tsx @@ -86,7 +86,7 @@ export default function MemberAddForm({ onSubmit }: { onSubmit: (data: MemberAdd 멤버 초대하기 diff --git a/frontend/src/components/WorkspaceMemberAddModal/index.tsx b/frontend/src/components/WorkspaceMemberAddModal/index.tsx index b4bb0f2..528b42d 100644 --- a/frontend/src/components/WorkspaceMemberAddModal/index.tsx +++ b/frontend/src/components/WorkspaceMemberAddModal/index.tsx @@ -38,7 +38,7 @@ export default function WorkspaceMemberAddModal({ > diff --git a/frontend/src/components/WorkspaceSidebar/ProjectStructure.tsx b/frontend/src/components/WorkspaceSidebar/ProjectStructure.tsx index f8a06fa..3ca75fd 100644 --- a/frontend/src/components/WorkspaceSidebar/ProjectStructure.tsx +++ b/frontend/src/components/WorkspaceSidebar/ProjectStructure.tsx @@ -70,7 +70,7 @@ export default function ProjectStructure({ project }: { project: Project }) { { diff --git a/frontend/src/components/ui/button.tsx b/frontend/src/components/ui/button.tsx index 39889f0..6c501db 100644 --- a/frontend/src/components/ui/button.tsx +++ b/frontend/src/components/ui/button.tsx @@ -9,18 +9,22 @@ const buttonVariants = cva( { variants: { variant: { - default: - 'bg-gray-900 text-gray-50 hover:bg-gray-900/90 dark:bg-gray-50 dark:text-gray-900 dark:hover:bg-gray-50/90', - destructive: - 'bg-red-500 text-gray-50 hover:bg-red-500/90 dark:bg-red-900 dark:text-gray-50 dark:hover:bg-red-900/90', - outline: - 'border border-gray-200 bg-white hover:bg-gray-100 hover:text-gray-900 dark:border-gray-800 dark:bg-gray-950 dark:hover:bg-gray-800 dark:hover:text-gray-50', - outlinePrimary: - 'border border-primary text-primary hover:bg-primary hover:text-white dark:border-primary dark:text-primary dark:hover:bg-primary dark:hover:text-white disabled:border-gray-200 disabled:bg-white disabled:text-gray-500 disabled:hover:bg-gray-100 disabled:hover:text-gray-300', - secondary: - 'bg-gray-100 text-gray-900 hover:bg-gray-100/80 dark:bg-gray-800 dark:text-gray-50 dark:hover:bg-gray-800/80', - ghost: 'hover:bg-gray-100 hover:text-gray-900 dark:hover:bg-gray-800 dark:hover:text-gray-50', - link: 'text-gray-900 underline-offset-4 hover:underline dark:text-gray-50', + // default: + // 'bg-gray-900 text-gray-50 hover:bg-gray-900/90 dark:bg-gray-50 dark:text-gray-900 dark:hover:bg-gray-50/90', + // destructive: + // 'bg-red-500 text-gray-50 hover:bg-red-500/90 dark:bg-red-900 dark:text-gray-50 dark:hover:bg-red-900/90', + // outline: + // 'border border-gray-200 bg-white hover:bg-gray-100 hover:text-gray-900 dark:border-gray-800 dark:bg-gray-950 dark:hover:bg-gray-800 dark:hover:text-gray-50', + // outlinePrimary: + // 'border border-primary text-primary hover:bg-primary hover:text-white dark:border-primary dark:text-primary dark:hover:bg-primary dark:hover:text-white disabled:border-gray-200 disabled:bg-white disabled:text-gray-500 disabled:hover:bg-gray-100 disabled:hover:text-gray-300', + // secondary: + // 'bg-gray-100 text-gray-900 hover:bg-gray-100/80 dark:bg-gray-800 dark:text-gray-50 dark:hover:bg-gray-800/80', + // ghost: 'hover:bg-gray-100 hover:text-gray-900 dark:hover:bg-gray-800 dark:hover:text-gray-50', + // link: 'text-gray-900 underline-offset-4 hover:underline dark:text-gray-50', + black: + 'bg-gray-900 text-white hover:bg-gray-900/90 disabled:border disabled:border-gray-200 disabled:bg-white disabled:text-gray-500', + red: 'bg-red-500 text-white hover:bg-red-500/90 disabled:border disabled:border-gray-200 disabled:bg-white disabled:text-gray-500', + blue: 'bg-blue-500 text-white hover:bg-blue-500/90 disabled:border disabled:border-gray-200 disabled:bg-white disabled:text-gray-500', }, size: { default: 'h-10 px-4 py-2', @@ -31,7 +35,7 @@ const buttonVariants = cva( }, }, defaultVariants: { - variant: 'default', + variant: 'blue', size: 'default', }, } diff --git a/frontend/src/pages/Home.tsx b/frontend/src/pages/Home.tsx index 2e0baaf..0e2131e 100644 --- a/frontend/src/pages/Home.tsx +++ b/frontend/src/pages/Home.tsx @@ -44,7 +44,7 @@ export default function Home() { <> 시작하기 diff --git a/frontend/src/pages/ProjectReviewList.tsx b/frontend/src/pages/ProjectReviewList.tsx index ea90fe0..b213701 100644 --- a/frontend/src/pages/ProjectReviewList.tsx +++ b/frontend/src/pages/ProjectReviewList.tsx @@ -65,7 +65,7 @@ export default function ProjectReviewList() { to={`/admin/${workspaceId}/reviews/request`} className="ml-auto" > - 리뷰 요청 + 리뷰 요청 {'거부'} {'승인'} @@ -148,7 +148,7 @@ export default function ReviewDetail(): JSX.Element { - 목록으로 돌아가기 + 목록으로 돌아가기 diff --git a/frontend/src/pages/WorkspaceReviewList.tsx b/frontend/src/pages/WorkspaceReviewList.tsx index 3f7a073..a1efbe5 100644 --- a/frontend/src/pages/WorkspaceReviewList.tsx +++ b/frontend/src/pages/WorkspaceReviewList.tsx @@ -65,7 +65,7 @@ export default function WorkspaceReviewList() { to={`/admin/${workspaceId}/reviews/request`} className="ml-auto" > - 리뷰 요청 + 리뷰 요청