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 - Kareha & Hanh #17

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 60 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d1e948d
Running new rails
seattlefurby17 Nov 3, 2020
67fb31c
rails new
agesak Nov 3, 2020
1c9589d
keep hanhs changes
agesak Nov 3, 2020
47e779d
fix merge conflict in gemfile
agesak Nov 3, 2020
824f53e
Controllers and Models created
seattlefurby17 Nov 3, 2020
52c1fc1
Update driver routes with index and show, created driver index
seattlefurby17 Nov 4, 2020
ddb2a5b
Updated driver methods in driver_controller
seattlefurby17 Nov 4, 2020
afa8511
deleting gemfile and yarn
agesak Nov 4, 2020
1a5c5c7
add yarn and gemfile to gitignore
agesak Nov 4, 2020
06c0549
setting up relationships, migrations to allow for seeding the data
agesak Nov 5, 2020
fa5d0a2
fix typo in driver controller
agesak Nov 5, 2020
a54b08b
starting driver tests, adding driver views
agesak Nov 5, 2020
81ce925
Created homepage and route for homepage
seattlefurby17 Nov 5, 2020
17a2f0a
Testing drivers_controllers
seattlefurby17 Nov 5, 2020
9639f1d
Added total_revenue to driver model
seattlefurby17 Nov 5, 2020
0a1df26
debug total_revenue
agesak Nov 5, 2020
afa321b
total revenue tests passing
agesak Nov 5, 2020
6e0ea6f
failing total revenue tests
agesak Nov 5, 2020
a334b75
Updated testing for drivers_controller
seattlefurby17 Nov 5, 2020
efc5b0f
Passenger controller methods
seattlefurby17 Nov 6, 2020
7ad70cf
Passenger_controller_tests
seattlefurby17 Nov 6, 2020
a0b159c
updated passengers testing
seattlefurby17 Nov 6, 2020
3f2368f
Passenger test
seattlefurby17 Nov 6, 2020
600669d
passenger model tests passing
agesak Nov 6, 2020
b121275
total earnings test still failing
agesak Nov 6, 2020
fac6ba0
example code from becca
agesak Nov 6, 2020
db64962
Updated trip class
seattlefurby17 Nov 6, 2020
e827fab
a hopeless trips#show method
agesak Nov 6, 2020
c2b4a10
routes update
seattlefurby17 Nov 6, 2020
bc3abdb
merge changes in routes
seattlefurby17 Nov 6, 2020
78a9e99
Trips method, show page
seattlefurby17 Nov 6, 2020
f361707
looks the same
agesak Nov 6, 2020
9107215
Merge branch 'master' of https://github.com/agesak/ride-share-rails
agesak Nov 6, 2020
56fcf21
Updating driver edit and update
seattlefurby17 Nov 6, 2020
6a99bc7
Merge branch 'master' of https://github.com/agesak/ride-share-rails
agesak Nov 6, 2020
1de7767
rename trips edit view file
agesak Nov 6, 2020
0f467dc
trip controller tests and passenger model tests in progress
agesak Nov 6, 2020
925686a
adding new to controller
agesak Nov 6, 2020
41b7600
working on tests
agesak Nov 6, 2020
d2d26cf
show errors if invalid passenger
agesak Nov 6, 2020
63a01ac
show errors if invalid driver
agesak Nov 6, 2020
3a80694
driver/trips errors raised in view
agesak Nov 6, 2020
d9d443d
tests for driver change status
agesak Nov 6, 2020
2957df1
remove unnecessary/wrong controller test in passenger model tests
agesak Nov 7, 2020
71460cf
change driver status if assignned to trip
agesak Nov 7, 2020
80168da
Trip controller update
seattlefurby17 Nov 7, 2020
c83c564
Resolve merge
seattlefurby17 Nov 7, 2020
73a7380
adding some model tests for trip
agesak Nov 7, 2020
5b51752
driver tests
agesak Nov 7, 2020
f4b2371
Trip controller tests done
seattlefurby17 Nov 7, 2020
7a3a459
updated trip controller test
seattlefurby17 Nov 7, 2020
28224d1
fix failing passenger net expenditures
agesak Nov 7, 2020
70e3552
Merge branch 'master' of https://github.com/agesak/ride-share-rails
agesak Nov 7, 2020
765f384
Remove status column from drivers
seattlefurby17 Nov 9, 2020
7d619b8
Update tests
seattlefurby17 Nov 9, 2020
52bf781
Updated tests
seattlefurby17 Nov 9, 2020
5e5c2f5
updated controller-trip-tests
seattlefurby17 Nov 9, 2020
8322c34
updated controller-trip-tests
seattlefurby17 Nov 9, 2020
3614d43
updated controller-trip-tests
seattlefurby17 Nov 9, 2020
0b9bf40
Cleaned up and removed comments
seattlefurby17 Nov 9, 2020
186c6ae
Ignore .env file
seattlefurby17 Nov 18, 2020
abc6acb
merge into master
seattlefurby17 Nov 19, 2020
3fc7892
Revert "merge into master"
seattlefurby17 Nov 19, 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
3 changes: 2 additions & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ jobs:
gem install bundler
yarn
bundle install --jobs 4 --retry 3
bin/rails db:setup
bin/rails db:create
bin/rails db:migrate

- name: Run Tests
env:
Expand Down
39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# 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

Gemfile.lock
yarn.lock
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