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

Brenda and Brandy - Rideshare - Octos #17

Open
wants to merge 75 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
5b01575
Created rails project
brandyaustinseattle Apr 3, 2018
e158ac5
Added controllers and models, created db
brandyaustinseattle Apr 3, 2018
34b74c8
Database set up with add reference migration
brandyaustinseattle Apr 3, 2018
8a3ccac
Added html.erb files
brandyaustinseattle Apr 3, 2018
f97b4f1
Added resources routes
brendarios Apr 3, 2018
89a301e
Created a main controller for the homepage.
brendarios Apr 3, 2018
970ff2d
Added functions to passengers_controller
brandyaustinseattle Apr 3, 2018
fce2a7a
Created drivers controller methods.
brendarios Apr 3, 2018
77bf932
Refactor some methods in drivers controller.
brendarios Apr 3, 2018
9c68c0e
Added index view for passenger
brandyaustinseattle Apr 3, 2018
36345ce
Worked on passengers view and added pagination
brandyaustinseattle Apr 3, 2018
eb918df
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brendarios Apr 3, 2018
167c5fe
Changes in driver controller and index.html.erb
brendarios Apr 3, 2018
4771474
Updated styling for index views
brandyaustinseattle Apr 3, 2018
33f679f
Created drivers view index.
brendarios Apr 3, 2018
b4f6521
Paginate working for passengers
brandyaustinseattle Apr 3, 2018
5ce9be3
Added paginate to drivers index and created files show, new, and edit…
brendarios Apr 3, 2018
8fa1794
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brendarios Apr 3, 2018
d5a9dd2
Working on show views
brandyaustinseattle Apr 3, 2018
840863b
Adding trips to passenger show
brandyaustinseattle Apr 3, 2018
2c1d7ac
Added to Drivers details the trips table and total earnings.
brendarios Apr 3, 2018
5898aa3
Add average rating method in Drivers model and show it in the Drivers…
brendarios Apr 4, 2018
f0ba7c0
Styling for passengers and trips pages
brandyaustinseattle Apr 4, 2018
4324bce
refactor html in Drivers show file
brendarios Apr 4, 2018
9ffdf98
Final styling for passengers and drivers details
brandyaustinseattle Apr 4, 2018
31f8241
Set up trips controller
brandyaustinseattle Apr 4, 2018
a05b8d0
Refactor delete link on drivers trips table.
brendarios Apr 4, 2018
3bbc701
Added trip details page
brandyaustinseattle Apr 4, 2018
2d6d3a4
Add partial view file for new and edit for Drivers.
brendarios Apr 4, 2018
14a852f
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brendarios Apr 4, 2018
5a089b3
In process of doing create trip
brandyaustinseattle Apr 5, 2018
c0b8955
Refactor drivers controller to use strong params.
brendarios Apr 5, 2018
7a0cec1
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brendarios Apr 5, 2018
52eb879
In process of creating trips
brendarios Apr 5, 2018
7c8fc81
process of creating new trips
brendarios Apr 5, 2018
f37cf6c
Created new driver, edit driver, and created error messages file.
brendarios Apr 5, 2018
2ae6574
Major changes to trips controller
brandyaustinseattle Apr 5, 2018
05ae4b6
Major changes to trips controller
brandyaustinseattle Apr 5, 2018
3085275
Fixed edit and delete buttons on index pages
brandyaustinseattle Apr 5, 2018
ad0ba8c
fixed bugs in drivers.
brendarios Apr 5, 2018
c005c9f
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brendarios Apr 5, 2018
c328c07
Fixed delete driver bug to delete and stay in the same page.
brendarios Apr 5, 2018
2ec0efe
Fixed routes issue
brandyaustinseattle Apr 5, 2018
7c4423b
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brandyaustinseattle Apr 5, 2018
2e87b49
Fixed bug in drivers to show the details of the trips of a driver.
brendarios Apr 5, 2018
be20844
Added link to trips details page
brandyaustinseattle Apr 5, 2018
543221f
Working on trip edit button
brandyaustinseattle Apr 5, 2018
3c9c4f0
added a conditional for rating in the model.
brendarios Apr 5, 2018
70cc7e1
Added links of drivers and passengers on the Trips details.
brendarios Apr 5, 2018
0cc227b
Added details to trips edit form
brandyaustinseattle Apr 5, 2018
bf5c954
Add link for error messages.
brendarios Apr 5, 2018
4338705
Add a link to add a new passenger.
brendarios Apr 5, 2018
8184f95
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brendarios Apr 5, 2018
97c2715
Finished form for trip
brandyaustinseattle Apr 5, 2018
d6b9d30
Working on styling
brandyaustinseattle Apr 6, 2018
687bb86
Header styling
brandyaustinseattle Apr 6, 2018
4a986ca
Added links to the root page
brendarios Apr 6, 2018
44e145b
Styling root page.
brendarios Apr 6, 2018
b6b2eda
Added font
brandyaustinseattle Apr 6, 2018
721f247
Styling for header and driver/passenger rectangles
brandyaustinseattle Apr 6, 2018
0e23bc7
Fixed the path of the create passenger button.
brendarios Apr 6, 2018
1753b7b
Added Home button in the navigation bar.
brendarios Apr 6, 2018
899fb6d
Random styling
brandyaustinseattle Apr 6, 2018
d96be23
Styling Home button
brandyaustinseattle Apr 6, 2018
5dc49d4
added images.
brendarios Apr 6, 2018
ab07d90
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brendarios Apr 6, 2018
4fe221f
Changed cost to dollars
brandyaustinseattle Apr 6, 2018
9e19a99
Deploying draft
brandyaustinseattle Apr 6, 2018
c0232c5
Added styling to the form fields.
brendarios Apr 6, 2018
562c9b7
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brendarios Apr 6, 2018
ce9c891
Styling to tables and homepage
brandyaustinseattle Apr 6, 2018
c042add
Merge branch 'master' of https://github.com/brandyaustinseattle/rides…
brandyaustinseattle Apr 6, 2018
50535dc
eliminated a div.
brendarios Apr 6, 2018
f15aec1
Buttons on homepage
brandyaustinseattle Apr 6, 2018
274c32d
text decoration line in request trip button.
brendarios 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

72 changes: 72 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
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 'will_paginate'

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
227 changes: 227 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
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)
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.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)
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)
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.2.0)
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.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-progressbar (1.9.0)
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)
will_paginate (3.1.6)
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.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)
will_paginate

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/big-car.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/blue.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/car.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/driver.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/people.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/road.jpg
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.
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/home.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/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