Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
1f6b4bb
rails new
TiffanyChio Oct 7, 2019
fede468
controllers and routes are in place
TiffanyChio Oct 7, 2019
076ef04
added schema and models
TiffanyChio Oct 7, 2019
e23735c
add methods to driver controller; index, show and new complete
janicewhuang Oct 8, 2019
d6954dd
Pushing latest copy for Janice to try re-downloading. Fixed seeds.rb.…
TiffanyChio Oct 8, 2019
0bc3a7c
added .keep files to the views folders
TiffanyChio Oct 8, 2019
929b161
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 8, 2019
9dbb032
fix view page for index, add view page for show. add functionality wi…
janicewhuang Oct 8, 2019
accd1e0
add form and view pages for edit and new
janicewhuang Oct 8, 2019
68a04fe
get forms working properly
janicewhuang Oct 8, 2019
bde4209
add delete link and functionality, need to figure out how to work wit…
janicewhuang Oct 8, 2019
b86ce0d
made edit and delete passenger functionality
brilatimer Oct 8, 2019
e3d0db1
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 8, 2019
6ca5495
passenger edit button leads to form requiring name and phone number f…
brilatimer Oct 8, 2019
4b2c9c0
Merge branch 'master' of https://github.com/TiffanyChio/ride-share-rails
brilatimer Oct 8, 2019
0ceee87
made changes to trip routes. made changes to trip controllers.
TiffanyChio Oct 8, 2019
db56990
main list of all passengers, when clicked takes you to details with p…
brilatimer Oct 8, 2019
cbf4d40
added edit and update methods to passenger controller, prefill form info
brilatimer Oct 8, 2019
95c8765
added .sort to retain order of passengers on main list
brilatimer Oct 8, 2019
2e010dc
Merge branch 'master' of https://github.com/TiffanyChio/ride-share-rails
TiffanyChio Oct 8, 2019
c7e0113
TRIPS ONLY: completed all views. All form submissions work. edit and …
TiffanyChio Oct 8, 2019
ddb6ba4
add link to trip list within driver profile show page
janicewhuang Oct 8, 2019
7fd07f9
dependents nullify
TiffanyChio Oct 8, 2019
d834eaf
comment out homepages controller test content so can run rails test
janicewhuang Oct 8, 2019
68beac5
add homepages controller
janicewhuang Oct 8, 2019
15426de
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 8, 2019
e858ca2
changed passengers destroy route temporarily
TiffanyChio Oct 8, 2019
a2540a4
merged changes
TiffanyChio Oct 8, 2019
0b78daa
write tests for drivers index
janicewhuang Oct 8, 2019
a86672c
added homepages
TiffanyChio Oct 8, 2019
452db19
get index tests passing
janicewhuang Oct 8, 2019
6bfca62
add passing driver controller show test
janicewhuang Oct 8, 2019
4f6f747
add driver controller test for show
janicewhuang Oct 8, 2019
aab51ee
add passing driver controller create test
janicewhuang Oct 8, 2019
3044fd1
passenger controller tests written
brilatimer Oct 8, 2019
afbec36
Merge branch 'master' of https://github.com/TiffanyChio/ride-share-rails
brilatimer Oct 8, 2019
56b7049
create method for passengers
brilatimer Oct 8, 2019
06c37e4
add validation to driver model and show error(s) in view
janicewhuang Oct 8, 2019
647cd65
add validation test
janicewhuang Oct 8, 2019
1513647
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 8, 2019
8445f09
passenger validations
brilatimer Oct 8, 2019
dae0b49
homepage test, started trip controller test
TiffanyChio Oct 9, 2019
301cbb2
added additional trip tests
TiffanyChio Oct 9, 2019
9a68ded
added more trip tests. about to change trip assign rating
TiffanyChio Oct 9, 2019
3b310f8
write more tests
janicewhuang Oct 9, 2019
76f87b5
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 9, 2019
4c71082
keep working on tests
janicewhuang Oct 9, 2019
9d53dfd
re-added assign rating update method and changed params hash
TiffanyChio Oct 10, 2019
0cc4bd2
Merge branch 'master' of https://github.com/TiffanyChio/ride-share-rails
TiffanyChio Oct 10, 2019
19f7515
added trip controller tests
TiffanyChio Oct 10, 2019
1fadfc0
added tests
TiffanyChio Oct 10, 2019
a4c0a7b
add driver trip rating method, get working, fix trip list, add nested…
janicewhuang Oct 10, 2019
e84510e
made changes to passenger controller and views. changed seeds.rb
TiffanyChio Oct 10, 2019
22d549e
merge changes
janicewhuang Oct 10, 2019
cae1dfc
round total earnings and average ratings to two decimal points
janicewhuang Oct 10, 2019
6e5a7fa
working on passenger forms. about to add trip functionality
TiffanyChio Oct 10, 2019
b697ddb
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 10, 2019
cd8b37c
added functionality to add trips.
TiffanyChio Oct 10, 2019
3d3bdfc
change wording of passenger show file
janicewhuang Oct 10, 2019
6701e65
made the passenger/driver destroy methods work correctly
TiffanyChio Oct 10, 2019
9c1e378
chnages to trip controller test
TiffanyChio Oct 10, 2019
29c0cd3
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 10, 2019
f6c9bde
add active/inactive toggle button to show and index pages
janicewhuang Oct 10, 2019
19fb718
add dollar sign to driver show page
janicewhuang Oct 10, 2019
372a931
add some styling
janicewhuang Oct 10, 2019
0563157
completed trip create and testing for trip controller
TiffanyChio Oct 10, 2019
97ab55f
make style changes: add link classs and related css, change trip appe…
janicewhuang Oct 10, 2019
b535d2f
further css futzing
janicewhuang Oct 10, 2019
2329000
added trip tests
TiffanyChio Oct 10, 2019
b32e2f7
styling, testing
janicewhuang Oct 10, 2019
6d908ba
add passing driver model tests
janicewhuang Oct 10, 2019
91c84b4
continue debugging tests
janicewhuang Oct 10, 2019
0f800f4
added passenger controller tests
TiffanyChio Oct 10, 2019
b6d5e01
add destroy test, fix bugs in other tests
janicewhuang Oct 10, 2019
60867bf
completed passenger controller tests
TiffanyChio Oct 10, 2019
eab99c7
tests
janicewhuang Oct 10, 2019
cefb766
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 10, 2019
cc8e2f5
tests are passing
TiffanyChio Oct 11, 2019
1bb77af
all Passenger tests complete and passing
TiffanyChio Oct 11, 2019
13e8f88
do more styling
janicewhuang Oct 11, 2019
fd7bf07
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 11, 2019
ca79983
change small details
janicewhuang Oct 11, 2019
9fadbe1
added links to nave bar
TiffanyChio Oct 11, 2019
631e612
fix button routes
janicewhuang Oct 11, 2019
3c86c8f
Merge branch 'master' of https://github.com/TiffanyChio/ride-share-rails
TiffanyChio Oct 11, 2019
9e7120f
made style changes to nav bar and homepage
TiffanyChio Oct 11, 2019
ad32d06
edit homepage css
TiffanyChio Oct 11, 2019
a68f76e
most up to date homepage
TiffanyChio Oct 11, 2019
0a561e4
style tweaks, change links to buttons
janicewhuang Oct 11, 2019
cb1899e
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 11, 2019
c088dbe
changes to passenger and driver index pages
TiffanyChio Oct 11, 2019
39efc9f
try to fix status dropdown default for edit
janicewhuang Oct 11, 2019
f4dc2cc
completed index pages css
TiffanyChio Oct 11, 2019
b4119bf
Merge branch 'master' of https://github.com/TiffanyChio/ride-share-rails
TiffanyChio Oct 11, 2019
364624a
made changes to driver controller
TiffanyChio Oct 11, 2019
9693e9f
test changes
janicewhuang Oct 11, 2019
50da77d
merge conflict for update method in driver controller
janicewhuang Oct 11, 2019
a35ebd5
changes to driver controller test
TiffanyChio Oct 11, 2019
5852065
commiting again
TiffanyChio Oct 11, 2019
637a393
forgot to save
TiffanyChio Oct 11, 2019
096537f
futzing
janicewhuang Oct 11, 2019
73557f7
merge conflicts
janicewhuang Oct 11, 2019
b175cdd
changes to driver's show page
TiffanyChio Oct 11, 2019
21e8c50
take status out of new and edit forms
janicewhuang Oct 11, 2019
cf88ab7
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 11, 2019
5ee36ca
changing forms
TiffanyChio Oct 11, 2019
0e687b3
Merge branch 'master' of https://github.com/TiffanyChio/ride-share-rails
TiffanyChio Oct 11, 2019
1f90190
changed detail page layouts
TiffanyChio Oct 11, 2019
664c4d0
made CSS changes for show pages
TiffanyChio Oct 11, 2019
a60ffcc
tying up loose ends
TiffanyChio Oct 11, 2019
f148d24
link to driver rating on passenger show page
janicewhuang Oct 11, 2019
895fcef
fix avg rating on driver show page
janicewhuang Oct 11, 2019
985cca0
fix bug in passenger show
janicewhuang Oct 11, 2019
d99cedb
changed passenger rating
TiffanyChio Oct 11, 2019
118ec9f
added driver model tests
TiffanyChio Oct 11, 2019
f14b120
edit headings and buttons
janicewhuang Oct 11, 2019
b9c3554
edit headings and buttons, fix driver edit redirect to render
janicewhuang Oct 11, 2019
02859db
Merge branch 'master' of github.com:TiffanyChio/ride-share-rails
janicewhuang Oct 11, 2019
6fbd1da
adjust font colors
janicewhuang Oct 11, 2019
55764e5
adjust colors more
janicewhuang Oct 11, 2019
91c1ae2
change wording of toggle button
janicewhuang 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
83 changes: 83 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
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]
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
277 changes: 277 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.3)
actionpack (= 5.2.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.3)
activesupport (= 5.2.3)
globalid (>= 0.3.6)
activemodel (5.2.3)
activesupport (= 5.2.3)
activerecord (5.2.3)
activemodel (= 5.2.3)
activesupport (= 5.2.3)
arel (>= 9.0)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
marcel (~> 0.3.1)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ansi (1.5.0)
archive-zip (0.12.0)
io-like (~> 0.3.0)
arel (9.0.0)
better_errors (2.5.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.8.1)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.4.5)
msgpack (~> 1.0)
builder (3.2.3)
byebug (11.0.1)
capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (3.0.0)
chromedriver-helper (2.1.1)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.1.5)
crass (1.0.4)
debase (0.2.4.1)
debase-ruby_core_source (>= 0.10.2)
debase-ruby_core_source (0.10.6)
debug_inspector (0.0.3)
erubi (1.9.0)
execjs (2.7.0)
ffi (1.11.1)
formatador (0.2.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-minitest (2.4.6)
guard-compat (~> 1.2)
minitest (>= 3.0)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.2)
minitest-rails (5.2.0)
minitest (~> 5.10)
railties (~> 5.2.0)
minitest-reporters (1.4.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-skip (0.0.1)
minitest (~> 5.0)
msgpack (1.3.1)
nenv (0.3.0)
nio4r (2.5.2)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.4)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.1)
puma (3.12.1)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
actioncable (= 5.2.3)
actionmailer (= 5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
activemodel (= 5.2.3)
activerecord (= 5.2.3)
activestorage (= 5.2.3)
activesupport (= 5.2.3)
bundler (>= 1.3.0)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
regexp_parser (1.6.0)
ruby-debug-ide (0.7.0)
rake (>= 0.8.1)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
rubyzip (2.0.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.1.0)
railties (>= 5.2.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.142.6)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
shellany (0.0.1)
spring (2.1.0)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.10)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
bootsnap (>= 1.1.0)
byebug
capybara (>= 2.15)
chromedriver-helper
debase (>= 0.2.4.1)
guard
guard-minitest
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
minitest-skip
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.3)
ruby-debug-ide (>= 0.7.0)
sass-rails (~> 5.0)
selenium-webdriver
spring
spring-watcher-listen (~> 2.0.0)
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)

RUBY VERSION
ruby 2.5.5p157

BUNDLED WITH
2.0.2
Loading