git.iko.soy/bridge
on master help sign in
move residents pagination controls to footer
c3f9b9fLiam Fitzgerald
src/views/Residents.js+27−23
compare with master
unifiedsplit
@@ -17,6 +17,7 @@ import * as need from 'lib/need';
17
17
18import { usePointCursor } from 'store/pointCursor';
18import { usePointCursor } from 'store/pointCursor';
19import { usePointCache } from 'store/pointCache';
19import { usePointCache } from 'store/pointCache';
20+import Footer from 'components/Footer';
20
21
21const NAMES = {
22const NAMES = {
22 REQUESTS: 'REQUESTS',
23 REQUESTS: 'REQUESTS',
@@ -78,28 +79,31 @@ function Tab({ className, points, onAccept, onDecline, page, setPage }) {
78 onDecline={onDecline}
79 onDecline={onDecline}
79 />
80 />
80 ))}
81 ))}
81−
82+ <Grid.Item as={Footer}>
83+ <Grid className="pb9">
82− {hasPrev && (
84+ {hasPrev && (
83− <Grid.Item
85+ <Grid.Item
84− className="pointer underline mt4"
86+ className="pointer underline mt4"
85− fourth={1}
87+ fourth={1}
86− onClick={onPrev}>
88+ onClick={onPrev}>
87− {'<-'} Previous
89+ {'<-'}
88− </Grid.Item>
90+ </Grid.Item>
89− )}
91+ )}
90− {maxPage !== 0 && (
92+ {maxPage > 0 && (
91− <Grid.Item className="mt6 ml7 t-center gray3" cols={[4, 10]}>
93+ <Grid.Item className="mt4 t-center gray3" cols={[4, 10]}>
92− <span className="black">Page {page + 1}</span> of {maxPage + 1}
94+ <span className="black">Page {page + 1}</span> of {maxPage + 1}
93− </Grid.Item>
95+ </Grid.Item>
94− )}
96+ )}
95− {hasNext && (
97+ {hasNext && (
96− <Grid.Item
98+ <Grid.Item
97− className="pointer underline t-right mt4"
99+ className="pointer underline t-right mt4"
98− fourth={4}
100+ fourth={4}
99− onClick={onNext}>
101+ onClick={onNext}>
100− Next {'->'}
102+ {'->'}
101− </Grid.Item>
103+ </Grid.Item>
102− )}
104+ )}
105+ </Grid>
106+ </Grid.Item>
103 </Grid>
107 </Grid>
104 );
108 );
105}
109}
@@ -122,7 +126,7 @@ function Resident({ point, onAccept, onDecline }) {
122 <Sigil patp={patp} size={25} colors={['#FFFFFF', '#000000']} />
126 <Sigil patp={patp} size={25} colors={['#FFFFFF', '#000000']} />
123 </div>
127 </div>
124 </Grid.Item>
128 </Grid.Item>
125− <Grid.Item className="flex-row align-center" cols={[3, 7]}>
129+ <Grid.Item className="flex-row align-center mono" cols={[3, 7]}>
126 {patp}{' '}
130 {patp}{' '}
127 </Grid.Item>
131 </Grid.Item>
128 {isRequest && (
132 {isRequest && (