fix(FE) resolve merge conflict

This commit is contained in:
randy-ar
2025-10-21 10:19:03 +07:00
31 changed files with 2742 additions and 33 deletions
+6 -2
View File
@@ -1,7 +1,5 @@
import react from 'react';
import Link from 'next/link';
import { cn } from '@/lib/helper';
import { Color } from '@/types/theme';
@@ -10,6 +8,8 @@ interface ButtonProps extends react.ComponentProps<'button'> {
color?: Color;
href?: string;
isLoading?: boolean;
target?: string;
rel?: string;
}
const Button = ({
@@ -22,6 +22,8 @@ const Button = ({
className,
disabled,
onClick,
target,
rel,
...props
}: ButtonProps) => {
const btnBaseClassName = cn(
@@ -68,6 +70,8 @@ const Button = ({
{href && (
<Link
href={disabled ? '#' : href}
target={target}
rel={rel}
aria-disabled={disabled}
className={cn(
btnBaseClassName,