Skip to content

Fix Languages /Technologies Filters for Projects 4587 #4668

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

Merged
blulady merged 2 commits into from
May 18, 2023
Merged

Fix Languages /Technologies Filters for Projects 4587 #4668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a526f1
fix languages /technologies filters 4587
t-will-gillis May 15, 2023
39ef60c
Update current-projects.js
t-will-gillis May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 89 additions & 89 deletions assets/js/current-projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,94 +476,94 @@ function clearAllEventHandler(){
* Takes a single project object and returns the html string representing the project card
*/
function projectCardComponent(project){
return `
<li class="project-card" id="${ project.identification }"
data-status="${project.status}"
data-looking="${project.looking ? [... new Set(project.looking.map(looking => looking.category)) ] : ''}"
data-technologies="${(project.technologies && project.languages) ? [... new Set(project.technologies.map(tech => tech)), project.languages.map(lang => lang)] : '' }"

data-location="${project.location? project.location.map(city => city) : '' }"
data-programs="${project.programAreas ? project.programAreas.map(programArea => programArea) : '' }"
>
<div class="project-card-inner">

<a href='${project.id}'>
<div class="project-tmb">
<img src='${window.location.origin}${project.image}' class="project-tmb-img" alt='${project.alt}'/>
</div>
</a>

<div class="project-body">
<div class='status-indicator status-${project.status}'>
<h5 class='status-text'>${ project.status }</h5>
</div>

<a href='${ project.id }'><h4 class="project-title">${ project.title }</h4></a>

<p class="project-description">${ project.description }</p>

<div class="project-links">
<strong>Links: </strong>
${project.links.map(item => `<a href="${ item.url }" rel="noopener" target='_blank'> ${ item.name }</a>`).join(", ")}
</div>

${project.partner ?
`
<div class="project-partner">
<strong>Partner: </strong>
${ project.partner }
</div>
`:""
}

${project.tools ?
`
<div class="project-tools">
<strong>Tools: </strong>
${ project.tools }
</div>
`:""
}

${project.looking ? "" : ""
// `
// <div class="project-needs">
// <strong>Looking for: </strong>
// ${project.looking.map( role => `<p class='project-card-field-inline'> ${ role.skill }</p>`).join(", ")}
// </div>
// `:""
// ^ See issue #1997 for more info on why this is commented out
}

${project.languages?.length > 0 ?
`
<div class="project-languages">
<strong>Languages: </strong>
${project.languages.map(language => `<p class='project-card-field-inline'> ${ language }</p>`).join(", ")}
</div>
`: ""
}

${project.technologies ?
`
<div class="project-technologies">
<strong>Technologies: </strong>
${project.technologies.map(tech => `<p class='project-card-field-inline'> ${ tech }</p>`).join(", ")}
</div>
`:""
}

${project.programAreas ?
`
<div class="project-programs">
<strong>Program Areas: </strong>
${project.programAreas.map(programArea => `<p class='project-card-field-inline'> ${ programArea }</p>`).join(", ")}
</div>
`:""
}
</div>
</div>
</li>`
return `
<li class="project-card" id="${ project.identification }"
data-status="${project.status}"
data-looking="${project.looking ? [... new Set(project.looking.map(looking => looking.category)) ] : ''}"
data-technologies="${(project.technologies && project.languages) ? [... new Set(project.technologies.map(tech => tech)), project.languages.map(lang => lang)] : project.languages.map(lang => lang) }"
data-location="${project.location? project.location.map(city => city) : '' }"
data-programs="${project.programAreas ? project.programAreas.map(programArea => programArea) : '' }"
>
<div class="project-card-inner">

<a href='${project.id}'>
<div class="project-tmb">
<img src='${window.location.origin}${project.image}' class="project-tmb-img" alt='${project.alt}'/>
</div>
</a>

<div class="project-body">
<div class='status-indicator status-${project.status}'>
<h5 class='status-text'>${ project.status }</h5>
</div>

<a href='${ project.id }'><h4 class="project-title">${ project.title }</h4></a>

<p class="project-description">${ project.description }</p>

<div class="project-links">
<strong>Links: </strong>
${project.links.map(item => `<a href="${ item.url }" rel="noopener" target='_blank'> ${ item.name }</a>`).join(", ")}
</div>

${project.partner ?
`
<div class="project-partner">
<strong>Partner: </strong>
${ project.partner }
</div>
`:""
}

${project.tools ?
`
<div class="project-tools">
<strong>Tools: </strong>
${ project.tools }
</div>
`:""
}

${project.looking ? "" : ""
// `
// <div class="project-needs">
// <strong>Looking for: </strong>
// ${project.looking.map( role => `<p class='project-card-field-inline'> ${ role.skill }</p>`).join(", ")}
// </div>
// `:""
// ^ See issue #1997 for more info on why this is commented out
}

${project.languages?.length > 0 ?
`
<div class="project-languages">
<strong>Languages: </strong>
${project.languages.map(language => `<p class='project-card-field-inline'> ${ language }</p>`).join(", ")}
</div>
`: ""
}

${project.technologies ?
`
<div class="project-technologies">
<strong>Technologies: </strong>
${project.technologies.map(tech => `<p class='project-card-field-inline'> ${ tech }</p>`).join(", ")}
</div>
`:""
}

${project.programAreas ?
`
<div class="project-programs">
<strong>Program Areas: </strong>
${project.programAreas.map(programArea => `<p class='project-card-field-inline'> ${ programArea }</p>`).join(", ")}
</div>
`:""
}
</div>
</div>
</li>`
}

/**
Expand Down Expand Up @@ -605,4 +605,4 @@ function filterTagComponent(filterName,filterValue){
${filterName === "looking" ? "Role" : filterName}: ${filterValue}
</span>
</div>`
}
}