From be6f265a89b3182aa199889f7559bc9f55c537dc Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsfaulkner.com>
Date: Fri, 15 Jan 2021 11:44:00 -0500
Subject: [PATCH 01/11] cleaned up spammy console.log statements in viewfactory

---
 src/ts_source/viewFactory.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/ts_source/viewFactory.ts b/src/ts_source/viewFactory.ts
index 36dfb74..7f0fdf1 100644
--- a/src/ts_source/viewFactory.ts
+++ b/src/ts_source/viewFactory.ts
@@ -22,7 +22,6 @@ export class CardModel {
 }
 
 export function buildFileCard(elem: JQuery<HTMLElement>, obj, append: boolean = false, $: any = require('jquery')) {
-    console.log(obj);
     let model = new CardModel(
         obj["title"],
         obj["description"],
@@ -40,12 +39,10 @@ export function buildFileCard(elem: JQuery<HTMLElement>, obj, append: boolean =
 
         if (model["show"] !== undefined) {
             $(`#${id}`).on("click", () => {
-                console.log("showing")
                 shell.showItemInFolder(model.resourcePath)
             });
         } else {
             $(`#${id}`).on("click", () => {
-                console.log("opening")
                 shell.openItem(model.resourcePath)
             });
         }

From b884fa88a7979258f10480f34ce327bdda977ca4 Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsfaulkner.com>
Date: Fri, 15 Jan 2021 13:26:11 -0500
Subject: [PATCH 02/11] initial draft of searching is finished

---
 src/assets/pages/resources-landing-page.html |   5 +-
 src/assets/pages/scripts/index_app.js        |   2 +-
 src/assets/pages/styles/theme-base.scss      |   7 +-
 src/assets/pages/styles/theme-dark.scss      |   4 +-
 src/assets/pages/styles/theme-light.scss     |   2 +
 src/assets/views/web-card.mustache           |   4 +-
 src/ts_source/fileutils.ts                   |  14 +-
 src/ts_source/search.ts                      | 129 +++++++++++++++++++
 src/ts_source/viewFactory.ts                 |  59 +++++----
 9 files changed, 185 insertions(+), 41 deletions(-)
 create mode 100644 src/ts_source/search.ts

diff --git a/src/assets/pages/resources-landing-page.html b/src/assets/pages/resources-landing-page.html
index 790a68d..33bce71 100644
--- a/src/assets/pages/resources-landing-page.html
+++ b/src/assets/pages/resources-landing-page.html
@@ -128,8 +128,8 @@
 
                     <div class="sb-example-1">
                         <div class="search">
-                            <input type="text" class="searchTerm" placeholder="Search">
-                            <button type="submit" class="searchbutton">
+                            <input id="searchfield" type="text" class="searchTerm" placeholder="Search">
+                            <button id="searchbutton" type="submit" class="searchbutton">
                                 <svg width="100%" height="auto" viewBox="-1 -3 22 22" class="bi bi-search" fill="info"
                                      xmlns="http://www.w3.org/2000/svg">
                                     <path fill-rule="evenodd"
@@ -168,6 +168,7 @@
 <script src="scripts/tsUtil.js"></script>
 <script>loadTSTarget("themes.js");</script>
 <script>let help = loadTSTarget("help.js");</script>
+<script>loadTSTarget("search.js");</script>
 
 <script src="scripts/index_app.js"></script>
 </html>
\ No newline at end of file
diff --git a/src/assets/pages/scripts/index_app.js b/src/assets/pages/scripts/index_app.js
index 2060104..087d7f6 100644
--- a/src/assets/pages/scripts/index_app.js
+++ b/src/assets/pages/scripts/index_app.js
@@ -2,7 +2,7 @@ const path = require('path');
 const factory = require(path.join(appDir, 'viewFactory'))
 
 function loadDocuments() {
-    factory.buildWebCardsFromConfig("resources-landing-page.json");
+    factory.buildUiFromConfig("resources-landing-page.json");
 }
 
 loadDocuments();
\ No newline at end of file
diff --git a/src/assets/pages/styles/theme-base.scss b/src/assets/pages/styles/theme-base.scss
index 0eefc73..7a28a7b 100644
--- a/src/assets/pages/styles/theme-base.scss
+++ b/src/assets/pages/styles/theme-base.scss
@@ -193,7 +193,7 @@ body {
 .feedbackdropdown .dropdown-menu {
   background-color: map-get($theme-colors, menudropdownfill);
   font-size: 15px;
-  margin-bottom: 9 px;
+  margin-bottom: 9px;
   color: map-get($theme-colors, activetextaccordion);
   box-shadow: -1 1 3 1 #cccccc;
 }
@@ -286,4 +286,9 @@ hr {
   margin-bottom: 1rem;
   border: 0;
   border-top: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.highlight {
+  color: map-get($theme-colors, highlight-text-color);
+  background-color: map-get($theme-colors, highlight-background);
 }
\ No newline at end of file
diff --git a/src/assets/pages/styles/theme-dark.scss b/src/assets/pages/styles/theme-dark.scss
index 69fe2c6..75093e7 100644
--- a/src/assets/pages/styles/theme-dark.scss
+++ b/src/assets/pages/styles/theme-dark.scss
@@ -51,7 +51,9 @@ $theme-colors: (
         "footerbackhover": rgba(157, 157, 157, .8),
         "helpmenudropdowntext": #9d9d9d,
         "helpmenudropdowntexthover": #a8a8a8,
-        "helpmenudropdownbghover": #5c5c66, 
+        "helpmenudropdownbghover": #5c5c66,
+        "highlight-text-color": #000,
+        "highlight-background": #ece665,
 );
 
 .theme-button{
diff --git a/src/assets/pages/styles/theme-light.scss b/src/assets/pages/styles/theme-light.scss
index bc54379..bfc657d 100644
--- a/src/assets/pages/styles/theme-light.scss
+++ b/src/assets/pages/styles/theme-light.scss
@@ -53,6 +53,8 @@ $theme-colors: (
         "helpmenudropdowntext": #3f4a5a,
         "helpmenudropdowntexthover": #080404,
         "helpmenudropdownbghover": #f2f2f2,
+        "highlight-text-color": #000,
+        "highlight-background": #ece665,
 );
 
 .theme-button{
diff --git a/src/assets/views/web-card.mustache b/src/assets/views/web-card.mustache
index 11ad99f..e91c62a 100644
--- a/src/assets/views/web-card.mustache
+++ b/src/assets/views/web-card.mustache
@@ -2,8 +2,8 @@
 <div class="col-md-4 mb-4 web-card" id="{{{id}}}">
     <div class="card mb-4 h-100 shadow-sm web-card-background">
         <div class="card-body d-flex flex-column text-center">
-            <h6 class="card-text text-header" style="text-align:center">{{title}}</h6>
-            <p class="card-text text-paragraph text-align-left">{{description}} </p>
+            <h6 class="card-text text-header" style="text-align:center">{{{title}}}</h6>
+            <p class="card-text text-paragraph text-align-left">{{{description}}} </p>
             <div class="d-inline-block mt-auto mx-auto justify-content-between align-items-center web-card-image-background">
                 <img id="collapse-image" class="rounded-circle mx-auto d-block img-fluid"
                      src="{{{imgPath}}}" alt="{{{altText}}}"
diff --git a/src/ts_source/fileutils.ts b/src/ts_source/fileutils.ts
index 06654ab..be7fafb 100644
--- a/src/ts_source/fileutils.ts
+++ b/src/ts_source/fileutils.ts
@@ -108,12 +108,12 @@ export class DocumentDirectory {
 
     root: DirectoryNode;
 
-    getCards(): Map<String, object[]> {
+    getCards(): Map<string, object[]> {
         return DocumentDirectory.walkCards(this.root);
     }
 
-    private static walkCards(d: DirectoryNode): Map<String, object[]> {
-        let cardsByCategory = new Map<String, object[]>();
+    private static walkCards(d: DirectoryNode): Map<string, object[]> {
+        let cardsByCategory = new Map<string, object[]>();
         for (let i = 0, l = d.children.length; i < l; i++) {
             let child = d.children[i];
             if (child instanceof DirectoryNode) {
@@ -151,7 +151,7 @@ export class DocumentDirectory {
         return cardsByCategory;
     }
 
-    private static mergeMaps(a: Map<String, Object[]>, b: Map<String, Object[]>) {
+    private static mergeMaps(a: Map<string, Object[]>, b: Map<string, Object[]>) {
         let keys = Object.keys(b);
         for (let z in keys) {
             let key = keys[z];
@@ -180,7 +180,7 @@ export class FileNode {
         this.parent = parent;
     }
 
-    static loadAltProps(path: String): object {
+    static loadAltProps(path: string): object {
         let props = {};
         let jsonPath = path + ".json"
         if (fs.existsSync(jsonPath)) {
@@ -225,7 +225,7 @@ export class FileNode {
         return cardObj
     }
 
-    getTitle(): String {
+    getTitle(): string {
         let name = path.basename(this.filePath);
         let ext = path.extname(name);
         let cName = name.replace(ext, "");
@@ -289,7 +289,7 @@ export class DirectoryNode extends FileNode {
         return false
     }
 
-    getCategory(): String {
+    getCategory(): string {
         let rawName = path.basename(this.filePath);
         let parts = rawName.split("-");
         for (let i = 0, l = parts.length; i < l; i++) {
diff --git a/src/ts_source/search.ts b/src/ts_source/search.ts
new file mode 100644
index 0000000..86323a5
--- /dev/null
+++ b/src/ts_source/search.ts
@@ -0,0 +1,129 @@
+import {Configurator, DocumentDirectory} from "./fileutils";
+import * as path from "path";
+import {buildCardsFromConfig, buildUiFromConfig} from "./viewFactory";
+
+
+function register() {
+    let searchBar = $("#searchfield");
+    let searchButton = $("#searchbutton");
+    searchBar.on("keyup", (evt) => {
+        if ("Enter" === evt.code) {
+            let term = searchBar.val().toString();
+            if (!term || 0 === term.length) {
+                reset()
+            } else {
+                search(term);
+            }
+
+        }else{
+            let term = searchBar.val().toString();
+            if (!term || 0 === term.length) {
+                reset()
+            }
+        }
+    });
+    searchButton.on("click", ()=>{
+        let term = searchBar.val().toString();
+        if (!term || 0 === term.length) {
+            reset()
+        } else {
+            search(term);
+        }
+    })
+}
+
+function reset(){
+    buildUiFromConfig("resources-landing-page.json");
+}
+
+function search(term: string) {
+    let webcards = getWebCardsWithSearchTerm(term);
+    let fileCards = getFileCardsWithSearchTerm(term);
+    buildCardsFromConfig(webcards, fileCards);
+}
+
+function getFileCardsWithSearchTerm(term): Map<string, object> {
+    let map = new Map<string, object>()
+    let directoryPath = path.join(__dirname, "../assets/resources");
+    let fileCards = new DocumentDirectory(directoryPath).getCards();
+    console.log(fileCards);
+    for (let [key, value] of fileCards) {
+        for (let card of value) {
+            if (cardContainsTerm(term, card)) {
+                addToFileMap(map, key, highlightCardTerm(term, card));
+            }
+        }
+    }
+
+
+    return map;
+}
+
+function getWebCardsWithSearchTerm(term): object {
+    let map = {};
+    let elementConfig = Configurator.loadAppConfig("resources-landing-page.json");
+    console.log(elementConfig);
+    let containerKeys = Object.keys(elementConfig);
+    for (let i = 0, l = containerKeys.length; i < l; i++) {
+        let containerKey = containerKeys[i];
+        let container = elementConfig[containerKey];
+        let categoryKeys = Object.keys(container);
+        console.log()
+        for (let categoryIdx in categoryKeys) {
+            let categoryKey = categoryKeys[categoryIdx]
+            let category = container[categoryKey];
+            let cards = category.cards;
+            for (let j = 0, k = cards.length; j < k; j++) {
+                let card = cards[j];
+                if (cardContainsTerm(term, card)) {
+                    addToWebMap(map, containerKey, categoryKey, category["description"], highlightCardTerm(term, card));
+                }
+            }
+        }
+    }
+    return map;
+}
+
+function addToWebMap(map: object, containerKey: string, categoryKey: string, categoryDescription: string, card: object) {
+    let container = map[containerKey];
+    if (!container) {
+        container = {};
+    }
+    let category = container[categoryKey];
+    if (!category) {
+        category = {"description": categoryDescription, "cards": []}
+    }
+    category["cards"].push(card);
+    container[categoryKey] = category;
+    map[containerKey] = container;
+}
+
+function addToFileMap(map: Map<string, object>, categoryKey: string, card) {
+    if (!map.get(categoryKey)) {
+        map.set(categoryKey, []);
+    }
+    let cards = map.get(categoryKey) as Array<object>;
+    cards.push(card);
+    map.set(categoryKey, cards);
+}
+
+function cardContainsTerm(term: string, card: object): boolean {
+    let titleContains = card["title"].toLowerCase().includes(term.toLowerCase())
+    let descriptionContains = card["description"].toLowerCase().includes(term.toLowerCase())
+    return titleContains || descriptionContains;
+}
+
+function highlightCardTerm(term: string, card: object): object {
+    let regexTerm = escapeRegExp(term);
+    let pattern = new RegExp(regexTerm, 'ig');
+    card["title"] = card["title"].replace(pattern, `<span class="highlight">$&</span>`);
+    card["description"] = card["description"].replace(pattern, `<span class="highlight">$&</span>`);
+    return card;
+}
+
+function escapeRegExp(term: string): string {
+    return term.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+}
+
+
+register()
\ No newline at end of file
diff --git a/src/ts_source/viewFactory.ts b/src/ts_source/viewFactory.ts
index 7f0fdf1..f89ef73 100644
--- a/src/ts_source/viewFactory.ts
+++ b/src/ts_source/viewFactory.ts
@@ -49,18 +49,22 @@ export function buildFileCard(elem: JQuery<HTMLElement>, obj, append: boolean =
     });
 }
 
-export function buildWebCardsFromConfig(configName: string) {
+export function buildUiFromConfig(configName: string){
     let elementConfig = Configurator.loadAppConfig(configName);
-    let $ = require('jquery')
-    let containers = Object.keys(elementConfig);
     let directoryPath = path.join(__dirname, "../assets/resources");
     let fileCards = new DocumentDirectory(directoryPath).getCards();
-    for (let i = 0, l = containers.length; i < l; i++) {
+    buildCardsFromConfig(elementConfig, fileCards);
+}
 
+export function buildCardsFromConfig(elementConfig: object, fileCards: Map<string, object>) {
+    let $ = require('jquery')
+    let containers = Object.keys(elementConfig);
+
+    for (let i = 0, l = containers.length; i < l; i++) {
         let containerName = containers[i];
         let containerObject = elementConfig[containerName];
         let containerElem = $(`#${containerName}`);
-
+        containerElem.html("")
         let containerCategories = Object.keys(containerObject);
 
         for (let j = 0, m = containerCategories.length; j < m; j++) {
@@ -86,25 +90,7 @@ export function buildWebCardsFromConfig(configName: string) {
             let view = $(`#${categoryKey}-container`);
             let collapseButton = $(`#${categoryKey}-collapser`);
 
-            collapseButton.on("click", () => {
-                let imageMatchRegex = /\.\.\/images\/chevron-(\w+)-(\w+)\.svg$/ig;
-                let collapsable = $(`#${categoryKey}-container`);
-                let collapseButton = $(`#${categoryKey}-collapser`);
-                let collapseImg = $(`#${categoryKey}-img`);
-                if ("none" === collapsable.css('display')) {
-                    collapsable.css("display", "");
-                    collapseButton.addClass("active");
-                } else {
-                    collapsable.css("display", "none");
-                    collapseButton.removeClass("active");
-                }
-                let srcImg = collapseImg.attr("src");
-                let groups = imageMatchRegex.exec(srcImg);
-                let direction = groups[1];
-                let theme = groups[2];
-                let newDirection = direction === "up"? "down": "up";
-                collapseImg.attr("src", `../images/chevron-${newDirection}-${theme}.svg`);
-            });
+            setCollapseOnElement(collapseButton, categoryKey);
 
             for (let j in files) {
                 let file = files[j];
@@ -115,13 +101,32 @@ export function buildWebCardsFromConfig(configName: string) {
                 let content = contentList[j];
                 buildWebCard(view, content, true, $);
             }
-
-
         }
-
     }
 }
 
+function setCollapseOnElement(collapseButton: JQuery<HTMLElement>, categoryKey: string){
+    collapseButton.on("click", () => {
+        let imageMatchRegex = /\.\.\/images\/chevron-(\w+)-(\w+)\.svg$/ig;
+        let collapsable = $(`#${categoryKey}-container`);
+        let collapseButton = $(`#${categoryKey}-collapser`);
+        let collapseImg = $(`#${categoryKey}-img`);
+        if ("none" === collapsable.css('display')) {
+            collapsable.css("display", "");
+            collapseButton.addClass("active");
+        } else {
+            collapsable.css("display", "none");
+            collapseButton.removeClass("active");
+        }
+        let srcImg = collapseImg.attr("src");
+        let groups = imageMatchRegex.exec(srcImg);
+        let direction = groups[1];
+        let theme = groups[2];
+        let newDirection = direction === "up"? "down": "up";
+        collapseImg.attr("src", `../images/chevron-${newDirection}-${theme}.svg`);
+    });
+}
+
 export function buildWebCard(elem: JQuery<HTMLElement>, obj, append: boolean = false, $: any = require('jquery')) {
     let model = new CardModel(
         obj["title"],

From d7e73e4361466b1b7b0886457890a03f15aa91d5 Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsfaulkner.com>
Date: Fri, 15 Jan 2021 13:36:54 -0500
Subject: [PATCH 03/11] file formatting cleanup on search.ts

---
 src/ts_source/search.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/ts_source/search.ts b/src/ts_source/search.ts
index 86323a5..7a36903 100644
--- a/src/ts_source/search.ts
+++ b/src/ts_source/search.ts
@@ -2,7 +2,6 @@ import {Configurator, DocumentDirectory} from "./fileutils";
 import * as path from "path";
 import {buildCardsFromConfig, buildUiFromConfig} from "./viewFactory";
 
-
 function register() {
     let searchBar = $("#searchfield");
     let searchButton = $("#searchbutton");
@@ -55,7 +54,6 @@ function getFileCardsWithSearchTerm(term): Map<string, object> {
         }
     }
 
-
     return map;
 }
 
@@ -125,5 +123,4 @@ function escapeRegExp(term: string): string {
     return term.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 }
 
-
 register()
\ No newline at end of file

From 7e994df6634bcb300d7774e6dda55fb506aa6efd Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsfaulkner.com>
Date: Fri, 15 Jan 2021 15:00:52 -0500
Subject: [PATCH 04/11] search will now appropriately find files when no web
 links for the category are found

---
 src/ts_source/search.ts | 44 +++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/ts_source/search.ts b/src/ts_source/search.ts
index 7a36903..e19d676 100644
--- a/src/ts_source/search.ts
+++ b/src/ts_source/search.ts
@@ -21,6 +21,8 @@ function register() {
             }
         }
     });
+
+
     searchButton.on("click", ()=>{
         let term = searchBar.val().toString();
         if (!term || 0 === term.length) {
@@ -36,16 +38,35 @@ function reset(){
 }
 
 function search(term: string) {
-    let webcards = getWebCardsWithSearchTerm(term);
+    let webCards = getWebCardsWithSearchTerm(term);
     let fileCards = getFileCardsWithSearchTerm(term);
-    buildCardsFromConfig(webcards, fileCards);
+
+    copyMissingKeys(webCards, fileCards);
+
+    buildCardsFromConfig(webCards, fileCards);
+    expandAllContainers();
+}
+
+function copyMissingKeys(webCards: object, fileCards: Map<string, object>){
+    let elementConfig = Configurator.loadAppConfig("resources-landing-page.json");
+    let containerKeys = Object.keys(elementConfig);
+    for (let containerKey of containerKeys) {
+        let container = webCards[containerKey];
+        let elementContainer = elementConfig[containerKey];
+        for (let [key, value] of fileCards) {
+            if (!container[key]) {
+                let original = elementContainer[key];
+                original["cards"] = [];
+                container[key] = original;
+            }
+        }
+    }
 }
 
 function getFileCardsWithSearchTerm(term): Map<string, object> {
     let map = new Map<string, object>()
     let directoryPath = path.join(__dirname, "../assets/resources");
     let fileCards = new DocumentDirectory(directoryPath).getCards();
-    console.log(fileCards);
     for (let [key, value] of fileCards) {
         for (let card of value) {
             if (cardContainsTerm(term, card)) {
@@ -53,20 +74,18 @@ function getFileCardsWithSearchTerm(term): Map<string, object> {
             }
         }
     }
-
     return map;
 }
 
 function getWebCardsWithSearchTerm(term): object {
     let map = {};
     let elementConfig = Configurator.loadAppConfig("resources-landing-page.json");
-    console.log(elementConfig);
     let containerKeys = Object.keys(elementConfig);
     for (let i = 0, l = containerKeys.length; i < l; i++) {
         let containerKey = containerKeys[i];
+        map[containerKey] = {};
         let container = elementConfig[containerKey];
         let categoryKeys = Object.keys(container);
-        console.log()
         for (let categoryIdx in categoryKeys) {
             let categoryKey = categoryKeys[categoryIdx]
             let category = container[categoryKey];
@@ -106,8 +125,9 @@ function addToFileMap(map: Map<string, object>, categoryKey: string, card) {
 }
 
 function cardContainsTerm(term: string, card: object): boolean {
-    let titleContains = card["title"].toLowerCase().includes(term.toLowerCase())
-    let descriptionContains = card["description"].toLowerCase().includes(term.toLowerCase())
+    let titleContains = card["title"].toLowerCase().includes(term.toLowerCase());
+    let descriptionContains = card["description"].toLowerCase().includes(term.toLowerCase());
+    //todo: add keywords
     return titleContains || descriptionContains;
 }
 
@@ -123,4 +143,12 @@ function escapeRegExp(term: string): string {
     return term.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 }
 
+function expandAllContainers(){
+    let containers = $('[id$="collapser"]')
+    for(let container of containers){
+        container.click()
+    }
+
+}
+
 register()
\ No newline at end of file

From ff4cab240b33f8b5a5bf97d0ef3bedbb3f9251c4 Mon Sep 17 00:00:00 2001
From: Rebecca Hollis <rhollis@jdsfaulkner.com>
Date: Fri, 15 Jan 2021 15:30:08 -0500
Subject: [PATCH 05/11] moved search field into the navbar from the main area

---
 src/assets/pages/resources-landing-page.html | 33 +++++++++++---------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/assets/pages/resources-landing-page.html b/src/assets/pages/resources-landing-page.html
index 33bce71..49f1fc2 100644
--- a/src/assets/pages/resources-landing-page.html
+++ b/src/assets/pages/resources-landing-page.html
@@ -24,6 +24,24 @@
              alt="JDSfaulkner logo">
         &nbsp;Resource Center
     </a>
+
+    <nav class="my-2 my-md-0 mr-md-3">
+                    <div class="sb-example-1">
+                        <div class="search">
+                            <input id="searchfield" type="text" class="searchTerm" placeholder="Search">
+                            <button id="searchbutton" type="submit" class="searchbutton">
+                                <svg width="100%" height="auto" viewBox="-1 -3 22 22" class="bi bi-search" fill="info"
+                                     xmlns="http://www.w3.org/2000/svg">
+                                    <path fill-rule="evenodd"
+                                          d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
+                                    <path fill-rule="evenodd"
+                                          d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+    </nav>
+
     <nav class="my-2 my-md-0 mr-md-3">
         <div class="helpdropdown">
         <a class="p-2 navigationitem" href="#" role="button" id="helpdropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-offset="-75,4">Help</a>
@@ -126,20 +144,7 @@
 
                 <div class="album py-5">
 
-                    <div class="sb-example-1">
-                        <div class="search">
-                            <input id="searchfield" type="text" class="searchTerm" placeholder="Search">
-                            <button id="searchbutton" type="submit" class="searchbutton">
-                                <svg width="100%" height="auto" viewBox="-1 -3 22 22" class="bi bi-search" fill="info"
-                                     xmlns="http://www.w3.org/2000/svg">
-                                    <path fill-rule="evenodd"
-                                          d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
-                                    <path fill-rule="evenodd"
-                                          d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
-                                </svg>
-                            </button>
-                        </div>
-                    </div>
+                    
 
 
                     <div class="album py-5 ">

From faee38e91c2ca4c537ab55c5d26a8634af99f3fe Mon Sep 17 00:00:00 2001
From: Rebecca Hollis <rhollis@jdsfaulkner.com>
Date: Fri, 15 Jan 2021 16:01:07 -0500
Subject: [PATCH 06/11] added keywords to the web resources in
 resources-landing-page.json

---
 src/assets/conf/resources-landing-page.json | 75 ++++++++++++++-------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/assets/conf/resources-landing-page.json b/src/assets/conf/resources-landing-page.json
index 0bc9ef6..6ca1da0 100644
--- a/src/assets/conf/resources-landing-page.json
+++ b/src/assets/conf/resources-landing-page.json
@@ -8,28 +8,32 @@
           "description": "Track your time off, manage your benefits plans, and access pay stubs using this human-resources application.",
           "imagePath": "paycor-logo3-100x100.png",
           "urlText": "https://www.paycor.com/",
-          "altText": "Paycor logo"
+          "altText": "Paycor logo",
+          "keywords": "human resources, benefits, vacation, sick, bereavement, health, insurance, enrollment"
         },
         {
           "title": "Swag Store",
           "description": "Buy polo shirts and other logo gear here. Costs are deducted from Funny Money coupons or your paycheck.",
           "imagePath": "swag-store-icon-100x100.png",
           "urlText": "https://www.companycasuals.com/JDSfaulknerapparel/start.jsp",
-          "altText": "Store icon"
+          "altText": "Store icon",
+          "keywords": "human resources"
         },
         {
           "title": "NC-4EZ Form",
           "description": "Submit this form to HR so that the correct amount of state income tax can be witheld from your paychecks.",
           "imagePath": "tax-icon-100x100.png",
           "urlText": "https://www.ncdor.gov/documents/employees-withholding-allowance-certificate-nc-4ez",
-          "altText": "tax icon"
+          "altText": "tax icon",
+          "keywords": "human resources"
         },
         {
           "title": "W-4 Form",
           "description": "Fill out this form and submit to HR so that the company can withhold the correct federal income tax from your pay.",
           "imagePath": "tax-icon-100x100.png",
           "urlText": "https://www.irs.gov/forms-pubs/about-form-w-4",
-          "altText": "tax icon"
+          "altText": "tax icon",
+          "keywords": "human resources"
         }
       ]
     },
@@ -41,28 +45,32 @@
           "description": "Our website conveys the company's value and convinces visitors to choose JDSfaulkner, all in the blink of an eye.",
           "imagePath": "jdsfaulkner-small-icon.png",
           "urlText": "https://jdsfaulkner.com/",
-          "altText": "JDSfaulkner brand mark"
+          "altText": "JDSfaulkner brand mark",
+          "keywords": "marketing"
         },
         {
           "title": "Salesforce",
           "description": "Focus on the customer experience with the help of the Salesforce customer relationship management application.",
           "imagePath": "salesforce-logo-100x100.png",
           "urlText": "https://login.salesforce.com/",
-          "altText": "Salesforce logo"
+          "altText": "Salesforce logo",
+          "keywords": "marketing"
         },
         {
           "title": "Facebook",
           "description": "Through Facebook, the company connects with the community by sharing content and interacting with the public.",
           "imagePath": "facebooklogogrey_100x100.png",
           "urlText": "https://www.facebook.com/JDSfaulkner/",
-          "altText": "Facebook icon"
+          "altText": "Facebook icon",
+          "keywords": "marketing, social"
         },
         {
           "title": "LinkedIn",
           "description": "JDSfaulkner maintains a presence on LinkedIn for professional networking, posting job openings and receiving resumes.",
           "imagePath": "linkedinlogo_100x100.png",
           "urlText": "https://www.linkedin.com/company/jds-consulting-&-design",
-          "altText": "LinkedIn icon"
+          "altText": "LinkedIn icon",
+          "keywords": "marketing, social"
         }
       ]
     },
@@ -74,28 +82,32 @@
           "description": "Access your company e-mail along with a suite of Google apps, including a calendar, instant messaging and cloud storage.",
           "imagePath": "gmail-logo2-100x100.png",
           "urlText": "https://mail.google.com",
-          "altText": "Gmail logo"
+          "altText": "Gmail logo",
+          "keywords": "productivity"
         },
         {
           "title": "Workplace",
           "description": "Get the latest news and connect with colleagues. JDSfaulkner uses Workplace by Facebook for posting and sharing.",
           "imagePath": "workplace-logo3-100x100.png",
           "urlText": "https://jdsfaulkner.workplace.com",
-          "altText": "Workplace logo"
+          "altText": "Workplace logo",
+          "keywords": "productivity, social"
         },
         {
           "title": "Google Workspace",
           "description": "This suite of Google products includes Gmail, Calendar, Meet, Chat, Drive, Docs, Sheets, Slides, Forms and more.",
           "imagePath": "google-logo2-100x100.png",
           "urlText": "https://myaccount.google.com/",
-          "altText": "Google Workspace logo"
+          "altText": "Google Workspace logo",
+          "keywords": "productivity, e-mail"
         },
         {
           "title": "Dropbox",
           "description": "The Structural Engineering Design department stores most of its files and folders in the Dropbox cloud-based system.",
           "imagePath": "dropbox-logo3-100x100.png",
           "urlText": "https://www.dropbox.com/login",
-          "altText": "Dropbox logo"
+          "altText": "Dropbox logo",
+          "keywords": "productivity, storage"
         }
       ]
     },
@@ -107,35 +119,40 @@
           "description": "Visit your central location for e-learning, offering the flexibility to learn on your own schedule and at your own pace. Password: jdsfaulknerschool",
           "imagePath": "learning-center-icon4-100x100.png",
           "urlText": "https://jdsfaulkner.workplace.com",
-          "altText": "Learning Center icon"
+          "altText": "Learning Center icon",
+          "keywords": "training, courses"
         },
         {
           "title": "Company Procedures",
-          "description": "Find out how to carry out specific tasks at JDSfaulkner in a manner that ensures company-wide consistency and quality. Password: jdsfaulknerschool",
+          "description": "Find out how to carry out specific tasks at JDSfaulkner in a manner that ensures company-wide consistency and quality. Learning Center password: jdsfaulknerschool",
           "imagePath": "learning-center-icon4-100x100.png",
           "urlText": "https://learning.carolina.engineering/additional-resources/",
-          "altText": "Learning Center icon"
+          "altText": "Learning Center icon",
+          "keywords": "SOP, standard operating procedure, training, instructions"
         },
         {
           "title": "Field Guide",
-          "description": "This quick-reference guide helps engineering technicians find helpful charts, tables and information. Password: jdsfaulknerschool",
+          "description": "This quick-reference guide helps engineering technicians find helpful charts, tables and information. Learning Center password: jdsfaulknerschool",
           "imagePath": "learning-center-icon4-100x100.png",
           "urlText": "https://learning.carolina.engineering/additional-resources/",
-          "altText": "Learning Center icon"
+          "altText": "Learning Center icon",
+          "keywords": "training"
         },
         {
           "title": "CAD Tech Study Guide",
-          "description": "This guide presents lessons for drafters, each of which can help a drafter advance to CAD Tech II status. Password: jdsfaulknerschool",
+          "description": "This guide presents lessons for drafters, each of which can help a drafter advance to CAD Tech II status. Learning Center password: jdsfaulknerschool",
           "imagePath": "learning-center-icon4-100x100.png",
           "urlText": "https://learning.carolina.engineering/additional-resources/",
-          "altText": "Learning Center icon"
+          "altText": "Learning Center icon",
+          "keywords": "training, modules, drafting, design"
         },
         {
           "title": "Deltek University",
           "description": "Increase your Deltek knowledge with courses designed to teach you how to use Deltek solutions.",
           "imagePath": "deltek-logo-black.png",
           "urlText": "https://www.deltek.com/en/support/deltek-university",
-          "altText": "Deltek logo"
+          "altText": "Deltek logo",
+          "keywords": "training"
         }
       ]
     },
@@ -147,42 +164,48 @@
           "description": "Create, track, review and bill field-engineering projects, start to finish, with Clarity project management software.",
           "imagePath": "clarity-icon-100x100.png",
           "urlText": "https://learning.carolina.engineering/introduction-to-clarity/",
-          "altText": "Clarity image"
+          "altText": "Clarity image",
+          "keywords": "workflow, applications, account"
         },
         {
           "title": "Project Insight",
           "description": "Structural Engineering Design uses this project management software to centralize the group's work, tasks and projects.",
           "imagePath": "project-insight-logo6-100x100.png",
           "urlText": "https://jds.projectinsight.net/",
-          "altText": "Project Insight logo"
+          "altText": "Project Insight logo",
+          "keywords": "workflow, applications, CAD, draft, plans, account, track"
         },
         {
           "title": "Deltek",
           "description": "Project intelligence, management and collaboration software helps maximize productivity and revenue.",
           "imagePath": "deltek-logo-black.png",
           "urlText": "https://www.deltek.com/en",
-          "altText": "Deltek logo"
+          "altText": "Deltek logo",
+          "keywords": "workflow, applications, account, track"
         },
         {
           "title": "Procore",
           "description": "Administrators for field engineering projects use Procore for collecting, reviewing and approving invoices.",
           "imagePath": "ProcoreLogo2.png",
           "urlText": "https://www.procore.com/",
-          "altText": "Procore logo"
+          "altText": "Procore logo",
+          "keywords": "workflow, applications, software, account"
         },
         {
           "title": "Client W-9 Form",
           "description": "A W-9 form is required by JDSfaulkner so that the company can file an information return with the IRS.",
           "imagePath": "tax-icon-100x100.png",
           "urlText": "https://www.irs.gov/forms-pubs/about-form-w-9",
-          "altText": "tax icon"
+          "altText": "tax icon",
+          "keywords": "workflow, tax, account"
         },
         {
           "title": "Project Folders",
           "description": "Access vital information about specific projects – from initial set-up to final delivery – in an accessible and central location.",
           "imagePath": "project-folder-icon-100x100.png",
           "urlText": "../resources/coming-soon.pdf",
-          "altText": "Project folder icon"
+          "altText": "Project folder icon",
+          "keywords": "workflow"
         }
       ]
     }

From 0c7d228ef9c95626dca03ff3d90c93aa5e460487 Mon Sep 17 00:00:00 2001
From: Rebecca Hollis <rhollis@jdsfaulkner.com>
Date: Fri, 15 Jan 2021 16:44:44 -0500
Subject: [PATCH 07/11] edited some resource descriptions

---
 src/assets/resources/marketing/JDSfaulkner-Letterhead.docx.json | 2 +-
 src/assets/resources/marketing/JDSfaulkner_Logo.eps.json        | 2 +-
 src/assets/resources/marketing/JDSfaulkner_Logo.png.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/resources/marketing/JDSfaulkner-Letterhead.docx.json b/src/assets/resources/marketing/JDSfaulkner-Letterhead.docx.json
index 87a65c3..624ebc4 100644
--- a/src/assets/resources/marketing/JDSfaulkner-Letterhead.docx.json
+++ b/src/assets/resources/marketing/JDSfaulkner-Letterhead.docx.json
@@ -1,5 +1,5 @@
 {
 	"title": "JDSfaulkner Letterhead",
-    "description": "Represent the company in a professional and consistent manner by writing your letters using this official letterhead template.",
+    "description": "Represent the company in a professional and consistent manner using the official letterhead for correspondence.",
     "altText": "Document icon"
 }          
\ No newline at end of file
diff --git a/src/assets/resources/marketing/JDSfaulkner_Logo.eps.json b/src/assets/resources/marketing/JDSfaulkner_Logo.eps.json
index 0f186a3..578560e 100644
--- a/src/assets/resources/marketing/JDSfaulkner_Logo.eps.json
+++ b/src/assets/resources/marketing/JDSfaulkner_Logo.eps.json
@@ -1,5 +1,5 @@
 {
           "title": "JDSfaulkner Logo - EPS",
-          "description": "Do you need to present the logo in your work? Here's an eps format to use in collateral and merchandise.",
+          "description": "Do you need to present the logo in your work? Here's an EPS format to use in collateral and merchandise.",
           "altText": "Image icon"
 }
\ No newline at end of file
diff --git a/src/assets/resources/marketing/JDSfaulkner_Logo.png.json b/src/assets/resources/marketing/JDSfaulkner_Logo.png.json
index f8a2a66..1fa535d 100644
--- a/src/assets/resources/marketing/JDSfaulkner_Logo.png.json
+++ b/src/assets/resources/marketing/JDSfaulkner_Logo.png.json
@@ -1,5 +1,5 @@
 {
 	      "title": "JDSfaulkner Logo - PNG",
-          "description": "Do you need to present the logo in your work? Here's a png format to use in collateral and merchandise.",
+          "description": "Do you need to present the logo in your work? Here's a PNG format to use in collateral and merchandise.",
           "altText": "Image icon"
 }
\ No newline at end of file

From d8625fe0177a23a7d2a81d1c08edc0317801866a Mon Sep 17 00:00:00 2001
From: Rebecca Hollis <rhollis@jdsfaulkner.com>
Date: Tue, 19 Jan 2021 11:32:43 -0500
Subject: [PATCH 08/11] changed search field and button colors

---
 src/assets/pages/styles/theme-base.scss  | 37 +++++++++++++++++++-----
 src/assets/pages/styles/theme-dark.scss  | 14 +++++----
 src/assets/pages/styles/theme-light.scss | 10 +++++--
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/assets/pages/styles/theme-base.scss b/src/assets/pages/styles/theme-base.scss
index 7a28a7b..613e07c 100644
--- a/src/assets/pages/styles/theme-base.scss
+++ b/src/assets/pages/styles/theme-base.scss
@@ -102,27 +102,35 @@ body {
   position: relative;
   display: flex;
   margin: auto;
-  max-width: 1100px
+  max-width: 1100px;
 }
 
 .sb-example-1 .searchTerm {
   width: 100%;
   border: 1px solid;
-  border-color: map-get($theme-colors, boxborder2);
+  border-color: map-get($theme-colors, boxborder3);
   border-right: none;
   padding-left: 15px;
   padding-right: 15px;
   border-radius: 25px 0 0 25px;
   stroke: map-get($theme-colors, searchicon);
   color: map-get($theme-colors, searchhint);
-  background-color: map-get($theme-colors, info);
+  background-color: map-get($theme-colors, searchfill);
+  box-shadow: none;
+  outline: none;
+}
+
+.sb-example-1 .searchTerm:hover {
+  stroke: map-get($theme-colors, searchiconhover);
+  background-color: map-get($theme-colors, searchfill);
   box-shadow: none;
+  color: map-get($theme-colors, searchfont) !important;
   outline: none;
 }
 
 .sb-example-1 .searchTerm:focus {
-  stroke: map-get($theme-colors, searchicon);
-  background-color: map-get($theme-colors, info);
+  stroke: map-get($theme-colors, searchiconhover);
+  background-color: map-get($theme-colors, searchfill);
   box-shadow: none;
   color: map-get($theme-colors, searchfont) !important;
   outline: none;
@@ -143,14 +151,29 @@ body {
   outline: none;
 }
 
+.sb-example-1 .searchbutton:hover {
+  width: 40px;
+  height: 50px;
+  border: 1px solid;
+  border-color: map-get($theme-colors, boxborder2);
+  background-color: map-get($theme-colors, searchbuttonfill);
+  text-align: center;
+  fill: map-get($theme-colors, searchiconhover) !important;
+  border-radius: 0 25px 25px 0;
+  cursor: pointer;
+  font-weight: normal;
+  box-shadow: none;
+  outline: none;
+}
+
 .sb-example-1 .searchbutton:focus {
   width: 40px;
   height: 50px;
   border: 1px solid;
   border-color: map-get($theme-colors, boxborder2);
-  background-color: map-get($theme-colors, searchbuttonfillfocus);
+  background-color: map-get($theme-colors, searchbuttonfill);
   text-align: center;
-  fill: map-get($theme-colors, searchiconfocus);
+  fill: map-get($theme-colors, searchiconfocus) !important;
   border-radius: 0 25px 25px 0;
   cursor: pointer;
   font-weight: normal;
diff --git a/src/assets/pages/styles/theme-dark.scss b/src/assets/pages/styles/theme-dark.scss
index 75093e7..eb57e7e 100644
--- a/src/assets/pages/styles/theme-dark.scss
+++ b/src/assets/pages/styles/theme-dark.scss
@@ -11,15 +11,19 @@ $theme-colors: (
         "inactivecard": #333337,
         "activecard": #4f4f56,
         "boxborder": #272727,
-        "boxborder2": #2f2f2f,
+        "boxborder2": #3c3c42,
+        "boxborder3": #323237,
         "activecardfont":#e1e4e8,
         "searchhint": #6b6866,
         "searchfont": #9f9c9a, 
+        "searchfill": #323237,
         "sidebarfill": #202023,
-        "searchbuttonfill": #39393f,
-        "searchbuttonfillfocus": #3e3e45, 
-        "searchicon": #737373,
-        "searchiconfocus": #878787,
+        "searchbuttonfill": #585861,
+        "searchbuttonfillhover": #808080, 
+        "searchbuttonfillfocus": #585861, 
+        "searchicon": #808080,
+        "searchiconhover": #c5c5c5,
+        "searchiconfocus": #c5c5c5,
         "sidebartext": #7d7d7d,
         "sidebarbg": #29292d,
         "webcardimagebackground": #707070,
diff --git a/src/assets/pages/styles/theme-light.scss b/src/assets/pages/styles/theme-light.scss
index bfc657d..41c4aa7 100644
--- a/src/assets/pages/styles/theme-light.scss
+++ b/src/assets/pages/styles/theme-light.scss
@@ -11,17 +11,21 @@ $theme-colors: (
         "inactivecard": #ffffff,
         "activecard": #13a04a,
         "boxborder": #c0c2c6,
-        "boxborder2": #c0c2c6,
+        "boxborder2": #ececec,
+        "boxborder3": #ebebeb,
         "activecardfont": #e1e4e8,
         "searchhint": #c0c2c6,
         "searchfont": #2c2c2c,
         "sidebarfill": #efefef,
         "sidebartext": #3f4959,
         "sidebarbg": #e5e5e5,
-        "searchbuttonfill": #f6f6f6,
+        "searchfill": #f0f0f2,
+        "searchbuttonfill": #ffffff,
+        "searchbuttonfillhover": #f6f6f6,
         "searchbuttonfillfocus": #f1f1f1,
         "searchicon": #3f4959,
-        "searchiconfocus": #38414f,
+        "searchiconhover": #000,
+        "searchiconfocus": #000,
         "webcardimagebackground": #eeeeee,
         "webcardimagebackgroundhover": #f0f0f0,
         "headertextcolor": #080404,

From dde4ee23ce5df6ae9550ea177d0e73471028f993 Mon Sep 17 00:00:00 2001
From: Rebecca Hollis <rhollis@jdsfaulkner.com>
Date: Tue, 19 Jan 2021 11:42:43 -0500
Subject: [PATCH 09/11] pushed down the top margin of the main area so that
 when the screen has a smaller width, the navbar does not overlap

---
 src/assets/pages/resources-landing-page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/pages/resources-landing-page.html b/src/assets/pages/resources-landing-page.html
index 49f1fc2..7bf227d 100644
--- a/src/assets/pages/resources-landing-page.html
+++ b/src/assets/pages/resources-landing-page.html
@@ -140,7 +140,7 @@
         </nav>
 
         <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
-            <div class="justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3">
+            <div class="justify-content-between flex-wrap flex-md-nowrap align-items-center pt-5 pb-2 mb-3">
 
                 <div class="album py-5">
 

From 3fd194138d81431075e58a5b87b055bcd1e604d7 Mon Sep 17 00:00:00 2001
From: Rebecca Hollis <rhollis@jdsfaulkner.com>
Date: Tue, 19 Jan 2021 11:53:34 -0500
Subject: [PATCH 10/11] added keywords to the web resources that were
 downloadable files

---
 .../human-resources/2-Paycor_Direct_Deposit_Worksheet.pdf.json | 3 ++-
 .../resources/human-resources/Employment-Application.docx.json | 3 ++-
 .../human-resources/ExpenseReportJDSfaulknerFILLIN.pdf.json    | 3 ++-
 .../JDSfaulknerDraftingQuiz_11-16-20a.docx.json                | 3 ++-
 .../JDSfaulknerEmpHandbook-v8.0_WithAddendums.pdf.json         | 3 ++-
 .../resources/human-resources/Notice-and-Agreement.pdf.json    | 3 ++-
 src/assets/resources/marketing/ComingSoon-Brochure.pdf.json    | 3 ++-
 src/assets/resources/marketing/ComingSoon-SOQ.pdf.json         | 3 ++-
 .../resources/marketing/JDSfaulkner-Letterhead.docx.json       | 3 ++-
 src/assets/resources/marketing/JDSfaulkner_Logo.eps.json       | 3 ++-
 src/assets/resources/marketing/JDSfaulkner_Logo.png.json       | 3 ++-
 11 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/assets/resources/human-resources/2-Paycor_Direct_Deposit_Worksheet.pdf.json b/src/assets/resources/human-resources/2-Paycor_Direct_Deposit_Worksheet.pdf.json
index 85fe56b..5a313b7 100644
--- a/src/assets/resources/human-resources/2-Paycor_Direct_Deposit_Worksheet.pdf.json
+++ b/src/assets/resources/human-resources/2-Paycor_Direct_Deposit_Worksheet.pdf.json
@@ -1,5 +1,6 @@
 {
           "title": "Direct Deposit",
           "description": "Would you like have your paychecks deposited into your bank account? Fill out this form and submit it to HR.",
-          "altText": "PDF icon"
+          "altText": "PDF icon",
+          "keywords": "human resources"
 }
\ No newline at end of file
diff --git a/src/assets/resources/human-resources/Employment-Application.docx.json b/src/assets/resources/human-resources/Employment-Application.docx.json
index 548163c..088baa6 100644
--- a/src/assets/resources/human-resources/Employment-Application.docx.json
+++ b/src/assets/resources/human-resources/Employment-Application.docx.json
@@ -2,5 +2,6 @@
 
           "title": "Employment Application",
           "description": "Would you or someone you know like to apply for a position? JDSfaulkner is always accepting applications.",
-          "altText": "Document icon"
+          "altText": "Document icon",
+          "keywords": "human resources, career, job"
 }
\ No newline at end of file
diff --git a/src/assets/resources/human-resources/ExpenseReportJDSfaulknerFILLIN.pdf.json b/src/assets/resources/human-resources/ExpenseReportJDSfaulknerFILLIN.pdf.json
index 42077c5..d5b1550 100644
--- a/src/assets/resources/human-resources/ExpenseReportJDSfaulknerFILLIN.pdf.json
+++ b/src/assets/resources/human-resources/ExpenseReportJDSfaulknerFILLIN.pdf.json
@@ -1,5 +1,6 @@
  {
           "title": "Expense Report",
           "description": "Request reimbursement for preapproved, company-related expenses. Send this form and receipts to Accounts Payable.",
-          "altText": "PDF icon"
+          "altText": "PDF icon",
+          "keywords": "human resources, purchase"
         }
\ No newline at end of file
diff --git a/src/assets/resources/human-resources/JDSfaulknerDraftingQuiz_11-16-20a.docx.json b/src/assets/resources/human-resources/JDSfaulknerDraftingQuiz_11-16-20a.docx.json
index de3a55b..d1954bc 100644
--- a/src/assets/resources/human-resources/JDSfaulknerDraftingQuiz_11-16-20a.docx.json
+++ b/src/assets/resources/human-resources/JDSfaulknerDraftingQuiz_11-16-20a.docx.json
@@ -1,5 +1,6 @@
  {
           "title": "Drafting Quiz",
           "description": "Click here to access a prequalifying quiz that is a requirement for those applying for drafting positions.",
-          "altText": "Document icon"
+          "altText": "Document icon",
+          "keywords": "human resources, plans, design, job, career, interview"
         }
\ No newline at end of file
diff --git a/src/assets/resources/human-resources/JDSfaulknerEmpHandbook-v8.0_WithAddendums.pdf.json b/src/assets/resources/human-resources/JDSfaulknerEmpHandbook-v8.0_WithAddendums.pdf.json
index 3fec641..14cac23 100644
--- a/src/assets/resources/human-resources/JDSfaulknerEmpHandbook-v8.0_WithAddendums.pdf.json
+++ b/src/assets/resources/human-resources/JDSfaulknerEmpHandbook-v8.0_WithAddendums.pdf.json
@@ -1,5 +1,6 @@
 {
 	      "title": "Employee Handbook",
           "description": "Read the handbook to learn about the company’s policies related to employment, including pay and benefits.",
-          "altText": "PDF icon"
+          "altText": "PDF icon",
+          "keywords": "human resources"
 }
\ No newline at end of file
diff --git a/src/assets/resources/human-resources/Notice-and-Agreement.pdf.json b/src/assets/resources/human-resources/Notice-and-Agreement.pdf.json
index 6e3cdf6..8d929e9 100644
--- a/src/assets/resources/human-resources/Notice-and-Agreement.pdf.json
+++ b/src/assets/resources/human-resources/Notice-and-Agreement.pdf.json
@@ -1,5 +1,6 @@
 {
 	      "title": "SRA",
           "description": "A salary reduction agreement helps you to establish or change the part of your compensation that goes to an IRA.",
-          "altText": "PDF icon"
+          "altText": "PDF icon",
+          "keywords": "human resources, savings, retirement"
 }
\ No newline at end of file
diff --git a/src/assets/resources/marketing/ComingSoon-Brochure.pdf.json b/src/assets/resources/marketing/ComingSoon-Brochure.pdf.json
index 83c276f..6a32cbb 100644
--- a/src/assets/resources/marketing/ComingSoon-Brochure.pdf.json
+++ b/src/assets/resources/marketing/ComingSoon-Brochure.pdf.json
@@ -1,5 +1,6 @@
 {
 	"title": "JDSfaulkner Brochure",
     "description": "Share the company's brochure with existing and potential clients to showcase the value JDSfaulkner has to offer.",
-    "altText": "PDF icon"
+    "altText": "PDF icon",
+    "keywords": "marketing, publications"
 }          
\ No newline at end of file
diff --git a/src/assets/resources/marketing/ComingSoon-SOQ.pdf.json b/src/assets/resources/marketing/ComingSoon-SOQ.pdf.json
index 1861075..5ec6021 100644
--- a/src/assets/resources/marketing/ComingSoon-SOQ.pdf.json
+++ b/src/assets/resources/marketing/ComingSoon-SOQ.pdf.json
@@ -1,5 +1,6 @@
 {
 	"title": "JDSfaulkner SOQ",
     "description": "SOQs present the experience and capabilities that qualify JDSfaulkner to win contracts or new clients.",
-    "altText": "PDF icon"
+    "altText": "PDF icon",
+    "keywords": "marketing, statement, qualifications, publications"
 }
\ No newline at end of file
diff --git a/src/assets/resources/marketing/JDSfaulkner-Letterhead.docx.json b/src/assets/resources/marketing/JDSfaulkner-Letterhead.docx.json
index 624ebc4..dfa4e40 100644
--- a/src/assets/resources/marketing/JDSfaulkner-Letterhead.docx.json
+++ b/src/assets/resources/marketing/JDSfaulkner-Letterhead.docx.json
@@ -1,5 +1,6 @@
 {
 	"title": "JDSfaulkner Letterhead",
     "description": "Represent the company in a professional and consistent manner using the official letterhead for correspondence.",
-    "altText": "Document icon"
+    "altText": "Document icon",
+    "keywords": "marketing, template"
 }          
\ No newline at end of file
diff --git a/src/assets/resources/marketing/JDSfaulkner_Logo.eps.json b/src/assets/resources/marketing/JDSfaulkner_Logo.eps.json
index 578560e..882660a 100644
--- a/src/assets/resources/marketing/JDSfaulkner_Logo.eps.json
+++ b/src/assets/resources/marketing/JDSfaulkner_Logo.eps.json
@@ -1,5 +1,6 @@
 {
           "title": "JDSfaulkner Logo - EPS",
           "description": "Do you need to present the logo in your work? Here's an EPS format to use in collateral and merchandise.",
-          "altText": "Image icon"
+          "altText": "Image icon",
+          "keywords": "marketing"
 }
\ No newline at end of file
diff --git a/src/assets/resources/marketing/JDSfaulkner_Logo.png.json b/src/assets/resources/marketing/JDSfaulkner_Logo.png.json
index 1fa535d..cb07253 100644
--- a/src/assets/resources/marketing/JDSfaulkner_Logo.png.json
+++ b/src/assets/resources/marketing/JDSfaulkner_Logo.png.json
@@ -1,5 +1,6 @@
 {
 	      "title": "JDSfaulkner Logo - PNG",
           "description": "Do you need to present the logo in your work? Here's a PNG format to use in collateral and merchandise.",
-          "altText": "Image icon"
+          "altText": "Image icon",
+          "keywords": "marketing"
 }
\ No newline at end of file

From 6b237dfbbb2253b296bee52315618c649796fa08 Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsfaulkner.com>
Date: Wed, 20 Jan 2021 13:11:46 -0500
Subject: [PATCH 11/11] search will correctly match files based on keyword

---
 src/ts_source/fileutils.ts | 29 ++++++++++++-----------------
 src/ts_source/search.ts    | 20 +++++++++++++-------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/ts_source/fileutils.ts b/src/ts_source/fileutils.ts
index be7fafb..af42c14 100644
--- a/src/ts_source/fileutils.ts
+++ b/src/ts_source/fileutils.ts
@@ -114,27 +114,24 @@ export class DocumentDirectory {
 
     private static walkCards(d: DirectoryNode): Map<string, object[]> {
         let cardsByCategory = new Map<string, object[]>();
-        for (let i = 0, l = d.children.length; i < l; i++) {
-            let child = d.children[i];
+        for (let child of d.children) {
             if (child instanceof DirectoryNode) {
                 let dir = child as DirectoryNode;
                 if (dir.containsDirectory()) {
                     let childDirectories = dir.getDirectories();
-                    for (let j = 0, k = childDirectories.length; j < k; j++) {
-                        let dir = childDirectories[j];
+                    for (let dir of childDirectories) {
                         let subCards = DocumentDirectory.walkCards(dir);
                         this.mergeMaps(cardsByCategory, subCards);
                     }
                 }
                 let sCards = dir.getDocuments();
                 let category = dir.getCategory();
-                for (let sCard in sCards) {
-                    let scrd = sCards[sCard];
+                for (let sCard of sCards) {
                     let cards = cardsByCategory.get(category);
                     if (cards === undefined || cards === null) {
                         cards = [];
                     }
-                    cards.push(scrd.toCard());
+                    cards.push(sCard.toCard());
                     cardsByCategory.set(category, cards);
                 }
             } else {
@@ -153,8 +150,7 @@ export class DocumentDirectory {
 
     private static mergeMaps(a: Map<string, Object[]>, b: Map<string, Object[]>) {
         let keys = Object.keys(b);
-        for (let z in keys) {
-            let key = keys[z];
+        for (let key of keys) {
             let sa = a.get(key)
             if (sa === undefined || sa === null) {
                 sa = [];
@@ -213,12 +209,12 @@ export class FileNode {
             "imagePath": imageName,
             "urlText": this.filePath,
             "altText": "",
-            "fileCard": true
+            "fileCard": true,
+            "open": this.open
         }
 
         let altKeys = Object.keys(altProps);
-        for (let kidx in altKeys) {
-            let key = altKeys[kidx];
+        for (let key of altKeys) {
             cardObj[key] = altProps[key]
         }
 
@@ -251,9 +247,9 @@ export class DirectoryNode extends FileNode {
             let stats = fs.lstatSync(filePath);
             if (stats.isDirectory()) {
                 let contents = fs.readdirSync(filePath);
-                for (let i = 0, l = contents.length; i < l; i++) {
-                    if (path.extname(contents[i]) === ".json") continue;
-                    let childPath = path.join(filePath, contents[i]);
+                for (let fileName of contents) {
+                    if (path.extname(fileName) === ".json") continue;
+                    let childPath = path.join(filePath, fileName);
                     let childStats = fs.lstatSync(childPath);
                     if (childStats.isDirectory()) {
                         this.children.push(new DirectoryNode(childPath, this));
@@ -282,8 +278,7 @@ export class DirectoryNode extends FileNode {
     }
 
     containsDirectory(): Boolean {
-        for (let i = 0, l = this.children.length; i < l; i++) {
-            let child = this.children[i];
+        for (let child of this.children) {
             if (child instanceof DirectoryNode) return true;
         }
         return false
diff --git a/src/ts_source/search.ts b/src/ts_source/search.ts
index e19d676..d651f05 100644
--- a/src/ts_source/search.ts
+++ b/src/ts_source/search.ts
@@ -14,7 +14,7 @@ function register() {
                 search(term);
             }
 
-        }else{
+        } else {
             let term = searchBar.val().toString();
             if (!term || 0 === term.length) {
                 reset()
@@ -23,7 +23,7 @@ function register() {
     });
 
 
-    searchButton.on("click", ()=>{
+    searchButton.on("click", () => {
         let term = searchBar.val().toString();
         if (!term || 0 === term.length) {
             reset()
@@ -33,7 +33,7 @@ function register() {
     })
 }
 
-function reset(){
+function reset() {
     buildUiFromConfig("resources-landing-page.json");
 }
 
@@ -47,7 +47,7 @@ function search(term: string) {
     expandAllContainers();
 }
 
-function copyMissingKeys(webCards: object, fileCards: Map<string, object>){
+function copyMissingKeys(webCards: object, fileCards: Map<string, object>) {
     let elementConfig = Configurator.loadAppConfig("resources-landing-page.json");
     let containerKeys = Object.keys(elementConfig);
     for (let containerKey of containerKeys) {
@@ -127,8 +127,14 @@ function addToFileMap(map: Map<string, object>, categoryKey: string, card) {
 function cardContainsTerm(term: string, card: object): boolean {
     let titleContains = card["title"].toLowerCase().includes(term.toLowerCase());
     let descriptionContains = card["description"].toLowerCase().includes(term.toLowerCase());
+
+    let keywordContains = false;
+    if (card["keywords"]) {
+        keywordContains = card["keywords"].toLowerCase().includes(term.toLowerCase());
+    }
+
     //todo: add keywords
-    return titleContains || descriptionContains;
+    return titleContains || descriptionContains || keywordContains;
 }
 
 function highlightCardTerm(term: string, card: object): object {
@@ -143,9 +149,9 @@ function escapeRegExp(term: string): string {
     return term.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 }
 
-function expandAllContainers(){
+function expandAllContainers() {
     let containers = $('[id$="collapser"]')
-    for(let container of containers){
+    for (let container of containers) {
         container.click()
     }