-
Notifications
You must be signed in to change notification settings - Fork 100
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
refactor(apply): redesign components of the my application page #761
Changes from 25 commits
bc579f7
86676d0
4c7e910
5480ba6
2cb8366
6f417f9
d218f86
604377f
b1ed5fb
989ea2f
a8041dd
15eb864
a2e5ab5
0c1a2ad
c53dd81
4eeaa4b
6cafd49
85349b1
680bd89
407308a
101f1f8
3d1048f
2221fdf
f01dfd7
a9fea3b
f38c0da
e8914a5
28a44c0
24437bc
0a01049
f1517c3
bc9d6d7
20924fd
04bcc21
b4277b4
f84fe3a
5e46853
c7213d2
acd9682
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,10 +6,27 @@ | |
word-break: break-all; | ||
} | ||
|
||
.detail-status-container { | ||
display: flex; | ||
justify-content: space-between; | ||
} | ||
|
||
.detail-status-container ul { | ||
display: flex; | ||
gap: 0.25rem; | ||
} | ||
|
||
.guide-container { | ||
display: flex; | ||
gap: 0.25rem; | ||
margin-left: auto; | ||
color: var(--gray-600); | ||
font-size: 0.815rem; | ||
} | ||
|
||
@media screen and (max-width: 800px) { | ||
.title-container { | ||
flex-direction: column; | ||
gap: 0.875rem; | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 commentThe reason will be displayed to describe this comment to others. Learn more. 좋습니당 :) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,22 @@ | ||
import { PropsWithChildren } from "react"; | ||
import { Mission } from "../../../../types/domains/recruitments"; | ||
import { MY_MISSION_TOOLTIP_MESSAGE } from "../../../constants/messages"; | ||
import Tooltip from "../../@common/Tooltip/Tooltip"; | ||
import CommitHash from "../CommitHash/CommitHash"; | ||
import JudgmentResultText from "../JudgmentResult/JudgmentResult"; | ||
import styles from "./MissionDetail.module.css"; | ||
|
||
type MissionDetailProps = { | ||
type MissionDetailProps = PropsWithChildren<{ | ||
judgment: Mission["judgment"]; | ||
}; | ||
}>; | ||
|
||
const MissionDetail = ({ judgment }: MissionDetailProps) => { | ||
const MissionDetail = ({ judgment, children }: MissionDetailProps) => { | ||
return ( | ||
<div className={styles["detail-container"]}> | ||
<JudgmentResultText judgment={judgment} /> | ||
<div className={styles["detail-status-container"]}> | ||
<JudgmentResultText judgment={judgment} /> | ||
<div>{children}</div> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. r: There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 commentThe reason will be displayed to describe this comment to others. Learn more. 그리고 말씀하신 것처럼 지금은
이전에 훅은
|
||
</div> | ||
<CommitHash judgment={judgment} /> | ||
<div className={styles["guide-container"]}> | ||
<p>테스트 코드 실행이 끝나기까지 3 ~ 5분이 걸릴 수 있습니다</p> | ||
|
This file was deleted.
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,10 +6,10 @@ import { Recruitment, RecruitmentStatus } from "../../../../types/domains/recrui | |
import { PARAM, PATH } from "../../../constants/path"; | ||
import { formatDateTime } from "../../../utils/format/date"; | ||
import { generateQuery } from "../../../utils/route/query"; | ||
import ApplyButton from "../MyApplicationButtons/ApplyButton"; | ||
import styles from "../MyApplicationItem.module.css"; | ||
import RecruitmentDetail from "../RecruitmentDetail/RecruitmentDetail"; | ||
import { BUTTON_LABEL, RECRUITMENT_STATUS } from "./../../../constants/recruitment"; | ||
import Button from "../../@common/Button/Button"; | ||
|
||
type MyApplicationFormItemProps = { | ||
recruitment: Recruitment; | ||
|
@@ -68,19 +68,24 @@ const MyApplicationFormItem = ({ recruitment, submitted }: MyApplicationFormItem | |
|
||
return ( | ||
<div className={classNames(styles["content-box"])}> | ||
<div className={styles["text-container"]}> | ||
<RecruitmentDetail startDate={formattedStartDateTime} endDate={formattedEndDateTime}> | ||
{recruitment.title} | ||
</RecruitmentDetail> | ||
<div className={styles["content-wrapper"]}> | ||
<div className={styles["title-container"]}> | ||
<RecruitmentDetail startDate={formattedStartDateTime} endDate={formattedEndDateTime}> | ||
{recruitment.title} | ||
</RecruitmentDetail> | ||
|
||
<div className={styles["button-container"]}> | ||
<ApplyButton | ||
isButtonDisabled={isButtonDisabled} | ||
onClick={() => { | ||
routeToApplicationForm(recruitment); | ||
}} | ||
label={applyButtonLabel} | ||
/> | ||
<ul className={styles["title-button-list"]}> | ||
<li> | ||
<Button | ||
disabled={isButtonDisabled} | ||
onClick={() => { | ||
routeToApplicationForm(recruitment); | ||
}} | ||
> | ||
{applyButtonLabel} | ||
</Button> | ||
</li> | ||
</ul> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. c: 이후에 추가될 것을 대비한 There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 commentThe reason will be displayed to describe this comment to others. Learn more. 아하 해당 UI가 추가될 때 같이 추가해주면 더 좋을 것 같습니다 :) 이 PR에서 다루는 이슈에서는 필요하지 않을 요소인 것 같아서요~! 🙂 |
||
</div> | ||
</div> | ||
</div> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,7 @@ | ||
.divider { | ||
border: 0.5px solid var(--gray-300); | ||
} | ||
|
||
.content-box { | ||
position: relative; | ||
display: flex; | ||
|
@@ -11,29 +15,41 @@ | |
border: 1px solid var(--gray-300); | ||
} | ||
|
||
.text-container { | ||
.content-wrapper { | ||
display: flex; | ||
flex-direction: column; | ||
gap: 0.875rem; | ||
width: 100%; | ||
} | ||
|
||
.auto-judgment-detail-contour { | ||
border: 0.5px solid var(--gray-300); | ||
.title-container { | ||
display: flex; | ||
justify-content: space-between; | ||
} | ||
|
||
.title-text { | ||
flex: 1; | ||
} | ||
|
||
.button-container { | ||
position: absolute; | ||
top: 1.25rem; | ||
right: 1.5rem; | ||
.title-button-list { | ||
display: flex; | ||
gap: 1rem; | ||
} | ||
|
||
.title-button-list li:not(:last-child) { | ||
margin-right: 0.4rem; | ||
} | ||
|
||
@media screen and (max-width: 800px) { | ||
.button-container { | ||
position: static; | ||
gap: 0.4rem; | ||
margin-left: auto; | ||
.title-container { | ||
flex-direction: column; | ||
gap: 0.875rem; | ||
} | ||
|
||
.title-button-list > li { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. a: 혹시나 마크업을 수정해서 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 오! 좋습니다 ㅎㅎ |
||
flex: 1; | ||
} | ||
|
||
.title-button-list > li > button { | ||
width: 100%; | ||
} | ||
} |
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.
a:
React.ButtonHTMLAttributes<HTMLButtonElement>
가 이미disabled
를 포함하고 있는 것으로 알고 있는데요! 혹시 더 명시적으로 표현해주기 위한 수정 사항일까요? 🙂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.
네넵! 버튼을 커스텀해서 사용하고 있어서 명시적으로 표현하기 위해서였는데
ButtonProps
선언부에서는 굳이disabled
속성을 표기해 줄 필요가 없겠군요! 그 부분만 적용해서 반영해보겠습니다.