From 8bd56c8435ce7f1ce54aa2e410a48f63f2f92747 Mon Sep 17 00:00:00 2001 From: Mike Mathew Date: Sat, 1 Jul 2023 19:42:53 -0500 Subject: [PATCH 1/3] fix(dates): switch July 1st logic to August 1st, update in all the places --- .../register/MemberRegisterContent.tsx | 9 ++++++--- src/components/register/RegisterEmail.tsx | 4 ++-- src/components/register/RegisterStepper.tsx | 4 ++-- .../register/register-member-form-wrapper.tsx | 4 ++-- .../shared/RegistrationPausedAlert.tsx | 2 +- src/pages/members/join.js | 8 ++++---- src/pages/sponsors/sponsor-info.tsx | 4 ++-- src/utils/helpers.ts | 17 ++++++++++++----- 8 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/components/register/MemberRegisterContent.tsx b/src/components/register/MemberRegisterContent.tsx index d5e525de..e9a9fa73 100644 --- a/src/components/register/MemberRegisterContent.tsx +++ b/src/components/register/MemberRegisterContent.tsx @@ -4,7 +4,7 @@ import React, { useEffect, useReducer } from 'react'; import styled from 'styled-components'; // Internal Dependencies -import { isTodayAfterJune30th } from '../../utils/helpers'; +import { isTodayAfterJuly31st } from '../../utils/helpers'; import { useGetAuthUser } from '../../utils/hooks/useGetAuthUser'; import Container from '../shared/container'; import RegisterEmail from './RegisterEmail'; @@ -212,8 +212,11 @@ const MemberRegisterContent: React.FC = () => { const hasCompletedAllMemberSteps = completedMemberSteps.length >= 3; - // We normally shut down registration and sponsorship after TMEA each year and open it up on 7/1 - const showMembershipCompleteNote = isTodayAfterJune30th; + console.log('isTodayAfterJuly31st', isTodayAfterJuly31st); + + // We normally shut down registration and sponsorship after TMEA each year and open it up on 8/1. + // This might change, so we need to talk to the Executive Secretary for the most up-to-date info. + const showMembershipCompleteNote = isTodayAfterJuly31st; /* Children change depending on which step is active */ return ( diff --git a/src/components/register/RegisterEmail.tsx b/src/components/register/RegisterEmail.tsx index f28bb2a9..2386f131 100644 --- a/src/components/register/RegisterEmail.tsx +++ b/src/components/register/RegisterEmail.tsx @@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; // Internal Dependencies import { appNameShort } from '../../utils/app-constants'; -import { isTodayAfterJune30th } from '../../utils/helpers'; +import { isTodayAfterJuly31st } from '../../utils/helpers'; import { MemberFormValues } from './MemberRegisterContent'; import { SponsorFormValues } from './SponsorRegisterContent'; import FormDivider from '../shared/FormDivider'; @@ -84,7 +84,7 @@ const RegisterEmail: React.FC = ({ ]); // We normally shut down registration and sponsorship after TMEA each year and open it up on 7/1 - if (!isTodayAfterJune30th) { + if (!isTodayAfterJuly31st) { return ; } diff --git a/src/components/register/RegisterStepper.tsx b/src/components/register/RegisterStepper.tsx index 20e49c37..5e05fd40 100644 --- a/src/components/register/RegisterStepper.tsx +++ b/src/components/register/RegisterStepper.tsx @@ -8,7 +8,7 @@ import styled from 'styled-components'; // Internal Dependencies import { appNameShort } from '../../utils/app-constants'; -import { isTodayAfterJune30th } from '../../utils/helpers'; +import { isTodayAfterJuly31st } from '../../utils/helpers'; import DrumBanner from '../shared/DrumBanner'; import EnhancedCard from '../shared/EnhancedCard'; @@ -102,7 +102,7 @@ const RegisterStepper: React.FC = ({ const steps = getSteps(isAuthenticated, isViewingSponsors); // We normally shut down registration and sponsorship after TMEA each year and open it up on 7/1 - if (!isTodayAfterJune30th) { + if (!isTodayAfterJuly31st) { return ; } diff --git a/src/components/register/register-member-form-wrapper.tsx b/src/components/register/register-member-form-wrapper.tsx index 4cb144c7..4f18d679 100644 --- a/src/components/register/register-member-form-wrapper.tsx +++ b/src/components/register/register-member-form-wrapper.tsx @@ -7,7 +7,7 @@ import { MemberFormValues, } from './MemberRegisterContent'; import { appNameShort } from '../../utils/app-constants'; -import { isTodayAfterJune30th } from '../../utils/helpers'; +import { isTodayAfterJuly31st } from '../../utils/helpers'; import FormDivider from '../shared/FormDivider'; import FormTitle from '../shared/FormTitle'; import RegisterForm from './register-member-form'; @@ -31,7 +31,7 @@ const MemberFormValuesWrapper: React.FC = ({ } // We normally shut down registration and sponsorship after TMEA each year and open it up on 7/1 - const showMembershipForm = isTodayAfterJune30th; + const showMembershipForm = isTodayAfterJuly31st; if (!showMembershipForm) { return ; diff --git a/src/components/shared/RegistrationPausedAlert.tsx b/src/components/shared/RegistrationPausedAlert.tsx index d434a21e..9e99eda4 100644 --- a/src/components/shared/RegistrationPausedAlert.tsx +++ b/src/components/shared/RegistrationPausedAlert.tsx @@ -16,7 +16,7 @@ const RegistrationPausedAlert: React.FC = ({ isMembership = true }) => { return ( - {appNameShort} {type} will open up again on July 1st. + {appNameShort} {type} will open up again on August 1st. ); diff --git a/src/pages/members/join.js b/src/pages/members/join.js index 2a45767e..9749d4e3 100644 --- a/src/pages/members/join.js +++ b/src/pages/members/join.js @@ -7,7 +7,7 @@ import React from 'react'; import styled from 'styled-components'; // Internal Dependencies -import { isTodayAfterJune30th } from '../../utils/helpers'; +import { isTodayAfterJuly31st } from '../../utils/helpers'; import ArrowForwardIcon from '../../components/shared/ArrowForwardIcon'; import AuthUserContext from '../../components/session/AuthUserContext'; import CardHeadline from '../../components/shared/cards/card-headline'; @@ -56,11 +56,11 @@ const JoinContainer = ({ location }) => {
Join TMAC - {!isTodayAfterJune30th + {!isTodayAfterJuly31st ? ( - TMAC Membership will open up again on July 1st. + TMAC Membership will open up again on August 1st. ) : ( @@ -103,7 +103,7 @@ const JoinContainer = ({ location }) => { )}
- {isTodayAfterJune30th && ( + {isTodayAfterJuly31st && ( <>
({ // Component Definition const SponsorInfo: React.FC = ({ location }) => { // We normally shut down registration and sponsorship after TMEA each year and open it up on 7/1 - const showSponsorshipInfo = isTodayAfterJune30th; + const showSponsorshipInfo = isTodayAfterJuly31st; return ( Date: Sat, 1 Jul 2023 19:46:01 -0500 Subject: [PATCH 2/3] fix(login): adjust where and how we layout the Motifs --- src/components/about/History.tsx | 1 - src/pages/members/login.tsx | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/about/History.tsx b/src/components/about/History.tsx index 5f8910d1..a24fb556 100644 --- a/src/components/about/History.tsx +++ b/src/components/about/History.tsx @@ -9,7 +9,6 @@ import Motifs from '../shared/Motifs'; // Local Variables const StyledRoot = styled.section(({ theme }) => ({ - address: { '& > p': { fontWeight: 500, diff --git a/src/pages/members/login.tsx b/src/pages/members/login.tsx index 5373d4eb..8d0ad12a 100644 --- a/src/pages/members/login.tsx +++ b/src/pages/members/login.tsx @@ -43,6 +43,7 @@ const StyledRoot = styled.div(({ theme }) => ({ flexDirection: 'column', flexWrap: 'wrap', justifyContent: 'space-around', + overflow: 'hidden', position: 'relative', width: '100vw', })); @@ -66,11 +67,10 @@ const Login: React.FC = ({ location }) => { > - -
+ Date: Sat, 1 Jul 2023 19:48:18 -0500 Subject: [PATCH 3/3] chore: bump version to 2.26.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2e4fb4d6..3a1f9e5e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tmac-website", "description": "Website for the Texas Music Administrators Conference", - "version": "2.25.0", + "version": "2.26.0", "repository": { "type": "git", "url": "https://github.com/m2mathew/tmac-website"