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

Ampers: Lily, Alex #16

Open
wants to merge 98 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
6dfcc12
inital diagram drawn
lillers1122 Apr 2, 2018
c1b64d4
rails new created
brownav Apr 2, 2018
7264516
updated ERB
lillers1122 Apr 3, 2018
e59493c
created models and migrated
brownav Apr 3, 2018
05859a2
fixed migration references
brownav Apr 3, 2018
89bf9c0
model relationships created
lillers1122 Apr 3, 2018
3efd859
basic routes created with resources
lillers1122 Apr 3, 2018
379b025
controllers created
lillers1122 Apr 3, 2018
ee60988
blueprint methods for controllers
brownav Apr 3, 2018
0aec5ac
params added for controllers
lillers1122 Apr 3, 2018
89ce107
fixed controllers, have html views
brownav Apr 3, 2018
46fde58
routes troubleshooting
brownav Apr 3, 2018
da7c79f
driver views updated, trip index basic links set up
lillers1122 Apr 3, 2018
21e5b9f
trips/index basic html/css done; links work
lillers1122 Apr 3, 2018
dc3b2c9
background color
brownav Apr 3, 2018
02b7688
Merge branch 'master' of https://github.com/brownav/rideshare-rails
brownav Apr 3, 2018
b0762c8
driver list page populated
brownav Apr 3, 2018
f9f053f
passenger index page mapped out; applicatiion css reformatted
lillers1122 Apr 3, 2018
4ebd15f
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 3, 2018
4cb920d
table created for passenger show page, passenger controller updated t…
lillers1122 Apr 3, 2018
8a7d234
driver trips basic display
brownav Apr 3, 2018
12d8370
driver show has passenger show links
brownav Apr 4, 2018
d994ac3
changed display of trip cost for passenger show
lillers1122 Apr 4, 2018
2367401
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 4, 2018
069765b
nested trip into driver and passenger
brownav Apr 4, 2018
3f0d1d1
formatted trip show
lillers1122 Apr 4, 2018
69cbdba
drivers/id/trips/id and passengers/id/trips/id working, not linked
lillers1122 Apr 4, 2018
24abbef
link for driver trip
brownav Apr 4, 2018
146ad0e
fixed driver show merge
brownav Apr 4, 2018
dbb0fd7
trip id links from driver and passenger work now; yay
lillers1122 Apr 4, 2018
c2502c2
passenger form, new and edit pages drafted
lillers1122 Apr 4, 2018
ea08eab
form and partials for adding and editing driver
brownav Apr 4, 2018
39b1569
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 4, 2018
8babb90
oops, passenger form
lillers1122 Apr 4, 2018
6f62a29
pushing up driver _form
brownav Apr 4, 2018
7adfe12
passenger information + edit button linked on show page
lillers1122 Apr 4, 2018
431f18a
delete and show changes
lillers1122 Apr 5, 2018
1e93f9e
driver deletes
brownav Apr 5, 2018
5832b14
resolving passengers show driver link
brownav Apr 5, 2018
d485921
deleted passenger is displayed as removed
brownav Apr 5, 2018
95d7071
added edit trip form
brownav Apr 5, 2018
5c4e5ab
trip delete works; controller and view updated
lillers1122 Apr 5, 2018
0d24d63
driver input validation
brownav Apr 5, 2018
465f366
validation of passenger
lillers1122 Apr 5, 2018
ca49181
html error messages added for driver, passenger, trip
brownav Apr 5, 2018
bcc2b80
resolving merge conflicts
lillers1122 Apr 5, 2018
5863d19
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 5, 2018
26226ca
cost rounded to 2 everywhere but edit form
lillers1122 Apr 5, 2018
d79da83
validates cost numericality
brownav Apr 5, 2018
7a7f99b
rating method for driver done + linked on driver show
lillers1122 Apr 5, 2018
ccc7a52
driver method to calculate total earnings
brownav Apr 5, 2018
ccc2e75
passenger paid method
lillers1122 Apr 5, 2018
6059c98
merge resolve
lillers1122 Apr 5, 2018
d00825c
formatting edits to driver
lillers1122 Apr 5, 2018
416f329
added to passenger nav
lillers1122 Apr 5, 2018
c36afbf
new trip added to passenger in routes
lillers1122 Apr 5, 2018
2c02ddf
new trip for passenger fields
brownav Apr 5, 2018
8384123
new trip assigns random driver
brownav Apr 5, 2018
73dd426
junk
lillers1122 Apr 5, 2018
fdd5915
fixes?
lillers1122 Apr 5, 2018
4ccb009
date generated for new trip
brownav Apr 6, 2018
385006e
new trip basics work
lillers1122 Apr 6, 2018
f542303
merge conflict fixed?
lillers1122 Apr 6, 2018
1c40cc7
trip form hidden_field, trip controller redirect
brownav Apr 6, 2018
2200638
fixed trips controller merge issue
brownav Apr 6, 2018
889479a
Driver total earnings method accounts for nil now
lillers1122 Apr 6, 2018
6d255e9
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 6, 2018
2f10350
deals with dividing by zero error, bolds mini-headers for driver and …
brownav Apr 6, 2018
fde2968
adjusted average rating; driver show route for trip
lillers1122 Apr 6, 2018
48d9034
can't request trip while in progress
lillers1122 Apr 6, 2018
e769e8a
trip rating by driver linked
lillers1122 Apr 6, 2018
87fd182
random cost and fixed zero trips bug
brownav Apr 6, 2018
6c2dd36
stashing commits
lillers1122 Apr 6, 2018
0a6f5f3
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 6, 2018
3c87ecd
removed space
brownav Apr 6, 2018
bf74236
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 6, 2018
983c822
cost formatting
lillers1122 Apr 6, 2018
6d8badf
duplicate changes
brownav Apr 6, 2018
5dedbd0
merge conflict resolved
brownav Apr 6, 2018
c436ed4
rate trip to finish
lillers1122 Apr 6, 2018
2e24729
RATE TRIP
lillers1122 Apr 6, 2018
1454d30
cost formatting for trip#show
brownav Apr 6, 2018
aea75d9
stylistic changes to nav and font, deleted unused html sheets
brownav Apr 6, 2018
66dbba3
home edits
lillers1122 Apr 6, 2018
79eab4f
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 6, 2018
9d0998e
style changes
brownav Apr 6, 2018
4307bd6
table formatting
lillers1122 Apr 6, 2018
ddc8c32
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 6, 2018
c4e1d1a
border color
lillers1122 Apr 6, 2018
1b5a5c8
style changes
brownav Apr 6, 2018
6ee1fb8
Merge branch 'master' of https://github.com/brownav/rideshare-rails
brownav Apr 6, 2018
a481d69
styling
brownav Apr 6, 2018
b00457a
emoji magic
lillers1122 Apr 6, 2018
f060c8a
cleaned nested routes
brownav Apr 6, 2018
0144b8b
more emoji magic
lillers1122 Apr 6, 2018
0f46181
Merge branch 'master' of https://github.com/brownav/rideshare-rails
lillers1122 Apr 6, 2018
959538b
new passengers and drivers consistent
lillers1122 Apr 6, 2018
ed7cbc1
Set theme jekyll-theme-cayman
brownav Jan 14, 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
Binary file added .DS_Store
Binary file not shown.
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
58 changes: 58 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
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

# group :development do
# gem "better_errors"
# gem "binding_of_caller"
# 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]
196 changes: 196 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
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)
bindex (0.5.0)
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)
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)
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)
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
byebug
capybara (~> 2.13)
coffee-rails (~> 4.2)
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
pg (>= 0.18, < 2.0)
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
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-cayman
Binary file added app/.DS_Store
Binary file not shown.
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.
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/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