From 2f8df414d376b12387ee75b0567db70f75bc9bce Mon Sep 17 00:00:00 2001
From: hongggy <hongggy@gmail.com>
Date: Thu, 12 Dec 2024 13:44:03 +0900
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=EA=B7=BC=EB=AC=B4=EC=9A=94=EC=9D=BC?=
 =?UTF-8?q?=20=ED=98=91=EC=9D=98=EA=B0=80=EB=8A=A5=EC=8B=9C=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=EB=B6=88=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(pages)/(albaform)/addform/page.tsx   |  2 +-
 .../addform/section/WorkConditionSection.tsx  | 47 +++++++++++--------
 .../components/button/default/CheckBtn.tsx    |  2 +-
 .../input/dateTimeDaypicker/DayPickerBtn.tsx  | 18 ++++++-
 .../input/dateTimeDaypicker/DayPickerList.tsx |  5 +-
 .../input/picker/DayPicker.stories.tsx        |  2 +-
 6 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/src/app/(pages)/(albaform)/addform/page.tsx b/src/app/(pages)/(albaform)/addform/page.tsx
index c5dcebc7..80d9dc40 100644
--- a/src/app/(pages)/(albaform)/addform/page.tsx
+++ b/src/app/(pages)/(albaform)/addform/page.tsx
@@ -18,7 +18,7 @@ import CustomFormModal from "@/app/components/modal/modals/confirm/CustomFormMod
 export default function AddFormPage() {
   const router = useRouter();
   const formId = useParams().formId;
-  // 리액트 훅폼에서 관리할 데이터 타입 지정 및 메서드 호출 (상위 컴���트 = useForm 사용)
+  // 리액트 훅폼에서 관리할 데이터 타입 지정 및 메서드 호출 (상위 컴포넌트 = useForm 사용)
   const methods = useForm<SubmitFormDataType>({
     mode: "onChange",
     defaultValues: {
diff --git a/src/app/(pages)/(albaform)/addform/section/WorkConditionSection.tsx b/src/app/(pages)/(albaform)/addform/section/WorkConditionSection.tsx
index 83fadbd5..c1382921 100644
--- a/src/app/(pages)/(albaform)/addform/section/WorkConditionSection.tsx
+++ b/src/app/(pages)/(albaform)/addform/section/WorkConditionSection.tsx
@@ -19,7 +19,6 @@ export default function WorkConditionSection() {
   const {
     register,
     setValue,
-    getValues,
     trigger,
     watch,
     formState: { errors },
@@ -40,6 +39,7 @@ export default function WorkConditionSection() {
 
   //근무 요일 지정
   const [selectedWorkDays, setSelectedWorkDays] = useState<string[]>([]);
+  const negotiable = watch("isNegotiableWorkDays");
 
   const handleClickDay = (e: MouseEvent<HTMLButtonElement>) => {
     e.preventDefault();
@@ -54,6 +54,9 @@ export default function WorkConditionSection() {
       setValue("workDays", [...selectedWorkDays, day]);
       trigger("workDays");
     }
+    if (negotiable) {
+      setSelectedWorkDays([]);
+    }
   };
 
   // 최저시급 상수 수정 (2025년 기준)
@@ -100,7 +103,7 @@ export default function WorkConditionSection() {
     <div className="relative">
       <Script src="//t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js" strategy="afterInteractive" />
 
-      <form className="my-8 flex flex-col gap-4">
+      <form className="my-8 flex flex-col gap-8">
         <Label>근무 위치</Label>
         <div className="relative">
           <LocationInput
@@ -151,9 +154,10 @@ export default function WorkConditionSection() {
             ))}
         </div>
 
+        {/* 요일 협의 가능하다면 근무요일은 선택하지 않아도 됨 */}
         <div className="flex flex-col gap-4">
           <Label>근무 요일</Label>
-          <DayPickerList workDays={selectedWorkDays} onClick={handleClickDay} />
+          <DayPickerList workDays={selectedWorkDays} onClick={handleClickDay} disabled={negotiable} />
 
           <div className="relative flex flex-col pl-[14px]">
             <CheckBtn
@@ -161,25 +165,28 @@ export default function WorkConditionSection() {
               checked={watch("isNegotiableWorkDays")}
               {...register("isNegotiableWorkDays")}
             />
-            {selectedWorkDays.length === 0 && <p className={cn(errorTextStyle, "")}>근무 요일을 선택해주세요.</p>}
+            {selectedWorkDays.length === 0 && !negotiable && (
+              <p className={cn(errorTextStyle, "")}>근무 요일을 선택해주세요.</p>
+            )}
           </div>
         </div>
-
-        <Label>시급</Label>
-        <BaseInput
-          {...register("hourlyWage", {
-            required: "시급을 작성해주세요.",
-            min: {
-              value: MINIMUM_WAGE,
-              message: `최저시급(${formatMoney(MINIMUM_WAGE.toString())}원) 이상을 입력해주세요.`,
-            },
-          })}
-          value={displayWage}
-          onChange={handleWageChange}
-          variant="white"
-          afterString="원"
-          errormessage={errors.hourlyWage?.message as string}
-        />
+        <div className="flex flex-col gap-4">
+          <Label>시급</Label>
+          <BaseInput
+            {...register("hourlyWage", {
+              required: "시급을 작성해주세요.",
+              min: {
+                value: MINIMUM_WAGE,
+                message: `최저시급(${formatMoney(MINIMUM_WAGE.toString())}원) 이상을 입력해주세요.`,
+              },
+            })}
+            value={displayWage}
+            onChange={handleWageChange}
+            variant="white"
+            afterString="원"
+            errormessage={errors.hourlyWage?.message as string}
+          />
+        </div>
 
         <div className="relative flex flex-col gap-4">
           <Label>공개 설정</Label>
diff --git a/src/app/components/button/default/CheckBtn.tsx b/src/app/components/button/default/CheckBtn.tsx
index 5c35c9b3..f203b2df 100644
--- a/src/app/components/button/default/CheckBtn.tsx
+++ b/src/app/components/button/default/CheckBtn.tsx
@@ -17,7 +17,7 @@ const CheckBtn = forwardRef<HTMLInputElement, CheckBtnProps>(
       <label
         htmlFor={name}
         className={cn(
-          "flex items-center gap-[10px] rounded-lg text-sm",
+          "flex items-center gap-[10px] rounded-lg text-sm lg:text-base",
           disabled ? "cursor-not-allowed text-grayscale-400" : "text-black cursor-pointer",
           className
         )}
diff --git a/src/app/components/input/dateTimeDaypicker/DayPickerBtn.tsx b/src/app/components/input/dateTimeDaypicker/DayPickerBtn.tsx
index 11adfeb9..554b8774 100644
--- a/src/app/components/input/dateTimeDaypicker/DayPickerBtn.tsx
+++ b/src/app/components/input/dateTimeDaypicker/DayPickerBtn.tsx
@@ -1,25 +1,41 @@
+import { cn } from "@/lib/tailwindUtil";
 import { MouseEvent } from "react";
+import toast from "react-hot-toast";
 
 const DayPickerBtn = ({
   selected,
   value,
   onClick,
+  disabled,
 }: {
   selected: boolean;
   value: string;
   onClick: (e: MouseEvent<HTMLButtonElement>) => void;
+  disabled?: boolean;
 }) => {
   const handleClick = (e: MouseEvent<HTMLButtonElement>) => {
+    if (disabled) {
+      toast.error("요일 협의가 가능한 경우 근무 요일을 선택하실 수 없습니다.");
+    }
     onClick(e);
   };
   const defaultStyle = "bg-background-200 text-grayscale-500";
   const activeStyle = "bg-primary-orange-300 text-white";
+  const disabledStyle = "bg-grayscale-200 text-grayscale-500";
+  const textStyle =
+    "placeholder:text-base placeholder:leading-[26px] lg:placeholder:text-xl lg:placeholder:leading-8 lg:text-xl font-normal lg:leading-8 text-base leading-[26px]";
 
   return (
     <div>
       <button
         onClick={handleClick}
-        className={`h-12 w-[38px] rounded-xl bg-background-200 focus:outline-none lg:h-[64px] lg:w-[50px] lg:rounded-2xl ${selected ? activeStyle : defaultStyle}`}
+        disabled={disabled}
+        className={cn(
+          "h-12 w-[38px] rounded-xl bg-background-200 focus:outline-none lg:h-[64px] lg:w-[50px] lg:rounded-2xl",
+          textStyle,
+          selected ? activeStyle : defaultStyle,
+          disabled ? disabledStyle : ""
+        )}
       >
         {value}
       </button>
diff --git a/src/app/components/input/dateTimeDaypicker/DayPickerList.tsx b/src/app/components/input/dateTimeDaypicker/DayPickerList.tsx
index b4c976b3..24df4288 100644
--- a/src/app/components/input/dateTimeDaypicker/DayPickerList.tsx
+++ b/src/app/components/input/dateTimeDaypicker/DayPickerList.tsx
@@ -4,14 +4,15 @@ import DayPickerBtn from "./DayPickerBtn";
 interface DayPickerProps {
   workDays: string[];
   onClick: (e: MouseEvent<HTMLButtonElement>) => void;
+  disabled?: boolean;
 }
-const DayPickerList = ({ onClick, workDays }: DayPickerProps) => {
+const DayPickerList = ({ onClick, workDays, disabled }: DayPickerProps) => {
   const daysToRender = ["일", "월", "화", "수", "목", "금", "토"];
 
   return (
     <div className="flex gap-2">
       {daysToRender.map((day) => (
-        <DayPickerBtn key={day} value={day} selected={workDays.includes(day)} onClick={onClick} />
+        <DayPickerBtn key={day} value={day} selected={workDays.includes(day)} onClick={onClick} disabled={disabled} />
       ))}
     </div>
   );
diff --git a/src/app/stories/design-system/components/input/picker/DayPicker.stories.tsx b/src/app/stories/design-system/components/input/picker/DayPicker.stories.tsx
index 400f75af..268e2333 100644
--- a/src/app/stories/design-system/components/input/picker/DayPicker.stories.tsx
+++ b/src/app/stories/design-system/components/input/picker/DayPicker.stories.tsx
@@ -28,7 +28,7 @@ export const DayPicker: Story = {
       return (
         <>
           <div className="text-grayscale-600 my-4">요일 선택 (토글)</div>
-          <DayPickerList workDays={selectedDays} onClick={handleClick} />
+          <DayPickerList workDays={selectedDays} onClick={handleClick} disabled={true} />
           <div className="mt-4">
             <strong>Selected Days:</strong> {selectedDays.join(", ") || "None"}
           </div>

From 1da21d468d242a24824942f6ebd68a6fbe59d744 Mon Sep 17 00:00:00 2001
From: hongggy <hongggy@gmail.com>
Date: Thu, 12 Dec 2024 14:11:22 +0900
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=ED=8F=BC=EC=9E=91=EC=84=B1=20?=
 =?UTF-8?q?=ED=9B=84=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(pages)/(albaform)/addform/page.tsx    | 18 +++++++++++++-----
 src/app/components/button/default/CheckBtn.tsx |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/app/(pages)/(albaform)/addform/page.tsx b/src/app/(pages)/(albaform)/addform/page.tsx
index 80d9dc40..ca7e0a4d 100644
--- a/src/app/(pages)/(albaform)/addform/page.tsx
+++ b/src/app/(pages)/(albaform)/addform/page.tsx
@@ -17,13 +17,13 @@ import CustomFormModal from "@/app/components/modal/modals/confirm/CustomFormMod
 
 export default function AddFormPage() {
   const router = useRouter();
-  const formId = useParams().formId;
+  const [formId, setFormId] = useState<number | undefined>(undefined);
   // 리액트 훅폼에서 관리할 데이터 타입 지정 및 메서드 호출 (상위 컴포넌트 = useForm 사용)
   const methods = useForm<SubmitFormDataType>({
     mode: "onChange",
     defaultValues: {
-      isPublic: false,
-      hourlyWage: 0,
+      isPublic: true,
+      hourlyWage: 10030,
       isNegotiableWorkDays: false,
       workDays: [],
       workEndTime: "",
@@ -102,14 +102,16 @@ export default function AddFormPage() {
           return acc;
         }, {});
 
-      await axios.post("/api/forms", filteredData);
+      const response = await axios.post("/api/forms", filteredData);
+      const id = response.data.id;
+      setFormId(id);
     },
     onSuccess: () => {
       if (typeof window !== "undefined") {
         window.localStorage.removeItem("tempAddFormData");
       }
       toast.success("알바폼을 등록했습니다.");
-      router.push(`/alba/${formId}`);
+      // if (formId) router.push(`/alba/${formId}`);
     },
     onError: (error) => {
       console.error("에러가 발생했습니다.", error);
@@ -118,6 +120,12 @@ export default function AddFormPage() {
     },
   });
 
+  useEffect(() => {
+    if (formId) {
+      router.push(`/alba/${formId}`);
+    }
+  }, [formId]);
+
   // tab 선택 시 Url params 수정 & 하위 폼 데이터 임시저장
   const searchParams = useSearchParams();
   const currentParam = searchParams.get("tab");
diff --git a/src/app/components/button/default/CheckBtn.tsx b/src/app/components/button/default/CheckBtn.tsx
index f203b2df..d04b29b6 100644
--- a/src/app/components/button/default/CheckBtn.tsx
+++ b/src/app/components/button/default/CheckBtn.tsx
@@ -12,7 +12,7 @@ interface CheckBtnProps extends InputHTMLAttributes<HTMLInputElement> {
 }
 
 const CheckBtn = forwardRef<HTMLInputElement, CheckBtnProps>(
-  ({ label, name, checked = false, disabled = false, onChange, className, ...props }, ref) => {
+  ({ label, name, checked = true, disabled = false, onChange, className, ...props }, ref) => {
     return (
       <label
         htmlFor={name}

From c417b2248bfd2c6ec0e2e117958796cee7a1f179 Mon Sep 17 00:00:00 2001
From: hongggy <hongggy@gmail.com>
Date: Thu, 12 Dec 2024 14:19:07 +0900
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20isEditing=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(pages)/(albaform)/addform/page.tsx | 8 ++++----
 src/hooks/useEditing.ts                     | 7 ++++++-
 src/types/addform.d.ts                      | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/app/(pages)/(albaform)/addform/page.tsx b/src/app/(pages)/(albaform)/addform/page.tsx
index ca7e0a4d..45a7f6ae 100644
--- a/src/app/(pages)/(albaform)/addform/page.tsx
+++ b/src/app/(pages)/(albaform)/addform/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { useEffect, useState } from "react";
-import { useParams, useRouter, useSearchParams } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import { FormProvider, useForm } from "react-hook-form";
 import axios from "axios";
 import TabMenuDropdown from "@/app/components/button/dropdown/TabMenuDropdown";
@@ -23,7 +23,7 @@ export default function AddFormPage() {
     mode: "onChange",
     defaultValues: {
       isPublic: true,
-      hourlyWage: 10030,
+      hourlyWage: "10,030",
       isNegotiableWorkDays: false,
       workDays: [],
       workEndTime: "",
@@ -92,7 +92,7 @@ export default function AddFormPage() {
             acc[key] = Number(value);
           } else if (key === "hourlyWage") {
             // 문자열이면 콤마 제거 후 숫자로 변환
-            acc[key] = typeof value === "string" ? Number(value.replace(/,/g, "")) : Number(value);
+            acc[key] = typeof value === "string" ? String(Number(value.replace(/,/g, ""))) : String(Number(value));
           } else if (key === "imageUrls") {
             // 업로드된 이미지 URL 사용
             acc[key] = uploadedUrls;
@@ -285,7 +285,7 @@ export default function AddFormPage() {
             options={[
               {
                 label: "모집 내용",
-                isEditing: isEditingRecruitContent || initialLoad || currentParam === "recruit-content",
+                isEditing: isEditingRecruitContent || currentParam === "recruit-content",
               },
               { label: "모집 조건", isEditing: isEditingRecruitCondition || currentParam === "recruit-condition" },
               { label: "근무 조건", isEditing: isEditingWorkCondition || currentParam === "work-condition" },
diff --git a/src/hooks/useEditing.ts b/src/hooks/useEditing.ts
index 6645766d..ae9a6e46 100644
--- a/src/hooks/useEditing.ts
+++ b/src/hooks/useEditing.ts
@@ -17,7 +17,12 @@ const useEditing = (data: SubmitFormDataType) => {
   }, [data.gender, data.numberOfPositions, data.education, data.age, data.preferred]);
 
   const isEditingWorkCondition = useMemo(() => {
-    return data.location !== "" || data.workStartTime !== "" || data.workStartDate !== "" || (data.hourlyWage ?? 0) > 0;
+    return (
+      data.location !== "" ||
+      data.workStartTime !== "" ||
+      data.workStartDate !== "" ||
+      (Number(data.hourlyWage) ?? 0) > 10030
+    );
   }, [data.location, data.workStartTime, data.workStartDate, data.hourlyWage]);
 
   return { isEditingRecruitContent, isEditingRecruitCondition, isEditingWorkCondition };
diff --git a/src/types/addform.d.ts b/src/types/addform.d.ts
index 9df5d950..d86941e6 100644
--- a/src/types/addform.d.ts
+++ b/src/types/addform.d.ts
@@ -1,6 +1,6 @@
 export interface SubmitFormDataType {
   isPublic: boolean;
-  hourlyWage: number;
+  hourlyWage: string;
   isNegotiableWorkDays: boolean;
   workDays: string[];
   workEndTime: string;

From 1279a9fca2760618bbec1accb845267d501ddfd6 Mon Sep 17 00:00:00 2001
From: hongggy <hongggy@gmail.com>
Date: Thu, 12 Dec 2024 14:33:12 +0900
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20description=20=EC=A4=84=EB=B0=94?=
 =?UTF-8?q?=EA=BF=88=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../(albaform)/addform/section/RecruitContentSection.tsx        | 1 -
 src/app/(pages)/alba/components/FormDetail.tsx                  | 2 +-
 src/app/components/input/textarea/BaseTextArea.tsx              | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/(pages)/(albaform)/addform/section/RecruitContentSection.tsx b/src/app/(pages)/(albaform)/addform/section/RecruitContentSection.tsx
index a1d35ae1..95d1ad02 100644
--- a/src/app/(pages)/(albaform)/addform/section/RecruitContentSection.tsx
+++ b/src/app/(pages)/(albaform)/addform/section/RecruitContentSection.tsx
@@ -18,7 +18,6 @@ export default function RecruitContentSection() {
   const {
     register,
     setValue,
-    getValues,
     formState: { errors },
   } = useFormContext();
 
diff --git a/src/app/(pages)/alba/components/FormDetail.tsx b/src/app/(pages)/alba/components/FormDetail.tsx
index 5b3f1d8a..5e63f664 100644
--- a/src/app/(pages)/alba/components/FormDetail.tsx
+++ b/src/app/(pages)/alba/components/FormDetail.tsx
@@ -24,7 +24,7 @@ export default function FormDetails({ albaFormDetailData }: FormDetailsProps) {
       </div>
       <p className="text-3xl font-bold">{albaFormDetailData.title}</p>
       <div className="space-y-32">
-        <div className="text-2xl">{albaFormDetailData.description}</div>
+        <div className="whitespace-pre-wrap text-2xl">{albaFormDetailData.description}</div>
         <p className="text-3xl font-bold">근무 지역</p>
       </div>
       <div className="flex space-x-5 text-2xl">
diff --git a/src/app/components/input/textarea/BaseTextArea.tsx b/src/app/components/input/textarea/BaseTextArea.tsx
index 14276ba2..0116112c 100644
--- a/src/app/components/input/textarea/BaseTextArea.tsx
+++ b/src/app/components/input/textarea/BaseTextArea.tsx
@@ -40,7 +40,7 @@ const BaseTextArea = forwardRef<HTMLTextAreaElement, BaseTextAreaProps>((props,
 
   const bgStyle = variantStyles[props.variant].bg;
 
-  const textareaStyle = `bg-transparent ${baseStyle} ${textStyle} ${props.innerClassName || ""}`;
+  const textareaStyle = `bg-transparent whitespace-pre-wrap ${baseStyle} ${textStyle} ${props.innerClassName || ""}`;
   const wrapperStyle = `p-[14px] lg:py-[18px] relative rounded-lg ${sizeStyles} ${variantStyle} ${bgStyle} ${errorStyle} ${props.wrapperClassName}`;
 
   return (

From 8b37c6a04584f79cbec9f3869d8e8344adf3263e Mon Sep 17 00:00:00 2001
From: hongggy <hongggy@gmail.com>
Date: Thu, 12 Dec 2024 15:06:48 +0900
Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20alba/id=20=ED=8F=B4=EB=8D=94=20?=
 =?UTF-8?q?=EB=B3=91=ED=95=A9=20=EB=B0=8F=20=EB=A0=88=EC=9D=B4=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edit}/components/ApplicationStatus.tsx    |  0
 .../[formId]/edit}/components/FormActions.tsx |  0
 .../[formId]/edit}/components/FormDetail.tsx  |  0
 .../[formId]/edit}/components/FormHeader.tsx  |  0
 .../edit}/components/RecruitInfomation.tsx    |  0
 .../(albaform)/alba/[formId]/edit/page.tsx    |  5 +-
 .../{ => (albaform)}/alba/[formId]/page.tsx   |  8 +-
 src/app/(pages)/(albaform)/layout.tsx         | 87 +++++++++++--------
 src/app/(pages)/{alba => albax}/layout.tsx    |  0
 9 files changed, 57 insertions(+), 43 deletions(-)
 rename src/app/(pages)/{alba => (albaform)/alba/[formId]/edit}/components/ApplicationStatus.tsx (100%)
 rename src/app/(pages)/{alba => (albaform)/alba/[formId]/edit}/components/FormActions.tsx (100%)
 rename src/app/(pages)/{alba => (albaform)/alba/[formId]/edit}/components/FormDetail.tsx (100%)
 rename src/app/(pages)/{alba => (albaform)/alba/[formId]/edit}/components/FormHeader.tsx (100%)
 rename src/app/(pages)/{alba => (albaform)/alba/[formId]/edit}/components/RecruitInfomation.tsx (100%)
 rename src/app/(pages)/{ => (albaform)}/alba/[formId]/page.tsx (89%)
 rename src/app/(pages)/{alba => albax}/layout.tsx (100%)

diff --git a/src/app/(pages)/alba/components/ApplicationStatus.tsx b/src/app/(pages)/(albaform)/alba/[formId]/edit/components/ApplicationStatus.tsx
similarity index 100%
rename from src/app/(pages)/alba/components/ApplicationStatus.tsx
rename to src/app/(pages)/(albaform)/alba/[formId]/edit/components/ApplicationStatus.tsx
diff --git a/src/app/(pages)/alba/components/FormActions.tsx b/src/app/(pages)/(albaform)/alba/[formId]/edit/components/FormActions.tsx
similarity index 100%
rename from src/app/(pages)/alba/components/FormActions.tsx
rename to src/app/(pages)/(albaform)/alba/[formId]/edit/components/FormActions.tsx
diff --git a/src/app/(pages)/alba/components/FormDetail.tsx b/src/app/(pages)/(albaform)/alba/[formId]/edit/components/FormDetail.tsx
similarity index 100%
rename from src/app/(pages)/alba/components/FormDetail.tsx
rename to src/app/(pages)/(albaform)/alba/[formId]/edit/components/FormDetail.tsx
diff --git a/src/app/(pages)/alba/components/FormHeader.tsx b/src/app/(pages)/(albaform)/alba/[formId]/edit/components/FormHeader.tsx
similarity index 100%
rename from src/app/(pages)/alba/components/FormHeader.tsx
rename to src/app/(pages)/(albaform)/alba/[formId]/edit/components/FormHeader.tsx
diff --git a/src/app/(pages)/alba/components/RecruitInfomation.tsx b/src/app/(pages)/(albaform)/alba/[formId]/edit/components/RecruitInfomation.tsx
similarity index 100%
rename from src/app/(pages)/alba/components/RecruitInfomation.tsx
rename to src/app/(pages)/(albaform)/alba/[formId]/edit/components/RecruitInfomation.tsx
diff --git a/src/app/(pages)/(albaform)/alba/[formId]/edit/page.tsx b/src/app/(pages)/(albaform)/alba/[formId]/edit/page.tsx
index 0125a90b..4930677d 100644
--- a/src/app/(pages)/(albaform)/alba/[formId]/edit/page.tsx
+++ b/src/app/(pages)/(albaform)/alba/[formId]/edit/page.tsx
@@ -16,6 +16,7 @@ import WorkConditionSection from "../../../addform/section/WorkConditionSection"
 import { SubmitFormDataType } from "@/types/addform";
 import useEditing from "@/hooks/useEditing";
 import useFormDetail from "@/hooks/queries/form/detail/useFormDetail";
+import formatMoney from "@/utils/formatMoney";
 
 export default function EditFormPage() {
   const router = useRouter();
@@ -57,7 +58,7 @@ export default function EditFormPage() {
     if (albaFormDetailData) {
       reset({
         isPublic: albaFormDetailData.isPublic,
-        hourlyWage: albaFormDetailData.hourlyWage, // 쉼표 추가하기
+        hourlyWage: formatMoney(String(albaFormDetailData.hourlyWage)), // 쉼표 추가하기
         isNegotiableWorkDays: albaFormDetailData.isNegotiableWorkDays,
         workDays: albaFormDetailData.workDays,
         workEndTime: albaFormDetailData.workEndTime,
@@ -146,7 +147,7 @@ export default function EditFormPage() {
             acc[key] = Number(value);
           } else if (key === "hourlyWage") {
             // hourlyWage는 쉼표를 제거하고 숫자형으로 변환
-            if (value.includes(",")) acc[key] = Number(value.replaceAll(/,/g, "")); // 쉼표 제거 후 숫자형 변환
+            if (value.includes(",")) acc[key] = String(Number(value.replaceAll(/,/g, ""))); // 쉼표 제거 후 숫자형 변환
           } else {
             acc[key as keyof SubmitFormDataType] = value; // 나머지 값은 그대로 추가
           }
diff --git a/src/app/(pages)/alba/[formId]/page.tsx b/src/app/(pages)/(albaform)/alba/[formId]/page.tsx
similarity index 89%
rename from src/app/(pages)/alba/[formId]/page.tsx
rename to src/app/(pages)/(albaform)/alba/[formId]/page.tsx
index d1d8a2fb..fbf1168d 100644
--- a/src/app/(pages)/alba/[formId]/page.tsx
+++ b/src/app/(pages)/(albaform)/alba/[formId]/page.tsx
@@ -3,10 +3,10 @@
 import { useParams } from "next/navigation";
 import React, { useEffect, useState } from "react";
 import { useUser } from "@/hooks/queries/user/me/useUser";
-import FormHeader from "../components/FormHeader";
-import FormDetails from "../components/FormDetail";
-import RecruitInformation from "../components/RecruitInfomation";
-import ApplicationStatus from "../components/ApplicationStatus";
+import FormHeader from "./edit/components/FormHeader";
+import FormDetails from "./edit/components/FormDetail";
+import RecruitInformation from "./edit/components/RecruitInfomation";
+import ApplicationStatus from "./edit/components/ApplicationStatus";
 import { useFormDetail } from "@/hooks/queries/form/detail/useFormDetail";
 
 export default function AlbaFormDetailPage() {
diff --git a/src/app/(pages)/(albaform)/layout.tsx b/src/app/(pages)/(albaform)/layout.tsx
index 60703d7b..cac38e98 100644
--- a/src/app/(pages)/(albaform)/layout.tsx
+++ b/src/app/(pages)/(albaform)/layout.tsx
@@ -6,49 +6,62 @@ import useModalStore from "@/store/modalStore";
 import { usePathname, useRouter } from "next/navigation";
 
 export default function Layout({ children }: { children: ReactNode }) {
+  const { openModal } = useModalStore();
   const router = useRouter();
   const pathname = usePathname();
-  const title = pathname.split("/").includes("apply") ? "알바폼 지원하기" : "알바폼 만들기";
 
-  const { openModal } = useModalStore();
+  const formPath = ["edit", "addform", "apply"];
+  //formPath 배열의 원소 중 포함되는게 있는지 여부 확인
+
+  const isForm: boolean = pathname.split("/").some((path) => formPath.includes(path));
+  const isFormWithTab: boolean = pathname.split("/").some((path) => path === "addform" || path === "edit");
+  const title = pathname.split("/").includes("apply") && isForm ? "알바폼 지원하기" : "알바폼 만들기";
+
+  // 폼 작성 페이지 레이아웃
+  const FormStyle = cn(
+    "mx-auto my-10 w-[327px] pb-[70px] lg:w-[680px] lg:pb-0 lg:pl-10",
+    isFormWithTab ? "lg:ml-[600px]" : ""
+  );
+
+  // 상세 페이지 레이아웃
+  const DetailStyle = "mx-auto max-w-screen-2xl px-4 py-4 sm:px-6 md:py-8";
 
   return (
-    <div
-      className={cn(
-        "mx-auto my-10 w-[327px] pb-[70px] lg:w-[680px] lg:pb-0 lg:pl-10",
-        title === "알바폼 만들기" ? "lg:ml-[600px]" : ""
+    <div className={cn(isForm ? FormStyle : DetailStyle)}>
+      {isForm && (
+        <ApplyHeader
+          title={title}
+          onCancel={() =>
+            openModal("customForm", {
+              isOpen: true,
+              title: "폼 작성 취소",
+              content: "작성을 취소하시겠습니까?",
+              onConfirm: () => {
+                openModal("customForm", {
+                  isOpen: false,
+                  title: "",
+                  content: "",
+                  onConfirm: () => {},
+                  onCancel: () => {},
+                });
+                router.back();
+              },
+              onCancel: () => {
+                openModal("customForm", {
+                  isOpen: false,
+                  title: "",
+                  content: "",
+                  onConfirm: () => {},
+                  onCancel: () => {},
+                });
+              },
+            })
+          }
+        />
       )}
-    >
-      <ApplyHeader
-        title={title}
-        onCancel={() =>
-          openModal("customForm", {
-            isOpen: true,
-            title: "폼 작성 취소",
-            content: "작성을 취소하시겠습니까?",
-            onConfirm: () => {
-              openModal("customForm", {
-                isOpen: false,
-                title: "",
-                content: "",
-                onConfirm: () => {},
-                onCancel: () => {},
-              });
-              router.back();
-            },
-            onCancel: () => {
-              openModal("customForm", {
-                isOpen: false,
-                title: "",
-                content: "",
-                onConfirm: () => {},
-                onCancel: () => {},
-              });
-            },
-          })
-        }
-      />
-      <Suspense fallback={<div>Loading...</div>}>{children}</Suspense>
+      <Suspense fallback={<div className="flex h-[calc(100vh-200px)] items-center justify-center">Loading...</div>}>
+        {children}
+      </Suspense>
     </div>
   );
 }
diff --git a/src/app/(pages)/alba/layout.tsx b/src/app/(pages)/albax/layout.tsx
similarity index 100%
rename from src/app/(pages)/alba/layout.tsx
rename to src/app/(pages)/albax/layout.tsx

From e7c72556ba6c133cdc1de3b67ed2b7b85211281a Mon Sep 17 00:00:00 2001
From: hongggy <hongggy@gmail.com>
Date: Thu, 12 Dec 2024 15:18:37 +0900
Subject: [PATCH 6/6] fix: merge conflict

---
 src/app/(pages)/(albaform)/alba/[formId]/page.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/(pages)/(albaform)/alba/[formId]/page.tsx b/src/app/(pages)/(albaform)/alba/[formId]/page.tsx
index b38c2508..7d91483e 100644
--- a/src/app/(pages)/(albaform)/alba/[formId]/page.tsx
+++ b/src/app/(pages)/(albaform)/alba/[formId]/page.tsx
@@ -3,13 +3,13 @@
 import { useParams } from "next/navigation";
 import React, { useEffect, useState } from "react";
 import { useUser } from "@/hooks/queries/user/me/useUser";
+import { useFormDetail } from "@/hooks/queries/form/detail/useFormDetail";
+import { Map, MapMarker, useKakaoLoader } from "react-kakao-maps-sdk";
+import Script from "next/script";
 import FormHeader from "./edit/components/FormHeader";
 import FormDetails from "./edit/components/FormDetail";
 import RecruitInformation from "./edit/components/RecruitInfomation";
 import ApplicationStatus from "./edit/components/ApplicationStatus";
-import { useFormDetail } from "@/hooks/queries/form/detail/useFormDetail";
-import { Map, MapMarker, useKakaoLoader } from "react-kakao-maps-sdk";
-import Script from "next/script";
 
 interface Coords {
   lat: number;