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

Iris & Noor #19

Open
wants to merge 75 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
a740fd9
created rails project
iris-lux Nov 2, 2020
09ee547
added controllers for Drivers, Trips, and Passengers
iris-lux Nov 2, 2020
c51d836
added Passenger, Trip, and Driver models, added migration establishin…
iris-lux Nov 4, 2020
95b3283
added RESTful routes for all models
iris-lux Nov 4, 2020
c9e95d5
added CRUD methods for dirver and passenger controllers, added respec…
iris-lux Nov 4, 2020
6939296
Added black view files for passengers
iris-lux Nov 4, 2020
0c2d19c
added blavnk crud methods to trips
iris-lux Nov 4, 2020
77a3384
updated drivers_controllers
hn4ever Nov 4, 2020
5918384
fixed merge conflict
iris-lux Nov 4, 2020
03e02c8
small changes
hn4ever Nov 4, 2020
a8337b4
Merge branch 'master' of https://github.com/iris-lux/ride-share-rails
hn4ever Nov 4, 2020
96a7390
added new, index, update, destroy methods to controller
iris-lux Nov 5, 2020
462c311
nested routes for passenger/trips
iris-lux Nov 5, 2020
d467729
toggle_complete method for drivers model
iris-lux Nov 5, 2020
2c62225
Merge branch 'master' of https://github.com/iris-lux/ride-share-rails
hn4ever Nov 5, 2020
f9e5614
reconfigured routes, removed unneccesary routes
iris-lux Nov 5, 2020
8c2f616
fixed formatting
iris-lux Nov 5, 2020
7ed073a
tests for create and show
iris-lux Nov 5, 2020
1c56c79
update and destroy
iris-lux Nov 5, 2020
629ec9e
Merge branch 'master' of https://github.com/iris-lux/ride-share-rails
hn4ever Nov 5, 2020
ce0807c
created validations for driver,passenger and trip models, and modifie…
hn4ever Nov 5, 2020
e1f4fbc
made views for drivers
hn4ever Nov 5, 2020
3260bca
added comments
iris-lux Nov 5, 2020
10bb014
merge
iris-lux Nov 5, 2020
78115e1
validation for trips,passeengers and driver
hn4ever Nov 5, 2020
129a3a0
merge
iris-lux Nov 5, 2020
e902296
finalized drivers_controller_test
hn4ever Nov 5, 2020
9ff8db3
total_earnings method
iris-lux Nov 6, 2020
80d0083
total_earnings test
iris-lux Nov 6, 2020
a00075c
formatting fix
iris-lux Nov 6, 2020
f014831
avg_rating and resective test - test for toggle_available
iris-lux Nov 6, 2020
6815e46
completed both toggle_avaiable tests
iris-lux Nov 6, 2020
17f96ca
moved request_trip business logic to model, replaced with model method
iris-lux Nov 6, 2020
1958dbc
request_trip - moved from trips controller
iris-lux Nov 6, 2020
40b1040
removed redundant route references
iris-lux Nov 6, 2020
fc9b2c8
rewrote let: statement
iris-lux Nov 6, 2020
b851bb4
blank views for trips
iris-lux Nov 6, 2020
a08a09a
created views for passengers
hn4ever Nov 6, 2020
e8ffd8f
Merge branch 'master' of https://github.com/iris-lux/ride-share-rails
hn4ever Nov 6, 2020
cada1b8
added passengers views and started on trips views
hn4ever Nov 6, 2020
c4c6d23
updated routes with the copied one
hn4ever Nov 6, 2020
d804d37
avg_rating now can handle empty self.trips
iris-lux Nov 6, 2020
93fa799
avg_rating now can handle empty self.trips
iris-lux Nov 6, 2020
1c4c0a9
added validations, for rating and cost
iris-lux Nov 6, 2020
ca929ce
fixed formatting
iris-lux Nov 6, 2020
a3046bc
tests for relationships, validations, and creation
iris-lux Nov 6, 2020
bd23bf6
added edit and delete tests for trips
iris-lux Nov 6, 2020
299582f
Modified routes and views
hn4ever Nov 6, 2020
c1175de
blank assign_rating
iris-lux Nov 6, 2020
e43c2e5
merge
iris-lux Nov 6, 2020
d1727cb
added custome assign_rating route
iris-lux Nov 6, 2020
bfe13fb
strong params was missing name: - added it
iris-lux Nov 6, 2020
833c86f
added blank assign_rating method
iris-lux Nov 6, 2020
9e5333f
fixed calculation for total revenue
iris-lux Nov 6, 2020
9d8907c
formatting
iris-lux Nov 6, 2020
b732985
replaced save and create with save creaet huh
iris-lux Nov 6, 2020
f183be6
replaced new and create with validation chck methods
iris-lux Nov 6, 2020
cdaddf2
fixed calculations for driver total_earnings
iris-lux Nov 6, 2020
9d9ee8b
finalized drivers views
hn4ever Nov 6, 2020
508d2e7
finalized drivers views
hn4ever Nov 6, 2020
91427de
removed excess comments, fixed typos, mode cost required for trip and…
iris-lux Nov 6, 2020
ab25b72
made small changes in driver controllers and views
hn4ever Nov 6, 2020
0d5a7dd
fixed merge conflict
iris-lux Nov 6, 2020
214bbe1
added assign_rating
iris-lux Nov 6, 2020
36cb58c
styling for nav-bar
iris-lux Nov 6, 2020
88f3149
html for nav bar
iris-lux Nov 6, 2020
cec3551
modified passengers, drivers, and trips views
hn4ever Nov 6, 2020
5d64421
finalized view
hn4ever Nov 6, 2020
c4cca23
comments
iris-lux Nov 6, 2020
09945d5
fixed merge conflict
iris-lux Nov 6, 2020
fb6411d
fixed test for show
iris-lux Nov 6, 2020
81a670a
finalized all views
hn4ever Nov 7, 2020
bd6718b
Merge branch 'master' of https://github.com/iris-lux/ride-share-rails
hn4ever Nov 7, 2020
c7bc7db
added tests for custom passenger and trip methods
iris-lux Nov 7, 2020
addd776
destroy all trips related to driver when driver is destroyed
iris-lux 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/irislux/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
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'
.idea
.floo
.flooignore

# 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
79 changes: 79 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
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'
gem 'rails-controller-testing'
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