From 7a526f11d6ba968b4648615ebe20022aac2cf070 Mon Sep 17 00:00:00 2001
From: t-will-gillis <40799239+t-will-gillis@users.noreply.github.com>
Date: Sun, 14 May 2023 18:37:23 -0700
Subject: [PATCH 1/2] fix languages /technologies filters 4587

---
 assets/js/current-projects.js | 175 +++++++++++++++++-----------------
 1 file changed, 87 insertions(+), 88 deletions(-)

diff --git a/assets/js/current-projects.js b/assets/js/current-projects.js
index 5aee0f5d13..06d80fc94c 100644
--- a/assets/js/current-projects.js
+++ b/assets/js/current-projects.js
@@ -476,94 +476,93 @@ 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>`
 }
 
 /**

From 39ef60c2c4b0d19b8015310dd671f6f1a9209995 Mon Sep 17 00:00:00 2001
From: Will Gillis <40799239+t-will-gillis@users.noreply.github.com>
Date: Sun, 14 May 2023 19:13:32 -0700
Subject: [PATCH 2/2] Update current-projects.js

---
 assets/js/current-projects.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/assets/js/current-projects.js b/assets/js/current-projects.js
index 06d80fc94c..8208e9267e 100644
--- a/assets/js/current-projects.js
+++ b/assets/js/current-projects.js
@@ -480,8 +480,9 @@ function projectCardComponent(project){
             <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-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">
@@ -604,4 +605,4 @@ function filterTagComponent(filterName,filterValue){
                 ${filterName === "looking" ? "Role" : filterName}: ${filterValue}
                 </span>
             </div>`
-}
\ No newline at end of file
+}