fix merge conflicts

Author: VirtualDOMinic

public/index.html

@@ -19,6 +19,7 @@ <h3>Borrowing to go here</h3>
       <form>
         <input type="text" id="search-input" placeholder="Enter your search here..." autocomplete="off">
         <button id="search-btn">search</button>
+        <button id="all-items-btn">all items</button>
       </form>
       <section class="table-container">
         <table id="items-table">

public/script.js

@@ -8,6 +8,7 @@ var itemIdInput = document.getElementById('item-id');
 var successDiv= document.getElementById('success');
 var reqForm = document.getElementById('request-form');
 var submitItemBtn = document.getElementById('submit-item');
+var allItemsBtn = document.getElementById('all-items-btn');
 
 function request(url, method, cb) {
   var xhr = new XMLHttpRequest();
@@ -107,6 +108,14 @@ searchBtn.addEventListener("click", function(e) {
   }
 });
 
+allItemsBtn.addEventListener("click", function(e) {
+  e.preventDefault();
+
+ 
+    // requestData uses a callback populate/ musicPopulate to populate the DOM
+    request("/search?q=", 'GET', updateDom);
+  
+});
 
 function updateDom(err, data) {
   if (err) {
@@ -118,26 +127,34 @@ function updateDom(err, data) {
     var table = document.getElementById("items-table");
     clearList(table);
 
-    items.forEach(function(item) {
-      // adding our item names
-      var row = document.createElement("tr");
-      var name = document.createElement("td");
-      var loanBtn = document.createElement('button');
-      loanBtn.textContent = 'borrow';
-      loanBtn.setAttribute('id', item.id);
-      loanBtn.setAttribute('onclick', "borrow(this.id)");
-      name.innerHTML = item.name;
-      row.appendChild(name);
-
-      // adding our item descriptions
-      var description = document.createElement("td");
-      description.innerHTML = item.description;
-      row.appendChild(description);
-      row.appendChild(loanBtn);
-      // add everything to the table
-      table.appendChild(row);
-      
-    });
+    if(items.length > 0){
+      items.forEach(function(item) {
+        // adding our item names
+        var row = document.createElement("tr");
+        var name = document.createElement("td");
+        var loanBtn = document.createElement('button');
+        loanBtn.textContent = 'borrow';
+        loanBtn.setAttribute('id', item.id);
+        loanBtn.setAttribute('onclick', "borrow(this.id)");
+        name.innerHTML = item.name;
+        row.appendChild(name);
+  
+        // adding our item descriptions
+        var description = document.createElement("td");
+        description.innerHTML = item.description;
+        row.appendChild(description);
+        row.appendChild(loanBtn);
+        // add everything to the table
+        table.appendChild(row);
+        
+      });
+    }
+    else{
+      var errorMsg = document.createElement('h3');
+      errorMsg.textContent = 'Sorry no items match that search';
+      table.appendChild(errorMsg);
+    }
+    
   }
 }
 

src/handlers.js

@@ -38,8 +38,8 @@ const handlers = {
   public(req, res, endpoint) {
     fs.readFile(buildPath(endpoint), (err, file) => {
       if (err) {
-        res.writeHead(500, { "Content-Type": "text/html" });
-        res.end("<h1>Server Error</h1>");
+        res.writeHead(404, { "Content-Type": "text/html" });
+        res.end("<h1>Page not found</h1>");
         console.log("public error");
       } else {
         res.writeHead(200, {
@@ -62,7 +62,7 @@ const handlers = {
       } else {
         res.writeHead(200, "Content-type: application/json");
         res.end(JSON.stringify(result));
-      }
+       }
     });
   },
   requestItem(req, res) {

src/router.js

@@ -5,8 +5,8 @@ const router = (req, res) => {
 
   if (endpoint === "") {
     handlers.home(req, res);
-  } else if (endpoint.includes("search?q=")) {
-    handlers.search(req, res, endpoint);
+  } else if (endpoint.startsWith("search?q=")) {
+    handlers.search(req, res, endpoint); // some arguments maybe
   } else if (endpoint === "request-item") {
     handlers.requestItem(req, res);
   } else if (endpoint === "add-item") {