Skip to content

Commit

Permalink
Merge pull request #43 from the-kingdoms/hotfix
Browse files Browse the repository at this point in the history
HOTFIX: 탈퇴 멤버 대응
  • Loading branch information
DeveloperRyou authored Jul 16, 2024
2 parents e678401 + 21a368b commit ab2e48f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
8 changes: 6 additions & 2 deletions components/list/ScheduleList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useState } from "react";
import styles from "./ScheduleList.module.css";

interface ScheduleListProps {
name: string;
name: string | null;
role: "MANAGER" | "STAFF" | "OWNER";
time: string;
onDelete?: () => void;
Expand Down Expand Up @@ -39,7 +39,11 @@ export default function ScheduleList({
>
<FlexBox direction="col" className="items-start gap-1 px-3 py-2.5">
<div className="B5-regular text-white">{time}</div>
<div className="B4-regular text-white">{name}</div>
{name === null ? (
<div className="B5-regular text-white">탈퇴한 유저입니다</div>
) : (
<div className="B4-regular text-white">{name}</div>
)}
</FlexBox>
</button>
<div className="ml-auto h-full bg-Gray6 rounded-r-xl w-12">
Expand Down
6 changes: 4 additions & 2 deletions components/profile/Profile.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FlexBox from "../../layout/FlexBox";

interface ProfileProps {
name: string;
name: string | null;
size: "S" | "M1" | "M2" | "L";
focus?: boolean;
}
Expand All @@ -27,7 +27,9 @@ export default function Profile({ name, size, focus = true }: ProfileProps) {
<FlexBox
className={`bg-gradient-to-b rounded-full ${focus ? colorStyle.focus : colorStyle.blur} ${style[size]} justify-center`}
>
<span className={`text-white ${textStyle[size]}`}>{name[0]}</span>
<span className={`text-white ${textStyle[size]}`}>
{name && name.length > 0 && name[0]}
</span>
</FlexBox>
);
}

0 comments on commit ab2e48f

Please sign in to comment.