Merge pull request #99 from m2mathew/dev

m2mathew · web-flow · commit e676bc76ab55 · 2022-08-30T18:40:30.000-05:00
2.10.0
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tmac-website",
   "description": "Website for the Texas Music Administrators Conference",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/m2mathew/tmac-website"
diff --git a/src/components/shared/sponsor-card/index.js b/src/components/shared/sponsor-card/index.js
@@ -274,16 +274,16 @@ const SponsorCard = ({
               <ul className={classes.list}>
                 <li>
                   The cost of lunch at the <span className={classes.strongText}>Fall Retreat</span>{' '}
-                  {/* {sponsorshipSecuredChip} */}
+                  {sponsorshipSecuredChip}
 
                 </li>
                 <li>
                   The cost of lunch at the <span className={classes.strongText}>TMEA TMAC Roundtable</span>{' '}
-                  {/* {sponsorshipSecuredChip} */}
+                  {sponsorshipSecuredChip}
                 </li>
                 <li>
                   The cost of a reception at the <span className={classes.strongText}>Fall Retreat</span>{' '}
-                  {/* {sponsorshipSecuredChip} */}
+                  {sponsorshipSecuredChip}
                 </li>
               </ul>
             </CardContent>
diff --git a/src/pages/about/MembershipByLaws.tsx b/src/pages/about/MembershipByLaws.tsx
@@ -26,12 +26,14 @@ const MembershipByLaws: React.FC<Props> = ({ showLinkToByLaws = false }) => {
   return (
     <>
       <CardHeadline>ARTICLE II &mdash; MEMBERSHIP</CardHeadline>
+
       {showLinkToByLaws && (
         <FuturaDiv>
           (from the Texas Music Administrators Conference&apos;s{' '}
           <Link to="/about/constitution">Constitution and Bylaws</Link>)
         </FuturaDiv>
       )}
+
       <section>
         <dl className={classes.paddingMedium}>
           <dt>Section 1 &mdash; Membership</dt>
diff --git a/src/pages/about/constitution.js b/src/pages/about/constitution.js
@@ -61,7 +61,7 @@ const Constitution = ({ location }) => {
           <Box mb={3}>
             <FuturaAnchor
               download
-              href="https://res.cloudinary.com/tmac/image/upload/v1650322843/TMAC_Bylaws_-_Updated_11-18-21.pdf"
+              href="https://res.cloudinary.com/tmac/image/upload/v1661895580/TMAC_Bylaws_-_Updated_7-22-22.pdf"
               rel="noreferrer noopener"
               target="_blank"
             >
@@ -188,7 +188,7 @@ const Constitution = ({ location }) => {
               <dt>Section 2 &mdash; Terms</dt>
               <dd className={classes.paddingMedium}>
                 {`All elected Directors shall serve a one-year term in each officer position in the
-                following sequence: Secretary, Vice-President, President and Past President.`}
+                following sequence: Secretary, Vice-President, President and Past President. Terms begin and end the day after the TMEA convention.`}
               </dd>
               <dt>Section 3 &mdash; Meetings</dt>
               <dd className={classes.paddingMedium}>
@@ -419,12 +419,13 @@ officio, non-voting member of the Board of Directors. The Executive Secretary’
 
           <section>
             <em>
-              These Bylaws were originally approved at a meeting of the Texas Music
-              Administrators Conference membership on February 15, 2008. These Bylaws were
-              amended on November 21, 2013; February 12, 2014; July 26, 2019; September 16,
-              2019; November 19, 2020; July 23, 2021; and November 18, 2021.
+              These Bylaws were originally approved at a meeting of the Texas Music Administrators
+              Conference membership on February 15, 2008. These Bylaws were amended on November 21,
+              2013; February 12, 2014; July 26, 2019; September 16, 2019;
+              November 19, 2020; July 23, 2021; November 18, 2021; and July 22, 2022.
             </em>
           </section>
+
           {/* Mobile sidebar */}
           <div
             css={{
diff --git a/src/pages/events/fall-retreat.js b/src/pages/events/fall-retreat.js
@@ -1,10 +1,10 @@
 // External Dependencies
 import {
   Box,
-  // Button,
+  Button,
 } from '@material-ui/core';
 import { Helmet } from 'react-helmet';
-// import OpenInNewIcon from '@material-ui/icons/OpenInNew';
+import OpenInNewIcon from '@material-ui/icons/OpenInNew';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@material-ui/core/styles';
 import { Link } from 'gatsby';
@@ -29,7 +29,7 @@ const useStyles = makeStyles((theme) => ({
     backgroundColor: theme.palette.events.hotelCta,
     color: theme.palette.getContrastText(theme.palette.events.hotelCta),
     fontWeight: 600,
-    marginBottom: theme.spacing(2),
+    margin: theme.spacing(2, 0, 1),
   },
   openInNewIcon: {
     fontSize: '1em',
@@ -51,6 +51,22 @@ const FallRetreat = ({ location }) => {
 
   const fallRetreat = edges.find((e) => e.node.titleOfEvent.includes('Fall Retreat')).node;
 
+  const hotelReservationButton = (
+    <Button
+      className="hotel-link"
+      classes={{ root: classes.hotelButton }}
+      color="primary"
+      href="https://www.marriott.com/event-reservations/reservation-link.mi?id=1661882188530&key=GRP&app=resvlink"
+      rel="noopener noreferrer"
+      size="large"
+      target="_blank"
+      variant="contained"
+    >
+      For Hotel reservations click here
+      <OpenInNewIcon className={classes.openInNewIcon} />
+    </Button>
+  );
+
   return (
     <Layout location={location}>
       <Helmet>
@@ -60,6 +76,8 @@ const FallRetreat = ({ location }) => {
       <Container>
         <h1>{fallRetreat.titleOfEvent}</h1>
 
+        {hotelReservationButton}
+
         <section>
           {/* <EnhancedAlert severity="info">
             Schedule available mid Fall 2022
@@ -99,19 +117,6 @@ const FallRetreat = ({ location }) => {
         <section>
           <h4>Where</h4>
           <div className={classes.text}>
-            {/* <Button
-              className="hotel-link"
-              classes={{ root: classes.hotelButton }}
-              color="primary"
-              href="https://urldefense.com/v3/__https:/www.marriott.com/events/start.mi?id=1628712503612&key=GRP__;!!FOfmI8qiWcWBHqypJtzENF0!jyzZPCsDM5kHUt1F35tHVI-Q0F_cAKGDBYU9DAczeJzzxyJBs2B3ScbLPIDA2HGv6w$"
-              rel="noopener noreferrer"
-              size="large"
-              target="_blank"
-              variant="contained"
-            >
-              For Hotel reservations click here
-              <OpenInNewIcon className={classes.openInNewIcon} />
-            </Button> */}
             <address>
               <p>
                 <a
@@ -122,6 +127,9 @@ const FallRetreat = ({ location }) => {
                   Austin Marriott South
                 </a>
               </p>
+
+              {hotelReservationButton}
+
               <p>
                 <a
                   href="https://www.google.com/maps/place/4415+S+IH+35+Frontage+Rd,+Austin,+TX+78744/@30.2109504,-97.755463,17z/data=!3m1!4b1!4m5!3m4!1s0x8644b49cb7935da1:0x5a86d0320722c79b!8m2!3d30.2109504!4d-97.7532743"
diff --git a/src/pages/resources/people/linda-fletcher.tsx b/src/pages/resources/people/linda-fletcher.tsx
@@ -0,0 +1,84 @@
+// External Dependencies
+import { Helmet } from 'react-helmet';
+import PropTypes from 'prop-types';
+import React, { FC } from 'react';
+
+// Internal Dependencies
+import CardHeadline from '../../../components/shared/cards/card-headline';
+import Container from '../../../components/shared/container';
+import FuturaParagraph from '../../../components/shared/futura-paragraph';
+
+// Sidebar data
+import Layout from '../../../components/layout';
+import presets from '../../../utils/presets';
+import resourcesSidebar from '../resources-links.yml';
+import SidebarBody from '../../../components/shared/sidebar/SidebarBody';
+
+// Local Variables
+const rootStyles = {
+  display: 'flex',
+  flexDirection: 'row',
+  flexWrap: 'wrap',
+  justifyContent: 'space-between',
+};
+
+const imageStyles = {
+  marginBottom: 0,
+  width: '50%',
+};
+
+const headingNameStyles = {
+  marginBottom: 32,
+};
+
+// Component Definition
+const SamHarris: FC = ({ location }) => (
+  <Layout location={location}>
+    <Helmet>
+      <title>TMAC | Linda Fletcher</title>
+    </Helmet>
+    <div css={rootStyles}>
+      <Container>
+        <img
+          alt="Linda Fletcher"
+          css={imageStyles}
+          src="https://res.cloudinary.com/tmac/image/upload/ar_1:1,c_fill,g_auto,w_1000/v1661896794/fletcher.jpg"
+        />
+        <h2 css={headingNameStyles}>Linda Fletcher</h2>
+        <CardHeadline>2022 TMAC Outstanding Administrator</CardHeadline>
+
+        <FuturaParagraph>
+          More info coming soon...
+        </FuturaParagraph>
+
+        {/* Mobile sidebar */}
+        <div
+          css={{
+            display: 'block',
+            [presets.Tablet]: {
+              display: 'none',
+            },
+          }}
+        >
+          <hr
+            css={{
+              border: 0,
+              height: 2,
+              marginTop: 10,
+            }}
+          />
+          <SidebarBody inline yaml={resourcesSidebar} />
+        </div>
+      </Container>
+    </div>
+  </Layout>
+);
+
+SamHarris.propTypes = {
+  location: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.object,
+  ]).isRequired,
+};
+
+export default SamHarris;
diff --git a/src/pages/resources/people/sam-harris.js b/src/pages/resources/people/sam-harris.js
@@ -46,6 +46,7 @@ const SamHarris = ({ location }) => (
         />
         <h2 css={headingNameStyles}>Sam Harris</h2>
         <CardHeadline>TMAC Past President, 2012-2013</CardHeadline>
+        <CardHeadline>2021 TMAC Outstanding Administrator</CardHeadline>
 
         <FuturaParagraph>
           Sam Harris is beginning his twenty-ninth year in public education as
diff --git a/src/pages/resources/resources-links.yml b/src/pages/resources/resources-links.yml
@@ -16,6 +16,10 @@
       link: /resources/people/david-cain/
     - title: James Drew
       link: /resources/people/james-drew/
+    - title: Sam Harris
+      link: /resources/people/sam-harris/
+    - title: Linda Fletcher
+      link: /resources/people/linda-fletcher/
     - title: George W. Jones
       link: /resources/people/george-w.-jones/
     - title: Mitzi Jones

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tmac-website",`
`3`	`3`	`"description": "Website for the Texas Music Administrators Conference",`
`4`		`- "version": "2.9.0",`
	`4`	`+ "version": "2.10.0",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
`7`	`7`	`"url": "https://github.com/m2mathew/tmac-website"`