Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
2e1c93a
inital set up of project folder
snicodimos Oct 1, 2018
0bf35bd
created three models
snicodimos Oct 2, 2018
3a84813
did some migrations to correct db cols
snicodimos Oct 2, 2018
13a205e
added foreign keys for relational db and updated model to reflect rel…
snicodimos Oct 2, 2018
6a73db4
added routes
snicodimos Oct 2, 2018
77a4ce4
created controllers and views for all the routes
snicodimos Oct 2, 2018
6363050
Created controller methods for passenger
snicodimos Oct 2, 2018
3bdde68
added action_view.rb in config to debug the validation problems that …
snicodimos Oct 2, 2018
69c758c
added destroy method is passenger controller
snicodimos Oct 2, 2018
f195b34
created index method for drivers & updated view to list all drivers
elle-terch Oct 2, 2018
278cd7f
created new methods in the drivers controller
elle-terch Oct 2, 2018
68f1662
created show view and method for driver
elle-terch Oct 2, 2018
bc1d662
index page for passenger with all the passenger list
snicodimos Oct 2, 2018
fe8723a
created form for driver details
elle-terch Oct 2, 2018
a484bf7
created link to passenger details
elle-terch Oct 2, 2018
a2fe5f2
created view for passenger detailed info
snicodimos Oct 3, 2018
9954b40
created a partial for new and edit passenger. Additionally created bo…
snicodimos Oct 3, 2018
f9cd7a4
played around with application buttons and page
snicodimos Oct 3, 2018
7e0c09b
Total spending method in passenger model and view displayed
snicodimos Oct 3, 2018
2af509a
added the controller methods placeholders and view template page as a…
snicodimos Oct 3, 2018
f8d0c4e
created model to calculate the average driver rating
elle-terch Oct 3, 2018
a2dc50d
created method to calculate the total cost of all of a driver's trips
elle-terch Oct 3, 2018
4a67f18
created partial for form
elle-terch Oct 3, 2018
71d810c
added table styling and a few other minor changes
elle-terch Oct 3, 2018
b2ceffe
minor changes to trip controller
snicodimos Oct 3, 2018
e82dca0
Merge branch 'passenger'
snicodimos Oct 3, 2018
beebf8c
corrected an error in the linking of driver to trip and passenger to …
snicodimos Oct 3, 2018
06eb2a5
changed type of cost from string to int
elle-terch Oct 3, 2018
305dc8e
created migration to change rating data type from string to int
elle-terch Oct 3, 2018
9fc2d81
added nested routes for trips under passenger
snicodimos Oct 3, 2018
d4c813e
made show, new and create methods in trips controller
snicodimos Oct 3, 2018
3896f03
created new and show view for trip
snicodimos Oct 3, 2018
68324d6
debugging nested routes paths for creating new trips off of passenger…
snicodimos Oct 3, 2018
10d7a23
minor changes
snicodimos Oct 4, 2018
a1b10e4
requesting a trip post cycle and partially working selecting avaiable…
snicodimos Oct 4, 2018
a6bb78e
show view for trip details
snicodimos Oct 4, 2018
30cfc0f
assigning a new driver who is avaiable
snicodimos Oct 4, 2018
bcb58fd
added a new migration to add availability status for drivers
snicodimos Oct 4, 2018
3fba7e0
minor changes in the driver model methods that cause some errors
snicodimos Oct 4, 2018
f3b4652
added a change status button and methods associated with it
snicodimos Oct 4, 2018
48d4f64
links from passenger to trip, driver to trip, and verse versa
snicodimos Oct 4, 2018
1c3a831
change cents to dollar and displayed correct decimal points
snicodimos Oct 4, 2018
bad2e00
created the ability to delete a driver & passenger while nullifying t…
elle-terch Oct 4, 2018
f3d516f
fixing merge conflicts
elle-terch Oct 4, 2018
1b68aed
updated nullify dependency
elle-terch Oct 4, 2018
2a40e75
rating with helper method to view it
snicodimos Oct 4, 2018
dc6a0ad
troubleshooting ratings
elle-terch Oct 5, 2018
71a103d
fixed error in driver details
elle-terch Oct 5, 2018
44d4301
fixed additional bug
elle-terch Oct 5, 2018
ac0639a
rating routes and button working.
snicodimos Oct 5, 2018
c4e946b
added logic to display the request trip button
elle-terch Oct 5, 2018
123f0af
added validation to new driver and passenger forms
snicodimos Oct 5, 2018
d135ce4
created a few initial styles
elle-terch Oct 5, 2018
42abf7f
Merge branch 'master' into css
elle-terch Oct 5, 2018
32431ce
added some general styling
elle-terch Oct 5, 2018
ec6e81e
Validations has been implemented and working
snicodimos Oct 5, 2018
55a1519
Merge branch 'validations'
snicodimos Oct 5, 2018
162d391
more styling & pagination
elle-terch Oct 5, 2018
f1e9be3
Merge branch 'master' of https://github.com/snicodimos/ride-share-rai…
elle-terch Oct 5, 2018
1d30d38
added pagination for passengers page
elle-terch Oct 5, 2018
f749c87
changed driver available method from trip model to driver model
snicodimos Oct 5, 2018
5452581
Added a message about rating trip before requesting a trip
snicodimos Oct 5, 2018
d41d15e
minor changes with $ sign, button for telling to rate previous trips
snicodimos Oct 5, 2018
df9a1c2
more styling changes
elle-terch Oct 5, 2018
59a4dde
merged master with local
elle-terch Oct 5, 2018
26817e8
changed styling for form
elle-terch Oct 5, 2018
1164c22
changed line heights on different pages
elle-terch Oct 5, 2018
98f9c2a
fixed total cost for new drivers
elle-terch Oct 6, 2018
7a4c76d
organized css file
elle-terch Oct 6, 2018
efa8562
fixed spacing and tried to add custom validation
elle-terch Oct 6, 2018
4b222cf
changed production.rb to show image
elle-terch Oct 6, 2018
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 @@
ruby-2.5.1
82 changes: 82 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.1'
# 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'
end

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

gem 'will_paginate', '~> 3.0'
271 changes: 271 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1)
actionpack (= 5.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.1)
activesupport (= 5.2.1)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
arel (>= 9.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
marcel (~> 0.3.1)
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
archive-zip (0.11.0)
io-like (~> 0.3.0)
arel (9.0.0)
better_errors (2.5.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
builder (3.2.3)
byebug (10.0.2)
capybara (3.8.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.0)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.9.25)
formatador (0.2.5)
globalid (0.4.1)
activesupport (>= 4.2.0)
guard (2.14.2)
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.1.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
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.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.5)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
msgpack (1.2.4)
multi_json (1.13.1)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.3)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.5)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
bundler (>= 1.3.0)
railties (= 5.2.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.6.0)
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.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.14.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
shellany (0.0.1)
spring (2.0.2)
activesupport (>= 4.2)
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.0)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.19)
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.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
will_paginate (3.1.6)
xpath (3.1.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
bootsnap (>= 1.1.0)
byebug
capybara (>= 2.15)
chromedriver-helper
guard
guard-minitest
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.1)
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)
will_paginate (~> 3.0)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.16.4
9 changes: 9 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
guard :minitest, autorun: false, spring: true do
watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" }
watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' }
watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" }
watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" }
watch(%r{^test/.+_test.rb$})
watch(%r{^test/test_helper.rb$}) { 'test' }
end
Loading