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

Water Sophia & Li RideShare Rails #8

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
fcb6957
Run rails new
nerdyistrendy Nov 3, 2020
b34717c
Created controllers and models for passenger, driver and trip. Creat…
nerdyistrendy Nov 3, 2020
13fe015
Created actions create, edit, update and destory for passenger contro…
nerdyistrendy Nov 3, 2020
1fdb96e
added index view page
nerdyistrendy Nov 4, 2020
de969b7
added edit, new, show view erb pages
nerdyistrendy Nov 4, 2020
952ee14
added basic actions of controllers, routes and show pages for drivers
nerdyistrendy Nov 4, 2020
0ae6a3d
added trips model and controllers
SoCodeDo Nov 4, 2020
aa5a499
added tests for drivers controllers
nerdyistrendy Nov 5, 2020
60d2cbc
relate trips to drivers
nerdyistrendy Nov 5, 2020
f8bfa49
relate trips to drivers
nerdyistrendy Nov 5, 2020
20a8bd0
updated trips controller
nerdyistrendy Nov 5, 2020
cb53d06
updated drivers controller tests, added passengers controller tests
nerdyistrendy Nov 5, 2020
74c3009
removed available options from forms
nerdyistrendy Nov 5, 2020
cc8fd60
showing trips info in driver show page
nerdyistrendy Nov 5, 2020
507570c
updated driver show page to show total cost, avg rating and trips
nerdyistrendy Nov 5, 2020
0e0c61a
added validation for drivers
nerdyistrendy Nov 5, 2020
c6f6cfb
added driver model tests
nerdyistrendy Nov 5, 2020
4226139
created trips controller test
SoCodeDo Nov 5, 2020
2b9d4ff
updated test data
nerdyistrendy Nov 5, 2020
befcdb9
relationship between trip and passenger
nerdyistrendy Nov 5, 2020
51ddb54
completed passenger show page and created table for trips
SoCodeDo Nov 5, 2020
26fef36
updated driver show page
nerdyistrendy Nov 5, 2020
8591b5f
added validation for passenger
nerdyistrendy Nov 5, 2020
faa0310
Error handling when deleting a driver/passenger; added rating dropdow…
nerdyistrendy Nov 6, 2020
05e56b5
added homepages controller and navigations
nerdyistrendy Nov 6, 2020
914d60a
added flash messages for new users
nerdyistrendy Nov 6, 2020
149bbb0
added flash messages for new users
nerdyistrendy Nov 6, 2020
05f52a2
added model tests for trips. all tests passing except trip controller
nerdyistrendy Nov 6, 2020
4d46b9e
added complete trips method
nerdyistrendy Nov 6, 2020
d6515ad
added redirect when no drivers available
nerdyistrendy Nov 6, 2020
e4fe941
added redirect when no drivers available
nerdyistrendy Nov 6, 2020
5011bc4
added redirect when no drivers available
nerdyistrendy Nov 6, 2020
5404806
updated trips controller test, incomplete but most tests passing
SoCodeDo Nov 6, 2020
4bf415f
created CSS & revised trips test
SoCodeDo Nov 6, 2020
a370554
removed unneeded css
SoCodeDo Nov 6, 2020
de307f5
updated complete_trip
nerdyistrendy Nov 6, 2020
07d408e
updated complete_trip
nerdyistrendy Nov 6, 2020
63403be
updated complete_trip
nerdyistrendy Nov 6, 2020
1b0b2fd
added h2 css
nerdyistrendy Nov 6, 2020
99b7e9f
update complete_trip
nerdyistrendy Nov 6, 2020
66d2356
update complete_trip
nerdyistrendy Nov 6, 2020
ed8a46c
update complete_trip
nerdyistrendy Nov 6, 2020
58d4fef
update complete_trip
nerdyistrendy Nov 6, 2020
dfc12dd
update passenger model test
nerdyistrendy Nov 6, 2020
079e2be
One more time trying the complete_trip
nerdyistrendy Nov 6, 2020
6e90710
Added Confirm messages when trips/passengers/drivers are saved.
nerdyistrendy Nov 6, 2020
211552c
updated h2 to center text
nerdyistrendy Nov 6, 2020
93be2fd
added footer and updated homepages font size
nerdyistrendy Nov 6, 2020
b6c5080
debugged failing test in trips_controller_test
SoCodeDo Nov 6, 2020
96e1ef6
debugged failing trips test
SoCodeDo Nov 6, 2020
ea6fcfb
update trip controller testing
nerdyistrendy Nov 6, 2020
dc39d2b
Debugged trips test
SoCodeDo Nov 6, 2020
32a4cda
made final changes to css
SoCodeDo Nov 6, 2020
034e775
update trip controller testing
nerdyistrendy Nov 6, 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
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
8 changes: 8 additions & 0 deletions .idea/.generators

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

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.

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

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

139 changes: 139 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 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