Cleaned up code

This commit is contained in:
Michael Fatemi 2020-11-29 01:06:26 -05:00
parent a21cf6cd80
commit 5ee5d07f27
7 changed files with 58 additions and 70 deletions

View File

@ -1,10 +1,8 @@
import React from 'react'; export default function NotFoundPage() {
return (
const NotFoundPage = () => ( <div style={{ textAlign: 'center' }}>
<div style={{ textAlign: 'center' }}> <h1>404: Not Found</h1>
<h1>404: Not Found</h1> <p>This page wasn't found...</p>
<p>This page wasn't found...</p> </div>
</div> );
); }
export default NotFoundPage;

View File

@ -8,16 +8,13 @@ export default function ClassCouncil() {
`*[_type == 'member' && role == 'class'] | order (year desc)` `*[_type == 'member' && role == 'class'] | order (year desc)`
); );
if (!members) {
return null;
}
return ( return (
<> <>
<Hero heading='Class Council' /> <Hero heading='Class Council' />
{members.map((member) => { {members &&
return <MemberRow key={member._id} member={member}></MemberRow>; members.map((member) => {
})} return <MemberRow key={member._id} member={member}></MemberRow>;
})}
</> </>
); );
} }

View File

@ -9,17 +9,14 @@ export default function Committee() {
); );
// year desc because seniority 8) // year desc because seniority 8)
if (!excomm) {
return null;
}
return ( return (
<> <>
<Hero heading='Executive Committee' /> <Hero heading='Executive Committee' />
<div> <div>
{excomm.map((member) => { {excomm &&
return <MemberRow member={member} />; excomm.map((member) => {
})} return <MemberRow member={member} />;
})}
</div> </div>
</> </>
); );

View File

@ -3,7 +3,7 @@ import Hero from '../components/Hero';
import NewsAndMission from '../components/NewsAndMission'; import NewsAndMission from '../components/NewsAndMission';
import SegmentGroup from '../components/SegmentGroup'; import SegmentGroup from '../components/SegmentGroup';
const IndexPage = () => { export default function IndexPage() {
return ( return (
<> <>
{/* Hero image */} {/* Hero image */}
@ -20,6 +20,4 @@ const IndexPage = () => {
<NewsAndMission /> <NewsAndMission />
</> </>
); );
}; }
export default IndexPage;

View File

@ -8,15 +8,11 @@ export default function Initiatives() {
'*[_type == "initiative"]' '*[_type == "initiative"]'
); );
if (!initiatives) {
return null;
}
return ( return (
<> <>
<Hero heading='Initiatives'></Hero> <Hero heading='Initiatives'></Hero>
<div style={{ display: 'flex', flexDirection: 'column' }}> <div style={{ display: 'flex', flexDirection: 'column' }}>
{initiatives.map((initiative) => { {initiatives && initiatives.map((initiative) => {
return <InitiativeRow initiative={initiative} />; return <InitiativeRow initiative={initiative} />;
})} })}
</div> </div>

View File

@ -6,46 +6,46 @@ import '../css/mission.css';
export default function Mission() { export default function Mission() {
let mission = useMission(); let mission = useMission();
if (!mission) {
return null;
}
return ( return (
<> <>
<Hero heading='Mission and History' /> <Hero heading='Mission and History' />
<div> {mission ? (
<div className='mission-quote'> <div>
<span className='mission-quote-text'>{mission.quote_text}</span> <div className='mission-quote'>
<br /> <span className='mission-quote-text'>{mission.quote_text}</span>
<br /> <br />
<span className='mission-quote-author'> {mission.quote_author}</span> <br />
</div> <span className='mission-quote-author'>
<div className='row'> {mission.quote_author}
<div className='flex-1'> </span>
<span className='mission-header'>Vision</span>
</div> </div>
<div className='flex-2'> <div className='row'>
<p className='mission-para'>{mission.vision}</p> <div className='flex-1'>
<span className='mission-header'>Vision</span>
</div>
<div className='flex-2'>
<p className='mission-para'>{mission.vision}</p>
</div>
</div>
<hr />
<div className='row'>
<div className='flex-1'>
<span className='mission-header'>Mission</span>
</div>
<div className='flex-2'>
<p className='mission-para'>{mission.mission}</p>
</div>
</div>
<div className='text-center'>
<a
href='https://docs.google.com/spreadsheets/d/1a3RYdqrDi1IPG9BKWQ2xhoX3YCPQKUl_FsRLvIVEMPg/edit?usp=drive_open&ouid=0'
className='blue-button'
>
Previous Leadership
</a>
</div> </div>
</div> </div>
<hr /> ) : null}
<div className='row'>
<div className='flex-1'>
<span className='mission-header'>Mission</span>
</div>
<div className='flex-2'>
<p className='mission-para'>{mission.mission}</p>
</div>
</div>
<div className='text-center'>
<a
href='https://docs.google.com/spreadsheets/d/1a3RYdqrDi1IPG9BKWQ2xhoX3YCPQKUl_FsRLvIVEMPg/edit?usp=drive_open&ouid=0'
className='blue-button'
>
Previous Leadership
</a>
</div>
</div>
</> </>
); );
} }

View File

@ -16,9 +16,11 @@ export default function Officers() {
<> <>
<Hero heading='Officers' /> <Hero heading='Officers' />
<div> <div>
{officers.map((officer) => { {officers
return <MemberRow member={officer} />; ? officers.map((officer) => {
})} return <MemberRow member={officer} />;
})
: null}
</div> </div>
</> </>
); );