Skip to content

fix: 보낸 메일함 UI, 로직 변경 수정 #66

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

Merged
Yejiin21 merged 2 commits into from
Mar 10, 2025
Merged

fix: 보낸 메일함 UI, 로직 변경 수정 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d977262
refact: "발송될 이메일 내용"로 label명 수정
Yejiin21 Mar 10, 2025
14ca3bf
refact: 발송 예약 메일과 미발송 예약 메일로 UI 변경
Yejiin21 Mar 10, 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/ui/textFields/MultilineTextField.tsx
View file
Open in desktop
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 text-base lg:text-lg md:mb-2">{label}</label>
<label className="block px-1 font-semibold 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
4 changes: 2 additions & 2 deletions src/features/dashboard/ui/EmailInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ const EmailInput = ({ type = '이메일 예약 발송', openSelectTicket, allPar
</div>
{/* 이메일 내용 작성 부분 */}
<MultilineTextField
label="추가 발송될 이메일 내용"
label="발송될 이메일 내용"
className="h-80 md:mb-4"
placeholder="추가 발송될 이메일 본문 내용입니다."
placeholder="발송될 이메일 본문 내용입니다."
/>
</div>
);
Expand Down
11 changes: 6 additions & 5 deletions src/pages/dashboard/ui/mail/MailBoxPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import { mailInfo } from '../../../../shared/types/mailInfoType';
import EmailDeleteMoal from '../../../../widgets/dashboard/ui/EmailDeleteModal';

const MailBoxPage = () => {
const [listType, setListType] = useState<'all' | 'pending'>('all');
const [listType, setListType] = useState<'completed' | 'pending'>('completed');
const [isModalOpen, setIsModalOpen] = useState(false);
const currentDate = new Date();

const completedMails = mailInfo.filter(mail => new Date(mail.date) < currentDate);
const pendingMails = mailInfo.filter(mail => new Date(mail.date) > currentDate);

return (
Expand All @@ -22,17 +23,17 @@ const MailBoxPage = () => {
</div>
<div className="flex gap-3 font-semibold text-15">
<TextButton
label="모든 메일"
onClick={() => setListType('all')}
className={listType === 'all' ? 'text-main' : ''}
label="발송 예약 메일"
onClick={() => setListType('completed')}
className={listType === 'completed' ? 'text-main' : ''}
/>
<TextButton
label="미발송 예약 메일"
onClick={() => setListType('pending')}
className={listType === 'pending' ? 'text-main' : ''}
/>
</div>
{(listType === 'all' ? mailInfo : pendingMails).map(mail => (
{(listType === 'completed' ? completedMails : pendingMails).map(mail => (
<SentMailCard
key={mail.id}
mail={mail}
Expand Down
Loading
⚡