Skip to content

Minor DB Class Changes. Also cats #25

Merged
merged 1 commit into from
Feb 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added WebContent/html/imgs/cat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added WebContent/html/imgs/cat_admin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 3 additions & 8 deletions WebContent/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand All @@ -61,7 +56,6 @@
border-color: #3B3C43;
border-radius: 5px;
}
div.displayDevice{
left: 0px;
}
Expand All @@ -77,7 +71,6 @@
border-radius: 10px;
background-color: #E9EAEB;
}
div.menuBox{
text-align: center;
position: absolute;
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/database/MySQLAccess.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down