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

Tor Shimizu - Wini Irarrazaval - Octos - Rideshare Rails #26

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
0fa4ab2
We added rails
winirarrazaval Apr 2, 2018
142c169
created Driver and Passenger models
torshimizu Apr 2, 2018
dd7d2b7
ralated trip and driver
winirarrazaval Apr 2, 2018
4097ca9
related passenger and trip models, added relationships in model
torshimizu Apr 2, 2018
43fc578
Created a controller for each model
winirarrazaval Apr 2, 2018
0f763c1
added all routes
winirarrazaval Apr 2, 2018
a74cdfc
fixed belongs_to in trip
torshimizu Apr 3, 2018
0570ed6
added passengers_controller methods
torshimizu Apr 3, 2018
ea6a83b
added index view for passengers
torshimizu Apr 3, 2018
02cac59
Added the methods for the driver controller and a template for driver…
winirarrazaval Apr 3, 2018
0b4d90b
Added a template (view) for the driver show action
winirarrazaval Apr 3, 2018
d9a2304
Added a form for editing and creating a new driver, and then using it…
winirarrazaval Apr 3, 2018
0e49ca3
Fixed a bug in controller
winirarrazaval Apr 3, 2018
cbc55ed
made a main website page, linked it to drivers#index and passengers#i…
torshimizu Apr 3, 2018
36722a3
added views for passenger, updated action name for drivers partial
torshimizu Apr 3, 2018
c482819
fixed form to find a drivers show page by name
torshimizu Apr 3, 2018
5fb4e36
Added partial form for searching by name both driver and passenger
winirarrazaval Apr 3, 2018
91d16b5
added nested routes for trip in passenger and driver
torshimizu Apr 4, 2018
57ca80c
Added a link to edit and delete action for the drivers show vision
winirarrazaval Apr 4, 2018
767be74
Added feature to be able to get into every of the drivers trips and v…
winirarrazaval Apr 4, 2018
33e52e7
fixed some of the trip show.html
winirarrazaval Apr 4, 2018
1e41bb9
Added business logic to driver model, with a average_rating and earni…
winirarrazaval Apr 4, 2018
1531b56
added a total spent method to passenger, added to passenger view
torshimizu Apr 4, 2018
dbb5a40
Merge branch 'master' of https://github.com/winirarrazaval/rideshare-…
torshimizu Apr 4, 2018
52da061
passenger can request a new trip and rating will update on page if su…
torshimizu Apr 4, 2018
66fc741
rounded assigned cost of trip to 2 decimal places
torshimizu Apr 4, 2018
e3fe171
Added a link in layout view to create a new passenger and driver
winirarrazaval Apr 4, 2018
472a4bd
Added feature to the partial by_name to require that the text field c…
winirarrazaval Apr 5, 2018
84ac7c4
If driver or passenger not found in serch, on index view, it will red…
winirarrazaval Apr 5, 2018
004b04d
updated driver calculate earnings and average rating to deal with nil…
torshimizu Apr 5, 2018
b57d0c3
Merge branch 'delete_driver'
torshimizu Apr 5, 2018
fce06bd
minor css changes
torshimizu Apr 5, 2018
eb5f170
added list of trips to passenger show page
torshimizu Apr 5, 2018
46dd07a
added list of trips to passenger and driver page, created a partial f…
torshimizu Apr 5, 2018
8a4a999
minor css changes
torshimizu Apr 5, 2018
566a377
validation and display error messages
winirarrazaval Apr 5, 2018
bafc2b7
added before action to create driver 9999 when destroying a driver
torshimizu Apr 5, 2018
12eb9a8
updated destroy driver
torshimizu Apr 5, 2018
d4e5eb0
Tried make foreign keys take nil
winirarrazaval Apr 5, 2018
8caad4c
made a column in Driver and Passenger that is toggleable for disabled…
torshimizu Apr 6, 2018
bc42545
uploading the file for disabled column and some css updates
torshimizu Apr 6, 2018
3c771fc
Added feature when finding a driver for a new trip to choose the one …
winirarrazaval Apr 6, 2018
5c5dc7c
Added a bussiness logig method to check if the driver is on trip, ass…
winirarrazaval Apr 6, 2018
71393eb
added some ideas for business logic in driver model for finding avail…
torshimizu Apr 6, 2018
52fc5c6
keeping both driver logic to determine what to do later
torshimizu Apr 6, 2018
44e48f6
Was able to move the ugly code from controller to the driver model
winirarrazaval Apr 6, 2018
4259cc6
added page stylings and if rating is incomplete on driver and passeng…
torshimizu Apr 6, 2018
f0cd39a
Merge branch 'master' of https://github.com/winirarrazaval/rideshare-…
torshimizu Apr 6, 2018
87465a2
changes
winirarrazaval Apr 6, 2018
a0ad919
Merge branch 'master' of https://github.com/winirarrazaval/rideshare-…
winirarrazaval Apr 6, 2018
4034ffc
updated average rating, should have a working method, need to test
torshimizu Apr 6, 2018
13cbcd4
fixed average_rating method
torshimizu Apr 6, 2018
7222325
passenger index page formats
torshimizu Apr 6, 2018
4a84393
added a not found message when driver o passenger not found
winirarrazaval Apr 6, 2018
a8ddfde
added not found to seach bar
winirarrazaval Apr 6, 2018
c73d70e
done
winirarrazaval Apr 6, 2018
bece5dd
added driver and passenger not found for search
winirarrazaval Apr 6, 2018
a21f00d
fixed passenger page styling
torshimizu Apr 6, 2018
60f0314
fixed a bug
winirarrazaval Apr 6, 2018
21f4719
added a partial for passenger and driver new and edit views
torshimizu Apr 6, 2018
d72d3fb
updated error showing when rating a trip other than 1..5
torshimizu Apr 7, 2018
e9adbe5
changed edit info to look like a button
torshimizu Apr 7, 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
22 changes: 22 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 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

/node_modules
/yarn-error.log

.byebug_history
/coverage
.DS_Store

70 changes: 70 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.5'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# 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 'therubyracer', 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 Capistrano for deployment
# gem 'capistrano-rails', group: :development

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]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
end

group :development do
# Access an IRB console on exception pages or by using <%= 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

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

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
225 changes: 225 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.5)
actionpack (= 5.1.5)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.5)
actionpack (= 5.1.5)
actionview (= 5.1.5)
activejob (= 5.1.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.5)
actionview (= 5.1.5)
activesupport (= 5.1.5)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.5)
activesupport (= 5.1.5)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.5)
activesupport (= 5.1.5)
globalid (>= 0.3.6)
activemodel (5.1.5)
activesupport (= 5.1.5)
activerecord (5.1.5)
activemodel (= 5.1.5)
activesupport (= 5.1.5)
arel (~> 8.0)
activesupport (5.1.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (8.0.0)
better_errors (2.4.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)
builder (3.2.3)
byebug (10.0.0)
capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.3)
debug_inspector (0.0.3)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.9.23)
globalid (0.4.1)
activesupport (>= 4.2.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.1)
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)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.1.19)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.13.1)
nio4r (2.3.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
pg (1.0.0)
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.2)
puma (3.11.3)
rack (2.0.4)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.5)
actioncable (= 5.1.5)
actionmailer (= 5.1.5)
actionpack (= 5.1.5)
actionview (= 5.1.5)
activejob (= 5.1.5)
activemodel (= 5.1.5)
activerecord (= 5.1.5)
activesupport (= 5.1.5)
bundler (>= 1.3.0)
railties (= 5.1.5)
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.1.5)
actionpack (= 5.1.5)
activesupport (= 5.1.5)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
sass (3.5.5)
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.11.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
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.1)
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.1.0)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.8)
execjs (>= 0.3.0, < 3)
web-console (3.5.1)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.0.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
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.7)
rails (~> 5.1.5)
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)

BUNDLED WITH
1.16.1
6 changes: 6 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require_relative 'config/application'

Rails.application.load_tasks
3 changes: 3 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
Empty file added app/assets/images/.keep
Empty file.
15 changes: 15 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
// vendor/assets/javascripts directory can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file. JavaScript code in this file should be added after the last require_* statement.
//
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require rails-ujs
//= require turbolinks
//= require_tree .
13 changes: 13 additions & 0 deletions app/assets/javascripts/cable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Action Cable provides the framework to deal with WebSockets in Rails.
// You can generate new channels where WebSocket features live using the `rails generate channel` command.
//
//= require action_cable
//= require_self
//= require_tree ./channels

(function() {
this.App || (this.App = {});

App.cable = ActionCable.createConsumer();

}).call(this);
Empty file.
2 changes: 2 additions & 0 deletions app/assets/javascripts/drivers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
2 changes: 2 additions & 0 deletions app/assets/javascripts/passengers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
2 changes: 2 additions & 0 deletions app/assets/javascripts/rideshare.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
2 changes: 2 additions & 0 deletions app/assets/javascripts/trips.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
Loading