Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
10 changes: 6 additions & 4 deletions src/app/challengerwelcome/challenger-welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import stepThree from '../../../public/static/images/pages/challenger-welcome/st
import stepFour from '../../../public/static/images/pages/challenger-welcome/step-4.png';
import logo from '../../../public/static/images/shared/8by8-logo.svg';
import styles from './styles.module.scss';
import { Button, type ButtonProps } from '../../components/utils/button/button';

export const ChallengerWelcome = isSignedOut(
wasNotInvited(function ChallengerWelcome() {
Expand Down Expand Up @@ -51,13 +52,14 @@ export const ChallengerWelcome = isSignedOut(
#8by8Challenge—register 8 friends to register to vote in 8 days!
</p>

<button
<Button
type="button"
className={styles.get_started_btn}
onClick={() => router.push('/signup')}
>
Get Started
</button>
</Button>


<p className={styles.signin_line}>
Already have an account? <Link href="/signin">Sign in</Link>
Expand Down Expand Up @@ -111,13 +113,13 @@ export const ChallengerWelcome = isSignedOut(
className={styles.image}
/>

<button
<Button
type="button"
className={styles.get_started_btn}
onClick={() => router.push('/signup')}
>
Get Started
</button>
</Button>

<p className={styles.signin_line}>
Already have an account?{' '}
Expand Down
1 change: 1 addition & 0 deletions src/app/share/share.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import socialMediaPostImage2 from '../../../public/static/images/pages/share/pos
import styles from './styles.module.scss';
import { createShareLink } from './create-share-link';


interface ShareProps {
hideShareButton?: boolean;
}
Expand Down
5 changes: 3 additions & 2 deletions src/app/signin/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { FormInvalidError } from '@/utils/client/form-invalid-error';
import { LoadingWheel } from '@/components/utils/loading-wheel';
import { isErrorWithMessage } from '@/utils/shared/is-error-with-message';
import styles from './styles.module.scss';
import { Button } from '../../components/utils/button/button';

export default isSignedOut(function SignIn() {
const signInForm = useForm(new SignInForm());
Expand Down Expand Up @@ -84,13 +85,13 @@ export default isSignedOut(function SignIn() {
<Turnstile field={signInForm.fields.captchaToken} />
</div>
<div className={styles.submit_btn_container}>
<button
<Button
type="submit"
className="btn_gradient btn_lg btn_wide"
disabled={isLoading}
>
Sign in
</button>
</Button>
</div>
</form>
<div className={styles.sign_up_link_container}>
Expand Down
6 changes: 4 additions & 2 deletions src/app/signup/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import { FormInvalidError } from '@/utils/client/form-invalid-error';
import { LoadingWheel } from '@/components/utils/loading-wheel';
import { isErrorWithMessage } from '@/utils/shared/is-error-with-message';
import styles from './styles.module.scss';
import { Button } from '../../components/utils/button/button';


export default isSignedOut(function SignUp() {
const signUpForm = useForm(new SignUpForm());
Expand Down Expand Up @@ -117,13 +119,13 @@ export default isSignedOut(function SignUp() {
</p>
</div>
<div className={styles.submit_btn_container}>
<button
<Button
type="submit"
className="btn_gradient btn_lg btn_wide"
disabled={isLoading}
>
Sign Up
</button>
</Button>
</div>
</form>
<div className={styles.sign_in_link_container}>
Expand Down
1 change: 1 addition & 0 deletions src/components/header/hamburger-menu/hamburger-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Greeting } from './greeting';
import { Links } from './links';
import styles from './styles.module.scss';


export function HamburgerMenu() {
const {
hamburgerMenuState,
Expand Down
1 change: 1 addition & 0 deletions src/components/progress/badges/player-badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ export function PlayerBadge({ badge, index }: PlayerBadgeProps): JSX.Element {
</div>
);
}

8 changes: 7 additions & 1 deletion src/components/utils/button/button.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
}
}

.button-wrapper {
padding: 4px;
}

@mixin -gradient-text {
:first-child {
background: $gradient-yellow-teal;
Expand All @@ -45,6 +49,8 @@
}
}



.gradient {
@include -base;
@include -outline;
Expand Down Expand Up @@ -73,4 +79,4 @@

.wide {
width: 100%;
}
}
2 changes: 1 addition & 1 deletion src/components/utils/button/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function Button({
}

return (
<button className={classNames.join(' ')} {...htmlButtonProps}>
<button className={`${styles['button-wrapper']} ${classNames.join(' ')}`} {...htmlButtonProps}>
<span>{children}</span>
</button>
);
Expand Down