diff --git a/README.md b/README.md
index 8ee797b..bf30d82 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
-# [Synchrony Financial Mobile Device Tracking System](https://seniordesign.cfapps.io/html/webpages/)
+# [Innovation Hub](https://seniordesign.cfapps.io/html/webpages/)
In the Innovation Station at Synchrony Financial, applications are used by over 60 million cardholders across the US, and those customers use a huge variety of devices to access them. To make sure applications work on all devices they house hundreds of smart phones, tablets, and other connected devices to test with. The devices are lent to employees across the country for their individual testing needs.
The goal of this project is to build and design an application that allows employees to view a list of available devices, allow employees to request one of those devices, and for it to be shipped for their testing needs. The current goal of this project is to design this as a Java web application that will work proficiently on phones and desktops.
Team member on this project include:
-* Brianna Boyce
+* Connor Jackson
* Adam Claxton
+* Brianna Boyce
* John Costa
* Maegan Dyakiw
-* Connor Jackson
+
diff --git a/Senior Design.war b/Senior Design.war
new file mode 100644
index 0000000..75fff92
Binary files /dev/null and b/Senior Design.war differ
diff --git a/WebContent/adminLogin.jsp b/WebContent/adminLogin.jsp
index 3ac93cc..9c3445f 100644
--- a/WebContent/adminLogin.jsp
+++ b/WebContent/adminLogin.jsp
@@ -1,67 +1,161 @@
<%@ page import = "database.*" %>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
<%@ page import = "java.sql.*" %>
<%@ page import = "java.security.MessageDigest" %>
<%@ page import = "java.security.NoSuchAlgorithmException" %>
-<%
-int ssoNum;
-String pass;
-Cookie adminCookie;
+<%@ page import = "java.util.Random" %>
+
+
+
+
+
+
+
+
+
-ssoNum = Integer.parseInt(request.getParameter("ssoNum2"));
-pass = request.getParameter("pass");
-String generatedPass = null;
+ Innovation Hub
-try {
- MessageDigest md = MessageDigest.getInstance("MD5");
- md.update(pass.getBytes());
- byte[] bytes = md.digest();
- StringBuilder sb = new StringBuilder();
- for(int i = 0; i
+
+
+
+
+
+
+
+
+
Password Reset
+
Please enter your SSO number and Email below.
+
+
+
+<%
+/*
+ If admin chose to login, we work on this form.
+*/
+if(request.getParameter("login") != null){
+ /*
+ Get form information from last page.
+ */
+ int ssoNum = Integer.parseInt(request.getParameter("username"));
+ String pass = request.getParameter("pass");
+ Cookie adminCookie;
+ String generatedPass = null;
- generatedPass = sb.toString();
-}
-catch (NoSuchAlgorithmException e){
+ /*
+ Hash what the user put in, so we can see if the passwords match up.
+ */
+ try {
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ md.update(pass.getBytes());
+ byte[] bytes = md.digest();
+ StringBuilder sb = new StringBuilder();
+ for(int i = 0; i
\ No newline at end of file
+/*
+ If the user wants to reset their password, we will keep them on this page.
+*/
+%>
+
+
\ No newline at end of file
diff --git a/WebContent/html/imgs/cat.png b/WebContent/html/imgs/cat.png
deleted file mode 100644
index 23058ae..0000000
Binary files a/WebContent/html/imgs/cat.png and /dev/null differ
diff --git a/WebContent/html/imgs/cat_admin.png b/WebContent/html/imgs/cat_admin.png
deleted file mode 100644
index f0bca6b..0000000
Binary files a/WebContent/html/imgs/cat_admin.png and /dev/null differ
diff --git a/WebContent/html/imgs/loader.gif b/WebContent/html/imgs/loader.gif
new file mode 100644
index 0000000..9bfca92
Binary files /dev/null and b/WebContent/html/imgs/loader.gif differ
diff --git a/WebContent/html/imgs/potato.png b/WebContent/html/imgs/potato.png
deleted file mode 100644
index d98bd68..0000000
Binary files a/WebContent/html/imgs/potato.png and /dev/null differ
diff --git a/WebContent/html/imgs/synchrony logo.png b/WebContent/html/imgs/synchrony logo.png
new file mode 100644
index 0000000..0751a83
Binary files /dev/null and b/WebContent/html/imgs/synchrony logo.png differ
diff --git a/WebContent/html/imgs/user_icon.png b/WebContent/html/imgs/user_icon.png
deleted file mode 100644
index feff4b3..0000000
Binary files a/WebContent/html/imgs/user_icon.png and /dev/null differ
diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp
index 21f9d45..e1e8f4c 100644
--- a/WebContent/html/javascript/request.jsp
+++ b/WebContent/html/javascript/request.jsp
@@ -11,6 +11,7 @@
Device[] mydevices = DeviceQueries.getAvailableDevices();
//string representation of array.
String deviceString = Device.arrayToString(mydevices);
+deviceString = deviceString.replace("'","\\'");
//out.println(description);
//out.println(hardware);
%>
@@ -32,6 +33,8 @@ showAll();
// searchbar listener
var searchbar = document.getElementsByName('searchBar');
searchbar[0].onkeyup = refresh;
+// populate page with all devices by default
+show(devices);
function refresh() {
show(fuzzyFilter(filter(devices)));
}
diff --git a/WebContent/html/webpages/administration/admin.jsp b/WebContent/html/webpages/administration/admin.jsp
index 6719058..d74b3fc 100644
--- a/WebContent/html/webpages/administration/admin.jsp
+++ b/WebContent/html/webpages/administration/admin.jsp
@@ -7,7 +7,7 @@
-Synchrony Financial
+Innovation Hub
@@ -74,12 +74,10 @@ div.approveConfirm {
<%@ include file="../components/adminsidebar.jsp" %>
-
Welcome to the admin page
+
Welcome to The Admin Hub!
+
Select from any option in the sidebar to exert your administrative power!