f6537ea · bridge · git.iko.soy

git.iko.soy/bridge

on master help sign in

adjust views to match designs

f6537eaLiam Fitzgerald7 years ago

src/components/NetworkingKeys.js−4

compare with master

unifiedsplit

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

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

33 });

35− const renderTitle = () => {

36− return 'Networking';

37− };

38−

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

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

40 <>

36 <>

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

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

src/views/Point.js+2−17

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

10import View from 'components/View';

11import Greeting from 'components/Greeting';

12import Passport from 'components/Passport';

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

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

14−import CopyButton from 'components/CopyButton';

15import Blinky from 'components/Blinky';

14import Blinky from 'components/Blinky';

16import BarGraph from 'components/BarGraph';

15import BarGraph from 'components/BarGraph';

17import Chip from 'components/Chip';

16import Chip from 'components/Chip';

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

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

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

23import useCurrentPermissions from 'lib/useCurrentPermissions';

22import useCurrentPermissions from 'lib/useCurrentPermissions';

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

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

25−import useKeyfileGenerator from 'lib/useKeyfileGenerator';

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

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

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

33 const { wallet } = useWallet();

31 const { wallet } = useWallet();

34 const point = need.point(pointCursor);

32 const point = need.point(pointCursor);

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

37−

38 const {

34 const {

39 isParent,

35 isParent,

40 isActiveOwner,

36 isActiveOwner,

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

229 onClick={goUrbitOS}>

225 onClick={goUrbitOS}>

230 Urbit OS

226 Urbit OS

231 </Grid.Item>

227 </Grid.Item>

228+ <Grid.Divider />

232 <Grid.Item

229 <Grid.Item

233 full

230 full

234 as={ForwardButton}

231 as={ForwardButton}

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

251 </>

248 </>

252 )}

249 )}

253 {senateButton}

250 {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 />

266 </Grid>

251 </Grid>

267 </View>

252 </View>

268 );

253 );

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

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

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

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

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

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

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

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

8import useCurrentPointName from 'lib/useCurrentPointName';

9+import useKeyfileGenerator from 'lib/useKeyfileGenerator';

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

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

12+import {

13+ OutButton,

14+ ForwardButton,

15+ BootUrbitOSButton,

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

16+} from 'components/Buttons';

17+import CopyButton from 'components/CopyButton';

12import NetworkingKeys from 'components/NetworkingKeys';

18import NetworkingKeys from 'components/NetworkingKeys';

14import BridgeForm from 'form/BridgeForm';

20import BridgeForm from 'form/BridgeForm';

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

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

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

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

35+

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

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

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

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

30 setShowKeys,

38 setShowKeys,

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

42 ]);

50 ]);

43 return (

51 return (

44 <>

52 <>

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+

46 <Grid>

61 <Grid>

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

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

48 Network

63 Network

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

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

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

59 </Grid.Item>

74 </Grid.Item>

60 <Grid.Divider />

75 <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 />

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

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

62 Reset Networking Keys

87 Reset Networking Keys

63 </Grid.Item>

88 </Grid.Item>

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

75 );

100 );

76}

101}

102

103+// eslint-disable-next-line

78function Hosting() {

104function Hosting() {

79 const name = useCurrentPointName();

105 const name = useCurrentPointName();

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

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