Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ports - Angela & Sopheary #6

Open
wants to merge 116 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
b279170
created rails app
Apr 15, 2019
801e98e
created Homepages controller and Passenger model
AngelaOh Apr 15, 2019
58b4d7c
Driver Model created
Apr 15, 2019
2e8dfdc
fixed conflicts and added Driver model
Apr 15, 2019
7ba73d3
created Trip model
Apr 15, 2019
a9de5b6
added active record relationships for trip to driver & passenger
AngelaOh Apr 15, 2019
02bf8a6
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
AngelaOh Apr 15, 2019
a3fe47e
added foreign keys in driver_passengers table
Apr 15, 2019
bd20fbf
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 15, 2019
4f47f9a
added trip foreign key in driver and passenger models
AngelaOh Apr 15, 2019
25527eb
created all routes and added index method in controller
AngelaOh Apr 15, 2019
5b4c985
added html view for all passenger
AngelaOh Apr 15, 2019
5f21f6d
added passengers/trips/drivers controller and fixed routes to each co…
AngelaOh Apr 15, 2019
00f047e
removed driver_passengers table
Apr 15, 2019
b3ecaf9
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 15, 2019
26b75e8
added new show and create actions for driver and passenger controller…
AngelaOh Apr 16, 2019
56d1fcd
added links to move between homepage, passenger index, driver index
AngelaOh Apr 16, 2019
776af34
fixed nav links to appear on all pages
AngelaOh Apr 16, 2019
28d5742
added validations to passenger and driver
Apr 16, 2019
263e9a7
practiced git branch with new text.txt file on branch-a
AngelaOh Apr 16, 2019
7b2b6fa
fixed data types and validations
Apr 16, 2019
b5741c6
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
AngelaOh Apr 16, 2019
5b4c4d0
trying to add error message in _form for passenger and driver
AngelaOh Apr 16, 2019
6ca972a
added working validation error message
AngelaOh Apr 16, 2019
1803c2b
add feature to see passenger cost and passenger trip info
AngelaOh Apr 16, 2019
11cf6e3
added driver model method for all trips and average rating
AngelaOh Apr 16, 2019
4c40507
added total_earning method in Driver model and added to view
AngelaOh Apr 16, 2019
761d6b2
added dollar sign for total earning
AngelaOh Apr 16, 2019
0cd681b
added the trip detail page when user clicks on the passenger's trip
Apr 16, 2019
b2a04ae
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 16, 2019
2db37a7
added all information for trips on trip detail page
AngelaOh Apr 16, 2019
720f52d
added edit and update method in passenger controller & updated show view
AngelaOh Apr 16, 2019
3a12afe
added destroy method for passenger and added link in show view
AngelaOh Apr 16, 2019
c2f5a52
added the feature to edit the driver
Apr 16, 2019
c3c16b0
created first index test for passenger controller -- not passing
AngelaOh Apr 16, 2019
04b5d54
add functionality to delete trips along with delete passenger
AngelaOh Apr 16, 2019
c7a43fc
added the feature to delete the driver
Apr 16, 2019
4f10de7
changed yml file for passenger and driver to have unique info
AngelaOh Apr 16, 2019
700314b
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 16, 2019
e640d2f
added test for passenger controller new, index, and show actions
AngelaOh Apr 17, 2019
9bd2d85
wrote index test for drivers_controller
Apr 17, 2019
faebb57
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 17, 2019
2b8c2d5
added code to average rating method to handle driver without trips
Apr 17, 2019
4c2e857
added all the tests for drivers_controller
Apr 17, 2019
3242deb
added nested route for trip in passenger and driver
AngelaOh Apr 17, 2019
996fedf
fixed show for trip controller using nested routes
AngelaOh Apr 17, 2019
e66390d
added the list for trips for each driver
Apr 17, 2019
62b8740
removed params from index in trips controller
Apr 17, 2019
e08346c
finished passenger controller tests
AngelaOh Apr 17, 2019
f225bc2
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
AngelaOh Apr 17, 2019
41abdeb
changed phone_num column to string
Apr 17, 2019
3f858f7
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 17, 2019
e787a6d
adding requestt trip link in passenger show
AngelaOh Apr 17, 2019
9392350
fixed route for request trip link
AngelaOh Apr 17, 2019
c92fdf2
tests for trips_controller
Apr 17, 2019
8459b29
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 17, 2019
30dd502
fixed money and rating calculations to account for nil
AngelaOh Apr 17, 2019
879513e
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 17, 2019
5aef681
fixed path to trip show for link_to in passenger show.html.erb
AngelaOh Apr 18, 2019
b1f6c23
added date and cost fields for new trip
AngelaOh Apr 18, 2019
9f1355f
added ability to rate trip
AngelaOh Apr 18, 2019
2a2aa36
request and rating views fixed for passengers with no rides
AngelaOh Apr 18, 2019
f5b8c53
added validation for rating
AngelaOh Apr 18, 2019
86d099f
erased unnecessary comments in passenger show view
AngelaOh Apr 18, 2019
8aa1819
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 18, 2019
f8e88c7
fixed the nested path
Apr 18, 2019
1cf5f74
changed request trip link to button
AngelaOh Apr 18, 2019
0a7e1bd
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
AngelaOh Apr 18, 2019
dcf54e4
added availability button in driver show -- need to route to update m…
AngelaOh Apr 18, 2019
68893ab
adding css styling for homepage
AngelaOh Apr 18, 2019
3b3b6b2
added table and styling for passenger & driver index
AngelaOh Apr 19, 2019
5c13728
styled passenger show and starting driver show
AngelaOh Apr 19, 2019
5057c33
tests for trips_controllers
Apr 19, 2019
b87a1b0
tests for trips_controller
Apr 19, 2019
3bec4e6
styling for passenger show and index tabls
AngelaOh Apr 19, 2019
e067237
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
AngelaOh Apr 19, 2019
c7e5ed7
fixed bugs in passenger controller test
AngelaOh Apr 19, 2019
6d7f1d8
completed tests for trips_controller
Apr 19, 2019
8d44289
added borders for styling
AngelaOh Apr 19, 2019
93cd599
fixed conflicts
Apr 19, 2019
d9b817c
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 19, 2019
85df008
added the online-offline toggle feature
Apr 19, 2019
8966da1
changed drivers' default statuses to be available for every 2 drivers
Apr 19, 2019
64c164a
added styling for driver show
AngelaOh Apr 19, 2019
9f348de
trying to make edit trip work
Apr 19, 2019
c2b085a
uncomment strong params
Apr 19, 2019
8228152
Merge branch 'edit_delete_trip'
Apr 19, 2019
85af7f9
fixed edit trip
AngelaOh Apr 19, 2019
15d33ff
added edit_trip feature
Apr 19, 2019
efa2637
added ability to change driver status when creating trip
AngelaOh Apr 19, 2019
d17f5a7
added edit trip feature
Apr 19, 2019
fcd01a5
Merge branch 'master' of https://github.com/sophearychiv/ride-share-r…
Apr 19, 2019
f04e086
fixed driver's status
Apr 19, 2019
575e91e
styled trip show
AngelaOh Apr 19, 2019
4aca253
trying to delete trip
Apr 19, 2019
d8846a5
fixed conflicts in show trip
Apr 19, 2019
1e4e24c
added the delete feature for trip
Apr 19, 2019
b1e49a1
completed tests for TripsController
Apr 20, 2019
a864790
Remove spurious model tests
Apr 20, 2019
5c6d196
added more tests for TripsController
Apr 20, 2019
8318558
added more tests in drivers_controller_test
Apr 20, 2019
b0e2efd
added flash and test for PassengersController
Apr 20, 2019
8df130d
updated gems
Apr 20, 2019
b32b7df
style driver's status button
Apr 20, 2019
ea5aa11
removed extra space in the body
Apr 20, 2019
f358eaf
styled Request a Ride
Apr 20, 2019
cbef90e
took off index route in TripsController
Apr 21, 2019
85dbb8b
removed yml files under fixtures folder
Apr 21, 2019
62a66bf
changed nav styles to dropdown lists
Apr 21, 2019
ff99fed
styled forms and buttons
Apr 21, 2019
636fdd8
fixed error of rgb not allowed by heroku
Apr 21, 2019
c025a26
styled index pages for passengers and drivers
Apr 21, 2019
71e9795
fixed header row in passenger and driver index page
Apr 21, 2019
4f6930f
added links to passenger and driver in the trip page
Apr 21, 2019
123423c
added the edit/delete links for each trip in the passenger's and driv…
Apr 22, 2019
74f0101
trying to add the icon to the title but not working
Apr 22, 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 @@
ruby-2.5.1
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.5.1'

# 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'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'minitest-skip'
end
274 changes: 274 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
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.6.0)
public_suffix (>= 2.0.2, < 4.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.7.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.4.3)
msgpack (~> 1.0)
builder (3.2.3)
byebug (11.0.1)
capybara (3.16.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
xpath (~> 3.2)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
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)
debug_inspector (0.0.3)
erubi (1.8.0)
execjs (2.7.0)
ffi (1.10.0)
formatador (0.2.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.0)
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.6.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.8.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.3)
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.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.6)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-skip (0.0.1)
minitest (~> 5.0)
msgpack (1.2.9)
multi_json (1.13.1)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.10.2)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
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 (3.0.3)
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.0.4)
loofah (~> 2.2, >= 2.2.2)
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 (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
regexp_parser (1.4.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
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.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.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.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.3)
thread_safe (0.3.6)
tilt (2.0.9)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.20)
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)
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
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)
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.1p57

BUNDLED WITH
1.17.3
Loading