git.iko.soy/bridge
on master help sign in
Buttons as grid items, instead of inside them
619d158Fang
src/views/Admin.js+20−19
compare with master
unifiedsplit
@@ -47,28 +47,29 @@ export default function Admin() {
47 return (
47 return (
48 <View>
48 <View>
49 <Grid className="pt2">
49 <Grid className="pt2">
50− <Grid.Item full>
50+ <Grid.Item
51+ full
51− <ForwardButton
52+ as={ForwardButton}
52− disabled={!canDownloadPassport}
53+ disabled={!canDownloadPassport}
53− onClick={goRedownload}
54+ onClick={goRedownload}
54− detail="Re-download your paper wallet">
55+ detail="Re-download your paper wallet">
55− Download Passport
56+ Download Passport
56− </ForwardButton>
57 </Grid.Item>
57 </Grid.Item>
58 <Grid.Divider />
58 <Grid.Divider />
59− <Grid.Item full>
59+ <Grid.Item
60+ full
60− <ForwardButton
61+ as={ForwardButton}
62+ disabled={!isOwner}
61− onClick={goReticket}
63+ onClick={goReticket}
62− detail="//TODO disable if not logged in as owner">
64+ detail="Move to brand new wallet, re-setting all permissions">
63− Reticket
65+ Reticket
64− </ForwardButton>
65 </Grid.Item>
66 </Grid.Item>
66− <Grid.Item full>
67+ <Grid.Item
68+ full
67− <ForwardButton
69+ as={ForwardButton}
68− onClick={goEditPerms}
70+ onClick={goEditPerms}
69− detail="Management, networking keys, etc.">
71+ detail="Management, networking keys, etc.">
70− Edit permissions
72+ Edit permissions
71− </ForwardButton>
72 </Grid.Item>
73 </Grid.Item>
73 </Grid>
74 </Grid>
74
75
src/views/Permissions.js+13−11
@@ -133,10 +133,12 @@ export default function Permissions() {
133 return (
133 return (
134 <View>
134 <View>
135 <Grid className="pt2">
135 <Grid className="pt2">
136− <Grid.Item full>
136+ <Grid.Item
137+ full
138+ as={ForwardButton}
139+ disabled="true"
137− <ForwardButton disabled="true" detail={pointDetails.owner}>
140+ detail={pointDetails.owner}>
138− Ownership address
141+ Ownership address
139− </ForwardButton>
140 </Grid.Item>
142 </Grid.Item>
141 {proxyAction(
143 {proxyAction(
142 'Management',
144 'Management',
@@ -145,13 +147,13 @@ export default function Permissions() {
145 )}
147 )}
146 {spawnProxyAction}
148 {spawnProxyAction}
147 {votingProxyAction}
149 {votingProxyAction}
148− <Grid.Item full>
150+ <Grid.Item
151+ full
149− <ForwardButton
152+ as={ForwardButton}
150− disabled={!canManage}
153+ disabled={!canManage}
151− onClick={goSetKeys}
154+ onClick={goSetKeys}
152− detail={netKeysText}>
155+ detail={netKeysText}>
153− Network keys
156+ Network keys
154− </ForwardButton>
155 </Grid.Item>
157 </Grid.Item>
156 </Grid>
158 </Grid>
157
159
src/views/Point.js+8−8
@@ -48,16 +48,16 @@ export default function Point() {
48 <View>
48 <View>
49 <Passport point={Maybe.Just(point)} />
49 <Passport point={Maybe.Just(point)} />
50 <Grid className="pt2">
50 <Grid className="pt2">
51− <Grid.Item full>
51+ <Grid.Item
52+ full
53+ as={ForwardButton}
52− <ForwardButton disabled={!hasInCache} onClick={goAdmin}>
54+ disabled={!hasInCache}
55+ onClick={goAdmin}>
53− Admin
56+ Admin
54− </ForwardButton>
55 </Grid.Item>
57 </Grid.Item>
56 <Grid.Divider />
58 <Grid.Divider />
57− <Grid.Item full>
58− <ForwardButton detail="Boot your computer" disabled>
59+ <Grid.Item full as={ForwardButton} detail="Boot your computer" disabled>
59− Boot Arvo
60+ Boot Arvo
60− </ForwardButton>
61 </Grid.Item>
61 </Grid.Item>
62 {showActions && (
62 {showActions && (
63 <Grid.Item full>
63 <Grid.Item full>