Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
107f6ba
instantiated new rails project
marks214 Nov 3, 2020
37e15d1
generated Trip, Passenger, and Driver controllers
marks214 Nov 3, 2020
b5113e9
generated models for trip, passenger, and driver
marks214 Nov 3, 2020
62bf84b
created columns for migrations
marks214 Nov 3, 2020
7ac84a4
renamed folders
marks214 Nov 3, 2020
0228c83
added index files to views
marks214 Nov 3, 2020
8b6688c
added index action to drivers controller
marks214 Nov 3, 2020
c9ad759
added Homepages controller and Homepage model
marks214 Nov 3, 2020
58617ab
created active record relationship between driver and trips, ran rail…
marks214 Nov 3, 2020
a49d2f7
added drivers route, index action to controller and view
marks214 Nov 3, 2020
3e12cf6
added driver show action
marks214 Nov 3, 2020
7c8828e
link the driver show page from the driver index page
marks214 Nov 3, 2020
0ab62bb
added route and controller for drivers new action
marks214 Nov 3, 2020
20da6af
added form and edit views, updated routes for all driver related actions
marks214 Nov 3, 2020
1df357d
updated form view and controller actions/methods
marks214 Nov 3, 2020
7a32ea5
links are working, need to update redirect paths
marks214 Nov 3, 2020
29b9354
driver controller, view, routes working - draft
marks214 Nov 3, 2020
1f3e294
Merge branch 'driversAimee' into master
marks214 Nov 3, 2020
b29c277
passengers index and test written. Can load all passengers
emirry Nov 3, 2020
f4833fe
show, new, and create updated with tests
emirry Nov 4, 2020
c60e991
update and tests updated
emirry Nov 4, 2020
eb2ce30
destroy and tests updated
emirry Nov 4, 2020
3f1c4a5
added in table for passenger details page
emirry Nov 4, 2020
df018b6
Changed passenger details page
emirry Nov 4, 2020
d817eca
Committing changes
emirry Nov 4, 2020
b39c797
merging passengersEmily to master
emirry Nov 4, 2020
f54ad86
added validation for drivers
marks214 Nov 4, 2020
db0fc85
modifed table in show page
emirry Nov 4, 2020
643bdd1
validates that a new passenger includes a name and phone number
emirry Nov 4, 2020
7418a03
dried up routes
emirry Nov 4, 2020
1e39b16
trip controller udpated
emirry Nov 4, 2020
45ac929
added in more view pages
emirry Nov 4, 2020
aa434c5
updating all files
emirry Nov 4, 2020
3b267d4
Merge branch 'passengersEmily'
emirry Nov 4, 2020
d087621
Merge branch 'master' of https://github.com/marks214/ride-share-rails…
marks214 Nov 4, 2020
645b9a9
show test
emirry Nov 5, 2020
6f741fc
modified vin validation
marks214 Nov 5, 2020
fd356fd
merge conflict
marks214 Nov 5, 2020
33d80a9
conflicts resolved
emirry Nov 5, 2020
b023951
fixed passenger and some driver tests
marks214 Nov 5, 2020
572d767
Edited Drivers layouts, updated paths/routes, & controller
marks214 Nov 5, 2020
80f85a9
restored ride_id to id and removed columns (migration)
marks214 Nov 5, 2020
d8b79e5
removed ride_id
emirry Nov 5, 2020
4bba2e3
updated driver show view to include accurate passenger info, gross ea…
marks214 Nov 5, 2020
1b2abb4
Merge branch 'master' into passengertripsEmily
emirry Nov 5, 2020
98d1edb
trips connected to passengers
emirry Nov 5, 2020
fab5431
driver details page now links to trip details, option to rate trip in…
marks214 Nov 5, 2020
305a52b
trip details page includes links back to driver and to passenger
marks214 Nov 5, 2020
b6fd365
trips showing up for passengers but seeing duplicates
emirry Nov 5, 2020
9836664
removed ride_id
emirry Nov 5, 2020
a3cf389
trips connected to passengers
emirry Nov 5, 2020
d87b222
trips showing up for passengers but seeing duplicates
emirry Nov 5, 2020
f31faa6
Merge branch 'passengertripsEmily'
emirry Nov 5, 2020
4185125
Experimenting, trying to understand nested routes
emirry Nov 5, 2020
e88e42b
Merge branch 'master' into passengertripsEmily
emirry Nov 5, 2020
1288996
user can click on individual trips for each passenger and included a …
emirry Nov 5, 2020
dce9104
added in view all trips link and add a trip link, but not working yet
emirry Nov 5, 2020
ef34f12
link to view all trips and to create a new trip from passenger working
emirry Nov 5, 2020
555c36d
updated trips index view and added buisness logic to driver model
marks214 Nov 5, 2020
0cd1d26
added links to nav bar
emirry Nov 5, 2020
17835c3
updated trip index page. edited table to include link of all trips
emirry Nov 5, 2020
d633293
included more fields for add a trip to passenger page and updated footer
emirry Nov 5, 2020
e31b88c
added extra breaks and fixed spacing
emirry Nov 5, 2020
7f6dd15
can create a new trip for passenger and assign an available driver
emirry Nov 6, 2020
8248551
finished drivers controller tests
marks214 Nov 6, 2020
b79f8cf
updated homepages controller test
marks214 Nov 6, 2020
007cf28
working on trips test and fixing trips controller. new trips are not …
emirry Nov 6, 2020
60f3dd9
can create a new trip for passenger and assign an available driver
emirry Nov 6, 2020
9419611
working on trips test and fixing trips controller. new trips are not …
emirry Nov 6, 2020
dbc2ae6
create new trips routes back to root_path now
marks214 Nov 6, 2020
c6e9f1b
create new trips routes to the newly created trips page, all links se…
marks214 Nov 6, 2020
58f788f
fixed error - able to see trip list even after driver/passenger is de…
marks214 Nov 6, 2020
877b969
fixed driver's trip detail page to match passengers
emirry Nov 6, 2020
082c6a7
trip model test completed
marks214 Nov 6, 2020
59c9bb1
create a new driver/passenger links for nav
emirry Nov 6, 2020
049d17f
reformatted header tags for driver and passenger
emirry Nov 6, 2020
37e21be
driver model test complete
marks214 Nov 6, 2020
aedc9c1
wrote a test to check custom method for passenger_test.rb
emirry Nov 6, 2020
ec99f63
merged conflicts
emirry Nov 6, 2020
b0ca0ec
fixed delete button on driver's show page
emirry Nov 6, 2020
1bea55f
finished trips controller tests
marks214 Nov 6, 2020
343824e
Merge branch 'master' of https://github.com/marks214/ride-share-rails…
marks214 Nov 6, 2020
c04aacb
fixed divide by zero error in driver model
marks214 Nov 6, 2020
0b25d54
added back in add a trip to driver link that I accidently deleted
emirry Nov 6, 2020
dba7580
added css
marks214 Nov 7, 2020
2d35bf5
changed font color to homepage and moved down footer
emirry Nov 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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
3 changes: 3 additions & 0 deletions .floo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"url": "https://floobits.com/adajn/ride-share-rails"
}
6 changes: 6 additions & 0 deletions .flooignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
extern
node_modules
tmp
vendor
.idea/workspace.xml
.idea/misc.xml
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
6 changes: 6 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/.rakeTasks

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 116 additions & 0 deletions .idea/ride-share-rails.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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 drivers
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