Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Daniela and Jackie F. - Spooky Bus #5

Open
wants to merge 94 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 89 commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
c64d8d1
rails new
mystioreo Oct 1, 2018
e4b36b0
created routes for driver and passenger
mystioreo Oct 1, 2018
f7c4b7f
created driver model
mystioreo Oct 1, 2018
7094d80
add passenger and trips migration file
jfahmy Oct 1, 2018
2095f82
Merge branch 'passenger'
jfahmy Oct 1, 2018
d9cae7a
add model relationships
jfahmy Oct 2, 2018
f057a29
changed ids to to_i
jfahmy Oct 2, 2018
68983a5
create trips migration
mystioreo Oct 2, 2018
f4aa031
Merge branch 'master' of https://github.com/mystioreo/ride-share-rails
mystioreo Oct 2, 2018
38cc07b
generate drivers controller and views
mystioreo Oct 2, 2018
1deb786
basic setup of drivers controller, fixed routing
mystioreo Oct 2, 2018
d472335
drivers index shows a list of drivers
mystioreo Oct 2, 2018
3556cd4
basic driver show view
mystioreo Oct 2, 2018
9c07c57
basic routes, controllers and views in place for index, show, new, ed…
jfahmy Oct 2, 2018
aa5b70c
driver model calculates total earnings and average rating
mystioreo Oct 2, 2018
e00702a
when a driver is deleted the associated trip gets a nil driver
mystioreo Oct 2, 2018
0ffacbb
Add total_charges method to passenger model and removed foreign key …
jfahmy Oct 2, 2018
e74f5b7
added table of trip details to driver show view
mystioreo Oct 2, 2018
9522605
driver forms show validation errors if no data is entered
mystioreo Oct 2, 2018
664dc80
added error validation for passenger new and edit
jfahmy Oct 2, 2018
885613f
updated delete popup message
mystioreo Oct 2, 2018
9932e23
updated delete trip popup message
mystioreo Oct 2, 2018
9291d23
add table to passenger show view
jfahmy Oct 2, 2018
6851ebe
Merge branch 'passenger'
jfahmy Oct 2, 2018
f3571b2
added controller and views for Trip
mystioreo Oct 2, 2018
45a5921
set before action in trips controller
mystioreo Oct 2, 2018
1e89937
fixed the delete bugs for passenger
jfahmy Oct 2, 2018
798b749
trip index and show views completed
mystioreo Oct 2, 2018
72ba099
resolved merge conflicts
mystioreo Oct 2, 2018
728d7fe
trips index links to individual trip show pages. trip show has an edi…
mystioreo Oct 2, 2018
d773d97
mess with request ride options
jfahmy Oct 2, 2018
569f5ed
Merge branch 'master' of github.com:mystioreo/ride-share-rails
jfahmy Oct 2, 2018
e74ac22
Create button to auto generate trips for passengers
jfahmy Oct 3, 2018
1f791b7
small change to autocreate method
jfahmy Oct 3, 2018
ba3e208
adjusted route for create trips button
jfahmy Oct 3, 2018
76ba8eb
typo fix for routes
jfahmy Oct 3, 2018
71e6ef3
can assign a rating from the trip show page
mystioreo Oct 3, 2018
144ca4f
Merge branch 'master' of https://github.com/mystioreo/ride-share-rails
mystioreo Oct 3, 2018
bf58253
moved trip cost dollar conversion from view to model
mystioreo Oct 3, 2018
844a6d4
moved passenger total charges dollar conversion from view to model
mystioreo Oct 3, 2018
d49eb3b
add trip edit form and links for nav
jfahmy Oct 3, 2018
e4ef2e0
driver show can handle a nil passenger, passenger show can handle a n…
mystioreo Oct 3, 2018
fc662b6
Merge branch 'master' of https://github.com/mystioreo/ride-share-rails
mystioreo Oct 3, 2018
976644e
added hover-over nav
jfahmy Oct 3, 2018
7c6a983
Merge branch 'master' of github.com:mystioreo/ride-share-rails
jfahmy Oct 3, 2018
6b03859
added pagination for driver, passenger, trips index views
mystioreo Oct 4, 2018
ed8d620
driver earns 80% of each ride after $1.65 is subtracted
mystioreo Oct 4, 2018
01d4fcf
driver dropdown in edit trip
mystioreo Oct 4, 2018
3722257
passenger dropdown in edit trip
mystioreo Oct 4, 2018
cde1bfc
validates rating 1 to 5
mystioreo Oct 4, 2018
a88340c
rating validation allows nil
mystioreo Oct 4, 2018
28f5072
edit trip cost in cents
mystioreo Oct 4, 2018
1c25688
added driver availability method, edited create trip to only select f…
mystioreo Oct 4, 2018
dd269c2
Add css for nav, homepage image, and made passenger and driver view i…
jfahmy Oct 4, 2018
e7efa28
added cost validation to edit trip view
mystioreo Oct 4, 2018
e253dec
make index passengers and drivers tables
jfahmy Oct 4, 2018
b871c05
Merge branch 'formchanges'
mystioreo Oct 4, 2018
0fb9014
fixed bug to handle nil rating in model
jfahmy Oct 4, 2018
28bee34
Merge branch 'master' of github.com:mystioreo/ride-share-rails
jfahmy Oct 4, 2018
8abc047
pagination styles
mystioreo Oct 4, 2018
b4441c9
table rows alternate colors
mystioreo Oct 4, 2018
f7c20e4
change to trip model method for creating a trip
jfahmy Oct 4, 2018
55eb5e5
Merge branch 'styles'
mystioreo Oct 4, 2018
def6e56
made driver and passenger views look alike
mystioreo Oct 4, 2018
6039a0f
added table styling
mystioreo Oct 4, 2018
9f94e27
driver creation redirects to drivers index
mystioreo Oct 4, 2018
fc7597e
fixed trip edit form
mystioreo Oct 4, 2018
9232b42
changed text on passenger new and edit pages
mystioreo Oct 4, 2018
1b1e218
change pagination count in controllers
jfahmy Oct 4, 2018
4fc0ca8
Merge branch 'master' of github.com:mystioreo/ride-share-rails
jfahmy Oct 4, 2018
75f71b5
changed header of add driver page
mystioreo Oct 4, 2018
7fc9dc4
changed header of edit driver page
mystioreo Oct 4, 2018
e8e25f7
centered forms with application css
jfahmy Oct 4, 2018
d8d5a0d
Merge branch 'master' of github.com:mystioreo/ride-share-rails
jfahmy Oct 4, 2018
c997547
styled request ride button
mystioreo Oct 5, 2018
4c90f52
added regex validation for phone number and first and last name
jfahmy Oct 5, 2018
ba9004b
Merge branch 'phonevalidation'
jfahmy Oct 5, 2018
f04b861
changed table and pagination colors
mystioreo Oct 5, 2018
ef1925e
Merge branch 'master' of https://github.com/mystioreo/ride-share-rails
mystioreo Oct 5, 2018
c884c26
button styling changes
jfahmy Oct 5, 2018
fa36296
Merge branch 'master' of github.com:mystioreo/ride-share-rails
jfahmy Oct 5, 2018
e2ea8d3
uncommented spooky bus photo
mystioreo Oct 5, 2018
0b3660e
merge conflict
mystioreo Oct 5, 2018
c9020fd
normalized add passenger and driver pages
jfahmy Oct 5, 2018
4676246
Merge branch 'master' of github.com:mystioreo/ride-share-rails
jfahmy Oct 5, 2018
e4b3c62
centered form errors
jfahmy Oct 5, 2018
5108281
fixed passenger edit form
mystioreo Oct 6, 2018
969ea90
cleaned up images folder
mystioreo Oct 6, 2018
010d8ea
fixed passenger edit form
mystioreo Oct 6, 2018
654e3b8
fixed vin validation issue
mystioreo Oct 6, 2018
08b4470
fixed vin validation issue
mystioreo Oct 6, 2018
b919e9c
fixed bug in the trip controller create method
jfahmy Oct 9, 2018
7328ba4
merging changes
jfahmy Oct 9, 2018
d4548f8
adjusted edit.html.erb
jfahmy Oct 9, 2018
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
82 changes: 82 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem 'will_paginate', '>= 3.1'

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.1'
# 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'
end
271 changes: 271 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1)
actionpack (= 5.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.1)
activesupport (= 5.2.1)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
arel (>= 9.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
marcel (~> 0.3.1)
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
archive-zip (0.11.0)
io-like (~> 0.3.0)
arel (9.0.0)
better_errors (2.5.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
builder (3.2.3)
byebug (10.0.2)
capybara (3.8.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.0)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.9.25)
formatador (0.2.5)
globalid (0.4.1)
activesupport (>= 4.2.0)
guard (2.14.2)
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.1.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.7.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.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.5)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
msgpack (1.2.4)
multi_json (1.13.1)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.3)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.5)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
bundler (>= 1.3.0)
railties (= 5.2.1)
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.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.6.0)
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.14.0)
childprocess (~> 0.5)
rubyzip (~> 1.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.0)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.19)
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.6)
xpath (3.1.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
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.1)
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.1)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.16.4
9 changes: 9 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
guard :minitest, autorun: false, spring: true do
watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" }
watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' }
watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" }
watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" }
watch(%r{^test/.+_test.rb$})
watch(%r{^test/test_helper.rb$}) { 'test' }
end
Loading