Skip to content

Commit

Permalink
🚨 Fix(#319): 4μ°¨ QA 사항 반영
Browse files Browse the repository at this point in the history
🚨 Fix(#319): 4μ°¨ QA 사항 반영
  • Loading branch information
sscoderati authored Dec 3, 2023
2 parents 25315b5 + 3bde362 commit 07b5491
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/app/(user-menu)/mypage/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ const MyProfilePage = () => {
"flex h-30 w-718 items-center justify-center gap-15 text-2xl italic text-st-gray-250",
)}
>
{`"${bio}"` ?? "ν•œ 쀄 μ†Œκ°œλ₯Ό μž…λ ₯ν•΄μ£Όμ„Έμš”."}
{`"${bio ?? "ν•œ 쀄 μ†Œκ°œλ‘œ μžμ‹ μ„ ν‘œν˜„ν•΄λ³΄μ„Έμš”!"}"`}
<button onClick={() => setIsEditingBio(true)}>
<Icon
name="pencil"
Expand Down
2 changes: 1 addition & 1 deletion src/app/error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const Error = ({
) {
toast({
description:
"토큰이 λ§Œλ£Œλ˜κ±°λ‚˜ μœ νš¨ν•˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€. λ‹€μ‹œ λ‘œκ·ΈμΈν•΄μ£Όμ„Έμš”.",
"둜그인 정보가 λ§Œλ£Œλ˜κ±°λ‚˜ μœ νš¨ν•˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€. λ‹€μ‹œ λ‘œκ·ΈμΈν•΄μ£Όμ„Έμš”.",
variant: "red",
});
router.push("/logout");
Expand Down
16 changes: 7 additions & 9 deletions src/components/_common/Dropdown/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,16 @@ const Dropdown = ({ children, options }: DropdownProps) => {
</DropdownMenu.Trigger>
<DropdownMenu.Content onInteractOutside={() => setOpen(false)}>
{options.map((option, idx) => (
<DropdownMenu.Item
<Link
href={option.linkTo}
onClick={() => setOpen(false)}
key={idx}
className={"p-0 hover:bg-st-primary"}
>
<Link
href={option.linkTo}
onClick={() => setOpen(false)}
className="flex h-full w-full items-center justify-center"
>
<div className="p-10">{option.label}</div>
</Link>
</DropdownMenu.Item>
<DropdownMenu.Item className={"cursor-pointer hover:bg-st-primary"}>
{option.label}
</DropdownMenu.Item>
</Link>
))}
</DropdownMenu.Content>
</DropdownMenu.Root>
Expand Down
2 changes: 1 addition & 1 deletion src/components/_common/Input/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const Input = ({
className="h-60 w-full rounded-12 p-5 text-xl font-bold outline-none"
type="text"
defaultValue={initialValue}
placeholder="ν•œ 쀄 μ†Œκ°œλ‘œ μžμ‹ μ„ ν‘œν˜„ν•΄ μ£Όμ„Έμš”!"
placeholder="ν•œ 쀄 μ†Œκ°œλ‘œ μžμ‹ μ„ ν‘œν˜„ν•΄λ³΄μ„Έμš”!"
onChange={(event) => {
onValueChange?.(event.target.value);
}}
Expand Down
2 changes: 1 addition & 1 deletion src/components/_common/NotificationPopup/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const NotificationPopup = () => {
if (notificationsError) {
if (notificationsError.response?.data.code === "A002") {
toast({
description: "토큰이 μ‘΄μž¬ν•˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€. λ‹€μ‹œ λ‘œκ·ΈμΈν•΄μ£Όμ„Έμš”.",
description: "둜그인 정보가 μ‘΄μž¬ν•˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€. λ‹€μ‹œ λ‘œκ·ΈμΈν•΄μ£Όμ„Έμš”.",
variant: "red",
});
setIsAuth(false);
Expand Down
8 changes: 8 additions & 0 deletions src/components/_common/ProfileImageUpload/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import Button, { buttonSize } from "@/components/_common/Button";
import { MyProfileKey } from "@/constants/queryKeys";

const ProfileImageUpload = ({ userData }: { userData: MyProfileType }) => {
const [open, setOpen] = useState("item-hidden");
const [imageSrc, setImageSrc] = useState("");
const [imageFile, setImageFile] = useState<File>();
const { toast } = useToast();
Expand Down Expand Up @@ -64,6 +65,7 @@ const ProfileImageUpload = ({ userData }: { userData: MyProfileType }) => {
description: "ν”„λ‘œν•„ 이미지가 μˆ˜μ •λ˜μ—ˆμŠ΅λ‹ˆλ‹€.",
variant: "green",
});
setOpen("item-hidden");
});
setImageSrc("");
setImageFile(undefined);
Expand All @@ -76,6 +78,8 @@ const ProfileImageUpload = ({ userData }: { userData: MyProfileType }) => {
type="single"
collapsible
className="h-30"
value={open}
onValueChange={(value) => setOpen(value)}
>
<AccordionItem value="item-1">
<AccordionTrigger
Expand Down Expand Up @@ -141,6 +145,10 @@ const ProfileImageUpload = ({ userData }: { userData: MyProfileType }) => {
</div>
</AccordionContent>
</AccordionItem>
<AccordionItem
value={"item-hidden"}
className={"hidden"}
></AccordionItem>
</Accordion>
);
};
Expand Down

0 comments on commit 07b5491

Please sign in to comment.