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

[FE] FIX: 수지회 신청 날짜 형식 수정 #1718 #1719

Merged
merged 10 commits into from
Dec 26, 2024
Merged

[FE] FIX: 수지회 신청 날짜 형식 수정 #1718 #1719

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
05a822c
[BE] FIX: sql 지식회 케이스 형태 맞춰서 5월까지 추가
jihyunk03 Dec 23, 2024
831cd83
[FE] FIX: PresentationLocation 기본 설정 층 BASEMENT(지하 1층)으로 변경
jihyunk03 Dec 23, 2024
769f7e7
[FE] FIX: 수지회 신청 시, 신청하고자 하는 날짜 그대로 api 보내도록 수정
jihyunk03 Dec 23, 2024
3fe91e8
[FE] ETC: 컴포넌트 명 컨벤션에 따라 수정 #1718
jihyunk03 Dec 23, 2024
e3e56a1
[FE] REFACTOR: 불필요한 로그 출력 삭제 #1718
jihyunk03 Dec 23, 2024
b7e64c3
[BE] FIX: sql 지식회 케이스 오타 수정
jihyunk03 Dec 26, 2024
535d773
[FE] REFACTOR: 불필요한 코드 삭제
jihyunk03 Dec 26, 2024
db96ca3
[BE] FIX: 서브모듈 업데이트
jihyunk03 Dec 26, 2024
f8e3227
[FE] FIX: 에러 메시지 관련 에러 수정 #1718
jihyunk03 Dec 26, 2024
5c949b1
[FE] FIX: 같은 날짜로 변경된 경우, DOM key값 중복 문제 index로 해결 #1718
jihyunk03 Dec 26, 2024
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
22 changes: 16 additions & 6 deletions backend/database/cabi_local.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,12 +809,22 @@ LOCK TABLES `presentation` WRITE;
/*!40000 ALTER TABLE `presentation`
DISABLE KEYS */;
INSERT INTO `presentation`
VALUES (1, 'JOB', '2024-10-09 14:00:00', 'DUMMY', 'FIRST', 'EXPECTED', 'HALF', 'DUMMY', 'DUMMY', NULL),
(2, NULL, '2024-10-23 14:00:00', 'DUMMY', 'FIRST', 'CANCEL', 'HALF', 'DUMMY', 'DUMMY', NULL),
(3, NULL, '2024-11-05 14:00:00', 'DUMMY', 'FIRST', 'EXPECTED', 'HALF', 'DUMMY', 'DUMMY', NULL),
(4, 'JOB', '2024-11-19 14:00:00', 'DUMMY', 'FIRST', 'EXPECTED', 'HALF', 'DUMMY', 'DUMMY', NULL),
(5, NULL, '2024-12-11 14:00:00', 'DUMMY', 'FIRST', 'EXPECTED', 'HALF', 'DUMMY', 'DUMMY', NULL),
(6, 'JOB', '2024-12-25 14:00:00', 'DUMMY', 'FIRST', 'EXPECTED', 'HALF', 'DUMMY', 'DUMMY', NULL);
VALUES (1, 'JOB', '2024-10-09 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(2, NULL, '2024-10-23 14:00:00', 'dummy', 'BASEMENT', 'CANCEL', 'HALF', 'dummy', 'dummy', NULL),
(3, NULL, '2024-11-05 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(4, 'JOB', '2024-11-19 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(5, NULL, '2024-12-11 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(6, 'JOB', '2024-12-25 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(7, NULL, '2025-01-08 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(8, NULL, '2025-01-22 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(9, NULL, '2025-02-12 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(10, NULL, '2025-02-26 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(11, NULL, '2025-03-12 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL),
(12, NULL, '2025-03-26 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL);
(13, NULL, '2025-04-09 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL);
(14, NULL, '2025-04-23 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL);
(15, NULL, '2025-05-07 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL);
(16, NULL, '2025-05-21 14:00:00', 'dummy', 'BASEMENT', 'EXPECTED', 'HALF', 'dummy', 'dummy', NULL);
Copy link
Collaborator

Choose a reason for hiding this comment

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

바뀐 거 확인했습니다~~ 굳굳!!

/*!40000 ALTER TABLE `presentation`
ENABLE KEYS */;
UNLOCK TABLES;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/Presentation/components/Modals/EditStatusModal/EditStatusModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const EditStatusModal = ({ list, closeModal }: EditStatusModalProps) => {
const [presentationStatus, setPresentationStatus] =
useState<PresentationStatusType>(PresentationStatusType.EXPECTED);
const [location, setLocation] = useState<PresentationLocation>(
PresentationLocation.THIRD
PresentationLocation.BASEMENT
);
const [isStatusDropdownOpen, setIsStatusDropdownOpen] = useState(false);
const [isDatesDropdownOpen, setIsDatesDropdownOpen] = useState(false);
Expand Down
12 changes: 4 additions & 8 deletions frontend/src/Presentation/components/Modals/RegisterModal/RegisterModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,21 @@ const RegisterModal = ({
const [hasErrorOnResponse, setHasErrorOnResponse] = useState<boolean>(false);
const [modalTitle, setModalTitle] = useState<string>("");
const [isLoading, setIsLoading] = useState<boolean>(false);
const [year, month, day] = date.split("/");
const navigate = useNavigate();

const registerDetail = `발표를 신청한 후에는 내용 수정이 <strong>불가능</strong>합니다.
발표 날짜와 시간을 수정하고 싶으시다면
Cabi 슬랙 채널로 문의해주세요.
<strong>${date}</strong> 에 수요지식회 발표를 신청하시겠습니까?`;
<strong>${month}/${day}</strong> 에 수요지식회 발표를 신청하시겠습니까?`;

const closeResponseModal = (e: React.MouseEvent) => {
closeModal(e);
};

const tryRegister = async () => {
try {
const [month, day] = date.split("/");
const data = new Date(
Number(new Date().getFullYear()),
Number(month) - 1,
Number(day)
);
const data = new Date(Number(year), Number(month) - 1, Number(day));
// NOTE: Date 객체의 시간은 UTC 기준이므로 한국 시간 (GMT + 9) 으로 변환, 이후 발표 시작 시간인 14시를 더해줌
data.setHours(9 + 14);
await axiosPostPresentationForm(
Expand All @@ -68,7 +64,7 @@ Cabi 슬랙 채널로 문의해주세요.
}, 1500);
setIsFinished(true);
} catch (error: any) {
setModalTitle(error.response.data.message);
setModalTitle(error.response);
setHasErrorOnResponse(true);
} finally {
setShowResponseModal(true);
Expand Down
31 changes: 17 additions & 14 deletions frontend/src/Presentation/components/Register/DropdownDateMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ const DropdownDateMenu = ({
});

const handleOptionSelect = useCallback(
(option: string) => {
setSelectedOption(option);
(option: string, displayOption: string) => {
setSelectedOption(displayOption);
setDropdownState((prev) => ({
...prev,
isVisible: false,
Expand Down Expand Up @@ -68,20 +68,23 @@ const DropdownDateMenu = ({
rotated={dropdownState.isFocused}
/>
</RegisterTimeInputStyled>
<AnimatedDropdownOptions
<AnimatedDropdownOptionsStyled
isVisible={dropdownState.isVisible}
clickCount={clickCount}
>
{data.map((time) => (
<DropdownOption
key={time}
onClick={() => handleOptionSelect(time)}
invalid={invalidDates?.includes(time)}
>
{time}
</DropdownOption>
))}
</AnimatedDropdownOptions>
{data.map((time) => {
const displayTime = time.split("/").slice(1).join("/");
return (
<DropdownOption
key={time}
onClick={() => handleOptionSelect(time, displayTime)}
invalid={invalidDates?.includes(time)}
>
{displayTime}
</DropdownOption>
);
})}
</AnimatedDropdownOptionsStyled>
</DropdownContainer>
);
};
Expand Down Expand Up @@ -116,7 +119,7 @@ const DropdownContainer = styled.div`
position: relative;
`;

const AnimatedDropdownOptions = styled.ul<{
const AnimatedDropdownOptionsStyled = styled.ul<{
isVisible: boolean;
clickCount: number;
}>`
Expand Down
21 changes: 8 additions & 13 deletions frontend/src/Presentation/components/Register/DropdownTimeMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ const DropdownTimeMenu = ({
hasSelectedOption={selectedOption !== ""}
>
{selectedOption || "시간을 선택해주세요"}
<DropdownIcon
<DropdownIconStyled
src={chevronIcon}
alt="Dropdown Icon"
rotated={dropdownState.isFocused}
/>{" "}
</RegisterTimeInputStyled>
<AnimatedDropdownOptions
<AnimatedDropdownOptionsStyled
isVisible={dropdownState.isVisible}
clickCount={clickCount}
>
Expand All @@ -75,15 +75,15 @@ const DropdownTimeMenu = ({
.map((timeKey) => {
const time = timeKey as PresentationTimeKey;
return (
<DropdownOption
<DropdownOptionStyled
key={time}
onClick={() => handleOptionSelect(time)}
>
{time}
</DropdownOption>
</DropdownOptionStyled>
);
})}
</AnimatedDropdownOptions>
</AnimatedDropdownOptionsStyled>
</DropdownContainer>
);
};
Expand Down Expand Up @@ -118,7 +118,7 @@ const DropdownContainer = styled.div`
position: relative;
`;

const AnimatedDropdownOptions = styled.ul<{
const AnimatedDropdownOptionsStyled = styled.ul<{
isVisible: boolean;
clickCount: number;
}>`
Expand Down Expand Up @@ -152,12 +152,7 @@ const AnimatedDropdownOptions = styled.ul<{
}
`;

const DropdownOptions = styled.ul`
list-style-type: none;
padding: 0;
`;

const DropdownOption = styled.li`
const DropdownOptionStyled = styled.li`
font-size: 0.875rem;
padding: 10px;
cursor: pointer;
Expand Down Expand Up @@ -194,7 +189,7 @@ const RegisterTimeInputStyled = styled.div<{
: "var(--normal-text-color)"};
`;

const DropdownIcon = styled.img<{ rotated: boolean }>`
const DropdownIconStyled = styled.img<{ rotated: boolean }>`
width: 14px;
height: 8px;
transform: ${(props) => (props.rotated ? "rotate(180deg)" : "rotate(0deg)")};
Expand Down
15 changes: 9 additions & 6 deletions frontend/src/Presentation/pages/DropdownMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ const DropdownMenu = () => {
{selectedOption || "시간을 선택해주세요"}
</RegisterTimeInputStyled>
{isVisible && (
<DropdownOptions>
<DropdownOptionsStyled>
{Object.values(PresentationTime).map((time) => (
<DropdownOption key={time} onClick={() => handleOptionSelect(time)}>
<DropdownOptionStyled
key={time}
onClick={() => handleOptionSelect(time)}
>
{time}
</DropdownOption>
</DropdownOptionStyled>
))}
</DropdownOptions>
</DropdownOptionsStyled>
)}
</DropdownContainer>
);
Expand All @@ -64,7 +67,7 @@ const DropdownContainer = styled.div`
position: relative;
`;

const DropdownOptions = styled.ul`
const DropdownOptionsStyled = styled.ul`
position: absolute;
top: 52px;
left: 0;
Expand All @@ -82,7 +85,7 @@ const DropdownOptions = styled.ul`
}
`;

const DropdownOption = styled.li`
const DropdownOptionStyled = styled.li`
font-size: 0.875rem;
color: var(--gray-line-btn-color);
padding: 10px;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/Presentation/pages/RegisterPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const RegisterPage = () => {
);

const invalidDates: string[] = useInvalidDates()?.map((date) =>
format(date, "M/d")
format(date, "y/M/d")
);

const handleFocus = (sectionName: string) => {
Expand Down Expand Up @@ -147,7 +147,7 @@ const RegisterPage = () => {
availableDates.sort();
const formattedAvailableDates = availableDates.map(
(dateTime: string) => {
return format(new Date(dateTime), "M/d");
return format(new Date(dateTime), "y/M/d");
}
);
setAvailableDates(formattedAvailableDates);
Expand Down
Loading