Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
fef4e25
rails.new
hertweckhr1 Oct 1, 2018
9879e0a
generate driver controller
hertweckhr1 Oct 2, 2018
5857148
driver model generated with name and vin columns
hertweckhr1 Oct 2, 2018
bbe80fa
migrated driver model and created database
hertweckhr1 Oct 2, 2018
39281b2
added core to index and show view incoporating csv file
hertweckhr1 Oct 2, 2018
432a566
delete and edit added to view, edit and new form completed
hertweckhr1 Oct 2, 2018
4b34ea5
Created models and columns
Naltrexone Oct 2, 2018
e995aa2
Merging branches
Naltrexone Oct 2, 2018
8e002ed
driver controller methods complete plus migrated passenger columns
hertweckhr1 Oct 2, 2018
fa59153
added columns and references to trips plus migrated
hertweckhr1 Oct 2, 2018
1a8860d
Added routes
Naltrexone Oct 2, 2018
b659dcb
Added index to passenger controller
Naltrexone Oct 2, 2018
980d889
average rating and total earnings mthods created and in driver view w…
hertweckhr1 Oct 2, 2018
fc0bf83
show, edit, delete created for trips plus added individual trip link …
hertweckhr1 Oct 2, 2018
312c14f
added validation on vin name and all trip attributes
hertweckhr1 Oct 3, 2018
423be95
homepage controller created with beginning layout
hertweckhr1 Oct 3, 2018
306b3a5
Some functions for passenger working
Naltrexone Oct 3, 2018
7a7b59f
Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails
Naltrexone Oct 3, 2018
c8058a0
Changed model for passenger
Naltrexone Oct 3, 2018
9cea2a3
fixed trip validation
hertweckhr1 Oct 3, 2018
189015a
fixed layout of homepage so does not affect other pages
hertweckhr1 Oct 3, 2018
57356f0
added links to driver and passenger from homepage and link to home fr…
hertweckhr1 Oct 3, 2018
b604a9f
added info section to homepage
hertweckhr1 Oct 3, 2018
a0ed076
added validation and working error messages pop up for driver
hertweckhr1 Oct 3, 2018
091f28d
routes in progress
hertweckhr1 Oct 3, 2018
2b83faf
Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails
hertweckhr1 Oct 3, 2018
a51425b
Edit and delete functions for passenger working
Naltrexone Oct 4, 2018
6c596b5
worked on routes and trips link accidentally in master
hertweckhr1 Oct 4, 2018
3fbfd4e
started fomatting application and driver html.erb
hertweckhr1 Oct 4, 2018
2ad538d
Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails
hertweckhr1 Oct 4, 2018
3a5a8cf
adjustments to driver and application html.erb
hertweckhr1 Oct 4, 2018
6622e67
fixed conflicts with application.html.erb
hertweckhr1 Oct 4, 2018
34bdf91
changed html and css for welcome and driver add turtle icon and align…
hertweckhr1 Oct 4, 2018
87a1fdd
added table to drivers
hertweckhr1 Oct 4, 2018
9277f17
added home button to welcome screen
hertweckhr1 Oct 4, 2018
a24a4f0
made sure each part of website had same header
hertweckhr1 Oct 4, 2018
42c1774
fixed merges
hertweckhr1 Oct 4, 2018
3667be0
edited routes to working
hertweckhr1 Oct 4, 2018
a8ef7c4
welcome buttons updated
hertweckhr1 Oct 4, 2018
a6e653f
changed driver button in driver css
hertweckhr1 Oct 4, 2018
e8c8ab6
Passenger page Edit, Delete,trip details working
Naltrexone Oct 4, 2018
6fab70b
Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails
Naltrexone Oct 4, 2018
56b380b
font via application
hertweckhr1 Oct 4, 2018
7cfb6f1
Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails
hertweckhr1 Oct 4, 2018
1ecf099
changes to passenger view
hertweckhr1 Oct 4, 2018
6f9df8a
passenger index view in line with driver index
hertweckhr1 Oct 4, 2018
6ad7dc6
Form for adding new trip created
Naltrexone Oct 4, 2018
0ec9537
editing passenger show
hertweckhr1 Oct 4, 2018
5b44a68
merged changed made
hertweckhr1 Oct 4, 2018
84fae56
changes merged
hertweckhr1 Oct 4, 2018
fd53e93
updated passenger show to match driver format
hertweckhr1 Oct 4, 2018
578181f
driver and passenger show now match with small box centered for custo…
hertweckhr1 Oct 4, 2018
65c030c
added currency symbol
hertweckhr1 Oct 4, 2018
e74d0f1
Fixed errors in passenger controller
Naltrexone Oct 5, 2018
155aec5
Added driver to new trip
Naltrexone Oct 5, 2018
67f6679
Add trip for passenger done
Naltrexone Oct 5, 2018
e7a77d2
added background photo to top of passenger and driver index pages
hertweckhr1 Oct 5, 2018
83eb09a
Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails
hertweckhr1 Oct 5, 2018
493e22c
Made changes to trip form format
Naltrexone Oct 5, 2018
f4af490
Updated New driver with picture button and underlined text field
hertweckhr1 Oct 5, 2018
e5496fc
color changed for table hover
hertweckhr1 Oct 5, 2018
c805438
Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails
hertweckhr1 Oct 5, 2018
20a012e
Created dropdown menu for Edit Trip
Naltrexone Oct 5, 2018
663b1c7
Styled Add Trip form
Naltrexone Oct 5, 2018
6af3394
added paginate gem
hertweckhr1 Oct 5, 2018
a66d773
added pagination to driver and passenger index
hertweckhr1 Oct 5, 2018
b914d16
Styling for forms in process - working model
Naltrexone Oct 5, 2018
8fee02a
removed trip rating validation
hertweckhr1 Oct 5, 2018
b6dd023
changed update in passenger fcontroller to render edit if incorrect i…
hertweckhr1 Oct 5, 2018
36d8d43
removed bullet point from validation error messages
hertweckhr1 Oct 5, 2018
73ae322
Styling changes made
Naltrexone Oct 5, 2018
f23f7c2
Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails
hertweckhr1 Oct 5, 2018
c5047a0
fixed html formatting for correctly lining up
hertweckhr1 Oct 5, 2018
2f53f09
changed image url in welcome css
Naltrexone Oct 5, 2018
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
82 changes: 82 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
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.1'
# 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
# paginate data in index fields
gem 'will_paginate', '>= 3.1'

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'
end
271 changes: 271 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1)
actionpack (= 5.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.1)
activesupport (= 5.2.1)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
arel (>= 9.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
marcel (~> 0.3.1)
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
archive-zip (0.11.0)
io-like (~> 0.3.0)
arel (9.0.0)
better_errors (2.5.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
builder (3.2.3)
byebug (10.0.2)
capybara (3.8.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.0)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.9.25)
formatador (0.2.5)
globalid (0.4.1)
activesupport (>= 4.2.0)
guard (2.14.2)
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.1.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.7.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.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.5)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
msgpack (1.2.4)
multi_json (1.13.1)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.3)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.5)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
bundler (>= 1.3.0)
railties (= 5.2.1)
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.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.6.0)
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.14.0)
childprocess (~> 0.5)
rubyzip (~> 1.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.0)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.19)
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)
will_paginate (3.1.6)
xpath (3.1.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
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.1)
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)
will_paginate (>= 3.1)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.16.2
9 changes: 9 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
guard :minitest, autorun: false, spring: true do
watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" }
watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' }
watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" }
watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" }
watch(%r{^test/.+_test.rb$})
watch(%r{^test/test_helper.rb$}) { 'test' }
end
Loading