2059fcc · bridge · git.iko.soy

git.iko.soy/bridge

Merge pull request #266 from urbit/mino-logout

Back button for logout

commit2059fcc83c47000a9344b00709808223b821907c authorFang <Fang-@users.noreply.github.com> dateTue 3 Sep 2019, 20:27 (7 years ago) parent3c61bb3 5a0f5bf

3 files changed+15−6

compare with master

unifiedsplit

src/components/Buttons.js+4−1 src/components/MiniBackButton.js+7−5 src/components/View.js+4

src/components/Buttons.js+4−1

@@ -25,7 +25,10 @@ export const OfflineButton = props => (

2525);

2626

2727export const BootArvoButton = props => (

28− <OutButton href="https://urbit.org/docs/getting-started" detail="Boot your computer" {...props}>

28+ <OutButton

29+ href="https://urbit.org/docs/getting-started"

30+ detail="Boot your computer"

31+ {...props}>

2932 Boot Arvo

3033 </OutButton>

3134);

src/components/MiniBackButton.js+7−5

@@ -4,8 +4,10 @@ import { IconButton } from 'indigo-react';

55import { ReactComponent as Back } from 'assets/back.svg';

7−export default ({ className, ...rest }) => (

8− <IconButton {...rest}>

9− <Back className={cn('black', className)} />

10− </IconButton>

11−);

7+export default ({ className, isExit = false, ...rest }) => {

8+ return (

9+ <IconButton {...rest}>

10+ {isExit ? '⏏' : <Back className={cn('black', className)} />}

11+ </IconButton>

12+ );

13+};

src/components/View.js+4

@@ -7,6 +7,8 @@ import useBreakpoints from 'lib/useBreakpoints';

77import MiniBackButton from './MiniBackButton';

88import { useHistory } from 'store/history';

10+const EXPECT_LOGOUT_WHEN_POPPING_AT_DEPTH = 2;

11+

1012// View is a top-level component that all Views must render to inherit styling

1113function View({

1214 className,

@@ -28,6 +30,7 @@ function View({

2830 const goBack = useCallback(() => pop(), [pop]);

2931

3032 const showBackButton = size > 1 && !!pop;

33+ const backIsLogout = size === EXPECT_LOGOUT_WHEN_POPPING_AT_DEPTH;

3134

3235 return (

3336 <Flex

@@ -52,6 +55,7 @@ function View({

5255 <MiniBackButton

5356 hpadding={!isMobile}

5457 vpadding={isMobile}

58+ isExit={backIsLogout}

5559 onClick={goBack}

5660 />

5761 )}