aee35bb · bridge · git.iko.soy

git.iko.soy/bridge

refactor: rename SHIP/SHIPS to POINT/POINTS

commitaee35bb8b8786b38cbb74c61b9279cb0904ea90e authorMatt Condon (shrugs) <mattgcondon@gmail.com> dateWed 19 Jun 2019, 13:09 (7 years ago) parentc626d94

14 files changed+23−23

compare with master

unifiedsplit

src/Bridge.js+1−1 src/components/old/RenderedPoint.js+3−3 src/lib/routeNames.js+3−3 src/lib/router.js+6−6 src/views/Keystore.js+1−1 src/views/Landing.js+1−1 src/views/Ledger.js+1−1 src/views/Mnemonic.js+1−1 src/views/Points.js+1−1 src/views/PrivateKey.js+1−1 src/views/Shards.js+1−1 src/views/Ticket.js+1−1 src/views/Trezor.js+1−1 src/views/ViewPoint.js+1−1

src/Bridge.js+1−1

@@ -25,7 +25,7 @@ const kInitialRoutes = kIsStubbed

2525 { name: ROUTE_NAMES.LANDING },

2626 { name: ROUTE_NAMES.NETWORK },

2727 { name: ROUTE_NAMES.WALLET },

28− { name: ROUTE_NAMES.SHIPS },

28+ { name: ROUTE_NAMES.POINTS },

2929 ]

3030 : [{ name: ROUTE_NAMES.LANDING }];

3131

src/components/old/RenderedPoint.js+3−3

@@ -25,7 +25,7 @@ const RenderedPoint = props => {

2525 className="clickable"

2626 onClick={() => {

2727 setPointCursor(Maybe.Just(point));

28− routeHandler(ROUTE_NAMES.SHIP);

28+ routeHandler(ROUTE_NAMES.POINT);

2929 }}>

3030 {sigil}

3131 </div>

@@ -34,7 +34,7 @@ const RenderedPoint = props => {

3434 className="clickable"

3535 onClick={() => {

3636 setPointCursor(Maybe.Just(point));

37− routeHandler(ROUTE_NAMES.SHIP);

37+ routeHandler(ROUTE_NAMES.POINT);

3838 }}>

3939 <code>{name}</code>

4040 </div>

@@ -45,7 +45,7 @@ const RenderedPoint = props => {

4545 prop-size={'sm'}

4646 onClick={() => {

4747 setPointCursor(Maybe.Just(point));

48− routeHandler(ROUTE_NAMES.SHIP);

48+ routeHandler(ROUTE_NAMES.POINT);

4949 }}>

5050 {'Details →'}

5151 </Button>

src/lib/routeNames.js+3−3

@@ -18,9 +18,9 @@ export const ROUTE_NAMES = {

1818 TREZOR: Symbol('TREZOR'),

1919 PRIVATE_KEY: Symbol('PRIVATE_KEY'),

2020 KEYSTORE: Symbol('KEYSTORE'),

21− VIEW_SHIP: Symbol('VIEW_SHIP'),

22− SHIPS: Symbol('SHIPS'),

23− SHIP: Symbol('SHIP'),

21+ VIEW_POINT: Symbol('VIEW_POINT'),

22+ POINTS: Symbol('POINTS'),

23+ POINT: Symbol('POINT'),

2424 SET_MANAGEMENT_PROXY: Symbol('SET_MANAGEMENT_PROXY'),

2525 SET_SPAWN_PROXY: Symbol('SET_SPAWN_PROXY'),

2626 SET_TRANSFER_PROXY: Symbol('SET_TRANSFER_PROXY'),

src/lib/router.js+6−6

@@ -46,7 +46,7 @@ const ROUTES = {

4646 [ROUTE_NAMES.CANCEL_TRANSFER]: CancelTransfer,

4747 [ROUTE_NAMES.NETWORK]: Network,

4848 [ROUTE_NAMES.WALLET]: Wallet,

49− [ROUTE_NAMES.VIEW_SHIP]: ViewPoint,

49+ [ROUTE_NAMES.VIEW_POINT]: ViewPoint,

5050 [ROUTE_NAMES.MNEMONIC]: Mnemonic,

5151 [ROUTE_NAMES.TICKET]: Ticket,

5252 [ROUTE_NAMES.SHARDS]: Shards,

@@ -54,8 +54,8 @@ const ROUTES = {

5454 [ROUTE_NAMES.TREZOR]: Trezor,

5555 [ROUTE_NAMES.PRIVATE_KEY]: PrivateKey,

5656 [ROUTE_NAMES.KEYSTORE]: Keystore,

57− [ROUTE_NAMES.SHIPS]: Points,

58− [ROUTE_NAMES.SHIP]: Point,

57+ [ROUTE_NAMES.POINTS]: Points,

58+ [ROUTE_NAMES.POINT]: Point,

5959 [ROUTE_NAMES.SET_MANAGEMENT_PROXY]: SetManagementProxy,

6060 [ROUTE_NAMES.SET_SPAWN_PROXY]: SetSpawnProxy,

6161 [ROUTE_NAMES.SET_TRANSFER_PROXY]: SetTransferProxy,

@@ -107,11 +107,11 @@ export const getRouteBreadcrumb = ({

107107 return 'Private Key';

108108 case ROUTE_NAMES.KEYSTORE:

109109 return 'Keystore File';

110− case ROUTE_NAMES.SHIPS:

110+ case ROUTE_NAMES.POINTS:

111111 return 'Points';

112− case ROUTE_NAMES.VIEW_SHIP:

112+ case ROUTE_NAMES.VIEW_POINT:

113113 return 'View';

114− case ROUTE_NAMES.SHIP:

114+ case ROUTE_NAMES.POINT:

115115 return ob.patp(need.pointCursor(pointCursor));

116116 case ROUTE_NAMES.SET_TRANSFER_PROXY:

117117 case ROUTE_NAMES.SET_MANAGEMENT_PROXY:

src/views/Keystore.js+1−1

@@ -152,7 +152,7 @@ class Keystore extends React.Component {

152152 className={'mt-10'}

153153 prop-size={'wide lg'}

154154 disabled={Nothing.hasInstance(wallet)}

155− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

155+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

156156 {'Continue →'}

157157 </Button>

158158 </View>

src/views/Landing.js+1−1

@@ -34,7 +34,7 @@ function Landing(props) {

3434 here. You'll need either your Urbit ticket or a keypair.

3535 </P>

3636

37− <ForwardButton onClick={() => history.push(ROUTE_NAMES.VIEW_SHIP)}>

37+ <ForwardButton onClick={() => history.push(ROUTE_NAMES.VIEW_POINT)}>

3838 View a point

3939 </ForwardButton>

4040 <P>{'View an Azimuth point without signing into a wallet.'}</P>

src/views/Ledger.js+1−1

@@ -206,7 +206,7 @@ class Ledger extends React.Component {

206206 className={'mt-8'}

207207 prop-size={'wide lg'}

208208 disabled={Maybe.Nothing.hasInstance(wallet)}

209− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

209+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

210210 {'Continue →'}

211211 </Button>

212212 </View>

src/views/Mnemonic.js+1−1

@@ -66,7 +66,7 @@ export default function Mnemonic() {

6666

6767 <ForwardButton

6868 disabled={Nothing.hasInstance(wallet)}

69− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

69+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

7070 Continue

7171 </ForwardButton>

7272 </View>

src/views/Points.js+1−1

@@ -104,7 +104,7 @@ class Points extends React.Component {

104104 <Button

105105 prop-type={'link'}

106106 prop-size={'md'}

107− onClick={() => history.push(ROUTE_NAMES.VIEW_SHIP)}>

107+ onClick={() => history.push(ROUTE_NAMES.VIEW_POINT)}>

108108 {'View a point →'}

109109 </Button>

110110 <P>{'View a point on Azimuth.'}</P>

src/views/PrivateKey.js+1−1

@@ -70,7 +70,7 @@ class PrivateKey extends React.Component {

7070 className={'mt-10'}

7171 prop-size={'wide lg'}

7272 disabled={Maybe.Nothing.hasInstance(wallet)}

73− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

73+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

7474 {'Continue →'}

7575 </Button>

7676 </View>

src/views/Shards.js+1−1

@@ -198,7 +198,7 @@ class Shards extends React.Component {

198198 className={'mt-4'}

199199 prop-size={'xl wide'}

200200 disabled={Nothing.hasInstance(wallet)}

201− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

201+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

202202 {'Continue →'}

203203 </Button>

204204 </View>

src/views/Ticket.js+1−1

@@ -140,7 +140,7 @@ class Ticket extends React.Component {

140140 className={'mt-4'}

141141 prop-size={'xl wide'}

142142 disabled={Nothing.hasInstance(wallet)}

143− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

143+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

144144 {'Continue →'}

145145 </Button>

146146 </View>

src/views/Trezor.js+1−1

@@ -132,7 +132,7 @@ class Trezor extends React.Component {

132132 className={'mt-8'}

133133 prop-size={'wide lg'}

134134 disabled={Maybe.Nothing.hasInstance(wallet)}

135− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

135+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

136136 {'Continue →'}

137137 </Button>

138138 </View>

src/views/ViewPoint.js+1−1

@@ -52,7 +52,7 @@ export default function ViewPoint() {

5252 onClick={() => {

5353 setPointCursor(Maybe.Just(parseInt(ob.patp2dec(pointName), 10)));

5454 // ^ pointCursor expects native number type, not string

55− history.popAndPush(ROUTE_NAMES.SHIP);

55+ history.popAndPush(ROUTE_NAMES.POINT);

5656 }}

5757 solid>

5858 Continue