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

Sockets- Jansen & Grace #15

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
b954f6b
generated models
gracemshea Apr 15, 2019
3312c5f
db:create
gracemshea Apr 15, 2019
b5422d3
Remove id column from models, rearrange relationships inside trip model
gracemshea Apr 15, 2019
d4ff611
7 RESTful routes added to controllers, initial shells only
gracemshea Apr 15, 2019
394e893
Add comments dividing routes.rb based on models
JansenMartin Apr 16, 2019
7a0ebc8
added to trips_controller
gracemshea Apr 16, 2019
7f1a58f
Add controller files?
JansenMartin Apr 16, 2019
b0d54ec
added to passenger_controller.rb
gracemshea Apr 16, 2019
347fd06
created homepages_controller.rb
gracemshea Apr 16, 2019
5b7e813
stopping point, share with Jansen :)
gracemshea Apr 16, 2019
d9560f7
Add index and show functionality for Drivers
JansenMartin Apr 16, 2019
3b325f3
initial tests for trip_controller
gracemshea Apr 16, 2019
b1e39f9
views for trip and passenger added
gracemshea Apr 16, 2019
ec5114c
Add driver details, including list of trips
JansenMartin Apr 16, 2019
aed01b4
Merge branch 'master' of github.com:gracemshea/ride-share-rails
JansenMartin Apr 16, 2019
d404d39
yml files are rude
gracemshea Apr 16, 2019
4b71f4e
really rude
gracemshea Apr 16, 2019
470162e
improvements made to views for trip, passenger, and homepage. syntax …
gracemshea Apr 16, 2019
a1c143c
passenger.rb updated
gracemshea Apr 16, 2019
535ae4b
syntax errors
gracemshea Apr 17, 2019
fe7e8ea
Add tests for index and show actions
JansenMartin Apr 17, 2019
26bbf68
Try to merge
JansenMartin Apr 17, 2019
edeb929
routes updated to use except and only syntax
gracemshea Apr 17, 2019
f8d251d
Merge branch 'master' of https://github.com/gracemshea/ride-share-rails
gracemshea Apr 17, 2019
ea6b47f
Add route, actions and view to create a new driver. Add test for 'ne…
JansenMartin Apr 17, 2019
485c517
started styling
gracemshea Apr 17, 2019
eb9fc4f
Add validators to driver model; Add test for 'create' action inside d…
JansenMartin Apr 17, 2019
ff06f72
Add conditional to handle unsuccessful submissions of new drivers to …
JansenMartin Apr 17, 2019
5488e3c
added styling
gracemshea Apr 17, 2019
ef32436
Merge branch 'master' of github.com:gracemshea/ride-share-rails
JansenMartin Apr 17, 2019
4a2550b
trip model updated
gracemshea Apr 18, 2019
070fc79
Add 'average_rating' business logic to model; Modify view for drivers…
JansenMartin Apr 18, 2019
347cf21
Merge branch 'master' of github.com:gracemshea/ride-share-rails
JansenMartin Apr 18, 2019
d8b1f0e
Corrected bugs inside driver model. 'Average_rating' and 'total_earn…
JansenMartin Apr 18, 2019
f8055ce
testing something out with jansen
gracemshea Apr 18, 2019
58291a7
Merge branch 'master' of https://github.com/gracemshea/ride-share-rails
gracemshea Apr 18, 2019
e917d19
Add partial form for drivers
JansenMartin Apr 18, 2019
5b92182
Add functionality to view driver-specific trips. Included nested rou…
JansenMartin Apr 18, 2019
47b73c1
Add trip#new and trip#create to routes
JansenMartin Apr 18, 2019
d78ed63
Add view for creating a new trip
JansenMartin Apr 18, 2019
9345ea9
Add trip#create functionality; Modify trip#show view to account for …
JansenMartin Apr 18, 2019
316db86
Remove date field from trip#create view; Clean up trip#index and add …
JansenMartin Apr 18, 2019
e922386
Debug tests for trip#show and trip#edit; Debug trip#edit in the contr…
JansenMartin Apr 18, 2019
956fd85
Debug first trip#update test. Currently passing
JansenMartin Apr 19, 2019
09d91b9
rating functionality added
gracemshea Apr 19, 2019
7bfc173
Debug tests for 'show', 'edit' and 'update' actions in trips controll…
JansenMartin Apr 19, 2019
b2984aa
Modify tests. All are currently passing
JansenMartin Apr 19, 2019
dbd7f60
passenger show view given links
gracemshea Apr 19, 2019
65784e0
Merge branch 'master' of https://github.com/gracemshea/ride-share-rails
gracemshea Apr 19, 2019
0743f24
Merge branch 'master' of github.com:gracemshea/ride-share-rails
JansenMartin Apr 19, 2019
b012670
view edits
gracemshea Apr 19, 2019
c6e7e6c
Merge branch 'master' of github.com:gracemshea/ride-share-rails
JansenMartin Apr 19, 2019
770bd23
Add nav bar and modify add-drivers page
JansenMartin Apr 19, 2019
105bdcf
nav bar edited in application.html.erb and removed from homepages view
gracemshea Apr 19, 2019
5997784
homepages controller index added
gracemshea Apr 19, 2019
164d9fc
styling changes
gracemshea Apr 19, 2019
5d56d12
styling tweaks
gracemshea Apr 19, 2019
69d625a
styled submit button
gracemshea Apr 19, 2019
9086bf0
standardizing list styles
gracemshea Apr 19, 2019
dd73b42
styling stopping point
gracemshea Apr 19, 2019
9f23c43
Fix driver's average rating bug for drivers with newly-requested trip…
JansenMartin Apr 19, 2019
64a4343
Add tests; debug drivers_controller. All tests for drivers_controlle…
JansenMartin Apr 19, 2019
77a88e1
text field boxes styled and made larger
gracemshea Apr 19, 2019
d48c663
index passenger_controller test added
gracemshea Apr 19, 2019
4aa5c04
syntax correction
gracemshea Apr 19, 2019
ef20478
Modify passenger_controller to conform to 'destroy' test. Currently …
JansenMartin Apr 19, 2019
ef8d71e
passenger controller tests updated
gracemshea Apr 19, 2019
4f520c2
Merge branch 'master' of https://github.com/gracemshea/ride-share-rails
gracemshea Apr 19, 2019
dc1ff5f
syntax correction
gracemshea Apr 19, 2019
d687393
forgot a it line
gracemshea Apr 19, 2019
c8c424d
git is rude
gracemshea Apr 19, 2019
a5c2343
syntax correction
gracemshea Apr 19, 2019
dc372f2
Add 404 test for 'destroy' action. Modify destroy action to conform …
JansenMartin Apr 19, 2019
ebd278d
passenger controller test updated to reflect 404 instead of 400
gracemshea Apr 19, 2019
22f0952
merge issues
gracemshea Apr 19, 2019
a20d168
Modify passengers#create to pass 'create' tests. All 'create' tests …
JansenMartin Apr 19, 2019
824fe69
Merge branch 'master' of github.com:gracemshea/ride-share-rails
JansenMartin Apr 19, 2019
3d11586
syncing
gracemshea Apr 19, 2019
e668b6b
Corrected conditional inside 'destroy'. All 'destroy' and 'create' t…
JansenMartin Apr 19, 2019
f3bc02c
uncommented portions of code
gracemshea Apr 19, 2019
2bf09b7
All trips passing.
gracemshea Apr 19, 2019
c56e27e
ready to deploy
gracemshea Apr 19, 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
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 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

/node_modules
/yarn-error.log

/public/assets
.byebug_history
/coverage
.DS_Store


# Ignore master key for decrypting credentials and more.
/config/master.key
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.5.1
81 changes: 81 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.3'
# 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.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# 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.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', 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 chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
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'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'minitest-skip'
end
274 changes: 274 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.3)
actionpack (= 5.2.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.3)
activesupport (= 5.2.3)
globalid (>= 0.3.6)
activemodel (5.2.3)
activesupport (= 5.2.3)
activerecord (5.2.3)
activemodel (= 5.2.3)
activesupport (= 5.2.3)
arel (>= 9.0)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
marcel (~> 0.3.1)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
archive-zip (0.12.0)
io-like (~> 0.3.0)
arel (9.0.0)
better_errors (2.5.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.7.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.4.3)
msgpack (~> 1.0)
builder (3.2.3)
byebug (11.0.1)
capybara (3.16.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
xpath (~> 3.2)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.1)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.1.5)
crass (1.0.4)
debug_inspector (0.0.3)
erubi (1.8.0)
execjs (2.7.0)
ffi (1.10.0)
formatador (0.2.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.0)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-minitest (2.4.6)
guard-compat (~> 1.2)
minitest (>= 3.0)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.8.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.6)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-skip (0.0.1)
minitest (~> 5.0)
msgpack (1.2.9)
multi_json (1.13.1)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.10.2)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.4)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (3.0.3)
puma (3.12.1)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
actioncable (= 5.2.3)
actionmailer (= 5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
activemodel (= 5.2.3)
activerecord (= 5.2.3)
activestorage (= 5.2.3)
activesupport (= 5.2.3)
bundler (>= 1.3.0)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
regexp_parser (1.4.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
shellany (0.0.1)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
bootsnap (>= 1.1.0)
byebug
capybara (>= 2.15)
chromedriver-helper
guard
guard-minitest
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
minitest-skip
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.3)
sass-rails (~> 5.0)
selenium-webdriver
spring
spring-watcher-listen (~> 2.0.0)
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.16.6
Loading