Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
3655d89
created new rails project
alexandria7 Apr 15, 2019
5498ed5
added TripsController
alexandria7 Apr 15, 2019
b3a9627
added PassengersController
alexandria7 Apr 15, 2019
08e5007
added DriversController
alexandria7 Apr 15, 2019
13435c4
added Driver model
alexandria7 Apr 15, 2019
a131f1d
added Passenger model
alexandria7 Apr 15, 2019
a5bc5ac
added Trip model
alexandria7 Apr 15, 2019
f0169b8
added schema and added references to driver_id and passenger_id in Tr…
alexandria7 Apr 15, 2019
0673d2d
defined associations for each model
alexandria7 Apr 16, 2019
a33f060
this is a new text file on branch called branch-a
alexandria7 Apr 16, 2019
9bd41ae
fixed routes to utilize resources
alexandria7 Apr 16, 2019
a182dbd
Remove spurious model tests
alexandria7 Apr 16, 2019
3eadba2
Adds drivers#index
goblineer Apr 16, 2019
e2d86c1
Adds drivers#show
goblineer Apr 16, 2019
b3ac397
added list of all passengers to index page
alexandria7 Apr 16, 2019
b12c640
added show page and made each passenger name a link to show
alexandria7 Apr 16, 2019
dd786ce
Add show and edit for drivers
goblineer Apr 16, 2019
c963cc9
added corresponding tests for index and show for passengers
alexandria7 Apr 16, 2019
957a713
list of drivers with links on index page
goblineer Apr 16, 2019
6ba0d59
Add views for driver
goblineer Apr 16, 2019
4473010
show.html.erb has edit and delete links
goblineer Apr 16, 2019
6a2e556
driver#show has table of trips
goblineer Apr 16, 2019
6a92778
added new and create actions as well as corresponding tests (user ver…
alexandria7 Apr 16, 2019
e803efa
added edit and create actions with corresponding tests for passenger …
alexandria7 Apr 16, 2019
68eab2d
added destroy action and corresponding tests
alexandria7 Apr 16, 2019
db49e91
added method for determining total amount charged
alexandria7 Apr 16, 2019
e5338f3
added validation parameters for passenger
alexandria7 Apr 16, 2019
7017948
Adds average_rating for driver
goblineer Apr 16, 2019
8183d6b
Merge branch 'creating-passenger-functionality'
alexandria7 Apr 16, 2019
03a43f3
Merge branch 'master' of https://github.com/alexandria7/ride-share-rails
alexandria7 Apr 16, 2019
0218d92
Adds a bit of style so we can see what we're doing.
goblineer Apr 17, 2019
f79c5be
Styles for tables so we can see while we work.
goblineer Apr 17, 2019
e97d3aa
Adds table tags around passenger list
goblineer Apr 17, 2019
37f8bfc
Data in tables for readability
goblineer Apr 17, 2019
3640d80
Tiniest tweak fixes tiniest thing
goblineer Apr 17, 2019
d0a953d
utilized partials for new and edit forms for passenger
alexandria7 Apr 17, 2019
c822fe8
Refactored averate_rating and adds total_earnings
goblineer Apr 17, 2019
30d2308
adds tests for drivers
goblineer Apr 17, 2019
57e4732
updated controller methods to handle validations and updated tests ac…
alexandria7 Apr 17, 2019
0563bfa
Merge branch 'master' of https://github.com/alexandria7/ride-share-ra…
alexandria7 Apr 17, 2019
6dc0c52
added homepage
alexandria7 Apr 17, 2019
2a8a143
pagination gem for tables
goblineer Apr 17, 2019
0d049eb
Merge branch 'master' of https://github.com/alexandria7/ride-share-rails
goblineer Apr 17, 2019
c12e704
fix typo in navbar
goblineer Apr 17, 2019
98a333c
Add a link back from show to drivers
goblineer Apr 17, 2019
2696236
added show page for trip
alexandria7 Apr 18, 2019
f3bc250
added basic actions for trips
alexandria7 Apr 18, 2019
759c297
more views and edits for trips
alexandria7 Apr 18, 2019
f936559
fixed testing let statement for trips and attempted if statement for …
alexandria7 Apr 18, 2019
80d7bc7
changes to drivers view
goblineer Apr 18, 2019
b6bc311
changed create method in trip_controller
alexandria7 Apr 18, 2019
0e10d89
Merge branch 'master' of https://github.com/alexandria7/ride-share-rails
alexandria7 Apr 18, 2019
660abf9
Merge branch 'master' of https://github.com/alexandria7/ride-share-rails
goblineer Apr 18, 2019
a518c54
fixed driver tests
alexandria7 Apr 18, 2019
fcb4c1f
added error visuals to _form for drivers
alexandria7 Apr 18, 2019
d0a6b1b
adds to delete driver
goblineer Apr 18, 2019
5acbbab
Trying a thing
goblineer Apr 18, 2019
ae06318
Fixes typo
goblineer Apr 18, 2019
bb85acd
Fixes drivers.controller bug
goblineer Apr 18, 2019
0dc61c5
Add available/availability for drivers
goblineer Apr 19, 2019
353eb81
edited trip controller and view for passengers and drivers
alexandria7 Apr 19, 2019
a468571
removed one link from driver show'
alexandria7 Apr 19, 2019
c61d503
Adds trip request function to passenger/show
goblineer Apr 19, 2019
6fb7d20
Migration adds column for driver active/inactive
goblineer Apr 19, 2019
e999b4c
edited routes to include homepages
alexandria7 Apr 19, 2019
62775d1
added edit page for trips
alexandria7 Apr 19, 2019
df8faa6
fixed tests
alexandria7 Apr 19, 2019
ac81618
fixed tests for trip delete and update
alexandria7 Apr 19, 2019
5a19a0b
added right create method
alexandria7 Apr 19, 2019
1037652
Adds passenger active/inactive functionality
goblineer Apr 20, 2019
ca4b1b8
Merge branch 'master' of https://github.com/alexandria7/ride-share-rails
goblineer Apr 20, 2019
5e0fed4
fixed tests for all
alexandria7 Apr 20, 2019
6526105
fixed merge conflicts
alexandria7 Apr 20, 2019
7959965
corrected a failed test that I just noticed was failing
alexandria7 Apr 22, 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
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.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

gem 'will_paginate', '~> 3.0'
276 changes: 276 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,276 @@
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)
will_paginate (3.1.7)
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)
will_paginate (~> 3.0)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.17.3
Loading