Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
63b2cfe
Rails.new
NatalieTapias Oct 7, 2019
8153327
Generated empty Driver model
NatalieTapias Oct 7, 2019
5d26159
Generated empty Passenger model.
NatalieTapias Oct 7, 2019
fb6a3e4
Generated Trip model.
NatalieTapias Oct 7, 2019
16a91be
Added columns to driver table.
NatalieTapias Oct 7, 2019
90b8356
Added columns to Passenger table.
NatalieTapias Oct 7, 2019
f908cf9
generated migration for Trips to update columns
NatalieTapias Oct 7, 2019
3b79143
Generate controllers for Drivers, Trips, and Passengers.
NatalieTapias Oct 7, 2019
e8e7b97
added routes
NatalieTapias Oct 7, 2019
fb4b539
Added HomepagesController
NatalieTapias Oct 7, 2019
cac4d34
Added first view index.html.
NatalieTapias Oct 8, 2019
3ed96e6
deleted complete trip test per Jared's note in slack
NatalieTapias Oct 8, 2019
a21ab8f
Added foreign key driver_id and passenger_id to trip.
NatalieTapias Oct 8, 2019
7072ab2
Established model relationships.
NatalieTapias Oct 8, 2019
0b48653
added index actions and views to Driver and Passenger
rinostar Oct 8, 2019
d44f427
added index action and view to Trip
rinostar Oct 8, 2019
e32dfbe
added new, create, and show actions to Driver
rinostar Oct 8, 2019
7630e11
added new, show, create actions to Passenger
rinostar Oct 8, 2019
4f0e3e5
added new, show, create actions to Trip
rinostar Oct 8, 2019
11d9dfa
Edit Index and Show actions for DriversController
NatalieTapias Oct 8, 2019
ff53f74
Added Passenger#Edit and Passenger#Delete actions.
NatalieTapias Oct 8, 2019
bbbb5a6
Added Trip#Edit and Trips#Delete actions to the controller.
NatalieTapias Oct 8, 2019
c013468
added Active column to Driver
rinostar Oct 9, 2019
ca2e556
added validation for Passenger
rinostar Oct 9, 2019
742205f
updated schema for Trip
rinostar Oct 9, 2019
f76f9a1
updated model tests
rinostar Oct 10, 2019
4efa826
Added link to Passenger Index View to see a passenger's detail.
NatalieTapias Oct 10, 2019
8f94955
Added iteration to list all trips for a given Passenger on Passenger …
NatalieTapias Oct 10, 2019
c265894
Links to delete and edit passenger on passenger show page.
NatalieTapias Oct 10, 2019
852c7dd
Display error messages when attemping to edit a passenger without a n…
NatalieTapias Oct 10, 2019
fa8d7e2
Added error validation for when you create a new passenger.
NatalieTapias Oct 10, 2019
1099bfc
Fixed and passed test for Trip Model
rinostar Oct 10, 2019
f0614c9
* Follow-up fix on test for Trip Model
rinostar Oct 10, 2019
168695a
added functionalities for Driver (driver story)
rinostar Oct 10, 2019
6825551
Added funcationalities for Driver (admin story)
rinostar Oct 10, 2019
6e00fc9
Merge branch 'master' of https://github.com/NatalieTapias/ride-share-…
NatalieTapias Oct 10, 2019
72fa77a
Incluing notes from afternoon discussion- passenger show view
NatalieTapias Oct 10, 2019
d3195fd
added total_earning & average_rating to Driver (model & view)
rinostar Oct 10, 2019
9bb1112
enable driver to be deleted (driver model)
rinostar Oct 11, 2019
3a6d8c2
added class method "available_driver" to driver model
rinostar Oct 11, 2019
6bc7f52
Added total_cost method to Passenger Model
NatalieTapias Oct 11, 2019
2a7fee3
Commit for now.
NatalieTapias Oct 11, 2019
ed745fc
tests for drivers controller (1/2)
rinostar Oct 11, 2019
5ee948c
modify Passenger views to have error messages in the form.
NatalieTapias Oct 11, 2019
3ae99eb
resolving conflict
NatalieTapias Oct 11, 2019
b5ce71b
tests (2/3)
rinostar Oct 11, 2019
5f60313
committing tests
NatalieTapias Oct 11, 2019
dfb7261
add_trip method for Passenger (1/2)
rinostar Oct 11, 2019
48cc97c
functionalities for trip (2/3)
rinostar Oct 11, 2019
d949e7c
setup homepage
rinostar Oct 11, 2019
1e7f7e9
fix set status method for Driver (1/2)
rinostar Oct 11, 2019
2073cb6
Driver Test, can update an existing driver with valid information acc…
NatalieTapias Oct 11, 2019
4f661a1
Destroy test passing.
NatalieTapias Oct 11, 2019
8578502
Destroy test
NatalieTapias Oct 11, 2019
f08ab4f
Drivers controller_test
NatalieTapias Oct 11, 2019
6165e59
Passengers_controller#create test.
NatalieTapias Oct 11, 2019
edf9a26
finished the add trip function
rinostar Oct 11, 2019
4739f76
Commit before continuing
NatalieTapias Oct 11, 2019
fdfcbdd
quick fix
rinostar Oct 11, 2019
21dd442
passengers controller test complete
NatalieTapias Oct 11, 2019
d21cf3e
Modified error message in Passengers and Drivers controllers
NatalieTapias Oct 11, 2019
b89b4f7
add change status option for Driver
rinostar Oct 11, 2019
dfeb460
resolve merge conflicts
rinostar Oct 11, 2019
846487f
finished status change for Driver
rinostar Oct 11, 2019
32a8a32
Happy to add a drop down menu to add a rating to a trip.
NatalieTapias Oct 11, 2019
f730d06
Merge branch 'trip-rating'
NatalieTapias Oct 11, 2019
97d6045
Working on tests
NatalieTapias Oct 11, 2019
1acf324
Saving some tests
NatalieTapias Oct 12, 2019
974f318
styling (1/3)
rinostar Oct 12, 2019
abd7319
styling (1/3)
rinostar Oct 12, 2019
db96982
styling layout
rinostar Oct 13, 2019
afde0ba
drivers styling
rinostar Oct 13, 2019
ae76c87
fix driver 'total_earning' rounding issues
rinostar Oct 13, 2019
8e9207a
passenger & trip styling
rinostar Oct 13, 2019
a262c73
added passenger and driver link in trip details
rinostar Oct 13, 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 @@
2.5.5
83 changes: 83 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.5'

# 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'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'minitest-skip'
end
277 changes: 277 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
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.7.0)
public_suffix (>= 2.0.2, < 5.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.8.1)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.4.5)
msgpack (~> 1.0)
builder (3.2.3)
byebug (11.0.1)
capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (3.0.0)
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)
debase (0.2.4.1)
debase-ruby_core_source (>= 0.10.2)
debase-ruby_core_source (0.10.6)
debug_inspector (0.0.3)
erubi (1.9.0)
execjs (2.7.0)
ffi (1.11.1)
formatador (0.2.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.1)
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.7.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jquery-rails (4.3.5)
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.3.0)
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.2)
mini_portile2 (2.4.0)
minitest (5.12.2)
minitest-rails (5.2.0)
minitest (~> 5.10)
railties (~> 5.2.0)
minitest-reporters (1.4.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-skip (0.0.1)
minitest (~> 5.0)
msgpack (1.3.1)
nenv (0.3.0)
nio4r (2.5.2)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
notiffany (0.1.3)
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 (4.0.1)
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.3.0)
loofah (~> 2.3)
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 (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
regexp_parser (1.6.0)
ruby-debug-ide (0.7.0)
rake (>= 0.8.1)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
rubyzip (2.0.0)
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.1.0)
railties (>= 5.2.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.142.6)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
shellany (0.0.1)
spring (2.1.0)
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.10)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.2.0)
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.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
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
debase (>= 0.2.4.1)
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)
ruby-debug-ide (>= 0.7.0)
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.5p157

BUNDLED WITH
2.0.2
Loading