Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
6d25738
created new rails app
anyatokar Nov 3, 2020
6a0f595
Drivers controller set up
anyatokar Nov 4, 2020
e8119c5
all 3 controllers set up
anyatokar Nov 4, 2020
ba0c7d7
added RESTful routes
anyatokar Nov 4, 2020
b12bc5b
models generated
anyatokar Nov 4, 2020
086b6e1
created db and ran migration
anyatokar Nov 4, 2020
76d77a4
table display in index view for each model
anyatokar Nov 4, 2020
8d9c0ac
Delete Gemfile.lock
anyatokar Nov 4, 2020
e863ffa
testing with removing gemfile.lock
anyatokar Nov 4, 2020
9848bc6
playing around with html and css, also had to do some weirdness with …
rencarot Nov 4, 2020
53035ab
added basic show method and views for all three models
rencarot Nov 4, 2020
837579e
added basic methods for passenger and driver, new and edit views
rencarot Nov 5, 2020
84ba7d1
added pagination to indices, created homepage as root_path
rencarot Nov 5, 2020
42b30b1
merging html-css into basic rails
rencarot Nov 5, 2020
6ee9fe6
whoops, auto merge made two root_paths, now fixed
rencarot Nov 5, 2020
395f99c
controller trips and driver tests as well as model driver tests atte…
anyatokar Nov 5, 2020
6682c71
sprucing up the forms view and css
rencarot Nov 5, 2020
5ff56dc
spruced up driver and passenger profile pages
rencarot Nov 5, 2020
a23fb34
added links to passenger and driver profile pages in the index tables
rencarot Nov 5, 2020
366d249
adding todos
anyatokar Nov 5, 2020
f69b2df
added trips to passenger and driver profile pages
rencarot Nov 5, 2020
d3addcc
added notes and some passenger tests
anyatokar Nov 5, 2020
8c46c47
updated show view for trips, added links to trip show in driver and p…
rencarot Nov 5, 2020
839bb74
tests ready to be.. tested
anyatokar Nov 5, 2020
9609058
first merge of tests Merge branch 'testing' into basic-rails
anyatokar Nov 5, 2020
0e9348a
drivers_controller tests passing so far
anyatokar Nov 5, 2020
f9fcca5
Merge branch 'basic-rails' of https://github.com/anyatokar/ride-share…
anyatokar Nov 5, 2020
a0378f5
commit test
anyatokar Nov 6, 2020
7a3a303
test edit
anyatokar Nov 6, 2020
dee19c9
created request trip on passenger show page
rencarot Nov 6, 2020
884d88a
Merge branch 'basic-rails' of https://github.com/anyatokar/ride-share…
rencarot Nov 6, 2020
f4fafc6
added driver average rating method, and display in show view
rencarot Nov 6, 2020
00bf3b6
average ratings method, currency method
rencarot Nov 6, 2020
1369481
fixed total earnings and test to convert from pennies to dollars
anyatokar Nov 6, 2020
6d27e9a
test adjustments, meant to be in basic-rails
anyatokar Nov 6, 2020
6b20d3d
fixed request new trip to switch driver status, made driver view corr…
rencarot Nov 6, 2020
98022d7
editing tests
anyatokar Nov 6, 2020
7396f19
adjusted currency methods to be useable by multiple methods if needed…
rencarot Nov 6, 2020
a3717ec
fixed trip show page to display rate button if trip unrated, else dis…
rencarot Nov 6, 2020
5567355
fixed currency on driver and pass show trip tables, fixed delete button
rencarot Nov 6, 2020
1904c67
test editing
anyatokar Nov 6, 2020
8d722ca
fixed the rest of the delete buttons
rencarot Nov 6, 2020
8e8ec97
merging changes in currency methods
rencarot Nov 6, 2020
86a13d1
pushing some test edit ideas to anya
rencarot Nov 6, 2020
2b365f5
working on drivers controller create test
anyatokar Nov 6, 2020
925612b
merging changes
anyatokar Nov 6, 2020
9af7388
driver create tests pass
anyatokar Nov 6, 2020
1b48159
driver and trips controller all 14 tests passing for each, still need…
anyatokar Nov 6, 2020
825ebe6
created validations, still need tests but works when testing on rails s
rencarot Nov 6, 2020
f35104c
trips controller tests work in progress
anyatokar Nov 6, 2020
704e8f6
tiny pedantic tweak to forms spacing
rencarot Nov 6, 2020
0079b59
Merge branch 'custom-model-methods' of https://github.com/anyatokar/r…
anyatokar Nov 6, 2020
59ca2c1
removed routes that didn't end up using - trip new and trip index
rencarot Nov 6, 2020
57ec6f2
trips tests push
anyatokar Nov 6, 2020
b5d293f
trips tests passing
anyatokar Nov 7, 2020
5c0c233
all controller tests passing
anyatokar Nov 7, 2020
e0a15bb
Merge branch 'custom-model-methods' of https://github.com/anyatokar/r…
anyatokar Nov 7, 2020
f56241c
updated routes
anyatokar Nov 7, 2020
2535ba8
consolidated project
anyatokar Nov 7, 2020
b44cd04
Merge branch 'master' of https://github.com/anyatokar/ride-share-rails
anyatokar Nov 7, 2020
65a5d4e
temporarily adding problematic gemfile back in for heroku deployment
rencarot Nov 7, 2020
67834e1
trying my gemfile instead for deployment
rencarot Nov 7, 2020
4e92f5f
should fix the error when attempting to view a driver with a deleted …
rencarot Nov 7, 2020
040c061
trips and other tests bug fix
anyatokar Nov 7, 2020
7ef9ee6
update gitignore
anyatokar Nov 7, 2020
9b4c0d5
gitignore merge conflict
anyatokar Nov 7, 2020
2565345
trip test bugs
anyatokar Nov 7, 2020
8eb6118
more trip test bugs resolved
anyatokar Nov 8, 2020
c0943b7
must have date validation passed
anyatokar Nov 8, 2020
293efd6
all tests resolved. passing
anyatokar Nov 8, 2020
4dc2c4b
online, offline tests added and passing
anyatokar Nov 8, 2020
bf197ff
odds and ends: fixed commented out test, blank test, adjusted header …
rencarot Nov 8, 2020
730828d
added the other blank test
rencarot Nov 8, 2020
088cf95
trying to discern why github is saying we failed this test
rencarot Nov 8, 2020
16e39df
added flash messages for successful/unsucessful CRUD for various mode…
rencarot Nov 10, 2020
bfed8c8
forgot one sneaky spot to put a flash
rencarot Nov 10, 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
41 changes: 41 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# 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'

#Gemfile.lock # need this for heroku

.idea/
.generators

# 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

# pagination
gem 'will_paginate', '~> 3.1.7'
Loading