diff --git a/client/src/components/button/component.tsx b/client/src/components/button/component.tsx index f6510551..38800070 100644 --- a/client/src/components/button/component.tsx +++ b/client/src/components/button/component.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; -import Link from 'next/link'; +import Link, { LinkProps } from 'next/link'; import { cn } from 'lib/utils'; @@ -8,7 +8,8 @@ import { THEME, SIZE } from './constants'; import type { ButtonProps, AnchorProps, Overload } from './types'; // Guard to check if href exists in props -const hasHref = (props: ButtonProps | AnchorProps): props is AnchorProps => 'href' in props; +const hasHref = (props: ButtonProps | AnchorProps | LinkProps): props is AnchorProps => + 'href' in props; function buildClassName({ className, disabled, size, theme }) { return cn({ diff --git a/client/src/components/forms/select/constants/theme.ts b/client/src/components/forms/select/constants/theme.ts index 6a1c8310..8977cf7d 100644 --- a/client/src/components/forms/select/constants/theme.ts +++ b/client/src/components/forms/select/constants/theme.ts @@ -18,7 +18,7 @@ const THEME = { light: { container: 'text-gray-600 text-sm', button: - 'relative w-full py-2 pl-3 pr-10 text-left transition duration-150 ease-in-out cursor-pointer sm:text-sm sm:leading-5 border border-grey-0 rounded-lg', + 'relative w-full py-2 pl-3 pr-10 text-left transition duration-150 ease-in-out cursor-pointer sm:text-sm sm:leading-5 border border-grey-40 rounded-lg', menu: 'bg-white', item: { base: 'text-sm', diff --git a/client/src/components/forms/textarea/component.tsx b/client/src/components/forms/textarea/component.tsx index d2f3a4f6..aca603f4 100644 --- a/client/src/components/forms/textarea/component.tsx +++ b/client/src/components/forms/textarea/component.tsx @@ -19,7 +19,7 @@ const THEME = { light: { base: 'leading-tight text-grey-0 bg-white border rounded placeholder:text-sm', status: { - none: 'border-gray-500', + none: 'border-grey-40', valid: 'border-green-500', error: 'border-red-500', disabled: 'border-grey-20 opacity-50', diff --git a/client/src/containers/my-projects/form/steps/contact-details/index.tsx b/client/src/containers/my-projects/form/steps/contact-details/index.tsx index 69ea945f..886cc9bf 100644 --- a/client/src/containers/my-projects/form/steps/contact-details/index.tsx +++ b/client/src/containers/my-projects/form/steps/contact-details/index.tsx @@ -83,6 +83,10 @@ export default function ContactDetailsStep() { theme="outline" href={`${pathname}?step=project-details`} className="flex items-center gap-2" + anchorLinkProps={{ + href: `${pathname}?step=project-details`, + replace: true, + }} > Project Details diff --git a/client/src/containers/my-projects/form/steps/project-details/index.tsx b/client/src/containers/my-projects/form/steps/project-details/index.tsx index bf2d27c4..8ec65568 100644 --- a/client/src/containers/my-projects/form/steps/project-details/index.tsx +++ b/client/src/containers/my-projects/form/steps/project-details/index.tsx @@ -217,8 +217,12 @@ export default function ProjectDetailsStep() {