Skip to content
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.

Sign up for GitHub

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

Jump to bottom

πŸ’„Style(#286): μŠ€ν…Œλ”” κ΄€λ ¨ νŽ˜μ΄μ§€ λ°˜μ‘ν˜• μ™„λ£Œ #299

Merged
merged 14 commits into from
Nov 30, 2023
Merged

πŸ’„Style(#286): μŠ€ν…Œλ”” κ΄€λ ¨ νŽ˜μ΄μ§€ λ°˜μ‘ν˜• μ™„λ£Œ #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e03f71e
πŸ’„ Style(#286): μŠ€ν…Œλ”” 운영 νŽ˜μ΄μ§€ λ°˜μ‘ν˜• κ΅¬ν˜„
JIY00N2 Nov 30, 2023
6202662
πŸ’„ Style(#286): λ²„νŠΌ sm 크기 μŠ€νƒ€μΌλ§ λ°˜μ‘ν˜• 제거
JIY00N2 Nov 30, 2023
1726180
πŸ’„ Style(#286): μŠ€ν…Œλ”” 운영 νŽ˜μ΄μ§€ λ°˜μ‘ν˜• μ‘°μ •
JIY00N2 Nov 30, 2023
f901948
πŸ’„ Style(#286): input border μΆ”κ°€ 및 높이 재 μ‘°μ •
JIY00N2 Nov 30, 2023
8283031
πŸ“ Chore(#286): μ½˜μ†” 제거
JIY00N2 Nov 30, 2023
bb9e665
πŸ’„ Style(#286): μŠ€ν…Œλ”” 생성 νŽ˜μ΄μ§€ λ°˜μ‘ν˜• κ΅¬ν˜„
JIY00N2 Nov 30, 2023
f6c3300
πŸ’„ Style(#286): μŠ€ν…Œλ”” 연락 μˆ˜λ‹¨ placeholder ellipsis 적용
JIY00N2 Nov 30, 2023
59fc3fd
πŸ’„ Style(#286): μŠ€ν…Œλ”” μ‹ μ²­μ„œ 질문 등둝 νŽ˜μ΄μ§€ λ°˜μ‘ν˜• κ΅¬ν˜„
JIY00N2 Nov 30, 2023
989efdc
πŸ’„ Style(#286): μŠ€ν…Œλ”” μ‹ μ²­μ„œ 질문 μˆ˜μ • νŽ˜μ΄μ§€ λ°˜μ‘ν˜• κ΅¬ν˜„
JIY00N2 Nov 30, 2023
97b3d20
πŸ’„ Style(#286): μŠ½ν…Œλ”” μˆ˜μ • νŽ˜μ΄μ§€ λ°˜μ‘ν˜• κ΅¬ν˜„
JIY00N2 Nov 30, 2023
87d2639
Merge branch 'main' of https://github.com/Team-Blitz-Steady/steady-cl…
JIY00N2 Nov 30, 2023
929ad09
πŸ’„ Style(#286): λ§ˆν¬λ‹€μš΄ 에디터 적용
JIY00N2 Nov 30, 2023
740b124
Merge branch 'main' into style/#286/steady
JIY00N2 Nov 30, 2023
cbb80e8
🚨 Fix(#286): λΉŒλ“œ μ—λŸ¬ μˆ˜μ •
JIY00N2 Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 58 additions & 53 deletions src/app/(steady)/steady/create/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ const CreateSteadyPage = () => {
};

return (
<div className={cn("mt-30")}>
<div
className={cn("mt-10 max-sm:w-400 sm:w-450 md:w-600 lg:w-800 xl:w-1000")}
>
<Form {...steadyForm}>
<form onSubmit={steadyForm.handleSubmit(onSubmit)}>
<h1 className={cn("mx-8 font-semibold")}>
Expand All @@ -92,49 +94,52 @@ const CreateSteadyPage = () => {
my={"3"}
className={cn("h-3 bg-st-gray-400")}
/>
<FormField
control={steadyForm.control}
name={"name"}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
inputName={"steady-title-input"}
onValueChange={(value) => {
field.onChange(value);
}}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<div className={cn("my-10")}></div>
<FormField
control={steadyForm.control}
name={"bio"}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
inputName={"steady-bio-input"}
onValueChange={(value) => {
field.onChange(value);
}}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<div className={cn("mt-30")}>
<div className="flex flex-col gap-10">
<FormField
control={steadyForm.control}
name={"name"}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
inputName={"steady-title-input"}
onValueChange={(value) => {
field.onChange(value);
}}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={steadyForm.control}
name={"bio"}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
inputName={"steady-bio-input"}
onValueChange={(value) => {
field.onChange(value);
}}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div>
<div className={cn("mt-10")}>
<Separator
size={"4"}
my={"3"}
className={cn("h-3 bg-st-gray-400")}
/>
<div
className={cn("mx-20 my-10 flex flex-row justify-between gap-15")}
className={cn(
"mb-15 grid items-center justify-center gap-15 px-20 max-sm:grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-3 xl:grid-cols-4",
)}
>
<FormField
control={steadyForm.control}
Expand All @@ -144,7 +149,7 @@ const CreateSteadyPage = () => {
<SingleSelector
initialLabel={"ν”„λ‘œμ νŠΈ / μŠ€ν„°λ””"}
items={steadyCategories}
className={cn("w-200")}
className={cn("w-full")}
onSelectedChange={(selected) => {
field.onChange(selected);
}}
Expand All @@ -162,7 +167,7 @@ const CreateSteadyPage = () => {
<SingleSelector
initialLabel={"진행 방식"}
items={steadyRunningMethods}
className={cn("w-200")}
className={cn("w-full")}
onSelectedChange={(selected) => {
field.onChange(selected);
}}
Expand All @@ -180,7 +185,7 @@ const CreateSteadyPage = () => {
<SingleSelector
initialLabel={"μŠ€ν…Œλ”” 정원"}
items={steadyParticipantsLimit}
className={cn("w-200")}
className={cn("w-full")}
onSelectedChange={(selected) => {
field.onChange(Number(selected));
}}
Expand All @@ -197,7 +202,7 @@ const CreateSteadyPage = () => {
<FormItem>
<DateSelector
initialLabel={"마감일"}
className={cn("w-200")}
className={cn("w-full")}
onDateChange={(date) => {
field.onChange(format(date, "yyyy-MM-dd"));
}}
Expand All @@ -207,23 +212,20 @@ const CreateSteadyPage = () => {
</FormItem>
)}
/>
</div>
<div
className={cn("mx-20 my-10 flex flex-row justify-between gap-15")}
>

<FormField
control={steadyForm.control}
name={"positions"}
render={({ field }) => (
<FormItem>
<FormItem className="h-40">
<MultiSelector
initialLabel={"λͺ¨μ§‘ λΆ„μ•Ό"}
// TODO: steadyState?.positions에 μžˆλŠ” id값을 가진 position을 λ½‘μ•„μ„œ initialData둜 λ„£μ–΄μ€˜μ•Ό 함
items={positions.positions.map((position) => ({
value: position.id.toString(),
label: position.name,
}))}
className={cn("w-200")}
className={cn("w-full")}
onSelectedChange={(selected) => {
field.onChange(extractValue(selected).map(Number));
}}
Expand All @@ -241,7 +243,7 @@ const CreateSteadyPage = () => {
<SingleSelector
initialLabel={"μ˜ˆμƒ κΈ°κ°„"}
items={steadyExpectedPeriods}
className={cn("w-200")}
className={cn("w-full")}
onSelectedChange={(selected) => {
field.onChange(selected);
}}
Expand All @@ -255,14 +257,14 @@ const CreateSteadyPage = () => {
control={steadyForm.control}
name={"stacks"}
render={({ field }) => (
<FormItem>
<FormItem className="h-40 w-450 max-sm:w-360 sm:w-410">
<MultiSelector
initialLabel={"기술 μŠ€νƒ"}
items={stacks.stacks.map((stack) => ({
value: stack.id.toString(),
label: stack.name,
}))}
className={cn("w-455")}
className={cn("w-full")}
onSelectedChange={(selected) => {
field.onChange(extractValue(selected).map(Number));
}}
Expand Down Expand Up @@ -316,9 +318,12 @@ const CreateSteadyPage = () => {
control={steadyForm.control}
name={"content"}
render={({ field }) => (
<FormItem>
<FormItem
className={
"my-10 h-720 w-full rounded-10 border-2 border-st-gray-75"
}
>
<RichEditor
className={"min-h-720 w-full"}
contentEditableClassName={"prose"}
onChange={(markdown) => {
unified()
Expand Down
Loading
Loading