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

RideShare - Carets - Marisa Morris & Isabel Suchanek #14

Open
wants to merge 83 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
d3f64fa
Controllers for Drivers, Passengers, and Trips created.
Oct 2, 2017
8af9370
Set up controllers and models
isabeldepapel Oct 2, 2017
64e10b1
Created routes.
Oct 2, 2017
038f092
Created drivers and passenger list and create passenger link
Oct 3, 2017
7cd056f
Added new driver form and partial
isabeldepapel Oct 3, 2017
4edbf33
Added links for all drivers and all passengers.
Oct 3, 2017
ec0926d
Added home page and a nav that holds all of the links to passengers, …
Oct 3, 2017
78f8038
added show and (broken) destroy for driver
isabeldepapel Oct 3, 2017
113cf1a
Created passenger form partial and can edit passenger.
Oct 3, 2017
291b383
Added average rating for drivers and trip lists
isabeldepapel Oct 3, 2017
0d35d85
Deleted random stuff from driver show
isabeldepapel Oct 4, 2017
360a67c
added create trip method and moved average rating method to model
Oct 4, 2017
a37724f
Added trips total method to passenger model
Oct 4, 2017
72e6cfb
Added a link_to for the create trip in addition to the already made b…
Oct 4, 2017
6960882
Added methods for total cost to driver and passenger
isabeldepapel Oct 4, 2017
56e5d1b
Added trip detail to passenger detail
isabeldepapel Oct 4, 2017
401b8da
Added passenger to trip show page.
Oct 4, 2017
3434832
Added links to driver and passenger pages
Oct 4, 2017
7654c5d
Added delete trip option in trips details page.
Oct 5, 2017
f6196df
Implemented edit trip
isabeldepapel Oct 5, 2017
a3ab0f0
select on trip edit displays current passenger
isabeldepapel Oct 5, 2017
ed56212
Added error messages if form fields are not completed for both driver…
Oct 5, 2017
5dfc4ff
added an error message if the edit trip form is not completely filled…
Oct 5, 2017
b012a10
form for edit trip was not allowing a passenger to add a new trip aft…
Oct 5, 2017
0341bcc
added commented message explaining changes from previous commit
Oct 5, 2017
0cdbd98
edited seeds so cost reads as decimal equivalent, not int
isabeldepapel Oct 5, 2017
a06ff13
changed methods and views to properly format cost as currency
isabeldepapel Oct 5, 2017
eacf8c4
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
isabeldepapel Oct 5, 2017
a1dbefc
added fonts and styled nav-bar
isabeldepapel Oct 5, 2017
3f4c40e
Added number field to edit trip rating
isabeldepapel Oct 5, 2017
c64494c
Added link to rate unrated rides.
Oct 5, 2017
2ae099b
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
Oct 5, 2017
94092b2
removed duplicate trip.rating
isabeldepapel Oct 5, 2017
fa71121
fixed bug in average rating
isabeldepapel Oct 5, 2017
1ed8233
moved home page styling from app css to home css
isabeldepapel Oct 5, 2017
242f705
more styling for driver details
isabeldepapel Oct 5, 2017
afceceb
added styling for nav, passenger, and driver pages.
Oct 5, 2017
a18d286
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
Oct 5, 2017
d33b508
replaced deleted css text
isabeldepapel Oct 5, 2017
3be405a
Images on driver and passenger index pages are now links to their pages.
Oct 5, 2017
132e52a
made trip rating radio buttons
isabeldepapel Oct 6, 2017
a2053c0
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
isabeldepapel Oct 6, 2017
4e3681c
hide trip rating if 0
isabeldepapel Oct 6, 2017
59b603c
added flash notices for succesfully creating/updating
isabeldepapel Oct 6, 2017
2353c0b
added home page image
isabeldepapel Oct 6, 2017
00b47ec
added hover to drivers and passengers index page.
Oct 6, 2017
d1cf4ce
added home to nav bar.
Oct 6, 2017
45708bf
added hover effects to nav bar and passenger and driver icons.
Oct 6, 2017
457d23c
updated hover effects.
Oct 6, 2017
7623bbe
Adjusted the passenge/driver index pages. images are now centered.
Oct 6, 2017
36435c2
styled buttons on driver detail page
isabeldepapel Oct 6, 2017
23572cb
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
isabeldepapel Oct 6, 2017
505a055
add flash notice to create trip from passenger detail
isabeldepapel Oct 6, 2017
7e0d9f8
removed home option in nav bar and expanded widened the ul holding al…
Oct 6, 2017
0256be4
made trips list a table in driver detail
isabeldepapel Oct 6, 2017
17ec311
add better_errors and binding_of_caller to gemfile
isabeldepapel Oct 6, 2017
ef3e51c
made trips list a table in passenger detail
isabeldepapel Oct 6, 2017
f489408
add flash error when driver or passenger not found
isabeldepapel Oct 6, 2017
3b51a61
fix flash notice/error color styling
isabeldepapel Oct 6, 2017
33256c2
style tables in passenger and driver details
isabeldepapel Oct 6, 2017
f5ecf1b
add flash notice to trip detail page
isabeldepapel Oct 6, 2017
8095f7f
created button_to's in place of link_to on passenger show pages.
Oct 6, 2017
a223ca0
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
Oct 6, 2017
c30fa12
change font color for rate-me link
isabeldepapel Oct 6, 2017
d45b411
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
isabeldepapel Oct 6, 2017
12935e0
added toggle sort links to table headings
isabeldepapel Oct 6, 2017
dba0446
sanitized input for toggle sorting in passenger detail views
isabeldepapel Oct 6, 2017
d162792
updated styling on passenger page.
Oct 6, 2017
05e81c4
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
Oct 6, 2017
dbb7374
add up/down arrow icons to table sort
isabeldepapel Oct 6, 2017
2ff60a6
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
isabeldepapel Oct 6, 2017
995dcc9
added hover to table
Oct 6, 2017
679205b
Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha…
isabeldepapel Oct 6, 2017
98500ed
fixed css syntax error
isabeldepapel Oct 6, 2017
a205c8f
fix css syntax error
isabeldepapel Oct 6, 2017
2333036
add favicon
isabeldepapel Oct 6, 2017
c0385e9
fixed home page styling
isabeldepapel Oct 6, 2017
d29bb50
added paginate to limit passengers and drivers amount on index pages.
Oct 6, 2017
1bd86e6
added paginate to limit passengers and drivers amount on index pages."
Oct 6, 2017
2fa6e7b
Displaying 30 passengers and drivers per page. Styled the option to c…
Oct 6, 2017
15ecba6
styled page numbers further
Oct 6, 2017
84120f9
added more styling to pagination
Oct 7, 2017
b30af9e
precompile assets ??
isabeldepapel Oct 7, 2017
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
19 changes: 19 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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
60 changes: 60 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
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.4'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# 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', '~> 3.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'
gem 'pry'
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'

gem "better_errors"
gem "binding_of_caller"
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'will_paginate', '~> 3.1.0'
214 changes: 214 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.4)
actionpack (= 5.1.4)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.4)
actionview (= 5.1.4)
activesupport (= 5.1.4)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.4)
activesupport (= 5.1.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.4)
activesupport (= 5.1.4)
globalid (>= 0.3.6)
activemodel (5.1.4)
activesupport (= 5.1.4)
activerecord (5.1.4)
activemodel (= 5.1.4)
activesupport (= 5.1.4)
arel (~> 8.0)
activesupport (5.1.4)
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)
arel (8.0.0)
better_errors (2.3.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (9.1.0)
capybara (2.15.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.8.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
crass (1.0.2)
debug_inspector (0.0.3)
erubi (1.6.1)
execjs (2.7.0)
ffi (1.9.18)
globalid (0.4.0)
activesupport (>= 4.2.0)
i18n (0.8.6)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.10.3)
multi_json (1.12.2)
nio4r (2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
pg (0.21.0)
pry (0.11.1)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.0)
puma (3.10.0)
rack (2.0.3)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails (5.1.4)
actioncable (= 5.1.4)
actionmailer (= 5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
activemodel (= 5.1.4)
activerecord (= 5.1.4)
activesupport (= 5.1.4)
bundler (>= 1.3.0)
railties (= 5.1.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.1.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby_dep (1.5.0)
rubyzip (1.2.1)
sass (3.5.1)
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.6)
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.6.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
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.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.3)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.2.0)
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.2)
will_paginate (3.1.6)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
coffee-rails (~> 4.2)
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
pg (~> 0.18)
pry
puma (~> 3.7)
rails (~> 5.1.4)
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.1.0)

BUNDLED WITH
1.16.0.pre.2
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.
Binary file added app/assets/images/background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/cars-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/down_arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/driver.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/favicon.ico
Binary file not shown.
Binary file added app/assets/images/rider.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/up_arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
3 changes: 3 additions & 0 deletions app/assets/javascripts/drivers.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/home.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/passengers.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/trips.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
Loading