diff --git a/src/page/coffee-chat/create/controls/rules/chat-content-rules.ts b/src/page/coffee-chat/create/controls/rules/chat-content-rules.ts
index 698c21ab..9780c7a5 100644
--- a/src/page/coffee-chat/create/controls/rules/chat-content-rules.ts
+++ b/src/page/coffee-chat/create/controls/rules/chat-content-rules.ts
@@ -11,11 +11,11 @@ type ChatContentRules = Omit<
export const chatContentRules: ChatContentRules = {
required: validationMessage.noContent,
minLength: {
- value: Limitation.content_limit_under,
- message: validationMessage.underContentLimit,
+ value: Limitation.chat_content_min_length,
+ message: validationMessage.chatContentLength,
},
maxLength: {
- value: Limitation.content_limit_over,
- message: validationMessage.overContentLimit,
+ value: Limitation.chat_content_max_length,
+ message: validationMessage.chatContentLength,
},
}
diff --git a/src/page/coffee-chat/create/controls/rules/hashtag-rules.ts b/src/page/coffee-chat/create/controls/rules/hashtag-rules.ts
index bb2e18d7..75f86d89 100644
--- a/src/page/coffee-chat/create/controls/rules/hashtag-rules.ts
+++ b/src/page/coffee-chat/create/controls/rules/hashtag-rules.ts
@@ -16,6 +16,7 @@ export type HashTagListField = ControllerRenderProps<
export const enum HashTagRuleValidateType {
"InvalidFormat" = "invalidFormat",
+ "WhiteSpace" = "invalidWhiteSpace",
}
export const enum HashTagListRuleValidateType {
@@ -42,6 +43,13 @@ export const hashTagRules: ({
return validationMessage.preventSpecialCharacter
},
+ [HashTagRuleValidateType.WhiteSpace]: (hashTag) => {
+ if (validatorInstance.validateHashTag(hashTag).whiteSpace()) {
+ return true
+ }
+
+ return "해시태그는 공백만 포함할 수 없습니다."
+ },
[HashTagListRuleValidateType.Duplicate]: (hashTag) => {
if (
validatorInstance.validateHashTagList(hashTagList).duplicate(hashTag)
diff --git a/src/page/coffee-chat/create/controls/util/form.ts b/src/page/coffee-chat/create/controls/util/form.ts
deleted file mode 100644
index 5fff0a98..00000000
--- a/src/page/coffee-chat/create/controls/util/form.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { CoffeeChatFormData } from "@/interfaces/form"
-import { FieldError, FieldErrors, Merge } from "react-hook-form"
-
-type ErrorType =
- | FieldError
- | Merge
- | (Record<
- string,
- Partial<{
- type: string | number
- message: string
- }>
- > &
- Partial<{
- type: string | number
- message: string
- }>)
-
-export function pickError(errors: FieldErrors): ErrorType {
- return (errors?.title ??
- errors?.introduction ??
- errors?.content ??
- errors?.hashTags ??
- errors?.dateTimes ??
- errors?.root)!
-}
diff --git a/src/page/coffee-chat/detail/reservation/calendar-base/ReservationCalendarBase.tsx b/src/page/coffee-chat/detail/reservation/calendar-base/ReservationCalendarBase.tsx
index 18eb9514..ad3662c6 100644
--- a/src/page/coffee-chat/detail/reservation/calendar-base/ReservationCalendarBase.tsx
+++ b/src/page/coffee-chat/detail/reservation/calendar-base/ReservationCalendarBase.tsx
@@ -6,28 +6,39 @@ import { getDay, getHoliday } from "@/util/getDate"
import dayjs from "dayjs"
import { Value } from "./Calendar.types"
import ReactCalendarTileContent from "@/components/react-calendar/ReactCalendarTileContent"
+import { ForwardedRef, forwardRef } from "react"
+import { twMerge } from "tailwind-merge"
type ReservationCalendarBaseProps = {
- start: Date
- limit: number
+ start?: Date
+ limit?: number
date: Value
onDateChange?: CalendarProps["onChange"]
tileClassName?: CalendarProps["tileClassName"]
minDate?: Date
maxDate?: Date
+ tileDisabled?: CalendarProps["tileDisabled"]
+ wrapperClassName?: string
}
-const ReservationCalendarBase = ({
- start,
- limit,
- date,
- onDateChange,
- tileClassName,
- minDate,
- maxDate,
-}: ReservationCalendarBaseProps) => {
+const ReservationCalendarBase = (
+ {
+ start,
+ limit,
+ date,
+ onDateChange,
+ tileClassName,
+ tileDisabled,
+ minDate,
+ maxDate,
+ wrapperClassName,
+ }: ReservationCalendarBaseProps,
+ ref: ForwardedRef,
+) => {
// 종료 날짜
- const calendarValue = new Date(dayjs(start).add(limit, "day").format())
+ const calendarValue = limit
+ ? new Date(dayjs(start).add(limit, "day").format())
+ : undefined
const tileClassNames = ({ date, activeStartDate, view }: TileArgs) => {
const holiday = getHoliday(date)
@@ -55,8 +66,14 @@ const ReservationCalendarBase = ({
return holiday ? "holiday" : undefined
}
+ const wrapperClassNames = twMerge([
+ "focus:outline focus:outline-1 focus:outline-blue-400/40",
+ wrapperClassName,
+ "react-calendar",
+ ])
+
return (
-
+
)
}
-export default ReservationCalendarBase
+export default forwardRef
(
+ ReservationCalendarBase,
+)
diff --git a/src/react-query/coding-meeting.ts b/src/react-query/coding-meeting.ts
deleted file mode 100644
index 62f05ee4..00000000
--- a/src/react-query/coding-meeting.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import queryKey from "@/constants/queryKey"
-import type { CreateCodingMeetingRequest } from "@/interfaces/dto/coding-meeting/create-coding-meeting.dto"
-import { UpdateCodingMeetingRequest } from "@/interfaces/dto/coding-meeting/update-coding-meeting.dto"
-import {
- createCodingMeeting,
- updateCodingMeeting,
-} from "@/service/coding-meetings"
-import { useMutation } from "@tanstack/react-query"
-
-// 모각코 등록글 생성
-const useCreateCodingMeeting = () => {
- const {
- data,
- mutate: createCodingMeetingMutate,
- isPending: isCreateCodingMeeting,
- isError: isCreateCodingMeetingPostError,
- isSuccess: isCreateCodingMeetingPostSuccess,
- } = useMutation({
- mutationKey: [queryKey.codingMeeting],
- mutationFn: (createPayload: CreateCodingMeetingRequest) =>
- createCodingMeeting({
- ...createPayload,
- }),
- })
-
- return {
- createCodingMeetingPostResponse: data,
- createCodingMeetingPost: createCodingMeetingMutate,
- createCodingMeetingPostStatus: {
- isCreateCodingMeeting,
- isCreateCodingMeetingPostError,
- isCreateCodingMeetingPostSuccess,
- },
- }
-}
-
-// 모각코 등록글 수정
-const useUpdateCodingMeeting = () => {
- const {
- data,
- mutate: updateCodingMeetingMutate,
- isPending: isUpdateCodingMeeting,
- isError: isUpdateCodingMeetingError,
- isSuccess: isUpdateCodingMeetingSuccess,
- } = useMutation({
- mutationKey: [queryKey.codingMeeting],
- mutationFn: (updatePayload: UpdateCodingMeetingRequest) =>
- updateCodingMeeting({ ...updatePayload }),
- })
-
- return {
- updateCodingMeetingResponse: data,
- updateCodingMeeting: updateCodingMeetingMutate,
- updateCodingMeetingStatus: {
- isUpdateCodingMeeting,
- isUpdateCodingMeetingError,
- isUpdateCodingMeetingSuccess,
- },
- }
-}
-
-export const CodingMeetingQueries = {
- useCreateCodingMeeting,
- useUpdateCodingMeeting,
-}
diff --git a/src/recoil/atoms/coding-meeting/dateTime.tsx b/src/recoil/atoms/coding-meeting/dateTime.tsx
deleted file mode 100644
index 4bb59bf1..00000000
--- a/src/recoil/atoms/coding-meeting/dateTime.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Value } from "@/interfaces/calendar"
-import { atom } from "recoil"
-
-export type Time = {
- hour: string
- minute: string
-}
-
-export const StartTime = atom