Commit cda8b90f authored by Donna Dumaliang's avatar Donna Dumaliang

update

parents d342d591 188b2973
...@@ -22,7 +22,9 @@ gem 'turbolinks' ...@@ -22,7 +22,9 @@ gem 'turbolinks'
gem 'jbuilder', '~> 2.0' gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api. # bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc gem 'sdoc', '~> 0.4.0', group: :doc
gem 'will_paginate' gem 'will_paginate'
# Use ActiveModel has_secure_password # Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7' # gem 'bcrypt', '~> 3.1.7'
......
...@@ -37,15 +37,21 @@ GEM ...@@ -37,15 +37,21 @@ GEM
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (6.0.3) arel (6.0.3)
<<<<<<< HEAD
better_errors (2.1.1) better_errors (2.1.1)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
rack (>= 0.9.0) rack (>= 0.9.0)
=======
>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
builder (3.2.2) builder (3.2.2)
byebug (9.0.5) byebug (9.0.5)
<<<<<<< HEAD
coderay (1.1.1) coderay (1.1.1)
=======
>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
coffee-rails (4.1.1) coffee-rails (4.1.1)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x) railties (>= 4.0.0, < 5.1.x)
...@@ -147,13 +153,19 @@ GEM ...@@ -147,13 +153,19 @@ GEM
binding_of_caller (>= 0.7.2) binding_of_caller (>= 0.7.2)
railties (>= 4.0) railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
<<<<<<< HEAD
will_paginate (3.1.0) will_paginate (3.1.0)
=======
>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
PLATFORMS PLATFORMS
x86-mingw32 x86-mingw32
DEPENDENCIES DEPENDENCIES
<<<<<<< HEAD
better_errors better_errors
=======
>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
byebug byebug
coffee-rails (~> 4.1.0) coffee-rails (~> 4.1.0)
jbuilder (~> 2.0) jbuilder (~> 2.0)
...@@ -166,7 +178,10 @@ DEPENDENCIES ...@@ -166,7 +178,10 @@ DEPENDENCIES
tzinfo-data tzinfo-data
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
web-console (~> 2.0) web-console (~> 2.0)
<<<<<<< HEAD
will_paginate will_paginate
=======
>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
BUNDLED WITH BUNDLED WITH
1.10.4 1.10.4
class CarLogsController < ApplicationController class CarLogsController < ApplicationController
def index def index
@CarLogs = CarLog.all.paginate(:page => params[:page], :per_page => 8) @CarLogs = CarLog.all.paginate(:page => params[:page], :per_page => 8)
end end
def deletestudent def deletestudent
......
class PagesController < ApplicationController class PagesController < ApplicationController
def index def index
end end
end end
...@@ -3,8 +3,12 @@ Rails.application.routes.draw do ...@@ -3,8 +3,12 @@ Rails.application.routes.draw do
# See how all your routes lay out with "rake routes". # See how all your routes lay out with "rake routes".
# You can have the root of your site routed with "root" # You can have the root of your site routed with "root"
root 'pages#index' root 'pages#index'
get 'carlogs' => 'car_logs#index' get 'carlogs' => 'car_logs#index'
# root 'welcome#index'
# Example of regular route: # Example of regular route:
# get 'products/:id' => 'catalog#view' # get 'products/:id' => 'catalog#view'
......
class CreateCarLogs < ActiveRecord::Migration class CreateCarLogs < ActiveRecord::Migration
def change def change
create_table :car_logs do |t| create_table :car_logs do |t|
t.string :plate_number t.string :plate_number
t.string :brand t.string :brand
t.string :slot_number t.string :slot_number
t.boolean :is_taken t.boolean :is_taken
t.timestamps null: false t.timestamps null: false
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment