Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
e19f2e0
Ran rails new
norrise120 Apr 15, 2019
d3062d2
Created Driver and Passenger models
norrise120 Apr 15, 2019
b618666
Link passenger and driver to trips
aphunk Apr 15, 2019
7eac96b
updated Trip model and updated Gemfile for readline error
norrise120 Apr 15, 2019
b93f223
add RESTful routes
aphunk Apr 15, 2019
d57dd71
Wrote test for driver controller index method, wrote method and view …
norrise120 Apr 16, 2019
82c338d
Wrote tests for driver#show, wrote method and html to pass test
norrise120 Apr 16, 2019
1892ca3
wrote tests for driver#update, wrote method and html to pass tests
norrise120 Apr 16, 2019
54bcef8
Add edit, update, show controllers and views
aphunk Apr 16, 2019
ab41256
Merge branch 'master' of https://github.com/aphunk/ride-share-rails
norrise120 Apr 16, 2019
af6fe49
edits to update method in passengers
aphunk Apr 16, 2019
9ff02b9
Merge branch 'amys_branch'
aphunk Apr 16, 2019
e896488
Remove spurious model tests
aphunk Apr 16, 2019
e3f8bb0
edit homepage and trips controllers
aphunk Apr 16, 2019
ad0b022
add passenger controller update tests
aphunk Apr 16, 2019
98e53d6
add Passenger destroy method & index view html
aphunk Apr 17, 2019
ef3fea7
wrote tests for driver#update method and wrote method to pass
norrise120 Apr 16, 2019
b34cf01
wrote tests for driver#new method and wrote method/html to pass
norrise120 Apr 16, 2019
7d0d38b
Wrote tests for driver#create method and updated code to match
norrise120 Apr 17, 2019
0f40e06
Wrote tests for driver#create method and wrote method to pass test
norrise120 Apr 17, 2019
38f2b30
Updated html pages for driver to include edit/delete links and driver…
norrise120 Apr 17, 2019
b4df97e
add successful delete flash notice
aphunk Apr 17, 2019
25ee081
add kaminari--pagination gem to gemfile
aphunk Apr 17, 2019
37685c0
Merge remote-tracking branch 'origin' into amys_branch
aphunk Apr 17, 2019
217b099
update form with passenger
aphunk Apr 17, 2019
03b46f2
Added nav bar and added new page for passenger
norrise120 Apr 17, 2019
449404a
update show index passenger pages
aphunk Apr 17, 2019
2db398e
add some styling to passengers index page
aphunk Apr 17, 2019
9c91bbc
Created trip controller, updated driver model with new methods and up…
norrise120 Apr 17, 2019
2f6e8f2
add styling to passenger index page & navigation
aphunk Apr 18, 2019
986663c
resolved conflicts in driver
aphunk Apr 18, 2019
859c2a5
added global styles
aphunk Apr 18, 2019
6583f43
styling to drivers index, style edit driver
aphunk Apr 18, 2019
2f4e16c
more styling
aphunk Apr 18, 2019
6b285c5
more styling
aphunk Apr 18, 2019
be89bcc
add new trip button to passenger show page
aphunk Apr 18, 2019
6404e69
Added Trips to driver details page
norrise120 Apr 18, 2019
f138fb7
updated passengers show page to include new trip option
norrise120 Apr 18, 2019
f60f2be
Updated passenger detail page to include trips, added error handling …
norrise120 Apr 18, 2019
78e14f9
update request trip path & method
aphunk Apr 18, 2019
1e17f13
Merge branch 'master' of https://github.com/aphunk/ride-share-rails i…
aphunk Apr 18, 2019
21c639e
request trip method
aphunk Apr 18, 2019
df7ea97
add date to trip
aphunk Apr 18, 2019
d12a474
Added status to Driver
norrise120 Apr 18, 2019
0b57430
add driver and cost to create trip
aphunk Apr 18, 2019
7d6ff88
Merge branch 'master' of https://github.com/aphunk/ride-share-rails i…
aphunk Apr 18, 2019
b273d1e
migration to update all driver status to available
norrise120 Apr 18, 2019
d9ef536
Merge branch 'master' of https://github.com/aphunk/ride-share-rails i…
aphunk Apr 18, 2019
76aec5f
trip destroy method
aphunk Apr 18, 2019
22d696d
reroute passenger trip detail page
aphunk Apr 19, 2019
56320c5
add button to update passenger trip
aphunk Apr 19, 2019
8552a5a
Added HomepagesController and added html for homepage
norrise120 Apr 19, 2019
b1d726f
added some trip controller tests, updated code to pass various tests
norrise120 Apr 19, 2019
1a46c43
successful updating of trip rating
aphunk Apr 19, 2019
e396a8f
resolve merge conflicts
aphunk Apr 19, 2019
b572d2f
add rating to strong params
aphunk Apr 19, 2019
c1b6474
fix merge conflicts
aphunk Apr 19, 2019
9b8a125
Updated tests for trip controller
norrise120 Apr 19, 2019
3406110
fix merge conflicts
norrise120 Apr 19, 2019
f29723c
final styling
aphunk Apr 19, 2019
0c04342
final styling
aphunk Apr 19, 2019
69e87bc
Added delete trip to trip index
norrise120 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
86 changes: 86 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

# Use Kaminari for pagination functionality
gem 'kaminari'
# 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
# Adding this for a readline issue that prevents rails console from opening
gem 'rb-readline'
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
Loading