Skip to content

Commit

Permalink
πŸ”§ chore: 잘λͺ» ν• λ‹Ήν•œ νƒ€μž… μˆ˜μ •
Browse files Browse the repository at this point in the history
  • Loading branch information
froggy1014 committed Aug 5, 2024
1 parent 1918739 commit 792d5df
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 36 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
active: boolean;
label: string;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/core/Button/IconButton/IconButton.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
active?: boolean;
icon: React.ReactNode;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/core/Button/KakaoButton/KakaoButton.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { KakaoIcon } from "@/components/icons";
import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
label?: string;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
active: boolean;
label: string;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
active: boolean;
label: string;
}
Expand Down
8 changes: 4 additions & 4 deletions src/components/core/Chip/BasicChip/BasicChip.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
active?: boolean;
label: string;
}

const ReviewChip: FC<Props> = ({ active = false, label, ...props }) => {
const BasicChip: FC<Props> = ({ active = false, label, ...props }) => {
return (
<button
type="button"
Expand All @@ -27,4 +27,4 @@ const ReviewChip: FC<Props> = ({ active = false, label, ...props }) => {
);
};

export default ReviewChip;
export default BasicChip;
4 changes: 2 additions & 2 deletions src/components/core/Chip/ReviewChip/ReviewChip.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
active?: boolean;
label: string;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

import { XIcon } from "../../../icons";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
label: string;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/core/List/BasicTile.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

// import { X_ICON } from "@/components/icons";
import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
active: boolean;
label: string;
}
Expand Down
7 changes: 3 additions & 4 deletions src/components/core/List/FestivalTile.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { Meta, StoryObj } from "@storybook/react";
import React from "react";

import { HeartIcon } from "@/components/icons";
import { ScrapIcon } from "@/components/icons";

import IconButton from "../Button/IconButton/IconButton";
import DateTag from "../Tag/DateTag/DateTag";
Expand Down Expand Up @@ -61,7 +60,7 @@ export const UnScrabedFestivalTile: Story = {
dday: "D-2",
},
icon: (
<IconButton active={false} icon={<HeartIcon width={24} height={24} />} />
<IconButton active={false} icon={<ScrapIcon width={24} height={24} />} />
),
},
};
Expand All @@ -81,7 +80,7 @@ export const ScrabedFestivalTile: Story = {
dday: "D-2",
},
icon: (
<IconButton active={true} icon={<HeartIcon width={24} height={24} />} />
<IconButton active={true} icon={<ScrapIcon width={24} height={24} />} />
),
},
};
4 changes: 2 additions & 2 deletions src/components/core/List/FestivalTile.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Image from "next/image";
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

Expand All @@ -12,7 +12,7 @@ interface Festival {
}

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
festival: Festival;
icon: React.ReactNode;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/core/List/ReviewTile.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Image from "next/image";
import { FC, HtmlHTMLAttributes } from "react";
import { FC, HTMLAttributes } from "react";

import Ratings from "@/components/rating/Ratings";
import { cn } from "@/utils/cn";
Expand All @@ -16,7 +16,7 @@ interface FestivalReview {
}

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLDivElement>, "children"> {
extends Omit<HTMLAttributes<HTMLDivElement>, "children"> {
festivalReview: FestivalReview;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/core/Tag/DateTag/DateTag.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { HtmlHTMLAttributes } from "react";
import React, { ButtonHTMLAttributes } from "react";
import { FC } from "react";

// import { X_ICON } from "@/components/icons";
import { cn } from "@/utils/cn";

export interface Props
extends Omit<
HtmlHTMLAttributes<HTMLButtonElement>,
ButtonHTMLAttributes<HTMLButtonElement>,
"children" | "className"
> {
className?: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
label: string;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/core/Tag/ReviewTag/ReviewTag.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

export interface Props
extends Omit<HtmlHTMLAttributes<HTMLButtonElement>, "children"> {
extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
label: string;
}

Expand Down
4 changes: 2 additions & 2 deletions src/layout/Mobile/MobileLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { FC, HtmlHTMLAttributes } from "react";
import { ButtonHTMLAttributes, FC } from "react";

import { cn } from "@/utils/cn";

interface Props extends HtmlHTMLAttributes<HTMLDivElement> {}
interface Props extends ButtonHTMLAttributes<HTMLDivElement> {}

const MobileLayout: FC<Props> = ({ ...props }) => {
return (
Expand Down

0 comments on commit 792d5df

Please sign in to comment.