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

Mud - Christabel (Water) & Lina (Earth) #16

Open
wants to merge 99 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
32bbf97
Run rails new
lina5147 Nov 2, 2020
057acf5
created Homepage controller
lina5147 Nov 3, 2020
b4c363e
created homepages controller, route, and view
lina5147 Nov 3, 2020
28708d6
all files created for passenger controller
lina5147 Nov 3, 2020
e1d2477
created model for Passenger and filled out index view
lina5147 Nov 3, 2020
8b292fc
test commit and push
cescarez Nov 3, 2020
6bb9601
created index and show views
cescarez Nov 3, 2020
20f4aa5
Created _form partial, new and edit views, new/create and edit/update…
cescarez Nov 3, 2020
38ac031
Removed Christabel's weird nested save structure
cescarez Nov 3, 2020
c3e27d7
Added destroy action for passenger controller
lina5147 Nov 3, 2020
861b527
Created drivers controller, route, and Restful actions
lina5147 Nov 3, 2020
3385760
created model for Driver
lina5147 Nov 3, 2020
f8ccd02
added an index page for drivers
lina5147 Nov 3, 2020
cc378f3
created all views for driver controller
lina5147 Nov 3, 2020
d4d859b
generated Trips controller
cescarez Nov 3, 2020
2a8ffe9
Added Trips routes and controller action definitions
cescarez Nov 3, 2020
2dea419
generate trip model
cescarez Nov 3, 2020
5bf1764
related Passenger to Trips and ran migration
cescarez Nov 3, 2020
3bb36c4
Related Drivers to Trips and migrated
cescarez Nov 3, 2020
0f20d50
wrote tests for Driver controller for all of the action methods, exce…
lina5147 Nov 4, 2020
f82d804
created validations for driver name and vin
lina5147 Nov 4, 2020
13118bd
removed availability status from driver form
lina5147 Nov 4, 2020
1609ca6
working on availability status to be true for new drivers
lina5147 Nov 4, 2020
f7e1ccd
wrote a test to check new drivers availability status is set to true
lina5147 Nov 4, 2020
5f8b40f
added view conditionals to show error messages for invalid form data
cescarez Nov 4, 2020
d4f7ac0
wrote tests for invalid params for create and update
cescarez Nov 4, 2020
8d80cac
updated controller methods to render public/404.html for not found pa…
cescarez Nov 5, 2020
e3e383f
Changed form partial so new/edit views will output error(s) to user f…
cescarez Nov 5, 2020
36c7aa2
passengers tests written for controller actions
cescarez Nov 5, 2020
1ea9e3a
added navbar to layout and basic css to application.scss
cescarez Nov 5, 2020
64d6205
added logic and view for passenger#total_charged
cescarez Nov 5, 2020
d361544
wrote driver#change_status
cescarez Nov 5, 2020
75f5389
Added view logic to display table of trips
cescarez Nov 5, 2020
4e81ec4
Deleted two hearts from homepages#index, modified seeds.rb script to …
cescarez Nov 5, 2020
b404924
added footer buttons to add driver and add passenger in layout
cescarez Nov 5, 2020
b92543d
added total_earnings and average_rating model definitions and view logic
cescarez Nov 5, 2020
54f024e
created the show page for trips and added radio buttons to choose the…
lina5147 Nov 5, 2020
3af25ff
made form for user to edit trip, added a drop down menu for driver an…
lina5147 Nov 6, 2020
e268722
added delete buttons to driver and passenger show pages
lina5147 Nov 6, 2020
212ba6a
modified given tests to call driver.availability_status and passenger…
cescarez Nov 6, 2020
237791e
Added logic in Passenger#destroy to nullify all trip associations bef…
cescarez Nov 6, 2020
4e1d065
modified Driver#destroy to nullify trip associations before driver de…
cescarez Nov 6, 2020
e38a002
Wrote passenger_request.trip, modified Trip.create, and added nested …
cescarez Nov 6, 2020
80c75c1
Added links to each individual trip in passenger and driver Show views
cescarez Nov 6, 2020
d04c9c4
Added edit and delete trip buttons to trip tables in passenger and dr…
cescarez Nov 6, 2020
2f5280c
modified trip cost assignment and view
cescarez Nov 6, 2020
c210166
Added .to_date to Time.now to convert Time object to appropriate form…
cescarez Nov 6, 2020
22c87e5
Hardcoded trip delete button to pass model.id to trip#destroy
cescarez Nov 6, 2020
d4634d1
modified controller tests --- not passing
cescarez Nov 6, 2020
c5e625c
Modified #destroy redirections and changed redirections of trip.nil t…
cescarez Nov 6, 2020
5230175
added validation to ensure rating is some integer between one and five
cescarez Nov 6, 2020
346d341
removed validation to ensure rating is some integer between one and five
cescarez Nov 6, 2020
4509fc2
Added two decimal formatting
cescarez Nov 6, 2020
6aa40d7
Added error messages output to view for trips that are missing a date…
cescarez Nov 6, 2020
e21102d
Added logic and button to change driver availability status
cescarez Nov 6, 2020
32e06e5
styled the nav bar using css
lina5147 Nov 6, 2020
522fe2b
added an image to the home page
lina5147 Nov 6, 2020
4211ad2
styled the layout of the divers list
lina5147 Nov 6, 2020
d265e55
added divs and classes to passenger index view for css styling, added…
lina5147 Nov 6, 2020
f0ce63c
styled the layout of the passenger list
lina5147 Nov 6, 2020
d36fc60
reformated trip show page where information is laid out in a table, c…
lina5147 Nov 6, 2020
d09fa52
the passengers and drivers for each trip links to their show pages
lina5147 Nov 6, 2020
063d20f
added a profile picture to the driver show page, formated the driver …
lina5147 Nov 6, 2020
cb61297
resised the trips table for the driver show page
lina5147 Nov 6, 2020
e88d417
added divs to trip edit page to help with styling, bolded and font-si…
lina5147 Nov 6, 2020
e7f65e1
Wrote basic tests (missing relationship tests)
cescarez Nov 6, 2020
9cc7143
used paddding and marging to format trip edit form, added a gray back…
lina5147 Nov 6, 2020
c6a99af
Added .to_date to Time.now to convert Time object to appropriate form…
cescarez Nov 6, 2020
f526cc9
Hardcoded trip delete button to pass model.id to trip#destroy
cescarez Nov 6, 2020
ec07585
modified controller tests --- not passing
cescarez Nov 6, 2020
fc65e1b
Modified #destroy redirections and changed redirections of trip.nil t…
cescarez Nov 6, 2020
718fbb5
added validation to ensure rating is some integer between one and five
cescarez Nov 6, 2020
c9556f7
removed validation to ensure rating is some integer between one and five
cescarez Nov 6, 2020
58312dc
Took Lina's formatting (I think)
cescarez Nov 6, 2020
7cf4c49
Added error messages output to view for trips that are missing a date…
cescarez Nov 6, 2020
ee017df
Added logic and button to change driver availability status
cescarez Nov 6, 2020
64aa6ed
Wrote basic tests (missing relationship tests)
cescarez Nov 6, 2020
4ce6e23
Removed erroneous form_with helper tag
cescarez Nov 6, 2020
df13703
idk yo, maybe resolved some merge issues? maybe descended into madness
cescarez Nov 6, 2020
14853f6
Removed uniqueness requirements for passenger.phone_number and driver…
cescarez Nov 6, 2020
9cd5a77
moved Driver and trip creations into a before block for custom methods
cescarez Nov 6, 2020
036a479
wrote total earnings tests
cescarez Nov 6, 2020
db45734
Added tests for Driver.change_status
cescarez Nov 6, 2020
26cd0cd
added passenger tests
cescarez Nov 6, 2020
3b5bcd2
added relationship tests
cescarez Nov 6, 2020
79b6c97
for idempotency, split driver#change_status into two methods: driver#…
cescarez Nov 6, 2020
ac842eb
show tests work
cescarez Nov 6, 2020
432c922
edit tests work (there isn't a test for creating a trip from the pass…
cescarez Nov 6, 2020
326be45
#update tests pass
cescarez Nov 6, 2020
a7e427c
#delete tests pass
cescarez Nov 6, 2020
a66eff6
Removed hardcoded param passing for trip deletion in passenger and dr…
cescarez Nov 6, 2020
9972ed6
removed TODO
cescarez Nov 6, 2020
689160e
moved TODO into relationship test block, but IGNORING IT!
cescarez Nov 6, 2020
1a431b8
Added a dolla sign to trip cost field
cescarez Nov 6, 2020
a59cf29
mid-implementing tests for driver#next_available
cescarez Nov 6, 2020
3816836
Merge branch 'master' of https://github.com/lina5147/ride-share-rails
cescarez Nov 6, 2020
1cd8c3d
worked on tests for next available method
lina5147 Nov 7, 2020
aa0f9b5
driver#next_available tests done...but other tests broken
cescarez Nov 7, 2020
5c60da8
Back to the green,babygit add . WOOHOO
cescarez Nov 7, 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: 3 additions & 0 deletions .floo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"url": "https://floobits.com/lina.do/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
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:application_record" /><Generator name="application_record" /><Generator name="assets" /><Generator name="channel" /><Generator name="controller" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="jbuilder" /><Generator name="job" /><Generator name="mailbox" /><Generator name="mailer" /><Generator name="migration" /><Generator name="minitest:generator" /><Generator name="minitest:install" /><Generator name="minitest:plugin" /><Generator name="model" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="system_test" /><Generator name="task" /><Generator name="test_unit:channel" /><Generator name="test_unit:controller" /><Generator name="test_unit:generator" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:job" /><Generator name="test_unit:mailbox" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /><Generator name="test_unit:system" /></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