Merge pull request #12 from arc12012/BrisBranch

Bris branch
arc12012 · Dec 7, 2016 · cab4dd7 · cab4dd7
2 parents cc1257d + ded9041
commit cab4dd7
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 7 deletions.
diff --git a/WebContent/html/imgs/potato.png b/WebContent/html/imgs/potato.png
diff --git a/WebContent/html/javascript/listing.js → WebContent/html/javascript/listing.jsp b/WebContent/html/javascript/listing.js → WebContent/html/javascript/listing.jsp
@@ -1,11 +1,40 @@
+<%@ page import = "database.MySQLAccess" %>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+<%
+MySQLAccess myaccess = new MySQLAccess();
+myaccess.connectDB();
+String name = myaccess.getResult()[0][0];
+String description = myaccess.getResult()[0][1];
+String hardware = myaccess.getResult()[0][2];
+//out.println(name);
+//out.println(description);
+//out.println(hardware);
+%>
+
+<script type=text/javascript>
+//gets variables for database data
+(function(){
+	window.myname = "<%=name%>";
+	window.mydesc = "<%=description%>";
+	window.myhard = "<%=hardware%>"; 
+	})();
+	
 //get all the option buttons
 var options = document.getElementsByClassName('option');
 
-var dev0 = { 
+var dev7 = { 
 name: window.myname,
 description: window.mydesc,
 hardware: window.myhard,
-software:"potato"
+software:"intel"
 };
 
 var dev1 = {
@@ -50,7 +79,7 @@ var dev6 = {
 		software:"intel"
 };
 
-var devices = [dev0, dev1, dev2, dev3, dev4, dev5, dev6];
+var devices = [dev1, dev2, dev3, dev4, dev5, dev6, dev7];
 options[0].addEventListener('click', showAll);
 for(var a = 1; a < options.length; a++){
 	options[a].addEventListener('click', show);
@@ -136,4 +165,7 @@ function isUnavailable(id){
 		}
 	}
 	return 0;
-}
+}
+</script>
+</body>
+</html>
diff --git a/WebContent/html/javascript/navbar.js b/WebContent/html/javascript/navbar.js
diff --git a/WebContent/html/webpages/index.html b/WebContent/html/webpages/index.html
@@ -61,7 +61,7 @@ <h2>Return</h2>
     </a>
   </div>
   <div>
-    <a class = "divlink" href = "listingPage.html">
+    <a class = "divlink" href = "listingPage.jsp">
       <div class = "menuOption">
         <h2>All Items</h2>
         <p>Just curious to see what devices we have to offer? You've come to the right place.</p>   

diff --git a/WebContent/html/webpages/listingPage.html → WebContent/html/webpages/listingPage.jsp b/WebContent/html/webpages/listingPage.html → WebContent/html/webpages/listingPage.jsp
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
   <head>
     <meta charset="utf-8">
@@ -72,7 +73,7 @@ <h2>Device Dictionary</h2>
 		  <div id = "devContainer"></div>   
 	  </div>
 
-	  <script src="../javascript/listing.js"></script>
+	  <%@ include file="../javascript/listing.jsp" %>
     <script src = "../javascript/navbar.js"></script>
   </body>
 </html>
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -0,0 +1 @@
+/features/