Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
bb2e93f
Created new project
morganschuler Oct 7, 2019
9c5a1e4
We created the controllers for Drivers, Passengers, Trips. We created…
north108 Oct 7, 2019
e2bde31
Set up relationships
morganschuler Oct 8, 2019
9782f21
Added new columns for make and model
morganschuler Oct 8, 2019
24c670f
added homepages controller
morganschuler Oct 8, 2019
30081e5
Added routes
morganschuler Oct 8, 2019
3594ca8
Added index method for passengers controller
morganschuler Oct 8, 2019
65428c5
Added index and view page for drivers
morganschuler Oct 8, 2019
cad9d53
Added show page for passenger and show method in controller
morganschuler Oct 8, 2019
9d59ecb
Created driver show method and driver show page
morganschuler Oct 8, 2019
3daf7ce
Added homepage show and index method
morganschuler Oct 8, 2019
d14a095
Added links to show pages
morganschuler Oct 8, 2019
092e676
Added a list of trips for both passenger and driver in their show page.
north108 Oct 8, 2019
2c250d9
Refactored link list of trips for driver and passenger to now link to…
north108 Oct 8, 2019
633fff4
Wrote total_amount for the passenger model and total_earned for the d…
north108 Oct 8, 2019
47b5af4
Created an index page for trips and created a link to the list of all…
north108 Oct 8, 2019
602a28b
Added create and new methods and view pages for passenger and driver
morganschuler Oct 8, 2019
5b6e1e8
Spacing in new drivers
morganschuler Oct 8, 2019
e36aea5
Added edit and update method and edit view for passenger
morganschuler Oct 8, 2019
f6f3d28
Created #edit in trips and added the link to the details page of trips.
north108 Oct 9, 2019
dcea049
Created #destroy for trips controller and added link in trips details…
north108 Oct 9, 2019
0c37f10
Added link to trip details page to show details of passenger and driver.
north108 Oct 9, 2019
0b7d8c6
Added destroy for passenger and driver
morganschuler Oct 9, 2019
bc38f8a
Merge branch 'en/ride-share'
north108 Oct 9, 2019
370c3d3
Wrote #create in trip and added link to create new trip on passenger'…
north108 Oct 9, 2019
7100b8d
Added validation for driver/passenger new text fields
morganschuler Oct 10, 2019
91575bc
Migrated new column to drivers and set available to true.
north108 Oct 10, 2019
76ee9e7
added rating button
morganschuler Oct 10, 2019
1077b36
Tried to write model method assign_driver for Trip.
north108 Oct 10, 2019
ec527b9
Fixed conflicts.
north108 Oct 10, 2019
f7a1227
Added rating dropdown
morganschuler Oct 10, 2019
cfedf73
Fixed weird edit bug
morganschuler Oct 10, 2019
7ec881a
Added validation for edit
morganschuler Oct 10, 2019
86e741a
Generated two migrations to delete make and model from drivers schema.
north108 Oct 10, 2019
89f56b3
Added toggle for driver status
morganschuler Oct 10, 2019
8777931
Wrote tests for drivers_controller, all pass.
north108 Oct 11, 2019
06e97fe
Wrote tests for passengers controller. All pass.
north108 Oct 11, 2019
10330cf
Added Css and some tests
morganschuler Oct 11, 2019
490ae73
Added css
morganschuler Oct 11, 2019
359b12c
Updated model tests from Jared's updates.
north108 Oct 11, 2019
f4d4373
Tests for test controller
morganschuler Oct 11, 2019
0c0e0f8
Merged
morganschuler Oct 11, 2019
689fbd2
Cleared merge conflicts
north108 Oct 11, 2019
26a4e36
Worked on tests.
north108 Oct 11, 2019
e05fba0
Finished controller tests. All pass.
north108 Oct 11, 2019
4525ffc
Updated tests for model
morganschuler Oct 11, 2019
2d68741
post migration for foreign key
morganschuler Oct 11, 2019
bfd27a4
Merge branch 'master' of https://github.com/morganschuler/ride-share-…
north108 Oct 11, 2019
c1626b2
Tried to fix model tests but struggled with a couple oops
morganschuler Oct 11, 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
85 changes: 85 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
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'

gem 'pry-byebug'
# 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
Loading