Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[To delete]: New results dynamic link for testing #1097

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

[To delete]: New results dynamic link for testing #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1a3e5b2
Partial check in next steps
Maxim-Lam Apr 16, 2024
6987ece
Summary + next steps done
Maxim-Lam May 28, 2024
590d66e
Fixed Summary Estimates headers
Maxim-Lam Jun 25, 2024
67ae8cc
Remove unused files and refs, clean up, remove console logs, add images
Maxim-Lam Jul 5, 2024
bebd916
Merge branch 'develop' into new-results
Maxim-Lam Jul 5, 2024
f32c5a5
Remove unused files
Maxim-Lam Jul 5, 2024
4c0d8f0
minor
alex-solo Jul 10, 2024
059968b
Batch 1,2,3 changes
Maxim-Lam Sep 18, 2024
0f0a18c
ITAO fixes
Maxim-Lam Oct 8, 2024
5447c8b
Fix lint issues
Maxim-Lam Oct 8, 2024
ea628df
Merge branch 'develop' into new-results
Maxim-Lam Oct 9, 2024
0f29d59
merge new results into dynamic link branch
Maxim-Lam Oct 9, 2024
5f1c268
Checking in batch 2 & 3 revisions as well as 4 and ITAO changes
Maxim-Lam Dec 12, 2024
9c62b60
Merge branch 'develop' into new-results + added api translations
Maxim-Lam Dec 12, 2024
93b27ad
Api translation added
Maxim-Lam Dec 12, 2024
1792e0f
Merge branch 'new-results' into new-results-to-test
Maxim-Lam Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion components/Forms/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ interface ButtonProps {
style: 'primary' | 'secondary' | 'supertask' | 'danger' | 'link'
custom?: string
href?: string
imgHref?: string
text: string
type?: ButtonType
locale?: string
onClick?: React.MouseEventHandler<HTMLButtonElement>
disabled?: boolean
ariaLabel?: string
attributes?: any
alt?: string
}

type ButtonType = 'submit' | 'reset' | 'button'
Expand All @@ -32,13 +34,15 @@ export const Button: React.FC<ButtonProps> = ({
style,
custom = '',
href,
imgHref,
text,
type = 'button',
locale,
onClick,
disabled,
ariaLabel,
attributes,
alt = 'Image alt',
}) => {
const btnStyle = BUTTON_STYLES[style]

Expand All @@ -47,7 +51,7 @@ export const Button: React.FC<ButtonProps> = ({
return href ? (
<Link href={href} locale={locale}>
<a className={classes} aria-label={ariaLabel} {...attributes}>
{text}
{imgHref && <img src={imgHref} alt={alt} className="pr-3" />} {text}
</a>
</Link>
) : (
Expand All @@ -60,6 +64,7 @@ export const Button: React.FC<ButtonProps> = ({
aria-label={ariaLabel}
{...attributes}
>
{imgHref && <img src={imgHref} alt={alt} className="pr-3" />}
{text}
</button>
)
Expand Down
Loading
Loading