Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
eab51a1
Run rails new
beauttie Nov 2, 2020
01a17f6
Create models for Driver, Passenger, Trip and migrated them
beauttie Nov 2, 2020
9309be7
Create controllers and resources as routes
beauttie Nov 3, 2020
b527fec
index and show methods and views for passenger and driver
mvlofthus Nov 3, 2020
c064099
Create controller and index view for homepage
beauttie Nov 3, 2020
fd7cdcd
added new and edit to views, controller
mvlofthus Nov 3, 2020
a3c651b
Add new and edit to controller and views for driver
beauttie Nov 4, 2020
e554cbb
create active record relationships, db migrations, re-seeded db
mvlofthus Nov 4, 2020
d41bd43
display trip data in Passenger show
mvlofthus Nov 4, 2020
ccbd080
Add model logic to drivers and passengers, update views
beauttie Nov 4, 2020
4ca458a
Add nested routes, validate AR for passenger and driver
beauttie Nov 5, 2020
3090a1b
Create partials for driver views
beauttie Nov 5, 2020
5614ae3
trip forms, passenger forms
mvlofthus Nov 5, 2020
a4d7a0b
Print errors from validations on new view
beauttie Nov 5, 2020
b3fa1cc
Fix argument in redirect_to method
beauttie Nov 5, 2020
8323e97
new trip issue
mvlofthus Nov 5, 2020
1518320
def create for trips worksssss
mvlofthus Nov 5, 2020
5da7d61
format change
mvlofthus Nov 5, 2020
b0f9077
Delete new controller action and its view, use number_to_currency to …
beauttie Nov 5, 2020
48ac746
driver avaialbility default, trip update, driver new
mvlofthus Nov 5, 2020
4817a6a
Add controller tests for index, show, new
beauttie Nov 6, 2020
6ea8b1e
starting testing, trips controller test for show does not work
mvlofthus Nov 6, 2020
55b8814
Finish controller tests for Driver except for destroy
beauttie Nov 6, 2020
4a36f3c
passenger controller tests, all but destroy
mvlofthus Nov 6, 2020
f3cf9fa
Revise validations for trip
beauttie Nov 6, 2020
26833cb
Create destroy controller action for Drivers and Passengers
beauttie Nov 6, 2020
388adec
passenger tests pass, driver tests pass, updated passenger and driver…
mvlofthus Nov 6, 2020
53da99c
started trip testing
mvlofthus Nov 6, 2020
45f2908
Clean up driver controller tests
beauttie Nov 6, 2020
20fd17c
Clean up passenger controller tests
beauttie Nov 6, 2020
354152f
Fix syntax of it blocks in trip controller test file
beauttie Nov 6, 2020
11df107
Edit footer of show view for trips
beauttie Nov 6, 2020
1e4ac73
Change h1 tags to h2
beauttie Nov 6, 2020
6ef9b27
Finish trip controller tests
beauttie Nov 6, 2020
ed3f4a2
model testing
mvlofthus Nov 6, 2020
fc8bea4
driver_test passes
mvlofthus Nov 7, 2020
b4f44fb
passenger_test passes
mvlofthus Nov 7, 2020
956032d
Finish trip model tests
beauttie Nov 7, 2020
ee3019c
added some css
mvlofthus Nov 7, 2020
8a5d094
solving final tests, mackenzie's debugger does not work
mvlofthus Nov 7, 2020
0db1434
DRY up code
beauttie Nov 7, 2020
ca7785e
Last edits hopefully
beauttie 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
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:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest you add .idea to the .gitignore file.

Suggested change
.idea

# 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
8 changes: 8 additions & 0 deletions .idea/.generators

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/.rakeTasks

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

137 changes: 137 additions & 0 deletions .idea/ride-share-rails.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
Loading