Skip to content

Commit 9d50cc8

Browse files
authored
Merge pull request #187 from m2mathew/refactor/member_content_fee_owed
Refactor/member content fee owed
2 parents 9f58158 + f8f5a34 commit 9d50cc8

27 files changed

+1415
-891
lines changed

package.json

Lines changed: 1 addition & 1 deletion
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.30.3",
4+
"version": "2.31.0",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/m2mathew/tmac-website"

src/components/about/MembershipByLaws.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,8 @@ const MembershipByLaws: React.FC<Props> = ({
7575
<dt>Section 2 &mdash; Annual dues</dt>
7676

7777
<dd className="paddingMedium">
78-
{`A registration fee of $50 (Active Member) or $30 (Retired Member) per year shall
79-
entitle an individual to full membership in the ${appName}. A majority vote of the members present at a regular meeting of the full
80-
membership is required to change these amounts. Continued membership is contingent
81-
upon being up-to-date on annual membership registration fees.`}
78+
Membership and registration fees shall be set annually by the Board of Directors as part of the adopted budget.
79+
Continued membership is contingent upon being up-to-date on annual membership fees.
8280
</dd>
8381

8482
<dt>Section 3 &mdash; Rights of members</dt>

src/components/events/EventsList.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import styled from 'styled-components';
99
import { appNameShort } from '../../utils/app-constants';
1010
import Motifs from '../shared/Motifs';
1111
import ViewDetailsButton from '../shared/ViewDetailsButton';
12+
import { currentSchoolYearLong } from '../../utils/helpers';
1213

1314
// Local Variables
1415
const StyledRoot = styled.section(({ theme }) => ({
@@ -65,7 +66,7 @@ const EventsList: FC = () => {
6566
</Typography>
6667

6768
<div className="eventsList">
68-
<section>
69+
{/* <section>
6970
<Typography
7071
className="sectionTitle"
7172
component="h3"
@@ -105,33 +106,34 @@ const EventsList: FC = () => {
105106
</Link>
106107
</li>
107108
</ul>
108-
</section>
109+
</section> */}
109110

110111
<section>
111112
<Typography
112113
className="sectionTitle"
113114
component="h3"
114115
>
115-
Fall Retreat
116+
Fall Conference
116117
</Typography>
117118

118119
<Box marginBottom={2}>
119120
<ViewDetailsButton
120121
context="event"
121-
to="/events/fall-retreat/"
122+
to="/events/fall-conference/"
122123
/>
123124
</Box>
124125

125126
<Typography paragraph>
126-
The 2023 Fall Retreat will be Nov. 1-3 in Austin.
127+
The 2023 Fall Conference will be held November 1-3 at the Austin Marriott South
128+
</Typography>
129+
130+
<Typography paragraph>
131+
The Fall Conference is open to all current {appNameShort} members who are in good standing{' '}
132+
(paid membership dues for the {currentSchoolYearLong} school year).
127133
</Typography>
128134

129135
<Typography>
130-
The {appNameShort} Fall Retreat is open to all current {appNameShort}{' '}
131-
members who are in good standing
132-
(paid for membership this school year).
133-
<br />
134-
There is no separate conference registration process.
136+
Registration for the Fall Conference is $75, due by October 30, 2023.
135137
</Typography>
136138
</section>
137139

@@ -140,7 +142,7 @@ const EventsList: FC = () => {
140142
className="sectionTitle"
141143
component="h3"
142144
>
143-
TMEA Round Table
145+
TMEA Roundtable
144146
</Typography>
145147

146148
<Box marginBottom={2}>

0 commit comments

Comments
 (0)