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

Leaves - Katie & Cloudy #10

Open
wants to merge 72 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
fad2934
setting up rails
KKennedyCodes Oct 7, 2019
6579471
Created Models
KKennedyCodes Oct 8, 2019
49a9588
Added Relationships
KKennedyCodes Oct 8, 2019
17e5249
Database Seeded
KKennedyCodes Oct 8, 2019
6bf5e43
Added Models, Seeded Database, and Verified Seeding
KKennedyCodes Oct 8, 2019
f02f495
Passengers, Drivers, Trips Controllers Created
KKennedyCodes Oct 8, 2019
2875c0a
Added Content to Index Method
KKennedyCodes Oct 8, 2019
2c414ec
Added Show Method to Passengers, Drivers, and Trips
KKennedyCodes Oct 8, 2019
3f84fcd
Added Routes
KKennedyCodes Oct 8, 2019
cdcaa17
Added View html.erb files
KKennedyCodes Oct 8, 2019
fc95128
first commit for new drives class
OhCloud Oct 8, 2019
98f017d
added drivers index show for all drivers
OhCloud Oct 8, 2019
a8c4d54
Added Index Page
KKennedyCodes Oct 8, 2019
fbb8ab8
added show logic to see list of all drivers and a single driver.
OhCloud Oct 8, 2019
bb39eeb
Add Passenger Form Created
KKennedyCodes Oct 8, 2019
5b23bc2
updating passenger form
KKennedyCodes Oct 8, 2019
d8b6d04
Add New Passenger Form Working
KKennedyCodes Oct 8, 2019
0d4a1a4
Edit Passenger Form Completed
KKennedyCodes Oct 8, 2019
6b7d02d
Can Delete Passenger
KKennedyCodes Oct 8, 2019
f671d2b
Added Basic Nav Bar Function
KKennedyCodes Oct 8, 2019
e285228
Updated Passenger Tests Sent from Jared
KKennedyCodes Oct 8, 2019
cfcfc2a
Merge pull request #1 from KKennedyCodes/kk/passengers
KKennedyCodes Oct 8, 2019
b7b3e7d
Started setting up trips, but stuck. Need to decide how we want to h…
KKennedyCodes Oct 8, 2019
3e24099
Merge pull request #2 from KKennedyCodes/kk/trips
KKennedyCodes Oct 8, 2019
8dfbd0e
completed all logic in view model index form show for driver. we can …
OhCloud Oct 8, 2019
593e928
Added Trip List for Passengers and Total Amout Spent
KKennedyCodes Oct 9, 2019
db170a0
Merge pull request #3 from KKennedyCodes/kk/add_trip_list_to_passenger
KKennedyCodes Oct 9, 2019
aa4fa37
Added Error Handling for Incorrect Input for New Passenger
KKennedyCodes Oct 9, 2019
23c9392
Edited Passenger Show
KKennedyCodes Oct 9, 2019
df4a4d8
Merge pull request #4 from KKennedyCodes/kk/passenger_interaction_wit…
KKennedyCodes Oct 9, 2019
fd28715
Partial Trip Form Created, Missing Drop Down of Passengers/Drivers
KKennedyCodes Oct 9, 2019
8f12636
Merge pull request #5 from KKennedyCodes/driver
KKennedyCodes Oct 9, 2019
bfcf20f
we have now merged driver and passenger back into master branch. test…
OhCloud Oct 9, 2019
26efbef
All Tests Passing for Passenger
KKennedyCodes Oct 9, 2019
59f69a9
Merge pull request #6 from KKennedyCodes/PassengerInteraction_with_Trips
KKennedyCodes Oct 9, 2019
172d6cd
added some tests to driver controller
OhCloud Oct 10, 2019
a707a29
Added Functionality to Form to Lock in Passenger and Driver info for …
KKennedyCodes Oct 10, 2019
7bbb957
driver controller tests done
OhCloud Oct 10, 2019
31381a4
Merge branch 'master' of https://github.com/KKennedyCodes/ride-share-…
OhCloud Oct 10, 2019
1d40751
Can create a new trip from passenger and edit trip.
KKennedyCodes Oct 10, 2019
4b300bc
Fixed Nav Routes
KKennedyCodes Oct 10, 2019
56ae6d2
Fixed Add Trip to Passenger Path
KKennedyCodes Oct 10, 2019
9102fb5
Fixed Routing Errors, Still working on cost - bugs exist
KKennedyCodes Oct 10, 2019
306d474
Fixed Cost Update Error
KKennedyCodes Oct 10, 2019
1b8cb57
Merge branch 'master' into kk/adding_new_trip
KKennedyCodes Oct 10, 2019
dc33928
Merge pull request #7 from KKennedyCodes/kk/adding_new_trip
KKennedyCodes Oct 10, 2019
d2bb0c8
Generates Random Amount to Charge
KKennedyCodes Oct 10, 2019
96a75fb
Merge pull request #8 from KKennedyCodes/fixing_monies
KKennedyCodes Oct 10, 2019
bafd4d9
CONTROLLER TESTS FINISHED AND PASSING
OhCloud Oct 10, 2019
3ef4b3a
Merge branch 'master' of https://github.com/KKennedyCodes/ride-share-…
OhCloud Oct 10, 2019
f17339f
created homepage controller and realized thats wrong, recreated homep…
OhCloud Oct 10, 2019
e452aa7
Automatically Adds Trip
KKennedyCodes Oct 10, 2019
2faa775
Merge pull request #9 from KKennedyCodes/fixing_monies
KKennedyCodes Oct 10, 2019
f51d282
fixed drivers edit page to save and route properly
OhCloud Oct 10, 2019
8132ec4
Added Homepage Route
KKennedyCodes Oct 10, 2019
50a54ff
Finished Auto Complete Date for Add Trip, Created Trip Views
KKennedyCodes Oct 10, 2019
cd33c27
Changes to Edit
KKennedyCodes Oct 11, 2019
60eb0a8
completed drivers model and show.
OhCloud Oct 11, 2019
6bbcb33
Merge branch 'master' of https://github.com/KKennedyCodes/ride-share-…
OhCloud Oct 11, 2019
0caa73a
Added CSS
KKennedyCodes Oct 11, 2019
16230d9
Further CSS changes
KKennedyCodes Oct 11, 2019
7e9c66e
Merge pull request #10 from KKennedyCodes/cssupdates
KKennedyCodes Oct 11, 2019
db7036b
Adding Basic Test Outline
KKennedyCodes Oct 11, 2019
7314d7a
poushing and pulling to get up to speed
OhCloud Oct 11, 2019
535f825
fixing driver toggle logic
OhCloud Oct 11, 2019
98e87eb
testing still under construction
KKennedyCodes Oct 11, 2019
5fa903e
working on toggle for status availability. otherwise, everything works.
OhCloud Oct 11, 2019
b696b3c
toggle TOGGLES FOR AVAILBILITY. YESSSS
OhCloud Oct 11, 2019
86b6e55
Merge pull request #11 from KKennedyCodes/toggle
KKennedyCodes Oct 11, 2019
3e66d3d
tests added, still not passing
KKennedyCodes Oct 11, 2019
d186e41
Merge pull request #12 from KKennedyCodes/adding_trip_tests_continued
KKennedyCodes Oct 11, 2019
9b35b70
fleshing out the controller for orders. not complete, will pair to fi…
OhCloud Oct 23, 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
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 @@
2.5.5
83 changes: 83 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.3'
# 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'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'minitest-skip'
end
277 changes: 277 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.3)
actionpack (= 5.2.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.3)
activesupport (= 5.2.3)
globalid (>= 0.3.6)
activemodel (5.2.3)
activesupport (= 5.2.3)
activerecord (5.2.3)
activemodel (= 5.2.3)
activesupport (= 5.2.3)
arel (>= 9.0)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
marcel (~> 0.3.1)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ansi (1.5.0)
archive-zip (0.12.0)
io-like (~> 0.3.0)
arel (9.0.0)
better_errors (2.5.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.8.1)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.4.5)
msgpack (~> 1.0)
builder (3.2.3)
byebug (11.0.1)
capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (3.0.0)
chromedriver-helper (2.1.1)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.1.5)
crass (1.0.4)
debase (0.2.4.1)
debase-ruby_core_source (>= 0.10.2)
debase-ruby_core_source (0.10.6)
debug_inspector (0.0.3)
erubi (1.9.0)
execjs (2.7.0)
ffi (1.11.1)
formatador (0.2.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.1)
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.7.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jquery-rails (4.3.5)
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.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.2)
minitest-rails (5.2.0)
minitest (~> 5.10)
railties (~> 5.2.0)
minitest-reporters (1.4.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-skip (0.0.1)
minitest (~> 5.0)
msgpack (1.3.1)
nenv (0.3.0)
nio4r (2.5.2)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.4)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.1)
puma (3.12.1)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
actioncable (= 5.2.3)
actionmailer (= 5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
activemodel (= 5.2.3)
activerecord (= 5.2.3)
activestorage (= 5.2.3)
activesupport (= 5.2.3)
bundler (>= 1.3.0)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
regexp_parser (1.6.0)
ruby-debug-ide (0.7.0)
rake (>= 0.8.1)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
rubyzip (2.0.0)
sass (3.7.4)
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.1.0)
railties (>= 5.2.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.142.6)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
shellany (0.0.1)
spring (2.1.0)
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.3)
thread_safe (0.3.6)
tilt (2.0.10)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.2.0)
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.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
bootsnap (>= 1.1.0)
byebug
capybara (>= 2.15)
chromedriver-helper
debase (>= 0.2.4.1)
guard
guard-minitest
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
minitest-skip
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.3)
ruby-debug-ide (>= 0.7.0)
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.5p157

BUNDLED WITH
2.0.2
Loading