Skip to content

Commit eee1c9c

Browse files
blackjackkentblackjackkent
authored
Merge pull request #157 from blackjackkent/development
Production Deployment v1.4.0
2 parents 967e43d + fd5268a commit eee1c9c

6 files changed

Lines changed: 258 additions & 10 deletions

File tree

‎src/display/shared/footer/Footer.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,16 @@ const Footer = (props) => {
2121
data-spec="footer-theme-toggle-button"
2222
>
2323
{useLightTheme ? 'dark theme' : 'light theme'}
24-
</button>
24+
</button>{' '}
25+
| Support the tracker on{' '}
26+
<a
27+
href="https://www.patreon.com/bePatron?u=4797959"
28+
rel="noopener noreferrer"
29+
target="_blank"
30+
>
31+
Patreon
32+
</a>
33+
!
2534
<span className="float-right">
2635
Powered by <a href="http://coreui.io">CoreUI</a>
2736
</span>

‎src/display/shared/footer/__tests__/__snapshots__/Footer.spec.js.snap‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@ exports[`rendering snapshots should render valid snapshot 1`] = `
2727
>
2828
light theme
2929
</button>
30+
31+
| Support the tracker on
32+
33+
<a
34+
href="https://www.patreon.com/bePatron?u=4797959"
35+
rel="noopener noreferrer"
36+
target="_blank"
37+
>
38+
Patreon
39+
</a>
40+
!
3041
<span
3142
className="float-right"
3243
>
@@ -67,6 +78,17 @@ exports[`rendering snapshots should render valid snapshot when light theme 1`] =
6778
>
6879
dark theme
6980
</button>
81+
82+
| Support the tracker on
83+
84+
<a
85+
href="https://www.patreon.com/bePatron?u=4797959"
86+
rel="noopener noreferrer"
87+
target="_blank"
88+
>
89+
Patreon
90+
</a>
91+
!
7092
<span
7193
className="float-right"
7294
>

‎src/display/views/help/components/AboutTrackerPane.js‎

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { TabPane, CardHeader, CardBody } from 'reactstrap';
2+
import { TabPane, CardHeader, CardBody, Col, Row } from 'reactstrap';
33
import Card from '../../../shared/styled/Card';
44

55
const AboutTrackerPane = () => (
@@ -22,8 +22,69 @@ const AboutTrackerPane = () => (
2222
</p>
2323
<p>
2424
RPThreadTracker is a product of{' '}
25-
<a href="http://www.blackjack-software.com">Blackjack Software</a>.
25+
<a href="http://www.twitter.com/blackjackkent">Blackjack Software</a>.
2626
</p>
27+
<hr />
28+
<p className="text-center">
29+
<strong>Many Thanks to Our Wonderful Patreon Supporters!</strong>
30+
</p>
31+
<p className="text-center">
32+
<em>
33+
Want to help keep RPThreadTracker running smoothly?
34+
<br />
35+
<a
36+
href="https://www.patreon.com/bePatron?u=4797959"
37+
rel="noopener noreferrer"
38+
target="_blank"
39+
>
40+
Become a patron today! <i className="fas fa-external-link-alt" />
41+
</a>
42+
</em>
43+
</p>
44+
<Row>
45+
<Col xs="6">
46+
<p>
47+
<strong>Kilobyte Tier ($5 a month)</strong>
48+
</p>
49+
<ul>
50+
<li>Abby Steinsieck</li>
51+
<li>Alex D</li>
52+
<li>Alex Stahl</li>
53+
<li>AvocaDon&quot;t</li>
54+
<li>Beth Halverson</li>
55+
<li>Cassandra Clark</li>
56+
<li>Emily Hunt</li>
57+
<li>Ezra Wilson</li>
58+
<li>Isabella R.</li>
59+
<li>LusidDreamer</li>
60+
<li>Maddie Douglas</li>
61+
<li>Maerkus</li>
62+
<li>Morgan Looney</li>
63+
<li>Rave</li>
64+
<li>Shelby Van Horn</li>
65+
<li>Sugar</li>
66+
<li>Tabitha Clancy</li>
67+
<li>The Colony Roleplay</li>
68+
<li>Windress</li>
69+
</ul>
70+
</Col>
71+
<Col xs="6">
72+
<p>
73+
<strong>Megabyte Tier ($10 a month)</strong>
74+
</p>
75+
<ul>
76+
<li>Carla Page</li>
77+
<li>Insolitus-Academy</li>
78+
<li>girl-next-door-writes</li>
79+
<li>Gravel Jessika</li>
80+
<li>Kenickie</li>
81+
<li>Lanie M</li>
82+
<li>Melissa Roule</li>
83+
<li>tabbyrp</li>
84+
<li>tyrantofthefirmament</li>
85+
</ul>
86+
</Col>
87+
</Row>
2788
</CardBody>
2889
</Card>
2990
</TabPane>

‎src/display/views/help/components/__tests__/__snapshots__/AboutTrackerPane.spec.js.snap‎

Lines changed: 157 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,168 @@ exports[`rendering snapshots should render valid snapshot 1`] = `
2828
RPThreadTracker is a product of
2929
3030
<a
31-
href="http://www.blackjack-software.com"
31+
href="http://www.twitter.com/blackjackkent"
3232
>
3333
Blackjack Software
3434
</a>
3535
.
3636
</p>
37+
<hr />
38+
<p
39+
className="text-center"
40+
>
41+
<strong>
42+
Many Thanks to Our Wonderful Patreon Supporters!
43+
</strong>
44+
</p>
45+
<p
46+
className="text-center"
47+
>
48+
<em>
49+
Want to help keep RPThreadTracker running smoothly?
50+
<br />
51+
<a
52+
href="https://www.patreon.com/bePatron?u=4797959"
53+
rel="noopener noreferrer"
54+
target="_blank"
55+
>
56+
Become a patron today!
57+
<i
58+
className="fas fa-external-link-alt"
59+
/>
60+
</a>
61+
</em>
62+
</p>
63+
<Row
64+
tag="div"
65+
>
66+
<Col
67+
tag="div"
68+
widths={
69+
Array [
70+
"xs",
71+
"sm",
72+
"md",
73+
"lg",
74+
"xl",
75+
]
76+
}
77+
xs="6"
78+
>
79+
<p>
80+
<strong>
81+
Kilobyte Tier ($5 a month)
82+
</strong>
83+
</p>
84+
<ul>
85+
<li>
86+
Abby Steinsieck
87+
</li>
88+
<li>
89+
Alex D
90+
</li>
91+
<li>
92+
Alex Stahl
93+
</li>
94+
<li>
95+
AvocaDon"t
96+
</li>
97+
<li>
98+
Beth Halverson
99+
</li>
100+
<li>
101+
Cassandra Clark
102+
</li>
103+
<li>
104+
Emily Hunt
105+
</li>
106+
<li>
107+
Ezra Wilson
108+
</li>
109+
<li>
110+
Isabella R.
111+
</li>
112+
<li>
113+
LusidDreamer
114+
</li>
115+
<li>
116+
Maddie Douglas
117+
</li>
118+
<li>
119+
Maerkus
120+
</li>
121+
<li>
122+
Morgan Looney
123+
</li>
124+
<li>
125+
Rave
126+
</li>
127+
<li>
128+
Shelby Van Horn
129+
</li>
130+
<li>
131+
Sugar
132+
</li>
133+
<li>
134+
Tabitha Clancy
135+
</li>
136+
<li>
137+
The Colony Roleplay
138+
</li>
139+
<li>
140+
Windress
141+
</li>
142+
</ul>
143+
</Col>
144+
<Col
145+
tag="div"
146+
widths={
147+
Array [
148+
"xs",
149+
"sm",
150+
"md",
151+
"lg",
152+
"xl",
153+
]
154+
}
155+
xs="6"
156+
>
157+
<p>
158+
<strong>
159+
Megabyte Tier ($10 a month)
160+
</strong>
161+
</p>
162+
<ul>
163+
<li>
164+
Carla Page
165+
</li>
166+
<li>
167+
Insolitus-Academy
168+
</li>
169+
<li>
170+
girl-next-door-writes
171+
</li>
172+
<li>
173+
Gravel Jessika
174+
</li>
175+
<li>
176+
Kenickie
177+
</li>
178+
<li>
179+
Lanie M
180+
</li>
181+
<li>
182+
Melissa Roule
183+
</li>
184+
<li>
185+
tabbyrp
186+
</li>
187+
<li>
188+
tyrantofthefirmament
189+
</li>
190+
</ul>
191+
</Col>
192+
</Row>
37193
</CardBody>
38194
</Styled(Card)>
39195
</TabPane>

‎src/display/views/threads/components/CheckboxTable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class CheckboxTable extends React.Component {
5858
let { selection } = this.state;
5959
const { data, onSelectionChanged } = this.props;
6060
// eslint-disable-next-line no-underscore-dangle
61-
const keyIndex = selection.findIndex((s) => s._id === key);
61+
const keyIndex = selection.findIndex((s) => `select-${s._id}` === key);
6262
if (keyIndex >= 0) {
6363
selection = [...selection.slice(0, keyIndex), ...selection.slice(keyIndex + 1)];
6464
} else {

‎src/display/views/threads/components/__tests__/CheckboxTable.spec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ describe('behavior', () => {
6161
});
6262
const jsx = <CheckboxTable {...props} />;
6363
const element = shallow(jsx);
64-
element.instance().toggleSelection(1, null, {
64+
element.instance().toggleSelection('select-1', null, {
6565
_id: 1,
6666
testProp: 'test1'
6767
});
68-
element.instance().toggleSelection(2, null, {
68+
element.instance().toggleSelection('select-2', null, {
6969
_id: 2,
7070
testProp: 'test2'
7171
});
@@ -88,15 +88,15 @@ describe('behavior', () => {
8888
});
8989
const jsx = <CheckboxTable {...props} />;
9090
const element = shallow(jsx);
91-
element.instance().toggleSelection(1, null, {
91+
element.instance().toggleSelection('select-1', null, {
9292
_id: 1,
9393
testProp: 'test1'
9494
});
95-
element.instance().toggleSelection(2, null, {
95+
element.instance().toggleSelection('select-2', null, {
9696
_id: 2,
9797
testProp: 'test2'
9898
});
99-
element.instance().toggleSelection(1, null, {
99+
element.instance().toggleSelection('select-1', null, {
100100
_id: 1,
101101
testProp: 'test1'
102102
});

0 commit comments

Comments
 (0)