fix console errors

- no "==" operator
- no javascript in href
- no "div" tags nested in "p"
- replace "value" prop with "checked" for Form.Checkbox component
master
Adrian Dmitra 9 months ago
parent ea236e895e
commit b10b81eac2
  1. 2
      webclient/src/Admin.js
  2. 40
      webclient/src/AdminMembers.js
  3. 4
      webclient/src/Classes.js
  4. 2
      webclient/src/Home.js
  5. 2
      webclient/src/Members.js
  6. 13
      webclient/src/Paymaster.js
  7. 4
      webclient/src/light.css

@ -171,7 +171,7 @@ export function AdminHistory(props) {
<React.Fragment key={x.id}> <React.Fragment key={x.id}>
<Table.Row> <Table.Row>
<Table.Cell> <Table.Cell>
<a href='javascript:;' onClick={() => setFocus(x.id)}> <a onClick={() => setFocus(x.id)}>
{moment.utc(x.history_date).tz('America/Edmonton').format('YYYY-MM-DD')} {moment.utc(x.history_date).tz('America/Edmonton').format('YYYY-MM-DD')}
</a> </a>
</Table.Cell> </Table.Cell>

@ -330,7 +330,7 @@ export function AdminMemberPause(props) {
<div> <div>
<Header size='medium'>Pause / Unpause Membership</Header> <Header size='medium'>Pause / Unpause Membership</Header>
<p> <div>
{result.member.paused_date ? {result.member.paused_date ?
result.member.vetted_date && moment().diff(moment(result.member.paused_date), 'days') > 370 ? result.member.vetted_date && moment().diff(moment(result.member.paused_date), 'days') > 370 ?
<> <>
@ -338,16 +338,16 @@ export function AdminMemberPause(props) {
{result.member.preferred_name} has been away for more than a year and will need to be re-vetted according to our {result.member.preferred_name} has been away for more than a year and will need to be re-vetted according to our
<a href='https://wiki.protospace.ca/Approved_policies/Membership' target='_blank' rel='noopener noreferrer'> policy</a>. <a href='https://wiki.protospace.ca/Approved_policies/Membership' target='_blank' rel='noopener noreferrer'> policy</a>.
</p> </p>
<p> <div>
<Form.Checkbox <Form.Checkbox
name='told1' name='told1'
value={told1} checked={told1}
label='Told member to get re-vetted' label='Told member to get re-vetted'
required required
onChange={(e, v) => setTold1(v.checked)} onChange={(e, v) => setTold1(v.checked)}
/> />
</p> </div>
<p> <div>
<Form.Checkbox <Form.Checkbox
name='told2' name='told2'
value={told2} value={told2}
@ -355,36 +355,36 @@ export function AdminMemberPause(props) {
required required
onChange={(e, v) => setTold2(v.checked)} onChange={(e, v) => setTold2(v.checked)}
/> />
</p> </div>
<Button onClick={handleUnpause} loading={loading} disabled={!told1 || !told2}> <Button onClick={handleUnpause} loading={loading} disabled={!told1 || !told2}>
Unpause Unpause
</Button> </Button>
</> </>
: :
result.member.status == 'Expired Member' ? result.member.status === 'Expired Member' ?
<> <>
<p> <p>
{result.member.preferred_name} has expired due to lapse of payment. {result.member.preferred_name} has expired due to lapse of payment.
</p> </p>
<p> <div>
<Form.Checkbox <Form.Checkbox
name='told1' name='told1'
value={told1} checked={told1}
label='Member has paid any back-dues owed' label='Member has paid any back-dues owed'
required required
onChange={(e, v) => setTold1(v.checked)} onChange={(e, v) => setTold1(v.checked)}
/> />
</p> </div>
<p> <div>
<Form.Checkbox <Form.Checkbox
name='told2' name='told2'
value={told2} checked={told2}
label='Recorded payment transaction on portal' label='Recorded payment transaction on portal'
required required
onChange={(e, v) => setTold2(v.checked)} onChange={(e, v) => setTold2(v.checked)}
/> />
</p> </div>
<Button onClick={handleUnpause} loading={loading} disabled={!told1 || !told2}> <Button onClick={handleUnpause} loading={loading} disabled={!told1 || !told2}>
Unpause Unpause
@ -398,31 +398,31 @@ export function AdminMemberPause(props) {
<> <>
<p>Pause members who are inactive, former, or on vacation.</p> <p>Pause members who are inactive, former, or on vacation.</p>
<p> <div>
<Form.Checkbox <Form.Checkbox
name='told1' name='told1'
value={told1} checked={told1}
label='Told member to stop any PayPal subscriptions' label='Told member to stop any PayPal subscriptions'
required required
onChange={(e, v) => setTold1(v.checked)} onChange={(e, v) => setTold1(v.checked)}
/> />
</p> </div>
<p> <div>
<Form.Checkbox <Form.Checkbox
name='told2' name='told2'
value={told2} checked={told2}
label='Told member to clear any shelves' label='Told member to clear any shelves'
required required
onChange={(e, v) => setTold2(v.checked)} onChange={(e, v) => setTold2(v.checked)}
/> />
</p> </div>
<Button onClick={handlePause} loading={loading} disabled={!told1 || !told2}> <Button onClick={handlePause} loading={loading} disabled={!told1 || !told2}>
Pause Pause
</Button> </Button>
</> </>
} }
</p> </div>
{success && <div>Success!</div>} {success && <div>Success!</div>}
{error && <p>Error, something went wrong.</p>} {error && <p>Error, something went wrong.</p>}

@ -354,7 +354,7 @@ export function Classes(props) {
</> </>
} }
<p> <div>
<Button <Button
onClick={() => { onClick={() => {
setSortByCourse(true); setSortByCourse(true);
@ -389,7 +389,7 @@ export function Classes(props) {
onClick={() => setSearch('')} onClick={() => setSearch('')}
/> />
} }
</p> </div>
<p>Filter by tag:</p> <p>Filter by tag:</p>

@ -63,7 +63,7 @@ function MemberInfo(props) {
<Table.Cell>Shelf:</Table.Cell> <Table.Cell>Shelf:</Table.Cell>
<Table.Cell> <Table.Cell>
{user.storage.length ? {user.storage.length ?
user.storage.sort((a, b) => a.location == 'member_shelves' ? -1 : 1).map((x, i) => user.storage.sort((a, b) => a.location === 'member_shelves' ? -1 : 1).map((x, i) =>
<StorageButton storage={x} /> <StorageButton storage={x} />
) )
: :

@ -201,7 +201,7 @@ export function Members(props) {
Sort by{' '} Sort by{' '}
{Object.entries(memberSorts).map((x, i) => {Object.entries(memberSorts).map((x, i) =>
<React.Fragment key={x[0]}> <React.Fragment key={x[0]}>
<a href='javascript:void(0)' onClick={() => doSort(x[0])}>{x[1]}</a> <a onClick={() => doSort(x[0])}>{x[1]}</a>
{i < Object.keys(memberSorts).length - 1 && ', '} {i < Object.keys(memberSorts).length - 1 && ', '}
</React.Fragment> </React.Fragment>
)}. )}.

@ -114,7 +114,6 @@ export function SendProtocoin(props) {
export function Paymaster(props) { export function Paymaster(props) {
const { token, user, refreshUser } = props; const { token, user, refreshUser } = props;
const [pop, setPop] = useState('20.00');
const [locker, setLocker] = useState('5.00'); const [locker, setLocker] = useState('5.00');
const [consumables, setConsumables] = useState(''); const [consumables, setConsumables] = useState('');
const [buyProtocoin, setBuyProtocoin] = useState('10.00'); const [buyProtocoin, setBuyProtocoin] = useState('10.00');
@ -214,14 +213,14 @@ export function Paymaster(props) {
/> />
</div> </div>
<p> <div>
Please explain what you bought:<br/> Please explain what you bought:<br/>
<Input <Input
value={consumablesMemo} value={consumablesMemo}
maxLength={50} maxLength={50}
onChange={(e, v) => setConsumablesMemo(v.value)} onChange={(e, v) => setConsumablesMemo(v.value)}
/> />
</p> </div>
<PayPalPayNow <PayPalPayNow
amount={consumables} amount={consumables}
@ -229,8 +228,6 @@ export function Paymaster(props) {
custom={JSON.stringify({ category: 'Consumables', member: user.member.id, memo: consumablesMemo })} custom={JSON.stringify({ category: 'Consumables', member: user.member.id, memo: consumablesMemo })}
/> />
<p/>
<PayWithProtocoin <PayWithProtocoin
token={token} user={user} refreshUser={refreshUser} token={token} user={user} refreshUser={refreshUser}
amount={consumables} amount={consumables}
@ -255,14 +252,14 @@ export function Paymaster(props) {
/> />
</div> </div>
<p> <div>
Optional memo:<br/> Optional memo:<br/>
<Input <Input
value={memo} value={memo}
maxLength={50} maxLength={50}
onChange={(e, v) => setMemo(v.value)} onChange={(e, v) => setMemo(v.value)}
/> />
</p> </div>
<PayPalPayNow <PayPalPayNow
amount={donate} amount={donate}
@ -308,4 +305,4 @@ export function Paymaster(props) {
</Grid> </Grid>
</Container> </Container>
); );
}; };

@ -17,6 +17,10 @@ body {
margin: 0; margin: 0;
} }
a {
cursor: pointer;
}
.hero { .hero {
padding-top: 1.5rem; padding-top: 1.5rem;
margin-bottom: 1.5rem; margin-bottom: 1.5rem;

Loading…
Cancel
Save