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

refactor: 모든 페이지 퍼블리싱 리팩토링 #58

Merged
merged 35 commits into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
61cf890
refact: 이벤트카드 타입 분리 및 IconButton 적용
Yejiin21 Feb 27, 2025
011595b
refact: 검색페이지 CSS 수정 및 커스텀 width, height 값 설정
Yejiin21 Feb 27, 2025
484c086
fix: 아이콘 안보이는 에러 수정
Yejiin21 Feb 27, 2025
4545be5
refact: 하단바 마이페이지 라우팅 설정
Yejiin21 Feb 27, 2025
9992780
feat: 체크리스트 3가지 페이지 라우팅 설정
Yejiin21 Feb 27, 2025
126518e
design: 일부 CSS 변경
Yejiin21 Feb 27, 2025
2b975b1
fix: 카테고리 드롭다운 선택 후 이름 반영 안되는 에러 수정
Yejiin21 Feb 27, 2025
51ea306
refact: 대시보드 티켓 생성하기 페이지 디자인 리펙토링
Yejiin21 Feb 27, 2025
9858022
design: 대시보드 이메일 예약 발송 CSS 수정
Yejiin21 Feb 27, 2025
04e7585
refact: 불필요한 코드 삭제
Yejiin21 Feb 27, 2025
5a2d4be
rename: create_ticket에서 ticket으로 파일명 변경
Yejiin21 Feb 27, 2025
ad92148
rename: 컨벤션에 맞게 파일명 수정
Yejiin21 Feb 27, 2025
4a9e0d4
rename: FSD 파일구조 특성에 맞게 파일 위치 이동
Yejiin21 Feb 27, 2025
2e478d1
refact: 이메일 보내는 창에서 받는 사람 인풋창은 readOnly로 설정
Yejiin21 Feb 28, 2025
49e10e9
rename: 파일명 앞에 공백 제거
Yejiin21 Feb 28, 2025
0a1143e
feat: 내 호스트 페이지 이벤트 카드에 대시보드 바로가기 버튼 추가
Yejiin21 Feb 28, 2025
45b2235
feat: 전체 페이지 헤더에 있는 로고 클릭시 메인페이지로 navigate
Yejiin21 Mar 1, 2025
ac62649
refact: 이용약관 페이지 버튼 UI 수정과 헤더 뒤로가기 추가, 일부 디자인 변경
Yejiin21 Mar 1, 2025
3bc8caa
refact: 회원정보 입력 페이지 버튼 UI 수정, 헤더 뒤로가기 추가,일부 디자인 변경
Yejiin21 Mar 1, 2025
535ebc0
rename: 내 호스트 관련 페이지 myHost 폴더로 분리
Yejiin21 Mar 1, 2025
b6b73da
fix: ES Module환경에서는 require 사용할 수 없다는 에러 해결
Yejiin21 Mar 2, 2025
6d16af8
rename: main-buttons에서 main으로 파일명 변경
Yejiin21 Mar 2, 2025
6fd669a
feat: 로그인 모달 구현
Yejiin21 Mar 2, 2025
cff5287
fix: HorizontalCardButton 이전 버전으로 복구하고 버튼 CSS 수정
Yejiin21 Mar 2, 2025
f660021
refact: PaymentLayout 수정 및 적용
Yejiin21 Mar 3, 2025
09992cb
refact: 버튼도 PaymentLayout에 이동, 일부 CSS 수정
Yejiin21 Mar 3, 2025
557dc41
refact: children 최소 높이 지정하여 저장하기 버튼 맨 밑으로 가도록 수정
Yejiin21 Mar 3, 2025
d28613f
refact: navigate 직접 선언으로 리팩토링
Yejiin21 Mar 3, 2025
9737650
refact: userData를 hostInfo로 변경
Yejiin21 Mar 3, 2025
4d0e5a3
feat: mainCardButtonType 파일 생성
Yejiin21 Mar 3, 2025
cfa2da3
fix: ticket/AddButton.svg 파일 복구
Yejiin21 Mar 4, 2025
a2ebd9a
refact: 구매 확인 페이지 대시 보드라우터에서 티켓 라우터로 수정
Yejiin21 Mar 4, 2025
44a59af
remove: 사용하지 않은 svg 파일 삭제
Yejiin21 Mar 4, 2025
fe7b482
refact: 티켓 확인 관련 컴포넌트 일부 CSS 수정
Yejiin21 Mar 4, 2025
755c141
refact: routesConfig를 카테고리별로 나누어 리팩토링
Yejiin21 Mar 4, 2025
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
2 changes: 1 addition & 1 deletion design-system/icons/QrCalendar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion design-system/icons/QrCheck.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion design-system/icons/QrLocation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion design-system/icons/QrTicket.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions design-system/ui/buttons/HorizontalCardButton.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
import { flexRowStart } from '../../styles/flex';
import { flexRow } from '../../styles/flex';

interface CardButtonProps {
iconPath: React.ReactElement;
Expand All @@ -20,7 +20,7 @@ export default function HorizontalCardButton({
return (
<button
className={`
${flexRowStart}
${flexRow}
rounded-default font-bold w-full
hover:text-main
sm:text-sm sm:px-3 sm:h-9
Expand Down
2 changes: 1 addition & 1 deletion design-system/ui/buttons/TertiaryButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ interface TertiaryButtonProps {
type: 'button' | 'submit';
color: 'pink' | 'black';
size: 'small' | 'medium' | 'large';
onClick?: () => void;
onClick?: React.MouseEventHandler<HTMLButtonElement>;
className?: string;
}

Expand Down
16 changes: 8 additions & 8 deletions design-system/ui/modals/QrModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,48 +55,48 @@ const QrModal = ({
{iconPath1 && <div className="w-full">{iconPath1}</div>}
{iconPath2 && <div className={`ml-[8%] -mt-[176%] ${isChecked ? '' : 'opacity-50'}`}>{iconPath2}</div>}
<div className={`${flexColumn} justify-start px-6 ${isChecked ? '' : 'opacity-50'}`}>
<div className={`${flexRowSpaceBetweenCenter} w-full mt-[21%]`}>
<div className={`${flexRowSpaceBetweenCenter} w-full mt-[22%]`}>
<h1 className="truncate max-w-48 mr-2 font-semibold">{title}</h1>
<Countdown children={`${isCountdownChecked ? 'D-5' : '완료'}`} isChecked={isCountdownChecked} />
</div>
<h2 className="text-deDayTextDark text-xs font-medium mb-1">{hostName}</h2>
<h2 className="text-deDayTextDark text-xs font-medium mb-2">{hostName}</h2>
<div className="space-y-1 text-deDayTextDark">
<IconText
size="xSmall"
iconPath={<img src={qr_calendar} alt="qr_calendar" />}
children={formattedDate}
className="text-10"
className="text-11"
></IconText>
<IconText
size="xSmall"
iconPath={<img src={qr_location} alt="qr_location" />}
children={location}
className="text-10"
className="text-11"
></IconText>
<IconText
size="xSmall"
iconPath={<img src={qr_ticket} alt="qr_ticket" />}
children={ticketName}
className="text-10"
className="text-11"
></IconText>
<span className="text-sm font-bold">{formattedPrice}원</span>
<hr />
<IconText
size="xSmall"
iconPath={<img src={qr_check} alt="qr_check" />}
children={isApproved ? '승인 됨' : '승인 안됨'}
className="text-10"
className="text-11"
></IconText>
<IconText
size="xSmall"
iconPath={<img src={qr_check} alt="qr_check" />}
children={isCheckIn ? '체크인 완료' : '체크인 미완료'}
className="text-10"
className="text-11"
></IconText>
</div>
</div>
</div>
<span onClick={onClick} className="text-white text-xs mt-3 underline cursor-pointer">
<span onClick={onClick} className="text-white text-xs mt-6 underline cursor-pointer">
닫기
</span>
</div>
Expand Down
4 changes: 2 additions & 2 deletions design-system/ui/textFields/DefaultTextField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ const DefaultTextField = forwardRef<HTMLInputElement, DefaultTextFieldProps>(
) => {
return (
<div>
<label className={`block px-1 font-semibold text-gray-700 ${labelClassName}`}>{label}</label>
<label className={`block px-1 text-sm font-semibold text-gray-700 ${labelClassName}`}>{label}</label>
<label className="block px-1 mb-1 font-medium text-placeholderText sm:text-10 md:text-13">{detail}</label>
<div className={`flex items-center justify-center `}>
{leftText && <div className="w-20 text-base font-bold whitespace-nowrap">{leftText}</div>}
{leftText && <div className="w-24 text-base font-bold whitespace-nowrap">{leftText}</div>}
<input
ref={ref}
value={value}
Expand Down
2 changes: 1 addition & 1 deletion design-system/ui/textFields/MultilineTextField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const MultilineTextField = forwardRef<HTMLTextAreaElement, MultilineTextFieldPro
({ label, detail, value, onChange, onKeyDown, disabled = false, placeholder = '', className = '', ...rest }, ref) => {
return (
<div className={`${className}`}>
<label className="block px-1 font-semibold text-gray-700 sm:text-base md:text-lg lg:text-lg">{label}</label>
<label className="block px-1 font-semibold text-gray-700 text-base lg:text-lg md:mb-2">{label}</label>
<label className="block px-1 mb-1 font-medium text-placeholderText sm:text-10 md:text-13 lg:text-13">
{detail}
</label>
Expand Down
2 changes: 1 addition & 1 deletion design-system/ui/textFields/SearchTextField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const SearchTextField = forwardRef<HTMLInputElement, SearchTextFieldProps>(
onChange={onChange}
placeholder={placeholder}
{...rest}
className="w-full sm:h-6 md:h-7 border-[0.3px] border-black rounded-[3px] px-2 outline-none placeholder:text-placeholderText text-xs font-light"
className="w-full h-7 md:h-8 border-[0.3px] border-black rounded-[3px] px-2 outline-none placeholder:text-placeholderText text-xs font-light"
/>
<div className="absolute cursor-pointer right-2">{iconPath}</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions design-system/ui/texts/IconText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const IconText = ({ size = 'medium', iconPath, children, className }: IconTextPr
};

return (
<button className={`${flexRowStart} ${sizeClasses[size]}`}>
<div className="w-ful h-full mr-2">{iconPath}</div>
<button className={`${flexRowStart}`}>
<div className={`w-ful h-full ${sizeClasses[size]}`}>{iconPath}</div>
<span className={`text-left whitespace-nowrap ${className}`}>{children}</span>
</button>
);
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"@tanstack/react-query": "^5.61.3",
"autoprefixer": "^10.4.20",
"date-fns": "^4.1.0",
"framer-motion": "^12.4.7",
"lodash": "^4.17.21",
"postcss": "^8.4.49",
"react": "^18.3.1",
Expand Down
4 changes: 4 additions & 0 deletions public/assets/dashboard/ticket/AddButton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/assets/dashboard/ticket/Ticket(horizon).svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 0 additions & 40 deletions public/assets/dashboard/ticket/ticketConfirmLayout.svg

This file was deleted.

6 changes: 6 additions & 0 deletions public/assets/main/Google.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading