0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-02-24 22:05:56 -05:00

Merge pull request #1288 from logto-io/charles-log-3185-log-3186-guide-last-step-should-be-primary

fix(console): last button in guide should be primary
This commit is contained in:
Charles Zhao 2022-06-29 11:24:43 +08:00 committed by GitHub
commit 0cfe3873ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 1 deletions

View file

@ -271,6 +271,7 @@ Notes:
index={4} index={4}
activeIndex={props.activeStepIndex} activeIndex={props.activeStepIndex}
buttonText="admin_console.general.done" buttonText="admin_console.general.done"
buttonType="primary"
onButtonClick={props.onComplete} onButtonClick={props.onComplete}
> >

View file

@ -271,6 +271,7 @@ logtoClient.signOut(logtoException -> {
index={4} index={4}
activeIndex={props.activeStepIndex} activeIndex={props.activeStepIndex}
buttonText="admin_console.general.done" buttonText="admin_console.general.done"
buttonType="primary"
onButtonClick={props.onComplete} onButtonClick={props.onComplete}
> >

View file

@ -105,6 +105,7 @@ await client.signOut()
index={4} index={4}
activeIndex={props.activeStepIndex} activeIndex={props.activeStepIndex}
buttonText="admin_console.general.done" buttonText="admin_console.general.done"
buttonType="primary"
onButtonClick={props.onComplete} onButtonClick={props.onComplete}
> >

View file

@ -184,6 +184,7 @@ export default SignOutButton;
index={4} index={4}
activeIndex={props.activeStepIndex} activeIndex={props.activeStepIndex}
buttonText="admin_console.general.done" buttonText="admin_console.general.done"
buttonType="primary"
onButtonClick={props.onComplete} onButtonClick={props.onComplete}
> >

View file

@ -183,6 +183,8 @@ export default SignOutButton;
subtitle="3 steps" subtitle="3 steps"
index={4} index={4}
activeIndex={props.activeStepIndex} activeIndex={props.activeStepIndex}
buttonText="admin_console.general.done"
buttonType="primary"
onButtonClick={props.onComplete} onButtonClick={props.onComplete}
> >

View file

@ -179,6 +179,7 @@ const onClickSignOut = () => signOut('http://localhost:1234');
index={4} index={4}
activeIndex={props.activeStepIndex} activeIndex={props.activeStepIndex}
buttonText="admin_console.general.done" buttonText="admin_console.general.done"
buttonType="primary"
onButtonClick={props.onComplete} onButtonClick={props.onComplete}
> >

View file

@ -152,6 +152,8 @@ const { isAuthenticated } = useLogto();
subtitle="1 step" subtitle="1 step"
index={3} index={3}
activeIndex={props.activeStepIndex} activeIndex={props.activeStepIndex}
buttonText="admin_console.general.done"
buttonType="primary"
onButtonClick={() => props.onNext(4)} onButtonClick={() => props.onNext(4)}
> >

View file

@ -20,6 +20,7 @@ type Props = PropsWithChildren<{
activeIndex: number; activeIndex: number;
buttonText?: I18nKey; buttonText?: I18nKey;
buttonHtmlType?: 'submit' | 'button'; buttonHtmlType?: 'submit' | 'button';
buttonType?: 'primary' | 'outline';
isLoading?: boolean; isLoading?: boolean;
onButtonClick?: () => void; onButtonClick?: () => void;
}>; }>;
@ -32,6 +33,7 @@ const Step = ({
activeIndex, activeIndex,
buttonText = 'admin_console.general.next', buttonText = 'admin_console.general.next',
buttonHtmlType = 'button', buttonHtmlType = 'button',
buttonType = 'outline',
isLoading, isLoading,
onButtonClick, onButtonClick,
}: Props) => { }: Props) => {
@ -78,7 +80,7 @@ const Step = ({
{children} {children}
<div className={styles.buttonWrapper}> <div className={styles.buttonWrapper}>
<Button <Button
type="outline" type={buttonType}
size="large" size="large"
isLoading={isLoading} isLoading={isLoading}
htmlType={buttonHtmlType} htmlType={buttonHtmlType}

View file

@ -102,6 +102,7 @@ const Guide = ({ connector, onClose }: Props) => {
activeIndex={0} activeIndex={0}
buttonText="admin_console.connectors.save_and_done" buttonText="admin_console.connectors.save_and_done"
buttonHtmlType="submit" buttonHtmlType="submit"
buttonType="primary"
isLoading={isSubmitting} isLoading={isSubmitting}
> >
<Controller <Controller