Skip to content

Commit 0ddc40c

Browse files
blackjackkentblackjackkent
authored
Merge pull request #152 from blackjackkent/CodeCleanup
General code cleanup
2 parents 4561ee3 + 128534f commit 0ddc40c

26 files changed

Lines changed: 175 additions & 311 deletions

File tree

‎src/display/shared/aside/_styles.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import colors from '../../../infrastructure/constants/colors';
33

44
export default styled.aside`
55
color: ${colors.GRAY_100};
6-
background: ${colors.GRAY_900} a {
6+
background: ${colors.GRAY_900};
7+
a {
78
color: ${colors.LIGHT_BLUE};
89
}
910
hr {
@@ -16,7 +17,8 @@ export default styled.aside`
1617
}
1718
.light-theme & {
1819
color: ${colors.GRAY_800};
19-
background: ${colors.GRAY_050} a {
20+
background: ${colors.GRAY_050};
21+
a {
2022
color: ${colors.BASE_BLUE};
2123
}
2224
hr {

‎src/display/shared/breadcrumb/_styles.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,19 @@ import styled from 'styled-components';
22
import colors from '../../../infrastructure/constants/colors';
33

44
export default styled.div`
5+
background-color: ${colors.GRAY_900};
56
border-bottom: 1px solid ${colors.GRAY_600};
67
margin-bottom: 1.5rem;
7-
background-color: ${colors.GRAY_900};
8+
.breadcrumb {
9+
background-color: ${colors.GRAY_900};
10+
}
811
.light-theme & {
12+
.breadcrumb {
13+
background-color: ${colors.GRAY_100};
14+
.breadcrumb-item::before {
15+
color: ${colors.GRAY_900};
16+
}
17+
}
918
background-color: ${colors.GRAY_100};
1019
border-bottom: none;
1120
}

‎src/display/shared/header/components/HeaderLogoBlock.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const HeaderLogoBlock = (props) => {
2626
>
2727
☰
2828
</NavbarToggler>
29-
<Link href="/" className="navbar-brand" to="/">
29+
<Link href="/" className="d-none d-sm-inline-block navbar-brand" to="/">
3030
RPTHREADTRACKER
3131
</Link>
3232
<NavbarToggler

‎src/display/shared/header/components/__tests__/__snapshots__/HeaderLogoBlock.spec.js.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ exports[`rendering snapshots should render valid snapshot 1`] = `
1818
☰
1919
</NavbarToggler>
2020
<Link
21-
className="navbar-brand"
21+
className="d-none d-sm-inline-block navbar-brand"
2222
href="/"
2323
replace={false}
2424
to="/"

‎src/display/shared/modals/GenericConfirmationModal.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ const propTypes = {
1111
closeButtonText: PropTypes.string,
1212
headerText: PropTypes.string.isRequired,
1313
bodyText: PropTypes.node.isRequired,
14-
data: PropTypes.oneOfType([PropTypes.shape({}), PropTypes.array]).isRequired
14+
data: PropTypes.oneOfType([PropTypes.shape({}), PropTypes.array])
1515
};
1616

1717
const defaultProps = {
1818
submitButtonText: 'OK',
19-
closeButtonText: 'Cancel'
19+
closeButtonText: 'Cancel',
20+
data: null
2021
};
2122

2223
const GenericConfirmationModal = (props) => {

‎src/display/views/dashboard/_styles.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default styled.div`
4646
4747
.random-thread-generator-card,
4848
.patreon-card {
49-
height: 180px;
49+
height: 230px;
5050
}
5151
.random-thread-generator-card .card-body,
5252
.patreon-card .card-body {
@@ -70,6 +70,10 @@ export default styled.div`
7070
padding: 30px;
7171
}
7272
73+
.patreon-card a {
74+
margin-bottom: 20px;
75+
}
76+
7377
@media (min-width: 768px) {
7478
// above 768px
7579
.at-a-glance-card > .card-body .card {

‎src/display/views/dashboard/components/tracker-support/TrackerSupportCard.js‎

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

55
const TrackerSupportCard = () => (
@@ -8,36 +8,52 @@ const TrackerSupportCard = () => (
88
<i className="fas fa-dollar-sign" /> Support Tracker Development
99
</CardHeader>
1010
<CardBody className="card-body">
11-
<div className="form-container">
12-
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank">
13-
<input type="hidden" name="cmd" value="_s-xclick" />
14-
{
15-
// eslint-disable-next-line max-len
16-
}
17-
<input
18-
type="hidden"
19-
name="encrypted"
20-
value="-----BEGIN PKCS7-----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-----END PKCS7-----"
21-
/>
22-
<input
23-
type="image"
24-
src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"
25-
border="0"
26-
name="submit"
27-
alt="PayPal - The safer, easier way to pay online!"
28-
/>
29-
<img
30-
alt=""
31-
border="0"
32-
src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif"
33-
width="1"
34-
height="1"
35-
/>
36-
</form>
37-
</div>
38-
{/* <div className="patreon-button-wrapper">
39-
<a href="https://www.patreon.com/bePatron?u=4797959" className="btn btn-primary">Support me on Patreon!</a>
40-
</div> */}
11+
<p>RPThreadTracker is always free, but user support helps keep it running!</p>
12+
<Row>
13+
<Col xs="12" sm="6">
14+
<a
15+
className="btn btn-primary"
16+
href="https://www.patreon.com/bePatron?u=4797959"
17+
data-patreon-widget-type="become-patron-button"
18+
>
19+
Support the Tracker on Patreon!
20+
</a>
21+
<script async src="https://c6.patreon.com/becomePatronButton.bundle.js" />
22+
</Col>
23+
<Col xs="12" sm="6">
24+
<div className="form-container">
25+
<form
26+
action="https://www.paypal.com/cgi-bin/webscr"
27+
method="post"
28+
target="_blank"
29+
>
30+
<input type="hidden" name="cmd" value="_s-xclick" />
31+
{
32+
// eslint-disable-next-line max-len
33+
}
34+
<input
35+
type="hidden"
36+
name="encrypted"
37+
value="-----BEGIN PKCS7-----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-----END PKCS7-----"
38+
/>
39+
<input
40+
type="image"
41+
src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"
42+
border="0"
43+
name="submit"
44+
alt="PayPal - The safer, easier way to pay online!"
45+
/>
46+
<img
47+
alt=""
48+
border="0"
49+
src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif"
50+
width="1"
51+
height="1"
52+
/>
53+
</form>
54+
</div>
55+
</Col>
56+
</Row>
4157
</CardBody>
4258
</Card>
4359
);

‎src/display/views/dashboard/components/tracker-support/__tests__/__snapshots__/TrackerSupportCard.spec.js.snap‎

Lines changed: 79 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,88 @@ exports[`rendering snapshots should render valid snapshot 1`] = `
1616
className="card-body"
1717
tag="div"
1818
>
19-
<div
20-
className="form-container"
19+
<p>
20+
RPThreadTracker is always free, but user support helps keep it running!
21+
</p>
22+
<Row
23+
tag="div"
2124
>
22-
<form
23-
action="https://www.paypal.com/cgi-bin/webscr"
24-
method="post"
25-
target="_blank"
25+
<Col
26+
sm="6"
27+
tag="div"
28+
widths={
29+
Array [
30+
"xs",
31+
"sm",
32+
"md",
33+
"lg",
34+
"xl",
35+
]
36+
}
37+
xs="12"
2638
>
27-
<input
28-
name="cmd"
29-
type="hidden"
30-
value="_s-xclick"
39+
<a
40+
className="btn btn-primary"
41+
data-patreon-widget-type="become-patron-button"
42+
href="https://www.patreon.com/bePatron?u=4797959"
43+
>
44+
Support the Tracker on Patreon!
45+
</a>
46+
<script
47+
async={true}
48+
src="https://c6.patreon.com/becomePatronButton.bundle.js"
3149
/>
32-
<input
33-
name="encrypted"
34-
type="hidden"
35-
value="-----BEGIN PKCS7-----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-----END PKCS7-----"
36-
/>
37-
<input
38-
alt="PayPal - The safer, easier way to pay online!"
39-
border="0"
40-
name="submit"
41-
src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"
42-
type="image"
43-
/>
44-
<img
45-
alt=""
46-
border="0"
47-
height="1"
48-
src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif"
49-
width="1"
50-
/>
51-
</form>
52-
</div>
50+
</Col>
51+
<Col
52+
sm="6"
53+
tag="div"
54+
widths={
55+
Array [
56+
"xs",
57+
"sm",
58+
"md",
59+
"lg",
60+
"xl",
61+
]
62+
}
63+
xs="12"
64+
>
65+
<div
66+
className="form-container"
67+
>
68+
<form
69+
action="https://www.paypal.com/cgi-bin/webscr"
70+
method="post"
71+
target="_blank"
72+
>
73+
<input
74+
name="cmd"
75+
type="hidden"
76+
value="_s-xclick"
77+
/>
78+
<input
79+
name="encrypted"
80+
type="hidden"
81+
value="-----BEGIN PKCS7-----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-----END PKCS7-----"
82+
/>
83+
<input
84+
alt="PayPal - The safer, easier way to pay online!"
85+
border="0"
86+
name="submit"
87+
src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"
88+
type="image"
89+
/>
90+
<img
91+
alt=""
92+
border="0"
93+
height="1"
94+
src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif"
95+
width="1"
96+
/>
97+
</form>
98+
</div>
99+
</Col>
100+
</Row>
53101
</CardBody>
54102
</Styled(Card)>
55103
`;

‎src/display/views/help/Help.js‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ import PropTypes from 'prop-types';
44
import { connect } from 'react-redux';
55
import AboutTrackerPane from './components/AboutTrackerPane';
66
import SupportGuidesPane from './components/SupportGuidesPane';
7-
import ContactFormPane from './components/ContactFormPane';
8-
import * as actions from '../../../infrastructure/actions';
7+
import ContactPane from './components/ContactPane';
98
import tabs from '../../../infrastructure/constants/tabs';
109
import TabContent from '../../shared/styled/TabContent';
1110
import StaticTabNav from '../../shared/static/StaticTabNav';
1211
import StaticDropdownNav from '../../shared/static/StaticDropdownNav';
1312
import FAQPane from './components/FAQPane';
1413

1514
const propTypes = {
16-
submitContactForm: PropTypes.func.isRequired,
1715
match: PropTypes.shape({
1816
url: PropTypes.string,
1917
params: PropTypes.shape({
@@ -27,7 +25,7 @@ function mapStateToProps() {
2725
}
2826

2927
const Help = (props) => {
30-
const { submitContactForm, match } = props;
28+
const { match } = props;
3129
const options = Object.values(tabs.HELP);
3230
return (
3331
<div className="animated fadeIn static-container help-container">
@@ -49,7 +47,7 @@ const Help = (props) => {
4947
<AboutTrackerPane />
5048
<SupportGuidesPane />
5149
<FAQPane />
52-
<ContactFormPane submitContactForm={submitContactForm} />
50+
<ContactPane />
5351
</TabContent>
5452
</Col>
5553
</Row>
@@ -58,6 +56,4 @@ const Help = (props) => {
5856
};
5957

6058
Help.propTypes = propTypes;
61-
export default connect(mapStateToProps, {
62-
submitContactForm: actions.submitContactForm
63-
})(Help);
59+
export default connect(mapStateToProps)(Help);

0 commit comments

Comments
 (0)