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

Ports - Margaret & Steph #1

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
df98986
create rails app in ride share fork folder
smarchante1 Apr 15, 2019
25f5347
added model migrations for trip passenger and driver
smarchante1 Apr 15, 2019
cf85ab6
ran db migrate to create schema files
smarchante1 Apr 15, 2019
8660219
Created actions for show and index for driver, created routes for sho…
msfinnan Apr 15, 2019
32b5ea2
updated .gitignore file to match original
msfinnan Apr 15, 2019
3a1303b
added erb driver index page
smarchante1 Apr 15, 2019
5d810ef
added foreign keys
msfinnan Apr 16, 2019
dddc3e8
new commit from margaret on branch-a
msfinnan Apr 16, 2019
bec3955
I have a new commit originally on branch named branch-a
smarchante1 Apr 16, 2019
5535c0d
Created basic show page for drivers
msfinnan Apr 16, 2019
3d2a5a7
created new and create methods for driver and created _form and new h…
msfinnan Apr 16, 2019
2f21b23
new driver form is working
msfinnan Apr 16, 2019
bee8416
added edit and update task for driver and have working edit form
msfinnan Apr 16, 2019
28cd678
did migration to add cascade on delete, working delete action in driver
msfinnan Apr 16, 2019
4473622
added link to edit driver to show page
msfinnan Apr 16, 2019
6a2ca56
added validation to new and edit
msfinnan Apr 16, 2019
e7bb9c7
added total earnings method to driver.rb and displayed earnings on show
msfinnan Apr 16, 2019
d4ab410
added average rating method to driver.rb and displayed average rating…
msfinnan Apr 16, 2019
f1d6793
added warning to confirmation message when you delete a driver to war…
msfinnan Apr 16, 2019
f0fe094
Merge branch 'master' of https://github.com/smarchante1/ride-share-rails
smarchante1 Apr 16, 2019
63c6b8a
added routes for passenger actions
smarchante1 Apr 16, 2019
e9c7576
added show html for passenger data
smarchante1 Apr 16, 2019
efc84a3
added form to create new passenger
smarchante1 Apr 16, 2019
87ad6c9
added the form to edit and did some troubleshooting
smarchante1 Apr 16, 2019
dff9902
added destroy action and associated link in show
smarchante1 Apr 17, 2019
d0ade66
added total charges method in passenger model and added associated vi…
smarchante1 Apr 17, 2019
394dcd0
Added trips model, view, controller, made trip routes and nested trip…
msfinnan Apr 17, 2019
179db70
Created show, new, and create methods and params for trips
msfinnan Apr 17, 2019
b3932a4
updated method to generate random cost for trip
msfinnan Apr 17, 2019
a5ad3ec
created working delete method for passenger's trip
msfinnan Apr 17, 2019
105c3c3
added the link to driver in the trips show
msfinnan Apr 18, 2019
c07c61a
fixed broken links in passenger and driver shows
msfinnan Apr 18, 2019
baf79de
added rating method to trip controller
msfinnan Apr 18, 2019
505655c
forgot to save
msfinnan Apr 18, 2019
6983b0d
added request new trip function, and adjusted the calculation for ave…
smarchante1 Apr 18, 2019
b61b340
finished request ride functionality, working on logic for nil rating …
smarchante1 Apr 18, 2019
0632312
Remove spurious model tests
smarchante1 Apr 18, 2019
3d466cc
added navigation to application file and changed headings of driver a…
smarchante1 Apr 18, 2019
57529a8
commented out model tests, added basic tests for drivers and passengers
msfinnan Apr 18, 2019
b68515d
working on css for header
smarchante1 Apr 18, 2019
95fd4a6
driver and passenger tests
msfinnan Apr 18, 2019
af7c863
fighting with navigation menu
smarchante1 Apr 18, 2019
f9f1e0f
Merge branch 'master' of https://github.com/smarchante1/ride-share-rails
msfinnan Apr 18, 2019
be5b048
finished designing navigation menu
smarchante1 Apr 18, 2019
4b75738
finished passenger and driver tests and created homepage controller
msfinnan Apr 18, 2019
2d24a75
Merge branch 'master' of https://github.com/smarchante1/ride-share-rails
msfinnan Apr 18, 2019
7d44c44
added homepage controller and index.html.erb, added missing links to …
msfinnan Apr 18, 2019
2c6405c
can switch between request ride and rate ride
msfinnan Apr 18, 2019
3ec2913
adding tests for trips controller
smarchante1 Apr 18, 2019
e4f494f
Merge branch 'master' of https://github.com/smarchante1/ride-share-rails
smarchante1 Apr 18, 2019
92eb3d4
can link to a trip and see details from drivers and trips shows
msfinnan Apr 18, 2019
43e48cc
added table to passenger show page
msfinnan Apr 18, 2019
84f2128
added table to driver show page
msfinnan Apr 18, 2019
d1a1cb7
finished update and edit tests. working on destroy method
smarchante1 Apr 19, 2019
e1b247c
finished trip controller tests. need to revisted one test in update …
smarchante1 Apr 19, 2019
e8dbea4
formatting tables for show pages
msfinnan Apr 19, 2019
9bf610f
Merge branch 'master' of https://github.com/smarchante1/ride-share-rails
msfinnan Apr 19, 2019
4a019e4
small css change to table and fixed rounding on driver average rating
msfinnan Apr 19, 2019
d2a0f8f
removed pry
msfinnan Apr 19, 2019
58cf143
fixed phone number issue in seed file
msfinnan Apr 19, 2019
0329767
made css changes for all pages
msfinnan Apr 19, 2019
643edbd
added band to line 17 in the show action for trips controller
smarchante1 Apr 19, 2019
f9381cd
changed head not found to redirect in the show action
smarchante1 Apr 19, 2019
1be7e52
general css styling
msfinnan Apr 19, 2019
1043320
made adjustments to indentations for html.erb files
smarchante1 Apr 19, 2019
1b83d37
removed spurious comments from from controller files
smarchante1 Apr 19, 2019
97e2d20
changed logic for show action and updated paths for show valid trip p…
smarchante1 Apr 19, 2019
cc0fb01
started working on homepages test
msfinnan Apr 19, 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
Binary file added .DS_Store
Binary file not shown.
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.1.6'
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.1.6)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.16.6
Loading