f6537ea · bridge · git.iko.soy

git.iko.soy/bridge

adjust views to match designs

commitf6537ea82516c1f7560aea8e77d23b58d8e3a851 authorLiam Fitzgerald <liam@urizen.co> dateThu 13 Feb 2020, 12:54 (7 years ago) parentbc74a1e

3 files changed+31−24

compare with master

unifiedsplit

src/components/NetworkingKeys.js−4 src/views/Point.js+2−17 src/views/UrbitOS/Home.js+29−3

src/components/NetworkingKeys.js−4

@@ -32,10 +32,6 @@ export default function NetworkingKeys({ point }) {

3232 // since NaN > 0 === false and that's a reasonable result

3333 });

3434

35− const renderTitle = () => {

36− return 'Networking';

37− };

38−

3935 const renderNetworkKeySection = (title, key) => (

4036 <>

4137 <Grid.Item full as={H5} className="mt3 gray4">

src/views/Point.js+2−17

@@ -10,8 +10,7 @@ import { useWallet } from 'store/wallet';

1010import View from 'components/View';

1111import Greeting from 'components/Greeting';

1212import Passport from 'components/Passport';

13−import { ForwardButton, BootUrbitOSButton } from 'components/Buttons';

14−import CopyButton from 'components/CopyButton';

13+import { ForwardButton } from 'components/Buttons';

1514import Blinky from 'components/Blinky';

1615import BarGraph from 'components/BarGraph';

1716import Chip from 'components/Chip';

@@ -22,7 +21,6 @@ import useInvites from 'lib/useInvites';

2221import { useSyncOwnedPoints } from 'lib/useSyncPoints';

2322import useCurrentPermissions from 'lib/useCurrentPermissions';

2423import { useLocalRouter } from 'lib/LocalRouter';

25−import useKeyfileGenerator from 'lib/useKeyfileGenerator';

2624

2725import Inviter from 'views/Invite/Inviter';

2826

@@ -33,8 +31,6 @@ export default function Point() {

3331 const { wallet } = useWallet();

3432 const point = need.point(pointCursor);

3533

36− const { code, notice } = useKeyfileGenerator();

37−

3834 const {

3935 isParent,

4036 isActiveOwner,

@@ -229,6 +225,7 @@ export default function Point() {

229225 onClick={goUrbitOS}>

230226 Urbit OS

231227 </Grid.Item>

228+ <Grid.Divider />

232229 <Grid.Item

233230 full

234231 as={ForwardButton}

@@ -251,18 +248,6 @@ export default function Point() {

251248 </>

252249 )}

253250 {senateButton}

254− <Grid.Item full as={BootUrbitOSButton} />

255− <Grid.Divider />

256− <Grid.Item

257− full

258− as={ForwardButton}

259− accessory={code && <CopyButton text={code} />}

260− detail={code || notice}

261− disabled={!code}

262− detailClassName="mono">

263− Login Code

264− </Grid.Item>

265− <Grid.Divider />

266251 </Grid>

267252 </View>

268253 );

src/views/UrbitOS/Home.js+29−3

@@ -1,14 +1,20 @@

11import React, { useCallback, useState } from 'react';

2−import { Grid, Button, SelectInput, Flex, H5, Text } from 'indigo-react';

2+import { Grid, Button, SelectInput } from 'indigo-react';

33import * as ob from 'urbit-ob';

55import { usePointCursor } from 'store/pointCursor';

66import { usePointCache } from 'store/pointCache';

88import useCurrentPointName from 'lib/useCurrentPointName';

9+import useKeyfileGenerator from 'lib/useKeyfileGenerator';

910import * as need from 'lib/need';

1011

11−import { OutButton, ForwardButton } from 'components/Buttons';

12+import {

13+ OutButton,

14+ ForwardButton,

15+ BootUrbitOSButton,

16+} from 'components/Buttons';

17+import CopyButton from 'components/CopyButton';

1218import NetworkingKeys from 'components/NetworkingKeys';

1319

1420import BridgeForm from 'form/BridgeForm';

@@ -25,6 +31,8 @@ export default function UrbitOSHome() {

2531

2632 const sponsor = ob.patp(details.sponsor);

2733

34+ const { code, notice } = useKeyfileGenerator();

35+

2836 const [showKeys, setShowKeys] = useState(false);

2937 const toggleShowKeys = useCallback(() => setShowKeys(!showKeys), [

3038 setShowKeys,

@@ -42,7 +50,14 @@ export default function UrbitOSHome() {

4250 ]);

4351 return (

4452 <>

45− <Hosting />

53+ <Grid>

54+ <Grid.Item full className="mv7">

55+ Urbit OS

56+ </Grid.Item>

57+ <Grid.Divider />

58+ <Grid.Item full as={BootUrbitOSButton} />

59+ </Grid>

60+

4661 <Grid>

4762 <Grid.Item full className="mv7 f5">

4863 Network

@@ -58,6 +73,16 @@ export default function UrbitOSHome() {

5873 <span className="f7 bg-black white p1 ml2 r4">SPONSOR</span>

5974 </Grid.Item>

6075 <Grid.Divider />

76+ <Grid.Item

77+ full

78+ as={ForwardButton}

79+ accessory={code && <CopyButton text={code} />}

80+ detail={code || notice}

81+ disabled={!code}

82+ detailClassName="mono">

83+ Login Code

84+ </Grid.Item>

85+ <Grid.Divider />

6186 <Grid.Item full as={ForwardButton} onClick={goNetworkingKeys}>

6287 Reset Networking Keys

6388 </Grid.Item>

@@ -75,6 +100,7 @@ export default function UrbitOSHome() {

75100 );

76101}

77102

103+// eslint-disable-next-line

78104function Hosting() {

79105 const name = useCurrentPointName();

80106 const options = [{ text: 'Tlon', value: 'tlon' }];