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

Brittany and Phoebe && Ampers #22

Open
wants to merge 70 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
9d38880
initial set up
brittanyrjones Apr 2, 2018
aeefa11
Created db tables for trip, driver, passenger
brittanyrjones Apr 3, 2018
21052de
added the controller methods for trip, driver, and passenger. Added t…
brittanyrjones Apr 3, 2018
2f2d3fe
added restful routes, needs dry
brittanyrjones Apr 3, 2018
69f532c
Dried up the routes
brittanyrjones Apr 3, 2018
c0fd150
updated driver controller methods
brittanyrjones Apr 3, 2018
12a2d1f
adds index views for all three models
pmanni02 Apr 3, 2018
b043ee1
initial site header
pmanni02 Apr 3, 2018
cb85b59
update controller for trips and passengers
brittanyrjones Apr 3, 2018
3e4cec0
show view for driver
pmanni02 Apr 3, 2018
4e1dda2
show view for driver
pmanni02 Apr 3, 2018
1288567
updated show method and html pages for the driver
pmanni02 Apr 3, 2018
6fceafc
updates show and index pages for the driver, passenger, and trips
pmanni02 Apr 4, 2018
553589d
added edit and delete functions for driver and passenger. Added parti…
brittanyrjones Apr 4, 2018
aa96cce
fixed vin number issue, migrated a change to the driver table so vin …
brittanyrjones Apr 4, 2018
1f6fd52
updated views for Trips, added tables to show page for driver, passen…
brittanyrjones Apr 4, 2018
71935a5
fixes merge conflicts
pmanni02 Apr 4, 2018
ef0beb8
adds/styles nav bar
pmanni02 Apr 4, 2018
411ad12
adds homepage background pic
pmanni02 Apr 4, 2018
b9fcfa0
adds footer
pmanni02 Apr 4, 2018
2ad8a71
added edit and create trip methods and views
brittanyrjones Apr 4, 2018
3385c40
adds validations for new passenger and driver
pmanni02 Apr 5, 2018
ca9e2ff
fixes lists display issue
pmanni02 Apr 5, 2018
928981b
updates gemfile for new error handling
pmanni02 Apr 5, 2018
d2cfee4
adds validation for rating
pmanni02 Apr 5, 2018
5a83f92
fixes validatation syntax error
pmanni02 Apr 5, 2018
8d76cf5
added avg rating to driver index pages
pmanni02 Apr 5, 2018
6877ef7
formats driver index page
pmanni02 Apr 5, 2018
fabc646
formats passenger index page
pmanni02 Apr 5, 2018
5d974e1
formats trips index page
pmanni02 Apr 5, 2018
75940a9
adds rails pry to gemfile
pmanni02 Apr 5, 2018
b0e4f03
add trip correctly links to passenger. needs modification on route
brittanyrjones Apr 5, 2018
43051cc
fixed merge
brittanyrjones Apr 5, 2018
8349fb8
fixed merge conflict in trip.rb
brittanyrjones Apr 5, 2018
84f4953
fixed merge conflict in routes
brittanyrjones Apr 5, 2018
7f4b9db
fixed errors in show pages
brittanyrjones Apr 5, 2018
2585b73
fixes zero division error in driver show page
pmanni02 Apr 5, 2018
b6d8f63
adds edit/delete links to index pages
pmanni02 Apr 5, 2018
744ae66
moves homepage image to image folder. fixes heroku image display issue
pmanni02 Apr 5, 2018
f42666b
reverts to image url ref
pmanni02 Apr 5, 2018
20866f5
modifies footer
pmanni02 Apr 5, 2018
d4c3272
moves index page titles
pmanni02 Apr 5, 2018
53e47ad
changes date formatting
pmanni02 Apr 5, 2018
ac3ad7e
reformats driver show page table
pmanni02 Apr 5, 2018
ffea18b
reformats passenger show page table
pmanni02 Apr 5, 2018
4573af0
reformates trip show page table and deletes route page comments
pmanni02 Apr 5, 2018
1a502c1
reformats pass and driver info
pmanni02 Apr 5, 2018
caa1612
reformats trip links
pmanni02 Apr 5, 2018
a44bcf3
adds live links to show pages
pmanni02 Apr 5, 2018
cbe84f3
updated update trip form
brittanyrjones Apr 5, 2018
d018c9b
code cleanup & driver new form fix
pmanni02 Apr 5, 2018
ed8e4ff
added column available to driver table
brittanyrjones Apr 5, 2018
537c5cc
reformats new and edit forms for passenger and driver
pmanni02 Apr 5, 2018
ed097bb
reformats trip form
pmanni02 Apr 5, 2018
667f5fa
adds live links to trips index
pmanni02 Apr 5, 2018
307e594
adds color to nav
pmanni02 Apr 5, 2018
c756bd4
formats request_trip link in passenger show page
pmanni02 Apr 5, 2018
01fb3fa
styling merge and merge conflict
pmanni02 Apr 5, 2018
9e47ad1
reformats edit trip page
pmanni02 Apr 5, 2018
de4e3c3
added driver status to db
brittanyrjones Apr 6, 2018
a5057ce
fixed merge conflicts
brittanyrjones Apr 6, 2018
663c138
changed view to show driver can be avail.
brittanyrjones Apr 6, 2018
a27c6c8
title text margin fixes
pmanni02 Apr 6, 2018
88c8d68
changes from homepage photo from jpeg to png
pmanni02 Apr 6, 2018
cabb203
all add trip functions working, driver selected at random, to fix soon
brittanyrjones Apr 6, 2018
bd49511
fixed merge conflict
brittanyrjones Apr 6, 2018
2cb9286
fixes homepage issue
pmanni02 Apr 6, 2018
ffc0512
fixes edit trip form
pmanni02 Apr 6, 2018
6e68de8
fixes nil rating issue
pmanni02 Apr 7, 2018
7a73b98
fixed errors in creating trip
brittanyrjones 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
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
61 changes: 61 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
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.6'
# 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

gem 'awesome_print'

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'

gem "better_errors"
gem "binding_of_caller"

gem 'pry-rails', '~> 0.3.4'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
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.6)
actionpack (= 5.1.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
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)
arel (8.0.0)
awesome_print (1.8.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.2)
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)
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.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 (1.0.0)
concurrent-ruby (~> 1.0)
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.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)
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.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
bundler (>= 1.3.0)
railties (= 5.1.6)
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.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
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_dep (1.5.0)
rubyzip (1.2.1)
sass (3.5.6)
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
awesome_print
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, < 2.0)
pry-rails (~> 0.3.4)
puma (~> 3.7)
rails (~> 5.1.6)
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.
Binary file added app/assets/images/speeding_car.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/driver.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/passengerindex.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/trip.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