Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
2a3e947
Run rails new
christinaminh Nov 3, 2020
b065eaa
created rails project & database
idago123 Nov 3, 2020
9db3865
Added passenger, driver, trip, homepage controllers
christinaminh Nov 3, 2020
30ce043
created restful routes for trips, drivers, and passengers
christinaminh Nov 3, 2020
2cdef08
added passenger model
idago123 Nov 3, 2020
9cd2b2e
added routes file
idago123 Nov 3, 2020
02e6ed9
added driver and trip models
idago123 Nov 3, 2020
4b3b0e4
Define relationship between trips and passenger and trips and driver
christinaminh Nov 3, 2020
b0432ac
Added PassengerController actions only
christinaminh Nov 3, 2020
56307c5
Fixed .find_by in PassengersController actions. Added views for edit,…
christinaminh Nov 3, 2020
e615379
Added tests for PassengerController actions
christinaminh Nov 3, 2020
753233c
updated index and show methods and views
idago123 Nov 4, 2020
db55cb3
created private driver params, updated controller actions for update …
idago123 Nov 4, 2020
94f879f
updated destroy action and html erb
idago123 Nov 4, 2020
1d5312d
unknown
christinaminh Nov 4, 2020
dd1ae5e
Made a minor change to be able to amend the last git message ('unknow…
christinaminh Nov 4, 2020
5578b11
updated driver.rb to add validation code and the new html erb file so…
idago123 Nov 4, 2020
fa7a552
added tests for index, show, create methods
idago123 Nov 4, 2020
bb1c9d8
updated tests for edit and update
idago123 Nov 4, 2020
1e7de42
updated destory and update method tests
idago123 Nov 4, 2020
abd4179
Added validation for Passenger and tests
christinaminh Nov 4, 2020
61717dd
added :has_many trips to driver.rb and belongs_to driver in trip.rb
idago123 Nov 4, 2020
bac3c4e
Added TripController tests for index, new, create, show, edit, update…
christinaminh Nov 4, 2020
934c0e6
added total earnings method and implemented it in html erb
idago123 Nov 4, 2020
950acab
added average rating and implented in show html page
idago123 Nov 4, 2020
81927de
added total_driver_trips method and updated how html file
idago123 Nov 4, 2020
1c3ad33
Fixed tests for TripsController. Added TripsController actions for RE…
christinaminh Nov 4, 2020
037e0b5
cleaned up indentations
idago123 Nov 4, 2020
efc7458
deleted lines
idago123 Nov 4, 2020
0f8f386
deleted commented out lines
idago123 Nov 4, 2020
5884797
Merge branch 'master' of https://github.com/christinaminh/ride-share-…
christinaminh Nov 4, 2020
5b0dd56
Added nested route for passenger in routes.rb
christinaminh Nov 5, 2020
a012b37
Fixed Trips index view. Changed TripsController#index with relationsh…
christinaminh Nov 5, 2020
34acf64
Fixed trips _form.html.erb to have header
christinaminh Nov 5, 2020
055a76e
updated driver's show view
idago123 Nov 5, 2020
903dafb
updated drivers show and index view
idago123 Nov 5, 2020
ebc063f
Added belongs_to :passenger relationship in trip model. Changed trip …
christinaminh Nov 5, 2020
dac7f27
cleaned up file
idago123 Nov 5, 2020
79d596f
Merge branch 'PassengerNestedRoutes'
christinaminh Nov 5, 2020
ea10f63
Removed old comments from trips/show.html.erb
christinaminh Nov 5, 2020
e89ec61
Changed trips/show.html.erb to address error when passenger or driver…
christinaminh Nov 5, 2020
f9be8f6
Added links to passenger and driver on trip details page trips/show.h…
christinaminh Nov 5, 2020
5e5b6db
Added to TripsController to add new trip with assigned driver and no …
christinaminh Nov 5, 2020
f6d038b
Changed links to driver and passenger. Added validations to trip.
christinaminh Nov 5, 2020
32adb6b
updated view for edit action to view error messages
idago123 Nov 5, 2020
0573650
Added driver methods self.find_available_driver and toggle_status. Ad…
christinaminh Nov 5, 2020
fa37205
Added support for 'On the trip's detail page, I want to be able to as…
christinaminh Nov 5, 2020
7cc3fb2
Add TripsController tests to test nested passenger paths. Added testi…
christinaminh Nov 5, 2020
b3cdd5d
Added TripsController#complete with custom route to allow user to com…
christinaminh Nov 5, 2020
3244a6e
Added TripsController#complete testing
christinaminh Nov 5, 2020
7074caf
Added validations to Trip model
christinaminh Nov 5, 2020
c110d2e
updated trips show view to take care of the trips when a driver or pa…
idago123 Nov 5, 2020
b7a13dd
Merge branch 'master' of https://github.com/christinaminh/ride-share-…
christinaminh Nov 5, 2020
c96a731
updated driver model tests
idago123 Nov 5, 2020
42f3523
updated model tests
idago123 Nov 5, 2020
56876ae
updated tests
idago123 Nov 5, 2020
fd9484b
added test for driver
idago123 Nov 6, 2020
22d21f8
added nested route for driver
idago123 Nov 6, 2020
6a0375c
updated trips index and new actions
idago123 Nov 6, 2020
1c77c59
updated homepage view
idago123 Nov 6, 2020
7b20b3c
Added Trip model tests
christinaminh Nov 6, 2020
e032a35
Merge branch 'master' of https://github.com/christinaminh/ride-share-…
christinaminh Nov 6, 2020
88a02fe
updated the view homepage
idago123 Nov 6, 2020
31666b5
Combined nested route conditions for passenger and driver in TripsCon…
christinaminh Nov 6, 2020
2e8ab83
added root to homepage index and resources in routes
idago123 Nov 6, 2020
f181f6c
updated homepage view and routes
idago123 Nov 6, 2020
8ec9b97
Changed select dropdown menu on trips/_form.html.erb to show only ava…
christinaminh Nov 6, 2020
d95784c
Merge branch 'master' of https://github.com/christinaminh/ride-share-…
christinaminh Nov 6, 2020
cc7f895
updated tests in driver index and new
idago123 Nov 6, 2020
2e72893
Changed PassengerControllers#update to render :edit if save fails (in…
christinaminh Nov 6, 2020
e35696e
Removed nesting for driver.trips.new
christinaminh Nov 6, 2020
479842d
updated forms
idago123 Nov 6, 2020
34c32e8
updated view form
idago123 Nov 6, 2020
c3b0fcb
Replaced Trip#default_fields with Trip#set_date and Trip#set_cost to …
christinaminh Nov 6, 2020
f8db821
Merge branch 'master' of https://github.com/christinaminh/ride-share-…
christinaminh Nov 6, 2020
bd80def
Fixed Trip edit form page to display current rating in the dropdown m…
christinaminh Nov 6, 2020
3442b3c
updated header for all pages
idago123 Nov 6, 2020
732439d
cleaned up driver model test file
idago123 Nov 6, 2020
d9f7143
editing views in new and edit
idago123 Nov 6, 2020
c966603
updated partial view and header
idago123 Nov 6, 2020
049e448
Added yield for tab title so title of tab matches content of each page
christinaminh Nov 6, 2020
049ebfa
updated stylesheet for drivers
idago123 Nov 6, 2020
a7e8c19
updated stylesheets for passenger and trips
idago123 Nov 6, 2020
bc7e1e6
Added header and footer navigation bars to layout
christinaminh Nov 6, 2020
8065520
Merge branch 'master' of https://github.com/christinaminh/ride-share-…
christinaminh Nov 6, 2020
948c2bb
Added content and styling to homepage
christinaminh Nov 6, 2020
61ba45b
Fixed typo and margins in Homepage
christinaminh Nov 6, 2020
4a30a0a
Standardized formating of show pages and added tab titles for each page
christinaminh Nov 6, 2020
578f79f
Fixed PassengersController and TripsController tests
christinaminh Nov 6, 2020
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
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
38 changes: 38 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# 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 pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

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

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
.idea

1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
78 changes: 78 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'
gem 'rails-controller-testing'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
# 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.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', 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.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 web drivers to run system tests with browsers
gem 'webdrivers'
end

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

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

group :development do
gem 'guard'
gem 'guard-minitest'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
Loading