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

Branches- Dora & Mac (MacDora) #15

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
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
621ac3b
Created projects files. Added Passengers, Trips, Drivers, Homepage co…
Oct 7, 2019
892031d
Added driver, passenger, and trip models. Added foreign keys to trips
Oct 7, 2019
45755ba
Added minitest requirements to test helper. Added relationships betwe…
Oct 8, 2019
33a900c
Drivers and Passengers #index, #show and respective html.erb files cr…
dora1405 Oct 8, 2019
e73e915
Trip#show created and show.html.erb functional
dora1405 Oct 8, 2019
175b58d
added new passenger and new driver methods with matching views
Oct 8, 2019
012a87e
Oops - added the actions for new passenger this time
Oct 8, 2019
9d522ff
Added Passenger and Driver view for Edit action and added edit action…
Oct 8, 2019
31ec669
Added some validation for passengers and drivers
Oct 8, 2019
fd5719f
Added error messages to validation for Driver and Passenger forms
Oct 8, 2019
8e39535
Changed passenger test so that phone_number matched our defined attri…
Oct 8, 2019
f4987ff
Changed passenger test so that phone_number matched our defined attri…
Oct 8, 2019
3d0ccd8
Created delete action for driver and passenger and added delete and e…
Oct 8, 2019
cb99e03
Added columns for drivers table
dora1405 Oct 8, 2019
c68d4f1
updated params for drivers and passengers update function
dora1405 Oct 8, 2019
fe2ee7f
Add link for creating new driver and passenger. Updated redirect for …
dora1405 Oct 8, 2019
b485755
updated driver's new and edit form to add in additional columns
dora1405 Oct 8, 2019
4a508af
Changed the driver and passenger validations to be more general. Pass…
Oct 8, 2019
c82c160
Working on drivers controller test
dora1405 Oct 8, 2019
8b8c77a
attempted to add simplecov. Added methods into driver models to count…
Oct 8, 2019
5388a3f
Merge branch 'mac_test_edits'
Oct 8, 2019
67dfc3e
Added drivers controller tests
dora1405 Oct 9, 2019
8f14bef
Added passengers controller tests. Need to write tests for drivers an…
dora1405 Oct 9, 2019
16ffc17
Updated trips routes
dora1405 Oct 9, 2019
3729cf2
Adjusted driver model methods
Oct 9, 2019
6289890
Adding drivers&passengers controller #index tests
dora1405 Oct 9, 2019
ad9dd6d
added table of all driver trips in driver show view
Oct 9, 2019
3d3a76f
added css formatting to all driver trips table
Oct 9, 2019
1c138e7
Merge branch 'master' of https://github.com/mdove92/ride-share-rails
dora1405 Oct 9, 2019
b760669
updated routes to add trips
dora1405 Oct 9, 2019
0cb0933
added links to trip show page from passenger show and driver show
Oct 9, 2019
8ff890c
Added delete trip button to driver and passenger show tables
Oct 9, 2019
b198903
Add trips controller CRUD and views
dora1405 Oct 9, 2019
1fdccb5
Merge branch 'master' of https://github.com/mdove92/ride-share-rails
dora1405 Oct 9, 2019
65d1178
Added delete button to trips show page
Oct 9, 2019
54528a6
Added driver and passenger details table to the show pages
Oct 9, 2019
852de48
Created total_earnings method for driver model
Oct 9, 2019
805c5b9
updated instance variable in trips html
dora1405 Oct 10, 2019
cf4e1bb
trips controller tests for #index, #show and #new completed and passed
dora1405 Oct 10, 2019
a1e8dd6
added Driver Model toggle_active method and driver controller action …
Oct 10, 2019
83f2371
Adjusted the driver test to match active status
Oct 10, 2019
4dfea68
added some lines for Trips#create controller test
dora1405 Oct 10, 2019
41a3b6b
Began writing tests for custom methods for Driver Model
Oct 10, 2019
1556a2b
Passenger can make new trip
dora1405 Oct 11, 2019
470d729
Merge branch 'master' of https://github.com/mdove92/ride-share-rails
dora1405 Oct 11, 2019
19c9adb
CSS for Homepage#index, Drivers#index and Passengers#index complete
dora1405 Oct 11, 2019
78508de
homepage CSS final draft
dora1405 Oct 11, 2019
391353e
drivers and passengers index page CSS final draft
dora1405 Oct 11, 2019
c7f16eb
CSS style added to drivers and passengers show page
dora1405 Oct 11, 2019
4d1a1a0
final draft completed for CSS
dora1405 Oct 11, 2019
1de357b
Added more model tests in driver and passenger for custom methods and…
Oct 11, 2019
331d5e1
Merge branch 'master' of https://github.com/mdove92/ride-share-rails
Oct 11, 2019
d3dfc64
Added trips controller routes to Create new trip without form. Adjust…
Oct 11, 2019
9189f64
Began passenger trip rating option in passenger show. Tried to add co…
Oct 11, 2019
e1252e8
Made rate trip method for passengers that changes driver's active status
Oct 11, 2019
937746a
Added model test for count_rides and add templates dor passenger cont…
Oct 11, 2019
f4d0832
COntinuing to add testing to passenger control and model
Oct 11, 2019
3a299fb
Removed error in view for editing trip
Oct 11, 2019
e882263
ADjusted passenger controller test for trip rating to have proper arr…
Oct 11, 2019
fb2ff4d
css for trips
Oct 11, 2019
c868149
Adjusted tests to remove errors
Oct 11, 2019
63c4671
Made edits to trips_contorller test to add testing for custom methods…
Oct 12, 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
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
34 changes: 34 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# 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

/public/assets
.byebug_history
/coverage
.DS_Store


# 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.5.5
76 changes: 76 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
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', '~> 6.0.0'
# 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'
# 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.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 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-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'
gem 'simplecov', require: false
end
Loading