Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed 'senior fellow' section from directory pages #1150

Merged
merged 1 commit into from Mar 5, 2018
Merged

Removed 'senior fellow' section from directory pages #1150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 14 additions & 10 deletions source/js/fellowships.js
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ import LoadingIndicator from './components/loading-indicator/loading-indicator.j
let pulseApiDomain = ``;
let pulseDomain = ``;
const DIRECOTRY_PAGE_FILTER_OPTIONS = {'program_year': `2017`};
const DIRECTORY_PAGE_TYPE_ORDER = [ `senior`, `science`, `open web`, `tech policy`, `media`];
const DIRECTORY_PAGE_TYPE_ORDER = [ `science`, `open web`, `tech policy`, `media`];

function getFellows(params, callback) {
Object.assign(params, {'profile_type': `fellow`});
Expand Down Expand Up @@ -60,7 +60,7 @@ function groupFellowsByAttr(attribute, fellows) {
let fellowsGroup = {};

fellows.forEach(fellow => {
let attr = fellow[attribute];
let attr = fellow[attribute].toLowerCase();

if (!attr) {
return;
Expand Down Expand Up @@ -90,7 +90,7 @@ function renderFellowsOnDirectoryPage() {
onClick={(event) => { window.scrollTo(0, document.getElementById(event.target.dataset.targetId).offsetTop); }}
data-target-id={`fellowships-directory-${getTypeSlug(option)}`}
>
{`${option}${option === `senior` ? ` Fellow` :``}`}
{option}
</button>;
};

Expand All @@ -99,8 +99,6 @@ function renderFellowsOnDirectoryPage() {

// get fellow info from Pulse
getFellows(DIRECOTRY_PAGE_FILTER_OPTIONS, fellows => {
let fellowsByType = groupFellowsByAttr(`program_type`, fellows);

// render filter bar
let filterBar = <div className="row">
<div className="col-12">
Expand All @@ -112,21 +110,27 @@ function renderFellowsOnDirectoryPage() {
</div>;

// render program type sections
let fellowsByType = groupFellowsByAttr(`program_type`, fellows);
let sections = Object.keys(fellowsByType).sort((a, b) => {
let aIndex = DIRECTORY_PAGE_TYPE_ORDER.indexOf(a.replace(`fellow`,``).trim());
let bIndex = DIRECTORY_PAGE_TYPE_ORDER.indexOf(b.replace(`fellow`,``).trim());
let aIndex = DIRECTORY_PAGE_TYPE_ORDER.indexOf(a);
let bIndex = DIRECTORY_PAGE_TYPE_ORDER.indexOf(b);

return aIndex - bIndex;
}).map(type => {
// don't render any fellow profiles that we don't intend to show
if (DIRECTORY_PAGE_TYPE_ORDER.indexOf(type) < 0) {
return null;
}

return <div className="row my-4" key={type} id={`fellowships-directory-${getTypeSlug(type)}`}>
<div className="col-12">
<h3 className="h3-black text-capitalize">{type}s</h3>
<h3 className="h3-black text-capitalize">{type} Fellows</h3>
<div className="row">
{fellowsByType[type].map(renderFellowCard)}
</div>
</div>
<div className="col-12 text-center mt-3 mb-5">
<a href={`/fellowships/directory/${getTypeSlug(type)}`} className="btn btn-ghost">See all {type}s</a>
<a href={`/fellowships/directory/${getTypeSlug(type)}`} className="btn btn-ghost">See all {type} Fellows</a>
</div>
</div>;
});
Expand All @@ -142,7 +146,7 @@ function renderFellowsOnDirectoryByTypePage() {
ReactDOM.render(<div className="mx-auto my-5 text-center"><LoadingIndicator /></div>, CONTAINER);

// get fellow info from Pulse
getFellows({'program_type': `${CONTAINER.dataset.type} fellow`}, fellows => {
getFellows({'program_type': `${CONTAINER.dataset.type}`}, fellows => {
let fellowsByYear = groupFellowsByAttr(`program_year`, fellows);

let sections = Object.keys(fellowsByYear).sort().reverse().map(year => {
Expand Down