Skip to content

Commit

Permalink
Merge pull request #187 from m2mathew/refactor/member_content_fee_owed
Browse files Browse the repository at this point in the history
Refactor/member content fee owed
  • Loading branch information
m2mathew authored Aug 9, 2023
2 parents 9f58158 + f8f5a34 commit 9d50cc8
Show file tree
Hide file tree
Showing 27 changed files with 1,415 additions and 891 deletions.
2 changes: 1 addition & 1 deletion package.json
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.30.3",
"version": "2.31.0",
"repository": {
"type": "git",
"url": "https://github.com/m2mathew/tmac-website"
Expand Down
6 changes: 2 additions & 4 deletions src/components/about/MembershipByLaws.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,8 @@ const MembershipByLaws: React.FC<Props> = ({
<dt>Section 2 &mdash; Annual dues</dt>

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

<dt>Section 3 &mdash; Rights of members</dt>
Expand Down
24 changes: 13 additions & 11 deletions src/components/events/EventsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import styled from 'styled-components';
import { appNameShort } from '../../utils/app-constants';
import Motifs from '../shared/Motifs';
import ViewDetailsButton from '../shared/ViewDetailsButton';
import { currentSchoolYearLong } from '../../utils/helpers';

// Local Variables
const StyledRoot = styled.section(({ theme }) => ({
Expand Down Expand Up @@ -65,7 +66,7 @@ const EventsList: FC = () => {
</Typography>

<div className="eventsList">
<section>
{/* <section>
<Typography
className="sectionTitle"
component="h3"
Expand Down Expand Up @@ -105,33 +106,34 @@ const EventsList: FC = () => {
</Link>
</li>
</ul>
</section>
</section> */}

<section>
<Typography
className="sectionTitle"
component="h3"
>
Fall Retreat
Fall Conference
</Typography>

<Box marginBottom={2}>
<ViewDetailsButton
context="event"
to="/events/fall-retreat/"
to="/events/fall-conference/"
/>
</Box>

<Typography paragraph>
The 2023 Fall Retreat will be Nov. 1-3 in Austin.
The 2023 Fall Conference will be held November 1-3 at the Austin Marriott South
</Typography>

<Typography paragraph>
The Fall Conference is open to all current {appNameShort} members who are in good standing{' '}
(paid membership dues for the {currentSchoolYearLong} school year).
</Typography>

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

Expand All @@ -140,7 +142,7 @@ const EventsList: FC = () => {
className="sectionTitle"
component="h3"
>
TMEA Round Table
TMEA Roundtable
</Typography>

<Box marginBottom={2}>
Expand Down
Loading

0 comments on commit 9d50cc8

Please sign in to comment.