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.

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

[FE]: 날짜를 선택할 수 있는 캘린더 UI 구현 #68

Merged
merged 12 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
86 changes: 86 additions & 0 deletions frontend/src/components/_common/Calendar/Calendar.styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import { css } from '@emotion/react';

export const s_calendarContainer = css`
display: flex;
flex-direction: column;
align-items: center;
`;

export const s_calendarContent = css`
display: grid;
grid-auto-rows: 40px;
grid-template-columns: repeat(7, 1fr);
width: 100%;
`;

export const s_dayOfWeekContainer = css`
margin-bottom: 2rem;
`;

export const s_dayOfWeek = css`
display: flex;
align-items: center;
justify-content: center;

width: 100%;
min-width: 40px;
height: 40px;
min-height: 40px;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P2]

여기 군데군데 px로 구현하신 부분이 보이는 것 같습니다..! rem으로 통일하는 것이 좋아보여서 리뷰 남깁니다 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rem으로 통일하기로 했는데 완전히 잊고 있었네요..수정할게요!!


font-size: 1.2rem;
font-weight: normal;
color: gray;
`;

export const s_monthHeader = css`
display: flex;
align-items: center;
justify-content: space-between;

width: 100%;
margin-bottom: 20px;
padding: 0 10px;

font-size: 1.5rem;
font-weight: bold;
`;

export const s_monthNavigation = css`
cursor: pointer;
`;

export const s_daySlotButton = css`
display: flex;
align-items: center;
justify-content: center;

width: 100%;
min-width: 36px;
height: 36px;

background-color: transparent;
border: none;
`;

// TODO : 공휴일 색 변경 논의 필요(@해리)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오👍👍 TODO 코멘트에 작업자 멘션한 부분 좋네요!!
멘션할 때 Giuhub id로 하는 방법도 있는 것 같아요! 자동 완성 할 수 장점이 있습니다 ㅎㅎ
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오...좋은데요?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

익스텐션 뭐죵!?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hwinkr 혹시 자동완성 익스텐션이 있어야 가능한가요? 지금 해리는 안 되나요?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

안돼요...ㅋㅋㅋ

// TODO : s_todayDaySlot 추가 예정(@해리)
export const s_daySlot = (isHoliday: boolean) => css`
cursor: pointer;
font-size: 1.5rem;
color: ${isHoliday ? 'red' : '#000'};
`;

export const s_selectedDaySlot = (isSelected: boolean) => css`
display: flex;
align-items: center;
justify-content: center;

width: 36px;
height: 36px;

${isSelected &&
css`
background-color: #fcc;
border-radius: 50%;
`}
`;
65 changes: 65 additions & 0 deletions frontend/src/components/_common/Calendar/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import useCalendarInfo from '@hooks/useCalendarInfo/useCalendarInfo';

import {
s_calendarContainer,
s_calendarContent,
s_dayOfWeek,
s_dayOfWeekContainer,
s_daySlot,
s_daySlotButton,
s_monthHeader,
s_monthNavigation,
s_selectedDaySlot,
} from './Calendar.styles';

const DAY_OF_WEEK = ['월', '화', '수', '목', '금', '토', '일'] as const;

// TODO : 선택된 날짜에 대한 강조 색을 외부에서 주입받을 수 있도록 props 수정 예정 (@해리)
interface CalendarProps {
hasDate: (date: string) => boolean;
onDateClick: (date: string) => void;
}

export default function Calendar({ hasDate, onDateClick }: CalendarProps) {
const { yearMonthInfo, handleGetDayInfo, handlePrevMonth, handleNextMonth } = useCalendarInfo();
const { year, month, daySlotCount } = yearMonthInfo;

return (
<div css={s_calendarContainer} aria-label={`${year}년 ${month}월 달력`}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aria-label 명시.. 👍 대 해 리

<header css={s_monthHeader}>
{/* TODO : 캘린더 헤더 버튼 스타일 수정 예정 (@해리) */}
<button css={s_monthNavigation} onClick={handlePrevMonth}>
{'<'}
</button>
<span>
{year}년 {month}월
</span>
<button css={s_monthNavigation} onClick={handleNextMonth}>
{'>'}
</button>
</header>
<section css={[s_calendarContent, s_dayOfWeekContainer]}>
{DAY_OF_WEEK.map((day) => (
<div key={day} css={s_dayOfWeek}>
{day}
</div>
))}
</section>
<section css={s_calendarContent}>
{Array.from({ length: daySlotCount }, (_, index) => {
// TODO : isToday 변수를 활용한 스타일 변경 논의 필요 (@해리)
const { date, dateString, isDate, isToday, isHoliday } = handleGetDayInfo(index);
const isSelectedDate = hasDate(dateString);

return (
<button key={dateString} onClick={() => onDateClick(dateString)} css={s_daySlotButton}>
<span css={[s_daySlot(isHoliday), s_selectedDaySlot(isSelectedDate)]}>
{isDate ? date : ''}
</span>
</button>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P3]
날짜 선택을 할 수 없는 첫 줄의 빈 공간에도 button이 삽입되는데, 웹 표준에 맞게 구현하기 위해서는 버튼이 없도록 만들어야 할 것 같아요! 급한 것은 아니니 추후에 수정해도 괜찮구요!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh...모든 요소들을 다 버튼으로 하니 날짜가 아닌 경우에도 cursor : pointer 속성이 적용되고 있었네요...! 이 부분은 접근성을 위해서라도 빠르게 수정할게요!!

);
})}
</section>
</div>
);
}