diff --git a/WebContent/adminLogin.jsp b/WebContent/adminLogin.jsp index e33796f..df36b10 100644 --- a/WebContent/adminLogin.jsp +++ b/WebContent/adminLogin.jsp @@ -1,88 +1,221 @@ <%@ 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("username")); -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 + + + + + + + + + +<% +/* + 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; -} - -String database = "jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317"; -String user = "b372dfe7409692"; -String password = "74f6e317"; -Class.forName("com.mysql.jdbc.Driver"); -Connection connection; -Statement stmt; -for(;;){ - try{ - connection = DriverManager.getConnection(database, user, password); - break; + /* + 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 +/* + Goes back to the previous page. +*/ +function goBack(){ + window.history.back(); +} + + \ No newline at end of file diff --git a/WebContent/html/webpages/administration/adminpasswordsetting.jsp b/WebContent/html/webpages/administration/adminpasswordsetting.jsp new file mode 100644 index 0000000..0359bc0 --- /dev/null +++ b/WebContent/html/webpages/administration/adminpasswordsetting.jsp @@ -0,0 +1,62 @@ + + + + + + + + + + Innovation Hub + + + + + + + + + + + + + +
+ <%@ include file="../components/adminsidebar.jsp" %> +
+ +
+ +
+

Change Your Password

+
+ + +
+
+ + +
+
+ + +
+ +
+
+

Change Pincode

+
+ + +
+ +
+
+ + \ No newline at end of file diff --git a/WebContent/html/webpages/administration/adminpasswordsettingtryagain.jsp b/WebContent/html/webpages/administration/adminpasswordsettingtryagain.jsp new file mode 100644 index 0000000..f006479 --- /dev/null +++ b/WebContent/html/webpages/administration/adminpasswordsettingtryagain.jsp @@ -0,0 +1,63 @@ + + + + + + + + + + Innovation Hub + + + + + + + + + + + + + +
+ <%@ include file="../components/adminsidebar.jsp" %> +
+ +
+ +
+

Something went wrong. Try again!

+

Change Your Password

+
+ + +
+
+ + +
+
+ + +
+ +
+
+

Change Pincode

+
+ + +
+ +
+
+ + \ No newline at end of file diff --git a/WebContent/html/webpages/administration/ticketApprove.jsp b/WebContent/html/webpages/administration/ticketApprove.jsp index 7b35f4c..7116095 100644 --- a/WebContent/html/webpages/administration/ticketApprove.jsp +++ b/WebContent/html/webpages/administration/ticketApprove.jsp @@ -29,6 +29,10 @@ + +
+ <%@ include file="../components/adminsidebar.jsp" %> +

Approving Tickets

Thanks for approving a ticket!

@@ -36,7 +40,7 @@
Synchrony Financial

-
+
diff --git a/WebContent/html/webpages/components/adminnavbar.jsp b/WebContent/html/webpages/components/adminnavbar.jsp index 160a20a..e3cde2c 100644 --- a/WebContent/html/webpages/components/adminnavbar.jsp +++ b/WebContent/html/webpages/components/adminnavbar.jsp @@ -24,6 +24,7 @@
  • @@ -79,5 +80,5 @@ var name = '<%=navname%>'; document.getElementById('user').innerHTML = "Hi " + name + "!"; if(<%=admin%> == 1) -document.getElementById('adminbar').innerHTML = '' +document.getElementById('adminbar').innerHTML = '' \ No newline at end of file diff --git a/WebContent/html/webpages/components/adminsidebar.jsp b/WebContent/html/webpages/components/adminsidebar.jsp index 0caa9bc..42f8a31 100644 --- a/WebContent/html/webpages/components/adminsidebar.jsp +++ b/WebContent/html/webpages/components/adminsidebar.jsp @@ -6,5 +6,6 @@
  • Device Hub
  • Location Hub
    • +
  • Update Password/Pincode
    • \ No newline at end of file diff --git a/WebContent/html/webpages/components/navbar.jsp b/WebContent/html/webpages/components/navbar.jsp index 0f32c01..ac1ec25 100644 --- a/WebContent/html/webpages/components/navbar.jsp +++ b/WebContent/html/webpages/components/navbar.jsp @@ -24,6 +24,7 @@
  • @@ -73,5 +74,5 @@ var name = '<%=navname%>'; document.getElementById('user').innerHTML = "Hi " + name + "!"; if(<%=admin%> == 1) -document.getElementById('adminbar').innerHTML = '' +document.getElementById('adminbar').innerHTML = '' \ No newline at end of file diff --git a/WebContent/html/webpages/error.jsp b/WebContent/html/webpages/error.jsp index ed5756d..ca6df45 100644 --- a/WebContent/html/webpages/error.jsp +++ b/WebContent/html/webpages/error.jsp @@ -16,7 +16,7 @@ @@ -85,9 +85,9 @@

    Device Dictionary - +
    - +

    diff --git a/WebContent/html/webpages/profileSettings.jsp b/WebContent/html/webpages/profileSettings.jsp index f1bbd44..8cf0fec 100644 --- a/WebContent/html/webpages/profileSettings.jsp +++ b/WebContent/html/webpages/profileSettings.jsp @@ -65,7 +65,7 @@ <% User self = EmployeeQueries.getEmployeeByID(Integer.parseInt(navsso)); - %> + %>
      @@ -136,27 +136,32 @@
      Tickets are generated
      -


      -
      Ticket is approved
      -
      + +


      +
      Ticket is approved
      +
      +


      -
      Ticket is rejected
      -
      + +


      +
      Ticket is rejected
      +
      +



      -
      + +



      +
      -
      - +
    +
    diff --git a/WebContent/html/webpages/redirect/adminpasswordchange.jsp b/WebContent/html/webpages/redirect/adminpasswordchange.jsp index d63e2c2..b0181bb 100644 --- a/WebContent/html/webpages/redirect/adminpasswordchange.jsp +++ b/WebContent/html/webpages/redirect/adminpasswordchange.jsp @@ -55,8 +55,26 @@ if(request.getParameter("submit") != null){ String password = "74f6e317"; System.getenv("VCAP_SERVICES"); Class.forName("com.mysql.jdbc.Driver"); - Connection connection = DriverManager.getConnection(database, user, password); - Statement stmt = connection.createStatement(); + Connection connection; + Statement stmt; + for(;;){ + try{ + connection = DriverManager.getConnection(database, user, password); + break; + } + catch(SQLException e){ + Thread.sleep(1); + } + } + for(;;){ + try{ + stmt = connection.createStatement(); + break; + } + catch(SQLException e){ + Thread.sleep(1); + } + } ResultSet result; result = stmt.executeQuery("select * FROM admin where Admin_ID='" + navsso + "' AND Password='" + generatedOldPass + "'"); if(result.next()){//if old password is accurate diff --git a/WebContent/html/webpages/redirect/adminpasswordupdate.jsp b/WebContent/html/webpages/redirect/adminpasswordupdate.jsp new file mode 100644 index 0000000..5dc7241 --- /dev/null +++ b/WebContent/html/webpages/redirect/adminpasswordupdate.jsp @@ -0,0 +1,205 @@ +<%@ page import = "database.*,entities.Device" %> +<%@ page import = "java.sql.*" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ page import = "java.security.MessageDigest" %> +<%@ page import = "java.security.NoSuchAlgorithmException" %> + + + + + + + + + + + Synchrony Financial + + + + + + + + +

    Redirect Page

    +

    You shouldn't be seeing this page :)

    + +<% +/* + We follow into this "if" statement if the password change form was submitted. +*/ +if(request.getParameter("password") != null){ + /* + Gathering form information that the user submitted. + */ + String old = request.getParameter("old"); + String newpass = request.getParameter("new"); + String confirm = request.getParameter("confirm"); + String generatedOldPass = null; + + /* + This uses MD5 to hash the old password the user entered in, so it can be compared against what is in the DB. + */ + try { + MessageDigest md = MessageDigest.getInstance("MD5"); + md.update(old.getBytes()); + byte[] bytes = md.digest(); + StringBuilder sb = new StringBuilder(); + for(int i = 0; i + + \ No newline at end of file diff --git a/WebContent/html/webpages/requestPage.jsp b/WebContent/html/webpages/requestPage.jsp index fd824c6..0e2822c 100644 --- a/WebContent/html/webpages/requestPage.jsp +++ b/WebContent/html/webpages/requestPage.jsp @@ -58,11 +58,11 @@ border-radius: 5px; } #pup{ - background-color: #E9EAEB; - border: solid; - text-align: center; - padding: 10px; - } + background-color: #E9EAEB; + border: solid; + text-align: center; + padding: 10px; + } @@ -97,7 +97,7 @@
    - +

    Or choose an option to the left to begin requesting!

    diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp index 6133e6c..30e6408 100644 --- a/WebContent/html/webpages/returnComplete.jsp +++ b/WebContent/html/webpages/returnComplete.jsp @@ -1,6 +1,6 @@ <%@ page import = "database.*" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> +pageEncoding="ISO-8859-1"%> @@ -24,21 +24,21 @@ -
    -

    Returning Devices

    -

    Thanks for returning some devices!

    -

    You can ship the devices to the following address:

    -
    - Synchrony Financial
    777 Long Ridge Road
    Stamford, CT
    06902 -
    -
    - -
    -
    -<% +
    +

    Returning Devices

    +

    Thanks for returning some devices!

    +

    You can ship the devices to the following address:

    +
    + Synchrony Financial
    777 Long Ridge Road
    Stamford, CT
    06902 +
    +
    + +
    +
    + <% //get string from request form -String devices = request.getParameter("devicesToReturn"); -DeviceQueries.returnDevices(devices); -%> + String devices = request.getParameter("devicesToReturn"); + DeviceQueries.returnDevices(devices); + %> \ No newline at end of file diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp index 1be4b5a..14aef23 100644 --- a/WebContent/html/webpages/returnPage.jsp +++ b/WebContent/html/webpages/returnPage.jsp @@ -1,6 +1,6 @@ <%@ page import = "database.*,entities.Device" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> +pageEncoding="ISO-8859-1"%> @@ -72,58 +72,58 @@ width: 20px; } #pup{ - background-color: #E9EAEB; - border: solid; - text-align: center; - padding: 10px; - } + background-color: #E9EAEB; + border: solid; + text-align: center; + padding: 10px; + } - + - -
    - +
    +
    + × +

    Please Review Your Return Choices

    +

    +
    + + + + + + + + + + + +
    Device NameModelHardware
    +
    + + +
    -
    -

    Devices to Be Returned

    - -
    -
    +
    +
    + +
    + +
    +
    +

    Devices to Be Returned

    + +
    +
    <% Device[] mydevices = DeviceQueries.getUserDevices(navsso); diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp index 91e2210..35a396d 100644 --- a/WebContent/html/webpages/shoppingCart.jsp +++ b/WebContent/html/webpages/shoppingCart.jsp @@ -7,210 +7,210 @@ pageEncoding="ISO-8859-1"%> - - - - - - - - Innovation Hub - - - - - - - - + #pup{ + background-color: #E9EAEB; + border: solid; + text-align: center; + padding: 10px; + } + input[type=text]{ margin: 0 auto; width: 60%; } + + input[type=tel]{ margin: 0 auto; width: 60%; } + + input[type=number]{ margin: 0 auto; width: 60%; } + + div.formcheck{ + display:inline-block; + margin-right: 5px; + border-style: solid; + padding: 5px; + border-width: 1px; + border-color: #ccc; + border-radius: 4px; + } + - -