git.iko.soy/bridge
on master help sign in
fix design discrepancies
a0107e0Liam Fitzgerald
src/components/BarGraph.js+1−1
compare with master
unifiedsplit
@@ -11,7 +11,7 @@ const BarGraph = ({
11 const _available = available.getOrElse(1);
11 const _available = available.getOrElse(1);
12 const _sent = sent.getOrElse(0);
12 const _sent = sent.getOrElse(0);
13 const _accepted = accepted.getOrElse(0);
13 const _accepted = accepted.getOrElse(0);
14− const total = _available + _sent + _accepted;
14+ const total = _available + _sent;
15 return (
15 return (
16 <div className={cn('h7 p1 b1 b-black flex', className)}>
16 <div className={cn('h7 p1 b1 b-black flex', className)}>
17 <div
17 <div
src/components/InviteSigilList.js+2−2
@@ -27,7 +27,7 @@ const InviteSigilList = ({ className, pendingPoints, acceptedPoints }) => {
27 return (
27 return (
28 <>
28 <>
29 {points.map((point, idx) => (
29 {points.map((point, idx) => (
30− <div className={cn(klassName, 'h9 w9')}>
30+ <div key={idx} className={cn(klassName, 'h9 w9')}>
31 <MaybeSigil patp={point} size={50} colors={colors} />
31 <MaybeSigil patp={point} size={50} colors={colors} />
32 </div>
32 </div>
33 ))}
33 ))}
@@ -39,7 +39,7 @@ const InviteSigilList = ({ className, pendingPoints, acceptedPoints }) => {
39 <div className={cn('flex justify-between', className)}>
39 <div className={cn('flex justify-between', className)}>
40 {renderSigil(_acceptedPoints, ['#000000', '#FFFFFF'])}
40 {renderSigil(_acceptedPoints, ['#000000', '#FFFFFF'])}
41 {renderSigil(_pendingPoints, ['#ee892b', '#FFFFFF'])}
41 {renderSigil(_pendingPoints, ['#ee892b', '#FFFFFF'])}
42− {renderSigil(empty, [], 'b1 b-black')}
42+ {renderSigil(empty, [], 'b1 b-black b-dashed')}
43 </div>
43 </div>
44 );
44 );
45};
45};
src/views/Invite/Cohort.js+13−7
@@ -198,6 +198,7 @@ const useInviter = sendInvites => {
198 setTxStatus(STATUS.SUCCESS);
198 setTxStatus(STATUS.SUCCESS);
199 setInvites(confirmedInvites);
199 setInvites(confirmedInvites);
200 console.log(unsentInvites);
200 console.log(unsentInvites);
201+ console.log(confirmedInvites);
201
202
202 if (unsentInvites.length > 0) {
203 if (unsentInvites.length > 0) {
203 return { [FORM_ERROR]: unsentInvites };
204 return { [FORM_ERROR]: unsentInvites };
@@ -410,14 +411,19 @@ const InviteUrl = () => {
410 return (
411 return (
411 <Grid.Item full as={Grid}>
412 <Grid.Item full as={Grid}>
412 {invites.length > 0 && (
413 {invites.length > 0 && (
414+ <>
413− <Grid.Item full className="b-gray3 b1 mv4 p1 flex flex-center">
415+ <Grid.Item full className="b-gray3 b1 mv4 p1 flex flex-center">
414− <div className="flex1 ml1">{url}</div>
416+ <div className="flex1 ml1">{url}</div>
415− <Grid.Item
417+ <Grid.Item
416− className="pv3 ph4 bg-black white"
418+ className="pv3 ph4 bg-black white"
417− onClick={() => doCopy()}>
419+ onClick={() => doCopy()}>
418− {didCopy ? 'Copied' : 'Copy'}
420+ {didCopy ? 'Copied' : 'Copy'}
421+ </Grid.Item>
419 </Grid.Item>
422 </Grid.Item>
420− </Grid.Item>
423+ <Grid.Item full>
424+ Your invite link expires after consumption.
425+ </Grid.Item>
426+ </>
421 )}
427 )}
422 {invites.length === 0 && renderGenerateButton()}
428 {invites.length === 0 && renderGenerateButton()}
423 {needFunds && <Grid.Item full as={NeedFundsNotice} {...needFunds} />}
429 {needFunds && <Grid.Item full as={NeedFundsNotice} {...needFunds} />}
src/views/Party/ShowParty.js+2−2
@@ -113,7 +113,7 @@ export default function ShowParty() {
113 const _pendingInvites = _pendingPoints.length;
113 const _pendingInvites = _pendingPoints.length;
114 const _acceptedInvites = _acceptedPoints.length;
114 const _acceptedInvites = _acceptedPoints.length;
115 const _totalInvites = availableInvites
115 const _totalInvites = availableInvites
116− .map(a => sentInvites.getOrElse(0) + a + _acceptedInvites)
116+ .map(a => sentInvites.getOrElse(0) + a)
117 .getOrElse(0);
117 .getOrElse(0);
118
118
119 return (
119 return (
@@ -133,7 +133,7 @@ export default function ShowParty() {
133 <Grid.Item full>
133 <Grid.Item full>
134 <Flex align="center">
134 <Flex align="center">
135 <Flex.Item>
135 <Flex.Item>
136− {_acceptedInvites} / {_totalInvites}
136+ {_acceptedInvites + _pendingInvites} / {_totalInvites}
137 </Flex.Item>
137 </Flex.Item>
138 {_pendingInvites && (
138 {_pendingInvites && (
139 <Flex.Item as={Chip} color="yellow">
139 <Flex.Item as={Chip} color="yellow">
src/views/Point.js+10−3
@@ -1,4 +1,5 @@
1import React, { useCallback, useState } from 'react';
1import React, { useCallback, useState } from 'react';
2+import cn from 'classnames';
2import { Just } from 'folktale/maybe';
3import { Just } from 'folktale/maybe';
3import { Grid, Flex } from 'indigo-react';
4import { Grid, Flex } from 'indigo-react';
4import { azimuth } from 'azimuth-js';
5import { azimuth } from 'azimuth-js';
@@ -162,17 +163,23 @@ export default function Point() {
162 <br />
163 <br />
163 </Grid.Item>
164 </Grid.Item>
164
165
166+ <Grid.Item
167+ className={cn('t-right underline', {
168+ gray4: sentInvites.getOrElse(0) === 0,
169+ })}
165− <Grid.Item className="t-right" onClick={goParty} cols={[11, 13]}>
170+ onClick={goParty}
171+ cols={[11, 13]}>
166 View
172 View
167 </Grid.Item>
173 </Grid.Item>
168 <Grid.Item full>
174 <Grid.Item full>
169 <Flex align="center">
175 <Flex align="center">
170 <Flex.Item>
176 <Flex.Item>
171− {acceptedInvites.getOrElse(0)} / {_totalInvites}
177+ {acceptedInvites.getOrElse(0) + _pendingInvites} /{' '}
178+ {_totalInvites}
172 </Flex.Item>
179 </Flex.Item>
173 {_pendingInvites > 0 && (
180 {_pendingInvites > 0 && (
174 <Flex.Item as={Chip} color="yellow">
181 <Flex.Item as={Chip} color="yellow">
175− {_pendingInvites.getOrElse([]).length} pending
182+ {_pendingInvites} pending
176 </Flex.Item>
183 </Flex.Item>
177 )}
184 )}
178 </Flex>
185 </Flex>