diff --git a/WebContent/html/imgs/cat.png b/WebContent/html/imgs/cat.png new file mode 100644 index 0000000..23058ae Binary files /dev/null and b/WebContent/html/imgs/cat.png differ diff --git a/WebContent/html/imgs/cat_admin.png b/WebContent/html/imgs/cat_admin.png new file mode 100644 index 0000000..f0bca6b Binary files /dev/null and b/WebContent/html/imgs/cat_admin.png differ diff --git a/WebContent/index.jsp b/WebContent/index.jsp index 91eca06..62f5aa4 100644 --- a/WebContent/index.jsp +++ b/WebContent/index.jsp @@ -26,27 +26,22 @@ background-color: #E9EAEB; display: inline-block; } - div.imgContainer{ display: inline-block; text-align: center; } - img.device{ display: block; } - div.deviceDescp{ display: inline-block; width: 200px; text-align: center; } - button.approvebutton{ display: block; margin: auto; } - div.approveConfirm{ display: none; top: 50%; @@ -61,7 +56,6 @@ border-color: #3B3C43; border-radius: 5px; } - div.displayDevice{ left: 0px; } @@ -77,7 +71,6 @@ border-radius: 10px; background-color: #E9EAEB; } - div.menuBox{ text-align: center; position: absolute; @@ -96,12 +89,14 @@
diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java index cfa855d..36a8ed9 100644 --- a/src/database/MySQLAccess.java +++ b/src/database/MySQLAccess.java @@ -9,7 +9,7 @@ public class MySQLAccess { public void connectDB() throws SQLException, ClassNotFoundException { System.getenv("VCAP_SERVICES"); Class.forName("com.mysql.jdbc.Driver"); - Connection connect = DriverManager.getConnection("jdbc:mysql://127.0.0.1:3306/seniordesign", "root", "password"); + Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); Statement statement = connect.createStatement(); //PreparedStatement preparedStatement = null; ResultSet resultSet = statement.executeQuery("SELECT * FROM devices");