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';
const NotFoundPage = () => (
<div style={{ textAlign: 'center' }}>
<h1>404: Not Found</h1>
<p>This page wasn't found...</p>
</div>
);
export default NotFoundPage;
export default function NotFoundPage() {
return (
<div style={{ textAlign: 'center' }}>
<h1>404: Not Found</h1>
<p>This page wasn't found...</p>
</div>
);
}

View File

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

View File

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

View File

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

View File

@ -6,46 +6,46 @@ import '../css/mission.css';
export default function Mission() {
let mission = useMission();
if (!mission) {
return null;
}
return (
<>
<Hero heading='Mission and History' />
<div>
<div className='mission-quote'>
<span className='mission-quote-text'>{mission.quote_text}</span>
<br />
<br />
<span className='mission-quote-author'> {mission.quote_author}</span>
</div>
<div className='row'>
<div className='flex-1'>
<span className='mission-header'>Vision</span>
{mission ? (
<div>
<div className='mission-quote'>
<span className='mission-quote-text'>{mission.quote_text}</span>
<br />
<br />
<span className='mission-quote-author'>
{mission.quote_author}
</span>
</div>
<div className='flex-2'>
<p className='mission-para'>{mission.vision}</p>
<div className='row'>
<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>
<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>
) : null}
</>
);
}

View File

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