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

Cassy and Sabine - DrivesMe #6

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
668680c
Run rails new
cassyarchibald Oct 2, 2018
c08c3c3
Created Driver Model
cassyarchibald Oct 2, 2018
a682af1
Created a passenger model
Sabineth17 Oct 2, 2018
6c9fade
Created trips model
Sabineth17 Oct 2, 2018
4f532e8
Added relationships to models
cassyarchibald Oct 2, 2018
8bb0c02
Added references between trips/drivers/passengers and seeded database
cassyarchibald Oct 2, 2018
d63095d
Created driver controller and empty views
Sabineth17 Oct 2, 2018
e180744
Created Passenger Controller
cassyarchibald Oct 2, 2018
2d85764
Created Trips Controller and Views
Sabineth17 Oct 2, 2018
5c15444
Created methods for passenger controller
cassyarchibald Oct 2, 2018
4f83acd
Created view for passengers
Sabineth17 Oct 2, 2018
9b00f89
Added routes for trips, drivers, and passengers
cassyarchibald Oct 2, 2018
956c71e
Refactored resources to display passenger id and updated views
Sabineth17 Oct 2, 2018
28597e6
Completed troubleshooting of passenger index and show views
cassyarchibald Oct 2, 2018
0b76831
Resolved issue with index show link
cassyarchibald Oct 2, 2018
a566a4c
Completed passengers edit method and updated database on partner machine
Sabineth17 Oct 2, 2018
a23d126
refactored a coded for passenger
Sabineth17 Oct 2, 2018
8d563c6
Created delete method for passenger
cassyarchibald Oct 2, 2018
baa9bf2
Merge branch 'master' of https://github.com/cassyarchibald/ride-share…
Sabineth17 Oct 2, 2018
3dcb51c
Updated the header on the application view
Sabineth17 Oct 2, 2018
93a585d
Created _form view for driver
cassyarchibald Oct 2, 2018
6d175ac
Created new and edit views for driver
cassyarchibald Oct 2, 2018
1289feb
Created views for driver edit and update
cassyarchibald Oct 2, 2018
d5ec01b
Continued work on driver index. Added phone number to passenger index
cassyarchibald Oct 2, 2018
e8778c2
Created driver controller methods
Sabineth17 Oct 2, 2018
7d29ea0
Created controls for trips
cassyarchibald Oct 2, 2018
f23ae7b
Merge branch 'master' of https://github.com/cassyarchibald/ride-share…
cassyarchibald Oct 2, 2018
0573cd4
Revised driver show and _form views
cassyarchibald Oct 2, 2018
5f19a9a
Revised main header layout with add driver/driver index
cassyarchibald Oct 2, 2018
c6dee4b
Finished header of main application
cassyarchibald Oct 2, 2018
de7ee60
Created Trip views
Sabineth17 Oct 2, 2018
7c59139
Debugged Trip index issue
Sabineth17 Oct 2, 2018
6f3223c
Created show for trips. Debugged edit for trips
cassyarchibald Oct 2, 2018
a7901fc
Updated views for new so they say add instead of edit
cassyarchibald Oct 3, 2018
ead8477
Added validation to driver and passenger
cassyarchibald Oct 3, 2018
9c6fe81
Created action_view to assist with showing errors. Created draft of e…
cassyarchibald Oct 3, 2018
7646bf1
Created nested routes for passengers/drivers to be linked to trips
cassyarchibald Oct 3, 2018
c433b0e
Created money converter for trip/attempted draft of amount earned by …
cassyarchibald Oct 3, 2018
3c603aa
Created draft of driver trip list on driver show page
cassyarchibald Oct 3, 2018
579b070
Created methods for driver average rating and amount earned. Updated …
cassyarchibald Oct 3, 2018
6db9c3c
Converted cost to show as currency on driver show page
cassyarchibald Oct 3, 2018
a4114c4
Created method to show amount passenger has been charged. Updated pas…
cassyarchibald Oct 3, 2018
7496d04
Added some css styling to drivers
cassyarchibald Oct 3, 2018
2209947
Styled trip index as a table with CSS
cassyarchibald Oct 4, 2018
8909396
Created css for a table for the driver and trip index and show pages
cassyarchibald Oct 4, 2018
ee39c31
Revised passenger show view as a table
cassyarchibald Oct 4, 2018
82e3ce0
Added header styling
cassyarchibald Oct 4, 2018
addf7a7
Revised driver and passenger index views to use tables
cassyarchibald Oct 4, 2018
82a755d
Revised the show views for passenger/driver and the index view for trips
cassyarchibald Oct 4, 2018
9d80b67
Revised trips index/show so their are links to driver, passenger, and…
cassyarchibald Oct 4, 2018
dcec87c
Showed driver trips on driver show page
cassyarchibald Oct 4, 2018
ce5ec60
Created partial for trips table and used partial in show page for dri…
cassyarchibald Oct 4, 2018
b1e5639
Swapped code in trips/index with trips partial
cassyarchibald Oct 4, 2018
3af7d7e
Adjusted table format
cassyarchibald Oct 5, 2018
fe38df8
Added a default status of active to drivers and passengers
cassyarchibald Oct 5, 2018
b7f86a7
Removed destroy views not being used
cassyarchibald Oct 5, 2018
37a67b5
Created dropdown menus in trip/new for drivers and passengers. Remove…
cassyarchibald Oct 5, 2018
d765268
Resolved extra field in trip form
cassyarchibald Oct 5, 2018
2dd3d36
Added minor formatting to trips index
cassyarchibald Oct 5, 2018
e133e25
Added root as trips index
cassyarchibald Oct 5, 2018
5e597a9
Added additional form styling
cassyarchibald Oct 5, 2018
1d9f674
Added formatting to new/edit forms
cassyarchibald Oct 5, 2018
ca6c55a
Revised header styling
cassyarchibald Oct 5, 2018
1dfcccf
Attempted showing first driver available for new trip.
cassyarchibald Oct 5, 2018
321fa17
Adjust trip show page
cassyarchibald Oct 5, 2018
9ff8755
Added Google fonts
cassyarchibald Oct 5, 2018
09b8299
Revert "Added Google fonts"
cassyarchibald Oct 5, 2018
22f9989
Adjusted formatting of header and trips index
cassyarchibald Oct 5, 2018
782a9e3
Adjusted header styling:
cassyarchibald Oct 5, 2018
992ee2a
Re-added Google fonts
cassyarchibald Oct 5, 2018
051e3d2
Adjusted styling for header
cassyarchibald Oct 5, 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
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 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

# Ignore uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history
/coverage
.DS_Store


# Ignore master key for decrypting credentials and more.
/config/master.key
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.5.1
80 changes: 80 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.1'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# 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 'mini_racer', 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 ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

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]
end

group :development do
# Access an interactive console on exception pages or by calling '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

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
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'
gem 'guard'
gem 'guard-minitest'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
269 changes: 269 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,269 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1)
actionpack (= 5.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.1)
activesupport (= 5.2.1)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
arel (>= 9.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
marcel (~> 0.3.1)
activesupport (5.2.1)
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)
archive-zip (0.11.0)
io-like (~> 0.3.0)
arel (9.0.0)
better_errors (2.5.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)
bootsnap (1.3.2)
msgpack (~> 1.0)
builder (3.2.3)
byebug (10.0.2)
capybara (3.8.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.0)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.9.25)
formatador (0.2.5)
globalid (0.4.1)
activesupport (>= 4.2.0)
guard (2.14.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-minitest (2.4.6)
guard-compat (~> 1.2)
minitest (>= 3.0)
i18n (1.1.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
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)
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.5)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
msgpack (1.2.4)
multi_json (1.13.1)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.3)
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.3)
puma (3.12.0)
rack (2.0.5)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
bundler (>= 1.3.0)
railties (= 5.2.1)
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.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.6.0)
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.14.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
shellany (0.0.1)
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.2)
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.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.19)
execjs (>= 0.3.0, < 3)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.1.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
bootsnap (>= 1.1.0)
byebug
capybara (>= 2.15)
chromedriver-helper
guard
guard-minitest
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.11)
rails (~> 5.2.1)
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)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.16.3
9 changes: 9 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
guard :minitest, autorun: false, spring: true do
watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" }
watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' }
watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" }
watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" }
watch(%r{^test/.+_test.rb$})
watch(%r{^test/test_helper.rb$}) { 'test' }
end
Loading