diff --git a/WebContent/WEB-INF/lib/mysql-connector-java-5.1.40-bin.jar b/WebContent/WEB-INF/lib/mysql-connector-java-5.1.40-bin.jar new file mode 100644 index 0000000..60bef5c Binary files /dev/null and b/WebContent/WEB-INF/lib/mysql-connector-java-5.1.40-bin.jar differ diff --git a/WebContent/html/javascript/listing.js b/WebContent/html/javascript/listing.js index 6275ffe..f67c432 100644 --- a/WebContent/html/javascript/listing.js +++ b/WebContent/html/javascript/listing.js @@ -1,49 +1,56 @@ //get all the option buttons var options = document.getElementsByClassName('option'); +var dev0 = { +name: window.myname, +description: window.mydesc, +hardware: window.myhard, +software:"potato" +}; + var dev1 = { - name:"George", - description:"George is probably the coolest iPhone to exist. Ever. Point blank, period.", - hardware:"iphone", - software:"apple" + name:"George", + description:"George is probably the coolest iPhone to exist. Ever. Point blank, period.", + hardware:"iphone", + software:"apple" }; var dev2 = { - name:"Greyson", - description:"Greyson is pretty cool.. I guess.", - hardware:"iphone", - software:"apple" + name:"Greyson", + description:"Greyson is pretty cool.. I guess.", + hardware:"iphone", + software:"apple" }; var dev3 = { - name:"Linkin Park", - description:'"The hardest part of ending is starting again."', - hardware:"ipad", - software:"apple" + name:"Linkin Park", + description:'"The hardest part of ending is starting again."', + hardware:"ipad", + software:"apple" }; var dev4 = { - name:"Abercrombie", - description:"To all the people that hated me in high school, I have the prettiest clothes you all wear now!!", - hardware:"ipad", - software:"apple" + name:"Abercrombie", + description:"To all the people that hated me in high school, I have the prettiest clothes you all wear now!!", + hardware:"ipad", + software:"apple" }; var dev5 = { - name:"Hulk", - description:"Go ahead and HULK SMASH! this awesome computer stick into your USB.", - hardware:"computerStick", - software:"intel" + name:"Hulk", + description:"Go ahead and HULK SMASH! this awesome computer stick into your USB.", + hardware:"computerStick", + software:"intel" }; var dev6 = { - name:"Captain America", - description:'"Make America Great Again. Wait, thats someone else.."', - hardware:"computerStick", - software:"intel" + name:"Captain America", + description:'"Make America Great Again. Wait, thats someone else.."', + hardware:"computerStick", + software:"intel" }; -var devices = [dev1, dev2, dev3, dev4, dev5, dev6]; +var devices = [dev0, dev1, dev2, dev3, dev4, dev5, dev6]; options[0].addEventListener('click', showAll); for(var a = 1; a < options.length; a++){ options[a].addEventListener('click', show); @@ -53,11 +60,11 @@ showAll(); function showAll(){ var html = ''; - + for(var i = 0; i < devices.length; i++){ html += '
' + devices[i].description + '
' + devices[i].description + '