Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
5f26243
rails new
sun-alice Oct 7, 2019
79fd814
added rb-readline gem to gemfile
Galaxylaughing Oct 7, 2019
cf84667
set up models and schema
Galaxylaughing Oct 7, 2019
af20711
generated homepages controller
Galaxylaughing Oct 7, 2019
4462eca
generated passengers controller
Galaxylaughing Oct 7, 2019
01fd190
generated trips controller
Galaxylaughing Oct 7, 2019
a4bb726
generated drivers controller
Galaxylaughing Oct 7, 2019
8fd92f1
added routes
Galaxylaughing Oct 7, 2019
b40dfc2
added minitest/rails to test_helper
Galaxylaughing Oct 7, 2019
ace4569
added drivers#index and test
Galaxylaughing Oct 7, 2019
2e61378
added code for drivers#index
Galaxylaughing Oct 7, 2019
72961c3
added passenger index + tests
sun-alice Oct 7, 2019
9f72e78
added view for index action
Galaxylaughing Oct 7, 2019
e33dd3c
added view for index action for passenger
sun-alice Oct 7, 2019
bdd02ed
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 7, 2019
2787abe
added and tested driver#show
Galaxylaughing Oct 8, 2019
9e87d54
added show method + tests
sun-alice Oct 8, 2019
eecd90e
implemented and tested driver#average_rating
Galaxylaughing Oct 8, 2019
ddd69a4
implemented and tested driver#total_earnings
Galaxylaughing Oct 8, 2019
f11e878
added crud tests/functions to passenger
sun-alice Oct 8, 2019
09ee65e
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 8, 2019
390e81a
implemented and tested driver new and create actions
Galaxylaughing Oct 8, 2019
9d01c45
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
Galaxylaughing Oct 8, 2019
917cccb
added nav bar
Galaxylaughing Oct 8, 2019
f52e449
made each list item in driver index a link
Galaxylaughing Oct 8, 2019
74aea53
added driver_controller#edit
Galaxylaughing Oct 8, 2019
b2ecce1
added driver_controller#update
Galaxylaughing Oct 8, 2019
f848a5a
added driver_controller#destroy
Galaxylaughing Oct 8, 2019
0656402
udpated driver earnings to follow fee and percentage instructions
Galaxylaughing Oct 8, 2019
b3469e9
added views for passenger edit/index/show
sun-alice Oct 8, 2019
ea670a9
added a passenger test
sun-alice Oct 8, 2019
2c6b2f1
added total_charged for passenger
sun-alice Oct 8, 2019
b7d6bad
added total trips count and prepped car details section to add make a…
Galaxylaughing Oct 8, 2019
015c1f8
added a homepage
sun-alice Oct 8, 2019
e7a6d72
homepage view
sun-alice Oct 8, 2019
7e458e6
passenger validation
sun-alice Oct 8, 2019
a9c28be
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 8, 2019
9678400
migrated to add active, car make, and car model to drivers table
Galaxylaughing Oct 8, 2019
bf953a6
made driver validation require name and vin
Galaxylaughing Oct 8, 2019
e8bddb9
added active, car make, and car model to seed file
Galaxylaughing Oct 8, 2019
e473e26
added tests for trip_controller#show
Galaxylaughing Oct 8, 2019
3a49275
added trip index and show action/view
sun-alice Oct 8, 2019
3fa5be5
removed index for trips
sun-alice Oct 8, 2019
9c60a84
removed index path from routes
Galaxylaughing Oct 8, 2019
5785e0c
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 8, 2019
150ac63
removed trip#new path from routes
Galaxylaughing Oct 8, 2019
9d2ea1c
updated passenger/trips controller actions
sun-alice Oct 8, 2019
0990018
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 8, 2019
5361be6
added trips_controller#create
Galaxylaughing Oct 8, 2019
bb56a35
edited driver/passenger create action
sun-alice Oct 8, 2019
30ce146
added trip link to passenger/driver show view
sun-alice Oct 8, 2019
81ad7ae
added trip show view
sun-alice Oct 8, 2019
457647d
edited driver/passenger show view
sun-alice Oct 8, 2019
f2258c1
made driver show page show status
Galaxylaughing Oct 8, 2019
4e3321a
made driver_controller#create set active to true
Galaxylaughing Oct 8, 2019
abfe3a5
added number_to_currency to trip show page
Galaxylaughing Oct 8, 2019
3dc9df0
added a test for request trip
Galaxylaughing Oct 8, 2019
08b456c
commented out stuff for nested routes. tomorrow's problem
sun-alice Oct 8, 2019
1cf7900
added car make and model inputs to new driver form
Galaxylaughing Oct 8, 2019
84d8923
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
Galaxylaughing Oct 8, 2019
d1cfe90
added gem to test template rendering, added error viewing in new driv…
Galaxylaughing Oct 8, 2019
d7bd32a
added passenger errors in view when creating
sun-alice Oct 8, 2019
0ea8f05
added car make and model and error messaging to driver edit
Galaxylaughing Oct 8, 2019
fc66f1b
removed extra nil check and also edit view errors
sun-alice Oct 8, 2019
d369e21
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 8, 2019
71862e0
driver nil check removed
sun-alice Oct 8, 2019
3ba23e8
typo
sun-alice Oct 8, 2019
d359376
added toggle for changing driver.active boolean
Galaxylaughing Oct 8, 2019
450739f
added nullify thing to deleted drivers/riders
sun-alice Oct 8, 2019
ee97f07
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 8, 2019
fa383cc
added trip destroy and tests
sun-alice Oct 8, 2019
d35efa4
edited passenger view
sun-alice Oct 8, 2019
4087011
made header a link to root page
Galaxylaughing Oct 8, 2019
b8c35a5
added form partial for driver
Galaxylaughing Oct 8, 2019
6c4a27b
added form partial for passenger
Galaxylaughing Oct 8, 2019
d6da2f6
added some styling
sun-alice Oct 9, 2019
e91729e
added shared partial for printing trip data table
Galaxylaughing Oct 9, 2019
ddc97b3
implemented table partial in driver show
Galaxylaughing Oct 9, 2019
033f846
added nested route for creating a new trip for a passenger, updated t…
Galaxylaughing Oct 9, 2019
a30dafe
removed passenger request_trip method, which should be the trips_cont…
Galaxylaughing Oct 9, 2019
0447698
added request trip link to passenger show page
Galaxylaughing Oct 9, 2019
8689407
fixed trip_controller#create method and tests, but it still uses temp…
Galaxylaughing Oct 9, 2019
85bbfd9
added a random cost generator to trip_controller#create
Galaxylaughing Oct 9, 2019
7af2ff2
added average_rating test for nil rating, fixed method to pass
Galaxylaughing Oct 9, 2019
e199ac1
added go_offline and go_online driver methods
Galaxylaughing Oct 9, 2019
7a2f48e
modified driver_controller#toggle_active to use go_offline and go_online
Galaxylaughing Oct 9, 2019
423ac81
modified driver#get_driver to use go_offline
Galaxylaughing Oct 9, 2019
59ee072
deleted tests-go-here comments, changed test name to be clearer
Galaxylaughing Oct 9, 2019
1cb1450
added some blank driver#get driver tests
Galaxylaughing Oct 9, 2019
8df7a0a
Removed extraneous resources from routes
Galaxylaughing Oct 9, 2019
7c8a7b5
added flash message and fixed trips create action
sun-alice Oct 9, 2019
63336fd
added a background color to the dropdown menu
Galaxylaughing Oct 9, 2019
6995ff8
added trip model tests
sun-alice Oct 10, 2019
49a98cf
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 10, 2019
a03c032
added default field for trip edit form
sun-alice Oct 10, 2019
81a4e81
fixed driver update method
sun-alice Oct 10, 2019
d9396e1
edited passenger controller update test
sun-alice Oct 10, 2019
b39c301
fixed trip controller update test yeet
sun-alice Oct 10, 2019
d658c2e
implemented rate action
Galaxylaughing Oct 10, 2019
f8e1dff
added tests for rating a trip
Galaxylaughing Oct 10, 2019
089a8f8
removed pry require
Galaxylaughing Oct 10, 2019
e9512a5
added some css to the homepage
Galaxylaughing Oct 10, 2019
4c24d26
added css to the nav
Galaxylaughing Oct 10, 2019
d4b1e95
added some css to the driver and passenger show pages
Galaxylaughing Oct 10, 2019
45b5f83
added carmake/model to driver controller test to fix test bug
sun-alice Oct 11, 2019
3d2ea17
added total_charged test for passenger model
sun-alice Oct 11, 2019
85f1733
added trip controller update test
sun-alice Oct 11, 2019
5560fd5
added feature so that passenger can only request a trip if they dont …
sun-alice Oct 11, 2019
689275a
added error/flash notice styling
sun-alice Oct 11, 2019
30720b2
added availability styling
sun-alice Oct 11, 2019
3fd1810
added more styling
sun-alice Oct 11, 2019
a4a3b53
add pagination to driver and passenger index
Galaxylaughing Oct 11, 2019
9de6ac0
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
Galaxylaughing Oct 11, 2019
6acab2f
removed sass variable from application.css
Galaxylaughing Oct 11, 2019
7ad1b0e
positioned dropdown menus and made them more distinct against background
Galaxylaughing Oct 11, 2019
3c95cfd
added inline rating functionality to trip show page
Galaxylaughing Oct 11, 2019
a46f07b
fixed trip show page to display 'deleted' for deleted drivers/passengers
Galaxylaughing Oct 11, 2019
8761979
added photos to each driver and passenger, and tested
Galaxylaughing Oct 11, 2019
2aec390
formatted driver/passenger show pages into two columns
Galaxylaughing Oct 11, 2019
96228d3
modified css for driver/passenger show to arrange image and name
Galaxylaughing Oct 11, 2019
aba4aac
table size
sun-alice Oct 11, 2019
dc26fbe
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 11, 2019
b3391c5
changed height of driver/passenger list to get rid of empty space at …
Galaxylaughing Oct 11, 2019
6159bf7
resolved merge conflict
Galaxylaughing Oct 11, 2019
a0daa25
centered pagination and titles
Galaxylaughing Oct 11, 2019
e039b92
button stylings
sun-alice Oct 11, 2019
2938b4d
centered trip table header
Galaxylaughing Oct 11, 2019
5f13b2a
added flash now
sun-alice Oct 11, 2019
c798c45
Merge branch 'master' of https://github.com/Galaxylaughing/ride-share…
sun-alice Oct 11, 2019
e7c10f2
fixed inline trip rating bug
Galaxylaughing Oct 11, 2019
b1052ae
fixed render/redirect bug ty becca
sun-alice Oct 11, 2019
7baf346
added driver and passenger model test update
sun-alice Oct 11, 2019
ee30eba
rating to float
sun-alice 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
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" }

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'
# 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]
gem 'rails-controller-testing'
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'
gem 'rb-readline'
gem 'pry-byebug'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'minitest-skip'
end
Loading