Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
9b86926
Added Ride Share Diagram.drawio
steve-messing Nov 2, 2020
cafb6a7
created rails template
steve-messing Nov 2, 2020
40b1cdd
trying to merge
steve-messing Nov 2, 2020
4e33e53
generate controllers, models, views, routes and migrations
steve-messing Nov 2, 2020
5c4a08d
framed out basic site structure in header
steve-messing Nov 3, 2020
90fb1c8
made a really pretty grid layout
steve-messing Nov 3, 2020
0ee2aff
made a really pretty grid layout
steve-messing Nov 3, 2020
9bf55e6
more css
steve-messing Nov 3, 2020
16642cf
add driver index action and all drivers table
kimvitug05 Nov 3, 2020
f1b6fec
Merge branch 'master' of github.com:kimvitug05/ride-share-rails
kimvitug05 Nov 3, 2020
2049f17
fix typo
kimvitug05 Nov 3, 2020
db73922
adjust table width
kimvitug05 Nov 3, 2020
268fc40
linked driver data in index to driver show pages
steve-messing Nov 3, 2020
89c0346
merging just because
steve-messing Nov 3, 2020
84704f1
added index list view for passengers
steve-messing Nov 3, 2020
f62e23d
fixed typo in passengers_controller.rb
steve-messing Nov 3, 2020
6e6dea4
has_many and belongs_to relationships
steve-messing Nov 3, 2020
311228d
has_many and belongs_to relationships in models
steve-messing Nov 3, 2020
fa7dbfe
add actions for driver controller
kimvitug05 Nov 3, 2020
0200b09
add actions for passenger controller
kimvitug05 Nov 3, 2020
3a092a7
created new & edit forms for drivers
steve-messing Nov 3, 2020
4e26f60
created new & edit forms for passengers
steve-messing Nov 3, 2020
2fc6f2b
write tests for driver controller
kimvitug05 Nov 3, 2020
9403ad7
write more drivers controller tests
kimvitug05 Nov 3, 2020
9347e12
fix belongs_to in trip.rb; rails test works now
kimvitug05 Nov 4, 2020
11b9bda
write index and show Passenger controller tests
kimvitug05 Nov 4, 2020
8ddd116
edited routes for trips
steve-messing Nov 4, 2020
23d5b13
edited routes for trips
steve-messing Nov 4, 2020
f4a203e
add new and create actions for passenger controller
kimvitug05 Nov 4, 2020
a7cb87b
add new and create tests for passenger controllers
kimvitug05 Nov 4, 2020
c66479e
completed all but one test for passenger controller
kimvitug05 Nov 4, 2020
b76329d
handle merge conflicts
kimvitug05 Nov 4, 2020
ec4ff08
removed has_many and belongs_to from controllers
steve-messing Nov 4, 2020
02af00e
merging not sure why
steve-messing Nov 4, 2020
4da57d7
generate migrations and migrate
steve-messing Nov 4, 2020
2423da9
started making trips show page
steve-messing Nov 4, 2020
e56b1bb
started making trips show page
steve-messing Nov 4, 2020
03730e5
tried to add list trips table to driver show page. errors
steve-messing Nov 4, 2020
4da6e78
add total cost method in passenger model
kimvitug05 Nov 4, 2020
f0dad0b
update method name
kimvitug05 Nov 4, 2020
96ac4b8
add avg_rating method in driver model
kimvitug05 Nov 4, 2020
b0a550c
write total_earnings method for driver model
kimvitug05 Nov 4, 2020
db8c958
add total spending to Passenger details view
kimvitug05 Nov 4, 2020
5f0a4e1
add total earnings and average rating to Driver details view
kimvitug05 Nov 4, 2020
4ac966e
display table for Driver's trips in view
kimvitug05 Nov 4, 2020
407c77a
display table for Passenger's trips in view
kimvitug05 Nov 4, 2020
4a9ffe9
add borders to all tables
kimvitug05 Nov 4, 2020
a94e1fd
edit passenger trips table to include driver name; removed passenger_…
kimvitug05 Nov 4, 2020
9cae417
edit driver trips table to include passenger name; removed passenger_…
kimvitug05 Nov 4, 2020
21bf935
trips can show, edit, destroy
steve-messing Nov 4, 2020
9af1739
added validations to driver, passenger, trip
steve-messing Nov 4, 2020
2e0c394
tried to add validations to forms, not yet working
steve-messing Nov 4, 2020
21908e2
write test for create Driver with validations
kimvitug05 Nov 5, 2020
629c2eb
all tests written for Driver controller
kimvitug05 Nov 5, 2020
0d2907e
write tests for Passenger controller - validations
kimvitug05 Nov 5, 2020
302eeb9
edit Passenger controller; error messages show up now
kimvitug05 Nov 5, 2020
d30e1f7
edit Driver controller; error messages show up now
kimvitug05 Nov 5, 2020
90fc1e3
edit tests
kimvitug05 Nov 5, 2020
222d681
add trip controller show test
kimvitug05 Nov 5, 2020
46733ca
edit tests for Passenger controller: update
kimvitug05 Nov 5, 2020
4ab5f1c
update test for Passenger controller: create
kimvitug05 Nov 5, 2020
94bfbe3
commented out validates available status; all tests passing
kimvitug05 Nov 5, 2020
1a475de
add colored heading for tables
kimvitug05 Nov 5, 2020
ac24985
nested routes not working yet
steve-messing Nov 5, 2020
5b8fb1a
nested routes
steve-messing Nov 5, 2020
3e79156
add request Trip button in passenger details view
kimvitug05 Nov 5, 2020
93743ab
nested routes work
steve-messing Nov 5, 2020
5cff0aa
trying to merge nested-routes
steve-messing Nov 5, 2020
855edef
merging again
steve-messing Nov 5, 2020
1111ac4
nested routes complete
steve-messing Nov 5, 2020
43cff59
fixed drivers_controller.rb update redirect
steve-messing Nov 5, 2020
5853451
implement request trip
kimvitug05 Nov 6, 2020
9f7723e
edit request trip
kimvitug05 Nov 6, 2020
63b72c4
request trip now working
kimvitug05 Nov 6, 2020
1837605
delete new trip view
kimvitug05 Nov 6, 2020
96230d2
request trip changes
kimvitug05 Nov 6, 2020
bf592b9
can set ratings in trip details page
steve-messing Nov 6, 2020
74f1cc3
added css styling and changed font
steve-messing Nov 6, 2020
d43bb72
updated homepage with silly text
steve-messing Nov 6, 2020
2ae6d5e
homepage text
steve-messing Nov 6, 2020
b6abaae
format validation errors
steve-messing Nov 6, 2020
9789a0c
handles trips belonging to deleted passenger and driver
steve-messing Nov 6, 2020
a32f277
write model tests for trip
kimvitug05 Nov 6, 2020
74b8ee2
add validations for trip model testing
kimvitug05 Nov 6, 2020
98c5ae1
add date validation for trip model test
kimvitug05 Nov 6, 2020
75602bf
continue writing test controller
kimvitug05 Nov 6, 2020
db9c46b
continue writing trips controller tests
kimvitug05 Nov 6, 2020
dd3684d
continue writing trips controller tests
kimvitug05 Nov 6, 2020
5decdce
update trips_controller_test.rb
steve-messing Nov 6, 2020
2fd70b6
more tests for trips controller
kimvitug05 Nov 6, 2020
ff93ee7
handle merge conflicts
kimvitug05 Nov 6, 2020
8070593
add tests for edit trip controller
kimvitug05 Nov 6, 2020
fe94bf9
add test for edit trip controller
kimvitug05 Nov 6, 2020
458cc8f
add test for update trip controller
kimvitug05 Nov 6, 2020
bee1a59
trip create trip test is working
steve-messing Nov 7, 2020
6f40699
test accidentally commented out
kimvitug05 Nov 7, 2020
2ae8e84
passenger and driver's tables now embedded on details page
kimvitug05 Nov 16, 2020
4375603
complete model tests
kimvitug05 Nov 16, 2020
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
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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 pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

# Ignore uploaded files in development.
/storage/*
!/storage/.keep

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
81 changes: 81 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
# 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.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', 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.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 web drivers to run system tests with browsers
gem 'webdrivers'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'guard'
gem 'guard-minitest'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

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


gem 'validates_timeliness', '~> 5.0.0.beta1'
Loading