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

Lynn Trickey's Task List #26

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
5bac4e9
Created new Rails App
ltrickey Mar 20, 2017
c2a5f8c
Finished hard coding tasks list in controller and displaying in index…
ltrickey Mar 20, 2017
b08a8d6
Created Task model & migrations. Used migration to add 3 tasks
ltrickey Mar 21, 2017
7aaa905
updated controller to show Task.all for index. Updated view to displ…
ltrickey Mar 21, 2017
bc781f7
Created route for tasks#show. Added method in controller and view as …
ltrickey Mar 21, 2017
0661754
Added as:task in routes so I could use link_to and rails wouldn't be …
ltrickey Mar 21, 2017
e10514b
using link_to, added link back to index page on each show page.
ltrickey Mar 21, 2017
281b385
great migration file add_col_to_tasks.rb
ltrickey Mar 21, 2017
292f345
added column to Tasks:image
ltrickey Mar 21, 2017
68b595c
added photo urls in database. Changed show.html.erb to display image…
ltrickey Mar 21, 2017
ca61ee2
created route for getting form for new task
ltrickey Mar 22, 2017
4b945e9
updated controller to add def new
ltrickey Mar 22, 2017
4bf0076
Added new.html.erb
ltrickey Mar 22, 2017
1294ca1
hard coded form into new view file.
ltrickey Mar 22, 2017
f6f8d2d
created route for post '/tasks', to: 'tasks#create'
ltrickey Mar 22, 2017
8316cad
define def create in controller, make it redirect to tasks_path to sh…
ltrickey Mar 22, 2017
94dfd26
created and ran migration to change column data type to text for desc…
ltrickey Mar 22, 2017
3c5998e
used form_for to create erb form
ltrickey Mar 22, 2017
092b173
Added link on index to create new task. Updated controller with priv…
ltrickey Mar 22, 2017
667c775
Changed form type from text_field to text_area for description.
ltrickey Mar 22, 2017
35026c5
Add columns of complete_by and status.
ltrickey Mar 22, 2017
727312d
updated form to accept complete_by and status
ltrickey Mar 22, 2017
0c923b3
messing around with styles
ltrickey Mar 23, 2017
06fa925
Added Edit functionality for rails cycle including view
ltrickey Mar 23, 2017
c9edf99
Added update functionality to save changes to tasks
ltrickey Mar 23, 2017
bd6d402
added link to edit task on task page.
ltrickey Mar 23, 2017
df16fc7
moved styling to application file.
ltrickey Mar 23, 2017
82dcb07
Complete_by not saving
ltrickey Mar 24, 2017
7bfb486
Updated ERB to fix saving problems for complete_by and status
ltrickey Mar 24, 2017
7465fe3
Added root 'tasks#index' and delete path in routes
ltrickey Mar 24, 2017
a67fcd2
Added delete route, path & confirmation window
ltrickey Mar 24, 2017
d2b4b91
added mark complete function, new path, new method
ltrickey Mar 24, 2017
75038e3
Removed option to edit if task is completed
ltrickey Mar 24, 2017
1945974
Changed styling of completed tasks.
ltrickey Mar 24, 2017
480b563
Messing around with styles
ltrickey Mar 26, 2017
12247be
Added Navbar to application.html.erb
ltrickey Mar 26, 2017
a12d52c
Added border for show pages. Fixed date_field in new form
ltrickey Mar 26, 2017
3877e9a
Added confirmation pop-up block for marking complete
ltrickey Mar 26, 2017
1d3b614
Added same styling for all pages
ltrickey Mar 26, 2017
2c6fc82
Added checkmark emoji for completed tasks
ltrickey Mar 26, 2017
05ce81d
Added partial for forms!
ltrickey Mar 26, 2017
1333a74
Changed styling on show page to make header a big larger
ltrickey Mar 26, 2017
5af0202
Adding small change to practice branches.
ltrickey Apr 5, 2017
820719d
Small change to README for practicing pull request.
ltrickey Apr 5, 2017
e52863c
Merge pull request #1 from ltrickey/let/testpull
ltrickey Apr 5, 2017
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
Prev Previous commit
Next Next commit
added link to edit task on task page.
ltrickey committed Mar 23, 2017

Verified

This commit was signed with the committer’s verified signature.
sidvishnoi Sid Vishnoi
commit bd6d4027d333ab87ded4e500ca687da8cadcac3f
3 changes: 2 additions & 1 deletion app/views/tasks/show.html.erb
Original file line number Diff line number Diff line change
@@ -14,5 +14,6 @@
</p>

<p>
<%= link_to "home", tasks_path %>
<%= link_to "Home", tasks_path %>
<%= link_to "Edit Task", edit_task_path %>
</p>
Binary file modified db/development.sqlite3
Binary file not shown.
64 changes: 64 additions & 0 deletions log/development.log
Original file line number Diff line number Diff line change
@@ -3874,3 +3874,67 @@ Processing by TasksController#show as HTML
Completed 200 OK in 25ms (Views: 22.0ms | ActiveRecord: 0.2ms)


Started GET "/tasks" for ::1 at 2017-03-23 15:52:16 -0700
ActiveRecord::SchemaMigration Load (0.6ms) SELECT "schema_migrations".* FROM "schema_migrations"
Processing by TasksController#index as HTML
Rendering tasks/index.html.erb within layouts/application
Task Load (0.4ms) SELECT "tasks".* FROM "tasks"
Rendered tasks/index.html.erb within layouts/application (13.0ms)
Completed 200 OK in 287ms (Views: 272.2ms | ActiveRecord: 0.9ms)


Started GET "/tasks/1" for ::1 at 2017-03-23 15:53:40 -0700
Processing by TasksController#show as HTML
Parameters: {"id"=>"1"}
Task Load (0.3ms) SELECT "tasks".* FROM "tasks" WHERE "tasks"."id" = ? LIMIT ? [["id", 1], ["LIMIT", 1]]
Rendering tasks/show.html.erb within layouts/application
Rendered tasks/show.html.erb within layouts/application (1.1ms)
Completed 200 OK in 29ms (Views: 20.7ms | ActiveRecord: 0.3ms)


Started GET "/tasks/1" for ::1 at 2017-03-23 15:54:19 -0700
Processing by TasksController#show as HTML
Parameters: {"id"=>"1"}
Task Load (0.1ms) SELECT "tasks".* FROM "tasks" WHERE "tasks"."id" = ? LIMIT ? [["id", 1], ["LIMIT", 1]]
Rendering tasks/show.html.erb within layouts/application
Rendered tasks/show.html.erb within layouts/application (1.3ms)
Completed 200 OK in 26ms (Views: 23.5ms | ActiveRecord: 0.1ms)


Started GET "/tasks/1/edit" for ::1 at 2017-03-23 15:54:20 -0700
Processing by TasksController#edit as HTML
Parameters: {"id"=>"1"}
Task Load (0.1ms) SELECT "tasks".* FROM "tasks" WHERE "tasks"."id" = ? LIMIT ? [["id", 1], ["LIMIT", 1]]
Rendering tasks/edit.html.erb within layouts/application
Rendered tasks/edit.html.erb within layouts/application (44.3ms)
Completed 200 OK in 67ms (Views: 63.9ms | ActiveRecord: 0.1ms)


Started PUT "/tasks/1" for ::1 at 2017-03-23 15:54:38 -0700
Processing by TasksController#update as HTML
Parameters: {"utf8"=>"✓", "authenticity_token"=>"WWQGz8sqbUTzY8UDNnSy1Exfegsu4MzWEBHvoB3kt1ZfbJhs9NHKmLeVgG9cMwbHDzuN2QjqBXAMszmouIsj+g==", "task"=>{"name"=>"Work Out", "description"=>"Get 20 min of exercise in.", "status"=>"Haven't Started", "complete_by(1i)"=>"2017", "complete_by(2i)"=>"3", "complete_by(3i)"=>"25"}, "commit"=>"Edit Task", "id"=>"1"}
Task Load (0.3ms) SELECT "tasks".* FROM "tasks" WHERE "tasks"."id" = ? LIMIT ? [["id", 1], ["LIMIT", 1]]
 (0.1ms) begin transaction
SQL (0.4ms) UPDATE "tasks" SET "description" = ?, "updated_at" = ? WHERE "tasks"."id" = ? [["description", "Get 20 min of exercise in."], ["updated_at", 2017-03-23 22:54:38 UTC], ["id", 1]]
 (0.7ms) commit transaction
Redirected to http://localhost:3000/tasks/1
Completed 302 Found in 7ms (ActiveRecord: 1.5ms)


Started GET "/tasks/1" for ::1 at 2017-03-23 15:54:38 -0700
Processing by TasksController#show as HTML
Parameters: {"id"=>"1"}
Task Load (0.1ms) SELECT "tasks".* FROM "tasks" WHERE "tasks"."id" = ? LIMIT ? [["id", 1], ["LIMIT", 1]]
Rendering tasks/show.html.erb within layouts/application
Rendered tasks/show.html.erb within layouts/application (1.0ms)
Completed 200 OK in 21ms (Views: 18.9ms | ActiveRecord: 0.1ms)


Started GET "/tasks" for ::1 at 2017-03-23 15:54:44 -0700
Processing by TasksController#index as HTML
Rendering tasks/index.html.erb within layouts/application
Task Load (0.2ms) SELECT "tasks".* FROM "tasks"
Rendered tasks/index.html.erb within layouts/application (2.2ms)
Completed 200 OK in 26ms (Views: 23.8ms | ActiveRecord: 0.2ms)