design

parkinglot/app/assets/stylesheets/bootstrap.css

@@ -5,12 +5,86 @@
  */
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
 html {
-  font-family: sans-serif;
+  font-family: fantasy;
   -webkit-text-size-adjust: 100%;
       -ms-text-size-adjust: 100%;
 }
+
+html, body {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    height: 100%;
+    display: table
+}
+
+#body{
+  font-family: fantasy;
+}
+
+#td1{
+  text-align: center;
+  margin-left: 100px;
+  margin-right: 100px;
+  font-weight: bold;
+}
+
+#td2{
+  text-align: center;
+  margin-left: 100px;
+  margin-right: 100px;
+}
+
+.tablebody{
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
+.homecontainer{
+  background-image: url(home.jpg);
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+  display: table-cell;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.memcontainer{
+  background-image: url(mem.jpg);
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+  display: table-cell;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.addcontainer{
+  background-image: url(add.jpg);
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+  display: table-cell;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.logcontainer{
+  background-image: url(log.jpg);
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+  display: table-cell;
+  text-align: center;
+  vertical-align: middle;
+}
 body {
-  margin: 50;
+  margin: 0;
 }
 article,
 aside,
@@ -60,8 +134,12 @@ dfn {
   font-style: italic;
 }
 h1 {
+  color: black;
   margin: .67em 0;
   font-size: 2em;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  font-weight: bold;
 }
 mark {
   color: #000;
@@ -180,13 +258,18 @@ optgroup {
   font-weight: bold;
 }
 table {
-  border-spacing: 0;
-  border-collapse: collapse;
+  border-spacing: 10px 10px;
+  border-collapse: separate;
+  border: 1px solid black;
+  margin-bottom: 10px;
+  margin-top: 10px;
 }
 td,
 th {
   padding: 0;
+
 }
+
 /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
 @media print {
   *,
@@ -1189,6 +1272,10 @@ h6,
   line-height: 1.1;
   color: inherit;
 }
+
+
+
+
 h1 small,
 h2 small,
 h3 small,
@@ -2251,6 +2338,8 @@ pre code {
 }
 table {
   background-color: transparent;
+  padding-top: 10px;
+  padding-bottom: 10px;
 }
 caption {
   padding-top: 8px;
@@ -5819,16 +5908,44 @@ button.list-group-item-danger.active:focus {
 .embed-responsive-4by3 {
   padding-bottom: 75%;
 }
-.well {
+.welllog {
   min-height: 20px;
   padding: 19px;
   margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #e3e3e3;
-  border-radius: 4px;
+  background-color: rgba(173, 156, 50, 0.78);
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
 }
+
+.wellhome {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: rgba(169, 68, 66, 0.59);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+}
+
+.wellmem {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: rgba(66, 169, 102, 0.59);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+}
+
+
+.welladd {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: rgba(66, 169, 102, 0.59);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+}
+
+
 .well blockquote {
   border-color: #ddd;
   border-color: rgba(0, 0, 0, .15);

parkinglot/app/controllers/cars_controller.rb

 class CarsController < ApplicationController
 	def index
 		@cars = CarLog.all
-
 		if params[:q].present?
 			@cars = CarLog.where(plate_number: params[:q])
-
 		end
 		render "cars/index.html.erb"
 	end

parkinglot/app/views/cars/add.html.erb

 <link rel="stylesheet" type="text/css" href="/app/assets/stylesheets/bootstrap.css">
 
-<h1> Add Cars</h1>
-<body></body>
+<body class="addcontainer">
+	<div class="row">
+		<div class="col-md-12 welladd">
+			<div class="col-md-12"> 
 
-<%= form_tag("/cars/create", method: "post") do %>
+				<h1><center>Add a Car</center></h1>
 				
+
+				<%= form_tag("/cars/create", method: "post") do %>
+					<ul style="list-style-type: none;">
+						<li>
 						<label>Plate Number</label>
 						<input type="text" name="plate_number">
-
+						</li>
+						<li>
 						<label>Time In</label>
 						<input type="text" name="time_in">
-
+						</li>
+						<li>
 						<label>Time Out</label>
 						<input type="text" name="time_out">
-
+						</li>
+						<li>
 						<label>Color</label>
 						<select name="color">
 							<option value="Red">Red</option>
@@ -25,7 +34,8 @@
 							<option value="Black">Black</option>
 							<option value="Others">Others</option>
 						</select>
-
+						</li>
+						<li>
 						<label>Brand</label>
 						<select name="brand">
 							<option value="Honda">Honda</option>
@@ -37,9 +47,15 @@
 							<option value="Mazda">Mazda</option>
 							<option value="Mitsubishi">Mitsubishi</option>
 						</select>
-
+						</li>
+						<li>
 						<input type="submit" value="Save Car">
-</form>
-<% end %>
-
-<h3><a href="../cars">Check Cars</a></h3>
+						</li>
+					</ul>
+				</form>
+				<% end %>
\ No newline at end of file
+			</div>
+				<a href="../cars">Check Cars</a>
+		</div>	
+	</div
+</body>
\ No newline at end of file

parkinglot/app/views/cars/index.html.erb

-<link rel="stylesheet" type="text/css" href="/app/assets/stylesheets/application.css">
+<link rel="stylesheet" type="text/css" href="/app/assets/stylesheets/bootstrap.css">
 
-<h1 align="center">Car Log</h1>
-<%= form_tag("/cars", method: "get") do %>
-	<label id ="labelSearch">Search for a Car:</label>
+<body class="logcontainer" >
+<div class = "row">
+	<div class = "col-md-12 welllog">
+		<h1 align="center"> Car Log </h1>
+	
+		<%= form_tag("/cars", method: "get") do %>
 			<input type="text" name="q"/>
 			<input type="submit" value="Search"/>
-<% end %>
-<body>
-	<table>
+		<% end %>
+
+		<body>
+			<table align="center">
 				<thead>
 					<td id="td1">Plate Number</td>
 					<td id="td1">Time In</td>
@@ -25,10 +29,12 @@
 					<td id="td1">Edit</td>
 					
 					<td id="td1">Delete</td>
+
 				</thead>
 				<% @cars.each do |car| %>
 				<tr>
 					<td id="td2"><%= "#{car.plate_number}"%></td>
+					
 					<td id="td2"><%= "#{car.time_in}"%></td>
 																	<td>               </td>
 					<td id="td2"><%= "#{car.time_out}"%></td>
@@ -40,15 +46,26 @@
 					<td id="td2"><%= "#{car.created_at}"%></td>
 																	<td>               </td>
 					<td id="td2"><%= "#{car.id}"%></td>
-															<td>               </td>
 
 					<td id="td2"> <a href="cars/edit/<%= car.id %>">Edit</a> </td>
 					
 					<td id="td2"> <a href="cars/delete/<%= car.id %>">Delete</a> </td>
+					
+					
 				</tr>
 				<% end %>
 			</table>
+		</body>
+		<ul  style="list-style-type: none;">
+			<li> <a href="/">Home</a> </li>
+			<li> <a href="/add">Add Car</a> </li> 
+		</ul>
+	</div>
 
-<h3><a href="/">Home</a> <a href="/add">Add Car</a></h3>
-
+</div>
 </body>
+
+
+		
+
+		
\ No newline at end of file

parkinglot/app/views/pages/index.html.erb

-<h1 align="center">Parking Ng Nanay Mo!</h1>
+<link rel="stylesheet" type="text/css" href="/app/assets/stylesheets/bootstrap.css">
+<body class="homecontainer">
+	<div class="row">
+		<div class="col-md-12 wellhome">
+			<h1 align="center"> <strong>Parking Lot Tracker</strong></h1>
 
-<h2 align="center">This is the home page for the MIS 21 Midterm Project.</h2>
-
-<h4 align="center"><a href="/cars">Go to Parking</a> <a href="/pages">Members</a></h4>
+			<ul  style="list-style-type: none;">
+				<li> <h3 align="center"><a href="/cars">Go to Parking</a> </h2> </li>
+				<li> <h3 align="center"><a href="/pages">Members</a></h2> </li>
\ No newline at end of file
+			</ul>
+		</div>
+	</div>
+</body>
\ No newline at end of file

parkinglot/app/views/pages/names.html.erb

-<h1 align="center">[MIS 21-B] "Parking Ng Nanay Mo!" Creators: </h1>
+<link rel="stylesheet" type="text/css" href="/app/assets/stylesheets/bootstrap.css">
 
-<h2 align="center">Troy Ang Ko | Jarod Catolico <br> Norence Illicito | Joseph Gerard Reyes</h2>
+<body class="memcontainer">
+	<div class="row">
+		<div class="col-md-12 wellmem">
+			<h1 align="center">[MIS 21-B] Parking Lot Tracker Creators: </h1>
 
-<h3 align="center"> <a href="/">Home</a></h3>
+			<h2 align="center">Troy Ang Ko | Jarod Catolico <br> Norence Ilicito | Joseph Gerard Reyes</h2>
\ No newline at end of file
+
+			<h3 align="center"> <a href="/">Home</a></h3>
+		</div>
+	</div>
+</body>
\ No newline at end of file

parkinglot/db/migrate/20160704132003_create_car_logs.rb

-class CreateCarLogs < ActiveRecord::Migration
-  def change
-    create_table :car_logs do |t|
-      t.string :plate_number
-      t.datetime :time_in
-      t.datetime :time_out
-      t.string :color
-      t.string :brand
-
-      t.timestamps null: false
-    end
-  end
-end

parkinglot/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160704132003) do
+ActiveRecord::Schema.define(version: 20160705124032) do
 
   create_table "car_logs", force: :cascade do |t|
     t.string   "plate_number"