Skip to content

Commit 3ee59e9

Browse files
m2mathewm2mathew
authored
Merge pull request #144 from m2mathew/refactor/allow_signup_for_members_and_sponsors
Refactor/allow signup for members and sponsors
2 parents b81001c + 1bf7e57 commit 3ee59e9

File tree

3 files changed

+108
-109
lines changed

3 files changed

+108
-109
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tmac-website",
33
"description": "Website for the Texas Music Administrators Conference",
4-
"version": "2.15.1",
4+
"version": "2.16.0",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/m2mathew/tmac-website"

‎src/pages/members/join.js

+55-56
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import React from 'react';
77
import styled from 'styled-components';
88

99
// Internal Dependencies
10-
import { isTodayAfterJune30th } from '../../utils/helpers';
10+
// import { isTodayAfterJune30th } from '../../utils/helpers';
1111
import ArrowForwardIcon from '../../components/shared/ArrowForwardIcon';
1212
import AuthUserContext from '../../components/session/AuthUserContext';
1313
import CardHeadline from '../../components/shared/cards/card-headline';
@@ -58,71 +58,70 @@ const JoinContainer = ({ location }) => (
5858
<div className="topContent">
5959
<CardHeadline>Join TMAC</CardHeadline>
6060

61-
{!isTodayAfterJune30th
61+
{/* {!isTodayAfterJune30th
6262
? (
6363
<Box mt={3}>
6464
<EnhancedAlert title="Membership Notice">
6565
TMAC Membership will open up again on July 1st.
6666
</EnhancedAlert>
6767
</Box>
6868
) : (
69-
<>
70-
<FuturaDiv>
71-
To join TMAC please complete these three steps:
72-
</FuturaDiv>
73-
74-
<FuturaDiv>
75-
<span className="strong">
76-
1.
77-
{' '}
78-
</span>
79-
Sign up for a TMAC website login.
80-
</FuturaDiv>
81-
82-
<FuturaDiv>
83-
<span className="strong">
84-
2.
85-
{' '}
86-
</span>
87-
Complete the Membership Form.
88-
</FuturaDiv>
89-
90-
<FuturaDiv>
91-
<span className="strong">
92-
3.
93-
{' '}
94-
</span>
95-
Pay dues online using PayPal (or mail invoice with check via mail).
96-
</FuturaDiv>
97-
98-
<p>
99-
Note: Sponsors should complete the
100-
{' '}
101-
<Link to="/sponsors">Sponsor Form</Link>
102-
.
103-
</p>
104-
</>
105-
)}
69+
<> */}
70+
<FuturaDiv>
71+
To join TMAC please complete these three steps:
72+
</FuturaDiv>
73+
74+
<FuturaDiv>
75+
<span className="strong">
76+
1.
77+
{' '}
78+
</span>
79+
Sign up for a TMAC website login.
80+
</FuturaDiv>
81+
82+
<FuturaDiv>
83+
<span className="strong">
84+
2.
85+
{' '}
86+
</span>
87+
Complete the Membership Form.
88+
</FuturaDiv>
89+
90+
<FuturaDiv>
91+
<span className="strong">
92+
3.
93+
{' '}
94+
</span>
95+
Pay dues online using PayPal (or mail invoice with check via mail).
96+
</FuturaDiv>
97+
98+
<p>
99+
Note: Sponsors should complete the
100+
{' '}
101+
<Link to="/sponsors">Sponsor Form</Link>
102+
.
103+
</p>
104+
{/* </>
105+
)} */}
106+
</div>
106107

108+
{/* {isTodayAfterJune30th && (
109+
<> */}
110+
<div className="bottomContent">
111+
<CtaButton
112+
buttonColor="blue"
113+
to="/members/register"
114+
>
115+
Begin Membership
116+
<ArrowForwardIcon />
117+
</CtaButton>
107118
</div>
108119

109-
{isTodayAfterJune30th && (
110-
<>
111-
<div className="bottomContent">
112-
<CtaButton
113-
buttonColor="blue"
114-
to="/members/register"
115-
>
116-
Begin Membership
117-
<ArrowForwardIcon />
118-
</CtaButton>
119-
</div>
120-
121-
<div style={{ marginTop: '1.5rem' }}>
122-
* Membership is not complete until payment is received.
123-
</div>
124-
</>
125-
)}
120+
<div style={{ marginTop: '1.5rem' }}>
121+
* Membership is not complete until payment is received.
122+
</div>
123+
{/* </>
124+
)} */}
126125
</Container>
127126

128127
<MobileDivider>

‎src/pages/sponsors/sponsor-info.js

+52-52
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import React from 'react';
66
import styled from 'styled-components';
77

88
// Internal Dependencies
9-
import { isTodayAfterJune30th } from '../../utils/helpers';
9+
// import { isTodayAfterJune30th } from '../../utils/helpers';
1010
import ArrowForwardIcon from '../../components/shared/ArrowForwardIcon';
1111
import AuthUserContext from '../../components/session/AuthUserContext';
1212
import CardHeadline from '../../components/shared/cards/card-headline';
1313
import Container from '../../components/shared/container';
1414
import CtaButton from '../../components/masthead/cta-button';
15-
import EnhancedAlert from '../../components/shared/EnhancedAlert';
15+
// import EnhancedAlert from '../../components/shared/EnhancedAlert';
1616
import FuturaDiv from '../../components/shared/futura-div';
1717
import Layout from '../../components/layout';
1818
import presets from '../../utils/presets';
@@ -54,66 +54,66 @@ const SponsorInfo = ({
5454
>
5555
<CardHeadline>Sponsor TMAC</CardHeadline>
5656

57-
{!isTodayAfterJune30th
57+
{/* {!isTodayAfterJune30th
5858
? (
5959
<Box mt={3}>
6060
<EnhancedAlert title="Sponsorship Notice">
6161
TMAC Sponsorship will open up again on July 1st.
6262
</EnhancedAlert>
6363
</Box>
6464
) : (
65-
<>
66-
<FuturaDiv>
67-
To become a TMAC sponsor please complete these three steps:
68-
</FuturaDiv>
69-
70-
<FuturaDiv>
71-
<span className="strong">
72-
1.{' '}
73-
</span>
74-
Sign up for a TMAC website login.
75-
</FuturaDiv>
76-
77-
<FuturaDiv>
78-
<span className="strong">
79-
2.{' '}
80-
</span>
81-
Complete the Sponsorship Form.
82-
</FuturaDiv>
83-
84-
<FuturaDiv>
85-
<span className="strong">
86-
3.{' '}
87-
</span>
88-
To pay, mail invoice with check to the TMAC Treasurer.
89-
</FuturaDiv>
90-
</>
91-
)}
65+
<> */}
66+
<FuturaDiv>
67+
To become a TMAC sponsor please complete these three steps:
68+
</FuturaDiv>
69+
70+
<FuturaDiv>
71+
<span className="strong">
72+
1.{' '}
73+
</span>
74+
Sign up for a TMAC website login.
75+
</FuturaDiv>
76+
77+
<FuturaDiv>
78+
<span className="strong">
79+
2.{' '}
80+
</span>
81+
Complete the Sponsorship Form.
82+
</FuturaDiv>
83+
84+
<FuturaDiv>
85+
<span className="strong">
86+
3.{' '}
87+
</span>
88+
To pay, mail invoice with check to the TMAC Treasurer.
89+
</FuturaDiv>
90+
{/* </>
91+
)} */}
9292
</Box>
9393

94-
{isTodayAfterJune30th && (
95-
<>
96-
<Box
97-
display="flex"
98-
justifyContent="flex-end"
94+
{/* {isTodayAfterJune30th && (
95+
<> */}
96+
<Box
97+
display="flex"
98+
justifyContent="flex-end"
99+
>
100+
<CtaButton
101+
buttonColor="blue"
102+
to="/sponsors/register"
103+
state={{ level: location && location.state && location.state.level }}
99104
>
100-
<CtaButton
101-
buttonColor="blue"
102-
to="/sponsors/register"
103-
state={{ level: location && location.state && location.state.level }}
104-
>
105-
<span>
106-
Begin Sponsorship
107-
</span>
108-
<ArrowForwardIcon />
109-
</CtaButton>
110-
</Box>
111-
112-
<div style={{ marginTop: '1.5rem' }}>
113-
* Sponsorship is not complete until payment is received.
114-
</div>
115-
</>
116-
)}
105+
<span>
106+
Begin Sponsorship
107+
</span>
108+
<ArrowForwardIcon />
109+
</CtaButton>
110+
</Box>
111+
112+
<div style={{ marginTop: '1.5rem' }}>
113+
* Sponsorship is not complete until payment is received.
114+
</div>
115+
{/* </>
116+
)} */}
117117
</Container>
118118

119119
<MobileDivider />

0 commit comments

Comments
 (0)