Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
4d4b5bb
created rails application
scottzec Nov 3, 2020
7cf66e4
created routes and controllers
scottzec Nov 3, 2020
faa0afb
Generated models driver, passenger, trip
StacyLundquist Nov 3, 2020
fb9866a
"modified schema"
StacyLundquist Nov 4, 2020
2b818d6
driver index
StacyLundquist Nov 4, 2020
0d97b58
trips and passenger indices
StacyLundquist Nov 4, 2020
48875b1
uhhhh, something happened
StacyLundquist Nov 4, 2020
5bf0865
Added navigation links
StacyLundquist Nov 4, 2020
c03d17f
passengers and trips index pages -- barebones
StacyLundquist Nov 4, 2020
e3291a7
show page
scottzec Nov 4, 2020
7d84beb
show method
scottzec Nov 4, 2020
69e9862
trying to merge leah-show
scottzec Nov 4, 2020
b705976
re-added show method
scottzec Nov 5, 2020
258ca7b
added delete clause to drivers
StacyLundquist Nov 5, 2020
8f3ab16
added relationship to driver and passenger
scottzec Nov 5, 2020
770fb44
Merge branch 'leah-association'
scottzec Nov 5, 2020
628486c
driver class
StacyLundquist Nov 5, 2020
b353a9d
driver#edit
StacyLundquist Nov 5, 2020
ce14e9d
added views and form for new and edit
scottzec Nov 5, 2020
21d495e
add another driver link on index
scottzec Nov 5, 2020
fe7d564
fixed driver show page, status works properly
scottzec Nov 5, 2020
3d00252
fixing typos
StacyLundquist Nov 5, 2020
fb59f44
form for edit and new working, but needs touching up
scottzec Nov 5, 2020
b7eca74
attempting merge leah-views
scottzec Nov 5, 2020
565a3f2
available part of show view
scottzec Nov 5, 2020
8dbef2d
Removed available field from form
scottzec Nov 5, 2020
08ad787
tests run, driver form checkbox and customized to new and edit
scottzec Nov 6, 2020
bd9bbe0
Trips controller test
StacyLundquist Nov 6, 2020
c51330b
driver#show
StacyLundquist Nov 6, 2020
e0148d3
fixing merge conflict
StacyLundquist Nov 6, 2020
bf62c1a
driver model #total_rev, avg_total
StacyLundquist Nov 6, 2020
5fda3c7
added drivers.nil clause to driver#destroy
StacyLundquist Nov 6, 2020
711e3db
DriverController tests
StacyLundquist Nov 6, 2020
fe8914c
added route for drivers#availability
StacyLundquist Nov 6, 2020
f338c52
passenger all working
scottzec Nov 6, 2020
f97223c
tests
StacyLundquist Nov 6, 2020
97c5aa8
driver.rb#first_available_driver
StacyLundquist Nov 6, 2020
0203a81
current passenger.rb method
StacyLundquist Nov 6, 2020
75db1a3
passenger_total_charged method
StacyLundquist Nov 6, 2020
eb67b70
trip linked to passenger and driver, currency set
scottzec Nov 6, 2020
4427ef6
edit trip fixed but still ids
scottzec Nov 6, 2020
46b5e71
Merge branch 'master' into Stacy
StacyLundquist Nov 6, 2020
999a4e4
fixed typo
StacyLundquist Nov 6, 2020
dc7f362
showing rating on driver#show
StacyLundquist Nov 6, 2020
7df7b30
validations set-up for p, d, t
scottzec Nov 6, 2020
45a310d
fixed merge conflicts
scottzec Nov 6, 2020
a1d5ee0
fixed merge conflicts
StacyLundquist Nov 6, 2020
49d7620
Passenger detail CSS
StacyLundquist Nov 6, 2020
8328396
driver show CSS
StacyLundquist Nov 6, 2020
df401b1
CSS for all details pages
StacyLundquist Nov 6, 2020
58b3d54
merging new styling
StacyLundquist Nov 6, 2020
0ba41fc
Commenting out validations so localhost will show in meantime
StacyLundquist Nov 6, 2020
ae9a2ea
Index page CSS
StacyLundquist Nov 7, 2020
41e2ea6
edited some tests
StacyLundquist Nov 7, 2020
e758aca
add trip via passenger
scottzec Nov 7, 2020
d36397b
stylesheet
StacyLundquist Nov 7, 2020
e3e4be0
edit driver#test
StacyLundquist Nov 7, 2020
44262c7
please
scottzec Nov 7, 2020
9bd0dc4
add back request trip link in passengers#show
scottzec Nov 7, 2020
e16adf6
driver#test
StacyLundquist Nov 7, 2020
f2288be
fixing merge conflicts
StacyLundquist Nov 7, 2020
2db1b2b
some feedback changes
StacyLundquist Nov 22, 2020
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
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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 pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

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

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
78 changes: 78 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
# 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.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', 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.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 web drivers to run system tests with browsers
gem 'webdrivers'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'guard'
gem 'guard-minitest'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
Loading