Skip to content

Commit

Permalink
Merge pull request #145 from m2mathew/dev
Browse files Browse the repository at this point in the history 
2.16.0
  • Loading branch information
@m2mathew
m2mathew authored Jan 10, 2023
2 parents 70699a9 + 3ee59e9 commit 1a2ecc1
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 109 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tmac-website",
"description": "Website for the Texas Music Administrators Conference",
"version": "2.15.1",
"version": "2.16.0",
"repository": {
"type": "git",
"url": "https://github.com/m2mathew/tmac-website"
Expand Down
111 changes: 55 additions & 56 deletions src/pages/members/join.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import React from 'react';
import styled from 'styled-components';

// Internal Dependencies
import { isTodayAfterJune30th } from '../../utils/helpers';
// import { isTodayAfterJune30th } from '../../utils/helpers';
import ArrowForwardIcon from '../../components/shared/ArrowForwardIcon';
import AuthUserContext from '../../components/session/AuthUserContext';
import CardHeadline from '../../components/shared/cards/card-headline';
Expand Down Expand Up @@ -58,71 +58,70 @@ const JoinContainer = ({ location }) => (
<div className="topContent">
<CardHeadline>Join TMAC</CardHeadline>

{!isTodayAfterJune30th
{/* {!isTodayAfterJune30th
? (
<Box mt={3}>
<EnhancedAlert title="Membership Notice">
TMAC Membership will open up again on July 1st.
</EnhancedAlert>
</Box>
) : (
<>
<FuturaDiv>
To join TMAC please complete these three steps:
</FuturaDiv>

<FuturaDiv>
<span className="strong">
1.
{' '}
</span>
Sign up for a TMAC website login.
</FuturaDiv>

<FuturaDiv>
<span className="strong">
2.
{' '}
</span>
Complete the Membership Form.
</FuturaDiv>

<FuturaDiv>
<span className="strong">
3.
{' '}
</span>
Pay dues online using PayPal (or mail invoice with check via mail).
</FuturaDiv>

<p>
Note: Sponsors should complete the
{' '}
<Link to="/sponsors">Sponsor Form</Link>
.
</p>
</>
)}
<> */}
<FuturaDiv>
To join TMAC please complete these three steps:
</FuturaDiv>

<FuturaDiv>
<span className="strong">
1.
{' '}
</span>
Sign up for a TMAC website login.
</FuturaDiv>

<FuturaDiv>
<span className="strong">
2.
{' '}
</span>
Complete the Membership Form.
</FuturaDiv>

<FuturaDiv>
<span className="strong">
3.
{' '}
</span>
Pay dues online using PayPal (or mail invoice with check via mail).
</FuturaDiv>

<p>
Note: Sponsors should complete the
{' '}
<Link to="/sponsors">Sponsor Form</Link>
.
</p>
{/* </>
)} */}
</div>

{/* {isTodayAfterJune30th && (
<> */}
<div className="bottomContent">
<CtaButton
buttonColor="blue"
to="/members/register"
>
Begin Membership
<ArrowForwardIcon />
</CtaButton>
</div>

{isTodayAfterJune30th && (
<>
<div className="bottomContent">
<CtaButton
buttonColor="blue"
to="/members/register"
>
Begin Membership
<ArrowForwardIcon />
</CtaButton>
</div>

<div style={{ marginTop: '1.5rem' }}>
* Membership is not complete until payment is received.
</div>
</>
)}
<div style={{ marginTop: '1.5rem' }}>
* Membership is not complete until payment is received.
</div>
{/* </>
)} */}
</Container>

<MobileDivider>
Expand Down
104 changes: 52 additions & 52 deletions src/pages/sponsors/sponsor-info.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import React from 'react';
import styled from 'styled-components';

// Internal Dependencies
import { isTodayAfterJune30th } from '../../utils/helpers';
// import { isTodayAfterJune30th } from '../../utils/helpers';
import ArrowForwardIcon from '../../components/shared/ArrowForwardIcon';
import AuthUserContext from '../../components/session/AuthUserContext';
import CardHeadline from '../../components/shared/cards/card-headline';
import Container from '../../components/shared/container';
import CtaButton from '../../components/masthead/cta-button';
import EnhancedAlert from '../../components/shared/EnhancedAlert';
// import EnhancedAlert from '../../components/shared/EnhancedAlert';
import FuturaDiv from '../../components/shared/futura-div';
import Layout from '../../components/layout';
import presets from '../../utils/presets';
Expand Down Expand Up @@ -54,66 +54,66 @@ const SponsorInfo = ({
>
<CardHeadline>Sponsor TMAC</CardHeadline>

{!isTodayAfterJune30th
{/* {!isTodayAfterJune30th
? (
<Box mt={3}>
<EnhancedAlert title="Sponsorship Notice">
TMAC Sponsorship will open up again on July 1st.
</EnhancedAlert>
</Box>
) : (
<>
<FuturaDiv>
To become a TMAC sponsor please complete these three steps:
</FuturaDiv>

<FuturaDiv>
<span className="strong">
1.{' '}
</span>
Sign up for a TMAC website login.
</FuturaDiv>

<FuturaDiv>
<span className="strong">
2.{' '}
</span>
Complete the Sponsorship Form.
</FuturaDiv>

<FuturaDiv>
<span className="strong">
3.{' '}
</span>
To pay, mail invoice with check to the TMAC Treasurer.
</FuturaDiv>
</>
)}
<> */}
<FuturaDiv>
To become a TMAC sponsor please complete these three steps:
</FuturaDiv>

<FuturaDiv>
<span className="strong">
1.{' '}
</span>
Sign up for a TMAC website login.
</FuturaDiv>

<FuturaDiv>
<span className="strong">
2.{' '}
</span>
Complete the Sponsorship Form.
</FuturaDiv>

<FuturaDiv>
<span className="strong">
3.{' '}
</span>
To pay, mail invoice with check to the TMAC Treasurer.
</FuturaDiv>
{/* </>
)} */}
</Box>

{isTodayAfterJune30th && (
<>
<Box
display="flex"
justifyContent="flex-end"
{/* {isTodayAfterJune30th && (
<> */}
<Box
display="flex"
justifyContent="flex-end"
>
<CtaButton
buttonColor="blue"
to="/sponsors/register"
state={{ level: location && location.state && location.state.level }}
>
<CtaButton
buttonColor="blue"
to="/sponsors/register"
state={{ level: location && location.state && location.state.level }}
>
<span>
Begin Sponsorship
</span>
<ArrowForwardIcon />
</CtaButton>
</Box>

<div style={{ marginTop: '1.5rem' }}>
* Sponsorship is not complete until payment is received.
</div>
</>
)}
<span>
Begin Sponsorship
</span>
<ArrowForwardIcon />
</CtaButton>
</Box>

<div style={{ marginTop: '1.5rem' }}>
* Sponsorship is not complete until payment is received.
</div>
{/* </>
)} */}
</Container>

<MobileDivider />
Expand Down

0 comments on commit 1a2ecc1

Please sign in to comment.