-
Notifications
You must be signed in to change notification settings - Fork 5
Fix : 폼 관련 수정 #124
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Fix : 폼 관련 수정 #124
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d6ab452
최저시급 초기값 수정 및 주석 추가
hongggyelim a72881a
design: 버튼 크기 수정
hongggyelim e92fb36
fix: 드롭다운 인풋에서 초기값 value 가져오기
hongggyelim 367ac7d
fix: 임시저장 활성화
hongggyelim adecfd4
chore: 주석 삭제
hongggyelim 1c46dd6
refactor: 레이아웃 수정
hongggyelim a5c3455
Merge remote-tracking branch 'origin/dev' into feat/albaform/edit
hongggyelim 7026298
fix: conflict
hongggyelim 3b9932b
feat: 폼 작성 취소버튼에 모달 연동
hongggyelim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
25 changes: 0 additions & 25 deletions
25
src/app/(pages)/(albaform)/component/addFormLayout/AddFormLayout.tsx
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,54 @@ | ||
| "use client"; | ||
| import AddFormLayout from "@/app/(pages)/(albaform)/component/addFormLayout/AddFormLayout"; | ||
| import { ReactNode, Suspense } from "react"; | ||
| import { cn } from "@/lib/tailwindUtil"; | ||
| import ApplyHeader from "./component/ApplyHeader"; | ||
| import useModalStore from "@/store/modalStore"; | ||
| import { usePathname, useRouter } from "next/navigation"; | ||
|
|
||
| export default function Layout({ children }: { children: ReactNode }) { | ||
| const router = useRouter(); | ||
| const pathname = usePathname(); | ||
| const title = pathname.split("/").includes("apply") ? "알바폼 지원하기" : "알바폼 만들기"; | ||
|
|
||
| const { openModal } = useModalStore(); | ||
|
|
||
| return ( | ||
| <AddFormLayout> | ||
| <div | ||
| className={cn( | ||
| "mx-auto my-10 w-[327px] pb-[70px] lg:w-[680px] lg:pb-0 lg:pl-10", | ||
| title === "알바폼 만들기" ? "lg:ml-[600px]" : "" | ||
| )} | ||
| > | ||
| <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> | ||
| </AddFormLayout> | ||
| </div> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
제가 (albaform) 하위에 alba/[formid] 를 못보고 바깥 쪽에 alba/[formid] 만들어서 예림님 위치로 옮겼더니 (albaform) 하위 layout 때문에 css를 아무리 수정해도 잘 안되길래 못 합쳤어요 ㅠ 같은 폴더가 중복되버렸어요
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
네네 저도 폴더구조 확인했습니다! 저는 레이아웃때문에 그냥 별도로 (현상태 유지) 하는게 좋을거같습니다
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
아니면 alba 폴더 합치고 경로에 따라 레이아웃 분기 처리 하는게 나을까요??
(edit, addform, apply -> (albaform) 폴더 내의 레이아웃 적용
& 그 외 (= /alba만 있는 경우) 예지님 레이아웃 적용