Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
9fa8c21
created rails application
lebaongoc Apr 15, 2019
e9622a3
added Passengers, Drivers, and Trips Controllers
lebaongoc Apr 15, 2019
6132ce5
Created driver, passenger, trip models
lebaongoc Apr 15, 2019
66864e9
i have a new commit orginially on branch named branch-a
lebaongoc Apr 16, 2019
3e5c54d
This is a commit that belongs to new-branch
MyriamWD Apr 16, 2019
a4f18f0
Remove spurious model tests
lebaongoc Apr 16, 2019
a46bf90
updated trips table to include foreign keys driver_id and passenger_i…
lebaongoc Apr 16, 2019
e46a5bb
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
MyriamWD Apr 16, 2019
6feef39
added route for drivers
MyriamWD Apr 16, 2019
2aed42e
added passengers resource in routes
lebaongoc Apr 16, 2019
de5d8fe
debugged
lebaongoc Apr 16, 2019
2243fdc
added index.html file to passengers folder in view
lebaongoc Apr 16, 2019
85fd299
added index file for drivers and trips
lebaongoc Apr 16, 2019
38e70a2
Create drivers index view
MyriamWD Apr 17, 2019
0c6f4af
added index function for passenger controller and index view to displ…
lebaongoc Apr 17, 2019
0e17181
added show view for the drivers
MyriamWD Apr 17, 2019
673c015
Added delete and edit links to driver
MyriamWD Apr 17, 2019
31094ff
added edit form for driver show view
MyriamWD Apr 17, 2019
1967e49
added update action and driver params to controller
MyriamWD Apr 17, 2019
1df9d0a
edit view little adjustment
MyriamWD Apr 17, 2019
b3dd0c5
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
MyriamWD Apr 17, 2019
3e8373f
added validation to edit driver view
MyriamWD Apr 17, 2019
7dca9eb
deleted code from yml files in the fixture folder of controllers. Tes…
MyriamWD Apr 17, 2019
7ad889c
added show function for passenger along with edit, update, destroy me…
lebaongoc Apr 17, 2019
461e4e1
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
lebaongoc Apr 17, 2019
540bfcc
added partial form for update and new driver. created test for inde a…
MyriamWD Apr 17, 2019
47c9b8d
added tests for passenger controller's index and show methods
lebaongoc Apr 17, 2019
5484019
created test for driver controller create and update
MyriamWD Apr 17, 2019
7a9af9f
added destroy test to drivers controller
MyriamWD Apr 18, 2019
a6883ee
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
MyriamWD Apr 18, 2019
2b5a948
fixed the display of cost in driver show view. Added method to calcul…
MyriamWD Apr 18, 2019
e76bddf
driver model average rating calculations
MyriamWD Apr 18, 2019
d63f769
calculated average rating and total earnings of driver and displayed…
MyriamWD Apr 18, 2019
940e95b
added conditional for destroy action in drivers_controller to delete…
MyriamWD Apr 18, 2019
907c2fa
added comment to drivers_controller
MyriamWD Apr 18, 2019
2ea04b0
added form, edit function and test for passenger controller
lebaongoc Apr 18, 2019
181de10
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
lebaongoc Apr 18, 2019
5050743
Added tests for passenger edit, update & added valiation for passenge…
lebaongoc Apr 18, 2019
6c38c6a
added new and create functions for passenger controller and their tests
lebaongoc Apr 18, 2019
21b53c5
same
MyriamWD Apr 18, 2019
f712dde
Merge branch 'calculation-rating-earnings-driver'
MyriamWD Apr 18, 2019
6a42a20
added test for trips show
MyriamWD Apr 18, 2019
da18e8d
added copyright hehe
MyriamWD Apr 18, 2019
818426d
added soft delete function for passengers controller
lebaongoc Apr 18, 2019
b573fc3
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
lebaongoc Apr 18, 2019
c1ba74e
debugged
lebaongoc Apr 18, 2019
94e7066
trips destroy test
MyriamWD Apr 18, 2019
0ae78c5
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
MyriamWD Apr 18, 2019
c4e1b92
added deleted function for driver along with test
lebaongoc Apr 19, 2019
141d938
added total cost method to passenger model
lebaongoc Apr 19, 2019
bcaca9b
added tests for trip controller
MyriamWD Apr 19, 2019
31cbddd
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
MyriamWD Apr 19, 2019
255bb1f
added links to delete and edit trip in driver and passenger show view
MyriamWD Apr 19, 2019
a9aac30
set the submit button of the partial form for drivers to a variable
MyriamWD Apr 19, 2019
764b6dc
added validation to edit and create partial form for trips
MyriamWD Apr 19, 2019
3e6ef38
added create form to passenger
MyriamWD Apr 19, 2019
020e9b5
minor changes
lebaongoc Apr 19, 2019
730fa27
debugged
lebaongoc Apr 19, 2019
78774a8
debugged
lebaongoc Apr 19, 2019
0a2dba9
added default value for deleted field on drivers and passengers contr…
lebaongoc Apr 19, 2019
0a31fff
bleh
MyriamWD Apr 19, 2019
0fc372f
debbuged
MyriamWD Apr 19, 2019
87324ed
added nested routes for trip & passenger
lebaongoc Apr 19, 2019
137b6a2
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
MyriamWD Apr 19, 2019
7772bdd
fixed new and create method in trip controller & create new trip routes
lebaongoc Apr 21, 2019
3838abe
updated trip controller test
lebaongoc Apr 21, 2019
c1ad287
Merge branch 'master' of https://github.com/MyriamWD/ride-share-rails
MyriamWD Apr 21, 2019
3323ef8
driver model total earnings return fixed
MyriamWD Apr 21, 2019
0348fff
adjusted nested routes for updating trips
MyriamWD Apr 21, 2019
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
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history
/coverage
.DS_Store


# Ignore master key for decrypting credentials and more.
/config/master.key
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.5.1
81 changes: 81 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.3'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
end

group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-turbolinks'
gem 'jquery-rails'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard'
gem 'guard-minitest'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'minitest-skip'
end
274 changes: 274 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.3)
actionpack (= 5.2.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.3)
activesupport (= 5.2.3)
globalid (>= 0.3.6)
activemodel (5.2.3)
activesupport (= 5.2.3)
activerecord (5.2.3)
activemodel (= 5.2.3)
activesupport (= 5.2.3)
arel (>= 9.0)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
marcel (~> 0.3.1)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
archive-zip (0.12.0)
io-like (~> 0.3.0)
arel (9.0.0)
better_errors (2.5.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.7.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.4.3)
msgpack (~> 1.0)
builder (3.2.3)
byebug (11.0.1)
capybara (3.16.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
xpath (~> 3.2)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.1)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.1.5)
crass (1.0.4)
debug_inspector (0.0.3)
erubi (1.8.0)
execjs (2.7.0)
ffi (1.10.0)
formatador (0.2.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.0)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-minitest (2.4.6)
guard-compat (~> 1.2)
minitest (>= 3.0)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.8.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.6)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-skip (0.0.1)
minitest (~> 5.0)
msgpack (1.2.9)
multi_json (1.13.1)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.10.2)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.4)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (3.0.3)
puma (3.12.1)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
actioncable (= 5.2.3)
actionmailer (= 5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
activemodel (= 5.2.3)
activerecord (= 5.2.3)
activestorage (= 5.2.3)
activesupport (= 5.2.3)
bundler (>= 1.3.0)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
regexp_parser (1.4.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
shellany (0.0.1)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
bootsnap (>= 1.1.0)
byebug
capybara (>= 2.15)
chromedriver-helper
guard
guard-minitest
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
minitest-skip
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.3)
sass-rails (~> 5.0)
selenium-webdriver
spring
spring-watcher-listen (~> 2.0.0)
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
2.0.1
Loading