Merge pull request #25 from arc12012/BriBranch

Minor DB Class Changes. Also cats
arc12012 · Feb 18, 2017 · e4b62fd · e4b62fd
2 parents b545bb8 + 11fe650
commit e4b62fd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/WebContent/html/imgs/cat.png b/WebContent/html/imgs/cat.png
diff --git a/WebContent/html/imgs/cat_admin.png b/WebContent/html/imgs/cat_admin.png
diff --git 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 @@
 <div>
       <a class = "divlink" href = "html/webpages/index.html">
        <div class = "menuOption">
-         <h2>User Login</h2>  
+         <h2>User Login</h2>
+         <img src = "html/imgs/cat.png"> </img>
        </div>
      </a>
       <a class = "divlink" href="html/webpages/admin.html">
       <div class = "menuOption">
         <h2>Admin Login</h2> 
+        <img src = "html/imgs/cat_admin.png"> </img>
       </div> 
     </a>
 </div>

diff --git 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");