on master help sign in
Merge pull request #309 from urbit/logout-text

Change eject symbol to "Log Out"

commit73bfaf9d1fe3819cc874963656a60f1b610b3497 authorAnthony Arroyo <anthony@tlon.io> dateThu 7 Nov 2019, 11:38 (7 years ago) parentea36a56ee83871
3 files changed+46−8
src/components/NavHeader.js+9 src/components/View.js+29−2 src/views/Points.js+8−6
src/components/NavHeader.jsnew file+9
@@ -0,0 +1,9 @@
1+import React from 'react';
2+import { createTeleporter } from 'react-teleporter';
3+
4+const NavHeaderTeleporter = createTeleporter();
5+
6+const NavHeader = NavHeaderTeleporter.Source;
7+NavHeader.Target = props => <NavHeaderTeleporter.Target as="div" {...props} />;
8+
9+export default NavHeader;
src/components/View.js+29−2
@@ -6,6 +6,7 @@ import Footer from './Footer';
66import useBreakpoints from 'lib/useBreakpoints';
77import MiniBackButton from './MiniBackButton';
88import { useHistory } from 'store/history';
9+import NavHeader from './NavHeader';
910
1011const EXPECT_LOGOUT_WHEN_POPPING_AT_DEPTH = 2;
1112
@@ -29,9 +30,32 @@ function View({
2930
3031 const goBack = useCallback(() => pop(), [pop]);
3132
33+ const goLogout = useCallback(() => pop(size - 1), [pop, size]);
34+
3235 const showBackButton = size > 1 && !!pop;
3336 const backIsLogout = size === EXPECT_LOGOUT_WHEN_POPPING_AT_DEPTH;
3437
38+ const Header = useCallback(
39+ ({ logout }) => {
40+ return showBackButton ? (
41+ <Flex.Item
42+ as={Flex}
43+ className={cn(insetPadding, 'flex-row-r justify-between pb5')}>
44+ <Flex.Item
45+ onClick={goLogout}
46+ as="a"
47+ className="f5 gray4 underline mr2 pointer">
48+ Logout
49+ </Flex.Item>
50+ <Flex.Item as={NavHeader.Target} />
51+ </Flex.Item>
52+ ) : (
53+ <Flex.Item className={insetPadding} as={NavHeader.Target} />
54+ );
55+ },
56+ [insetPadding, showBackButton]
57+ );
58+
3559 return (
3660 <Flex
3761 row={!isMobile}
@@ -51,7 +75,7 @@ function View({
5175 col
5276 style={{ width: '48px' }}
5377 className={cn(insetPadding)}>
54− {showBackButton && (
78+ {showBackButton && !backIsLogout && (
5579 <MiniBackButton
5680 hpadding={!isMobile}
5781 vpadding={isMobile}
@@ -62,7 +86,10 @@ function View({
6286 </Flex.Item>
6387
6488 <Flex.Item flex={1} as={Flex} col justify="between">
65− <Flex.Item className={cn('pb5', insetPadding)}>{children}</Flex.Item>
89+ <Flex.Item className="pb5 ">
90+ <Header logout={goBack} />
91+ {children}
92+ </Flex.Item>
6693 <Flex.Item as={Footer.Target} />
6794 </Flex.Item>
6895
src/views/Points.js+8−6
@@ -21,6 +21,7 @@ import Passport from 'components/Passport';
2121import Footer from 'components/Footer';
2222import { ForwardButton } from 'components/Buttons';
2323import CopiableAddress from 'components/CopiableAddress';
24+import NavHeader from 'components/NavHeader';
2425
2526const maybeGetResult = (obj, key, defaultValue) =>
2627 obj.matchWith({
@@ -227,13 +228,14 @@ export default function Points() {
227228
228229 return (
229230 <View pop={pop} inset>
231+ <NavHeader>
232+ <CopiableAddress
233+ text={address}
234+ className="f6 mono gray4 mb4 us-none pointer">
235+ {abbreviateAddress(address)}
236+ </CopiableAddress>
237+ </NavHeader>
230238 <Grid>
231− <Grid.Item full as={H1} className="f6 mono gray4 mb4 us-none pointer">
232− <CopiableAddress text={address}>
233− {abbreviateAddress(address)}
234− </CopiableAddress>
235− </Grid.Item>
236−
237239 {displayEmptyState && (
238240 <Grid.Item full as={HelpText} className="mt8 t-center">
239241 No points to display. This wallet is not the owner or proxy for any