From 0f9e002e3fcd56927bbdb998c80b47af55007a20 Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Mon, 20 Mar 2017 15:24:32 -0700
Subject: [PATCH 01/13] created tasks controller, a route to view task index
 page, array of tasks and erv to view tasks

---
 app/controllers/tasks_controller.rb | 11 +++++++++++
 app/views/tasks/index.html.erb      | 17 +++++++++++++++++
 config/routes.rb                    |  4 ++++
 3 files changed, 32 insertions(+)
 create mode 100644 app/controllers/tasks_controller.rb
 create mode 100644 app/views/tasks/index.html.erb
 create mode 100644 config/routes.rb

diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
new file mode 100644
index 000000000..3a5a83814
--- /dev/null
+++ b/app/controllers/tasks_controller.rb
@@ -0,0 +1,11 @@
+class TasksController < ApplicationController
+  def index
+    @tasks = [
+      {title: "make dinner", priority: :med},
+      {title: "shower", priority: :high},
+      {title: "pay bills", priority: :med},
+      {title: "homework", priority: :high},
+      {title: "clean house", priority: :low},
+    ]
+  end
+end
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
new file mode 100644
index 000000000..144fbbd0b
--- /dev/null
+++ b/app/views/tasks/index.html.erb
@@ -0,0 +1,17 @@
+<h1>Tasks#index</h1>
+<p>Find me in app/views/tasks/index.html.erb</p>
+<p>
+  Your high priority tasks are:
+  <% high_tasks = @tasks.select { |task| task[:priority] == :high} %>
+  <% high_tasks.each do |task| %>
+    <li> <%= task[:title] %></li>
+  <% end %>
+</p>
+<p>
+  Lower priority tasks:
+  <% other_tasks = @tasks - high_tasks %>
+  <% other_tasks.each do |task| %>
+    <li> <%= task[:title] %> </li>
+  <% end %>
+
+</p>
diff --git a/config/routes.rb b/config/routes.rb
new file mode 100644
index 000000000..bcc866ea6
--- /dev/null
+++ b/config/routes.rb
@@ -0,0 +1,4 @@
+Rails.application.routes.draw do
+  get '/tasks', to: 'tasks#index'
+  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+end

From c27a95d33efe7717b93107d722f03dbf4be4873a Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Tue, 21 Mar 2017 14:11:35 -0700
Subject: [PATCH 02/13] completed Wave 1 reqs with three tasks added in console

---
 .gitignore                                    |  48 ++---
 .ruby-version                                 |   1 -
 Gemfile                                       |  53 ++++++
 Gemfile.lock                                  | 176 ++++++++++++++++++
 README.md                                     |  75 ++------
 Rakefile                                      |   6 +
 app/assets/config/manifest.js                 |   3 +
 app/assets/images/.keep                       |   0
 app/assets/javascripts/application.js         |  16 ++
 app/assets/javascripts/cable.js               |  13 ++
 app/assets/javascripts/channels/.keep         |   0
 app/assets/javascripts/tasks.coffee           |   3 +
 app/assets/stylesheets/application.css        |  15 ++
 app/assets/stylesheets/tasks.scss             |   3 +
 app/channels/application_cable/channel.rb     |   4 +
 app/channels/application_cable/connection.rb  |   4 +
 app/controllers/application_controller.rb     |   3 +
 app/controllers/concerns/.keep                |   0
 app/controllers/tasks_controller.rb           |  13 +-
 app/helpers/application_helper.rb             |   2 +
 app/helpers/tasks_helper.rb                   |   2 +
 app/jobs/application_job.rb                   |   2 +
 app/mailers/application_mailer.rb             |   4 +
 app/models/application_record.rb              |   3 +
 app/models/concerns/.keep                     |   0
 app/models/task.rb                            |   2 +
 app/views/layouts/application.html.erb        |  14 ++
 app/views/layouts/mailer.html.erb             |  13 ++
 app/views/layouts/mailer.text.erb             |   1 +
 app/views/tasks/index.html.erb                |  22 +--
 app/views/tasks/show.html.erb                 |   9 +
 bin/bundle                                    |   3 +
 bin/rails                                     |   9 +
 bin/rake                                      |   9 +
 bin/setup                                     |  34 ++++
 bin/spring                                    |  17 ++
 bin/update                                    |  29 +++
 config.ru                                     |   5 +
 config/application.rb                         |  15 ++
 config/boot.rb                                |   3 +
 config/cable.yml                              |   9 +
 config/database.yml                           |  25 +++
 config/environment.rb                         |   5 +
 config/environments/development.rb            |  54 ++++++
 config/environments/production.rb             |  86 +++++++++
 config/environments/test.rb                   |  42 +++++
 .../application_controller_renderer.rb        |   6 +
 config/initializers/assets.rb                 |  11 ++
 config/initializers/backtrace_silencers.rb    |   7 +
 config/initializers/cookies_serializer.rb     |   5 +
 .../initializers/filter_parameter_logging.rb  |   4 +
 config/initializers/inflections.rb            |  16 ++
 config/initializers/mime_types.rb             |   4 +
 config/initializers/new_framework_defaults.rb |  24 +++
 config/initializers/session_store.rb          |   3 +
 config/initializers/wrap_parameters.rb        |  14 ++
 config/locales/en.yml                         |  23 +++
 config/puma.rb                                |  47 +++++
 config/routes.rb                              |   7 +
 config/secrets.yml                            |  22 +++
 config/spring.rb                              |   6 +
 db/migrate/20170321204046_create_tasks.rb     |  12 ++
 db/migrate/20170321204818_add_done_column.rb  |   5 +
 db/schema.rb                                  |  25 +++
 db/seeds.rb                                   |   7 +
 lib/assets/.keep                              |   0
 lib/tasks/.keep                               |   0
 log/.keep                                     |   0
 public/404.html                               |  67 +++++++
 public/422.html                               |  67 +++++++
 public/500.html                               |  66 +++++++
 public/apple-touch-icon-precomposed.png       |   0
 public/apple-touch-icon.png                   |   0
 public/favicon.ico                            |   0
 public/robots.txt                             |   5 +
 test/controllers/.keep                        |   0
 test/controllers/tasks_controller_test.rb     |   9 +
 test/fixtures/.keep                           |   0
 test/fixtures/files/.keep                     |   0
 test/fixtures/tasks.yml                       |  13 ++
 test/helpers/.keep                            |   0
 test/integration/.keep                        |   0
 test/mailers/.keep                            |   0
 test/models/.keep                             |   0
 test/models/task_test.rb                      |   7 +
 test/test_helper.rb                           |  10 +
 tmp/.keep                                     |   0
 vendor/assets/javascripts/.keep               |   0
 vendor/assets/stylesheets/.keep               |   0
 89 files changed, 1230 insertions(+), 117 deletions(-)
 delete mode 100644 .ruby-version
 create mode 100644 Gemfile
 create mode 100644 Gemfile.lock
 create mode 100644 Rakefile
 create mode 100644 app/assets/config/manifest.js
 create mode 100644 app/assets/images/.keep
 create mode 100644 app/assets/javascripts/application.js
 create mode 100644 app/assets/javascripts/cable.js
 create mode 100644 app/assets/javascripts/channels/.keep
 create mode 100644 app/assets/javascripts/tasks.coffee
 create mode 100644 app/assets/stylesheets/application.css
 create mode 100644 app/assets/stylesheets/tasks.scss
 create mode 100644 app/channels/application_cable/channel.rb
 create mode 100644 app/channels/application_cable/connection.rb
 create mode 100644 app/controllers/application_controller.rb
 create mode 100644 app/controllers/concerns/.keep
 create mode 100644 app/helpers/application_helper.rb
 create mode 100644 app/helpers/tasks_helper.rb
 create mode 100644 app/jobs/application_job.rb
 create mode 100644 app/mailers/application_mailer.rb
 create mode 100644 app/models/application_record.rb
 create mode 100644 app/models/concerns/.keep
 create mode 100644 app/models/task.rb
 create mode 100644 app/views/layouts/application.html.erb
 create mode 100644 app/views/layouts/mailer.html.erb
 create mode 100644 app/views/layouts/mailer.text.erb
 create mode 100644 app/views/tasks/show.html.erb
 create mode 100755 bin/bundle
 create mode 100755 bin/rails
 create mode 100755 bin/rake
 create mode 100755 bin/setup
 create mode 100755 bin/spring
 create mode 100755 bin/update
 create mode 100644 config.ru
 create mode 100644 config/application.rb
 create mode 100644 config/boot.rb
 create mode 100644 config/cable.yml
 create mode 100644 config/database.yml
 create mode 100644 config/environment.rb
 create mode 100644 config/environments/development.rb
 create mode 100644 config/environments/production.rb
 create mode 100644 config/environments/test.rb
 create mode 100644 config/initializers/application_controller_renderer.rb
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/backtrace_silencers.rb
 create mode 100644 config/initializers/cookies_serializer.rb
 create mode 100644 config/initializers/filter_parameter_logging.rb
 create mode 100644 config/initializers/inflections.rb
 create mode 100644 config/initializers/mime_types.rb
 create mode 100644 config/initializers/new_framework_defaults.rb
 create mode 100644 config/initializers/session_store.rb
 create mode 100644 config/initializers/wrap_parameters.rb
 create mode 100644 config/locales/en.yml
 create mode 100644 config/puma.rb
 create mode 100644 config/secrets.yml
 create mode 100644 config/spring.rb
 create mode 100644 db/migrate/20170321204046_create_tasks.rb
 create mode 100644 db/migrate/20170321204818_add_done_column.rb
 create mode 100644 db/schema.rb
 create mode 100644 db/seeds.rb
 create mode 100644 lib/assets/.keep
 create mode 100644 lib/tasks/.keep
 create mode 100644 log/.keep
 create mode 100644 public/404.html
 create mode 100644 public/422.html
 create mode 100644 public/500.html
 create mode 100644 public/apple-touch-icon-precomposed.png
 create mode 100644 public/apple-touch-icon.png
 create mode 100644 public/favicon.ico
 create mode 100644 public/robots.txt
 create mode 100644 test/controllers/.keep
 create mode 100644 test/controllers/tasks_controller_test.rb
 create mode 100644 test/fixtures/.keep
 create mode 100644 test/fixtures/files/.keep
 create mode 100644 test/fixtures/tasks.yml
 create mode 100644 test/helpers/.keep
 create mode 100644 test/integration/.keep
 create mode 100644 test/mailers/.keep
 create mode 100644 test/models/.keep
 create mode 100644 test/models/task_test.rb
 create mode 100644 test/test_helper.rb
 create mode 100644 tmp/.keep
 create mode 100644 vendor/assets/javascripts/.keep
 create mode 100644 vendor/assets/stylesheets/.keep

diff --git a/.gitignore b/.gitignore
index 28f484983..bab620de0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,21 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/test/tmp/
-/test/version_tmp/
-/tmp/
+# 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'
 
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
+# Ignore bundler config.
+/.bundle
 
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
 
-## Environment normalisation:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
 
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
+# Ignore Byebug command history file.
+.byebug_history
diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index 197c4d5c2..000000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-2.4.0
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..568a39f6a
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,53 @@
+source 'https://rubygems.org'
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+gem 'awesome_print'
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.0.2'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3'
+# Use Puma as the app server
+gem 'puma', '~> 3.0'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+# 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', '~> 3.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platform: :mri
+end
+
+group :development do
+  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '~> 3.0.5'
+  # 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
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..d0a32a07d
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,176 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
+      globalid (>= 0.3.6)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
+      arel (~> 7.0)
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.4)
+    awesome_print (1.7.0)
+    builder (3.2.3)
+    byebug (9.0.6)
+    coffee-rails (4.2.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.2.x)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
+    debug_inspector (0.0.2)
+    erubis (2.7.0)
+    execjs (2.7.0)
+    ffi (1.9.18)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    i18n (0.8.1)
+    jbuilder (2.6.3)
+      activesupport (>= 3.0.0, < 5.2)
+      multi_json (~> 1.2)
+    jquery-rails (4.2.2)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
+      mini_portile2 (~> 2.1.0)
+    puma (3.8.2)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.2)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
+      ffi (>= 0.5.0)
+    sass (3.4.23)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    spring (2.0.1)
+      activesupport (>= 4.2)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
+    turbolinks (5.0.1)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (3.1.9)
+      execjs (>= 0.3.0, < 3)
+    web-console (3.4.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      debug_inspector
+      railties (>= 5.0)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  awesome_print
+  byebug
+  coffee-rails (~> 4.2)
+  jbuilder (~> 2.5)
+  jquery-rails
+  listen (~> 3.0.5)
+  puma (~> 3.0)
+  rails (~> 5.0.2)
+  sass-rails (~> 5.0)
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  sqlite3
+  turbolinks (~> 5)
+  tzinfo-data
+  uglifier (>= 1.3.0)
+  web-console (>= 3.3.0)
+
+BUNDLED WITH
+   1.14.6
diff --git a/README.md b/README.md
index 399dc287c..7db80e4ca 100644
--- a/README.md
+++ b/README.md
@@ -1,73 +1,24 @@
-# Task List
-Let's build a Task List in Rails! We will solve the problem of tracking tasks in a web application. This project will enable us to keep track of and persist, add, edit and remove tasks. This is an individual Stage 1 project.
+# README
 
-## Learning Goals
-Practice all aspects of Rails development.
-- Create a new Rails application
-- Explore each aspect of the Rails Request Cycle: Model, View, Controller
-- Implement RESTful routes using Rails standards
-- Complete all CRUD actions in a Rails application
+This README would normally document whatever steps are necessary to get the
+application up and running.
 
-## Baseline
-In this baseline, you'll create a new Rails application and get started with two of the major components: route, controller and view.
+Things you may want to cover:
 
-- Fork and clone this repository to your computer
-- Create a new Rails application using `rails new .`
-  - create a `Tasks` controller
-  - create a route to view the task `index` page
-  - create a controller action for the task `index` page which contains an array of hard-coded tasks
-  - create an ERB view to display the tasks from the controller action
+* Ruby version
 
-<!--
-## Wave 1
-This wave is where we introduce ActiveRecord to create a model. We use the model to persist our data.
+* System dependencies
 
-1. create a migration which will create a new `Task` model
-    - create the database schema and tables by running the `rails db:migrate` command
-    - the `Task` model should include _at least_ a name, a description and a completion date
-    - create at least 2 `Task` model instances using the `rails console`
-1. update the controller's `index` action you created to retrieve and show `all` Task objects from the database
-    - you may need to update the view as well to use the model fields rather than the hard-coded data
--->
+* Configuration
 
-<!--
-## Wave 2
-In this wave, we will expand the actions we support and introduce forms for user interactivity and persistence.
+* Database creation
 
-1. add support to `show` each task
-    - update the task list to link to a `show` action for each individual task
-    - create a route
-    - create a controller action
-    - create an ERB view
-1. Create a new task:
-    - update the task list to have a link to add a new task
-      - this will give the user a new page with a **form** with the appropriate task fields
-      - the site should take the user back to the task list after the new task is added
--->
+* Database initialization
 
-<!--
-## Wave 3
-In this wave we will extend the interactivity with users, allowing them to edit existing tasks.
+* How to run the test suite
 
-1. Edit a task
-    - update each task's show page to include an edit link
-      - this will give the user a new page with a **form** that is pre-populated with the data about that task
-      - the site should take the user back to the task's show page after the task is updated
+* Services (job queues, cache servers, search engines, etc.)
 
-1. **Optional**
-  - DRY up your code by reusing the view code from the `new` functionality
-    - Hint: Rendering _partials_ in Rails
--->
+* Deployment instructions
 
-<!--
-## Wave 4
-In this wave, we will add the ability to delete tasks. We will also add the ability for a user to mark a task complete.
-
-1. Delete a task  
-    On the task list, add a button or link for each task that will, once clicked:
-    1. Ask the user to confirm that they definitely want to delete the task.
-    1. Delete the task from the database and redirect the user back to the list of remaining tasks
-1. Mark a task complete
-    - Add a button to the list of tasks on the home page that, when clicked, will mark a task complete
-    - Update the database with the task's completed date
--->
+* ...
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000000000..e85f91391
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
new file mode 100644
index 000000000..b16e53d6d
--- /dev/null
+++ b/app/assets/config/manifest.js
@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
diff --git a/app/assets/images/.keep b/app/assets/images/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
new file mode 100644
index 000000000..b12018d09
--- /dev/null
+++ b/app/assets/javascripts/application.js
@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require_tree .
diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
new file mode 100644
index 000000000..71ee1e66d
--- /dev/null
+++ b/app/assets/javascripts/cable.js
@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the rails generate channel command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);
diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/assets/javascripts/tasks.coffee b/app/assets/javascripts/tasks.coffee
new file mode 100644
index 000000000..24f83d18b
--- /dev/null
+++ b/app/assets/javascripts/tasks.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
new file mode 100644
index 000000000..0ebd7fe82
--- /dev/null
+++ b/app/assets/stylesheets/application.css
@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */
diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss
new file mode 100644
index 000000000..c5e7712d4
--- /dev/null
+++ b/app/assets/stylesheets/tasks.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Tasks controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100644
index 000000000..d67269728
--- /dev/null
+++ b/app/channels/application_cable/channel.rb
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
new file mode 100644
index 000000000..0ff5442f4
--- /dev/null
+++ b/app/channels/application_cable/connection.rb
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
new file mode 100644
index 000000000..1c07694e9
--- /dev/null
+++ b/app/controllers/application_controller.rb
@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery with: :exception
+end
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
index 3a5a83814..883a9758c 100644
--- a/app/controllers/tasks_controller.rb
+++ b/app/controllers/tasks_controller.rb
@@ -1,11 +1,10 @@
 class TasksController < ApplicationController
   def index
-    @tasks = [
-      {title: "make dinner", priority: :med},
-      {title: "shower", priority: :high},
-      {title: "pay bills", priority: :med},
-      {title: "homework", priority: :high},
-      {title: "clean house", priority: :low},
-    ]
+    @tasks = Task.all
   end
+
+  def show
+    @selected_task = Task.find params[:id]
+  end
+
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
new file mode 100644
index 000000000..de6be7945
--- /dev/null
+++ b/app/helpers/application_helper.rb
@@ -0,0 +1,2 @@
+module ApplicationHelper
+end
diff --git a/app/helpers/tasks_helper.rb b/app/helpers/tasks_helper.rb
new file mode 100644
index 000000000..ce894d00c
--- /dev/null
+++ b/app/helpers/tasks_helper.rb
@@ -0,0 +1,2 @@
+module TasksHelper
+end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
new file mode 100644
index 000000000..a009ace51
--- /dev/null
+++ b/app/jobs/application_job.rb
@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
new file mode 100644
index 000000000..286b2239d
--- /dev/null
+++ b/app/mailers/application_mailer.rb
@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
new file mode 100644
index 000000000..10a4cba84
--- /dev/null
+++ b/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/models/task.rb b/app/models/task.rb
new file mode 100644
index 000000000..3c2342421
--- /dev/null
+++ b/app/models/task.rb
@@ -0,0 +1,2 @@
+class Task < ApplicationRecord
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
new file mode 100644
index 000000000..be7a9f069
--- /dev/null
+++ b/app/views/layouts/application.html.erb
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>TaskList</title>
+    <%= csrf_meta_tags %>
+
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 000000000..cbd34d2e9
--- /dev/null
+++ b/app/views/layouts/mailer.html.erb
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 000000000..37f0bddbd
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index 144fbbd0b..59eefd3b0 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -1,17 +1,7 @@
-<h1>Tasks#index</h1>
-<p>Find me in app/views/tasks/index.html.erb</p>
-<p>
-  Your high priority tasks are:
-  <% high_tasks = @tasks.select { |task| task[:priority] == :high} %>
-  <% high_tasks.each do |task| %>
-    <li> <%= task[:title] %></li>
-  <% end %>
-</p>
-<p>
-  Lower priority tasks:
-  <% other_tasks = @tasks - high_tasks %>
-  <% other_tasks.each do |task| %>
-    <li> <%= task[:title] %> </li>
-  <% end %>
+<h1>Tasks</h1>
 
-</p>
+<ul>
+  <% @tasks.each do |task| %>
+  <li><%= link_to task.name, task_path(task.id) %> </li>
+  <% end %>
+</ul>
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
new file mode 100644
index 000000000..812f87724
--- /dev/null
+++ b/app/views/tasks/show.html.erb
@@ -0,0 +1,9 @@
+<h1>tasks tasks tasks</h1>
+<p><%= @selected_task.name %></p>
+<p> <% unless @selected_task.done? %>
+        <%= "This task is incomplete" %>
+    <% end %>
+</p>
+<p>Description: <%= @selected_task.description %></p>
+<p>Priority level: <%= @selected_task.priority %></p>
+<p><%= link_to "task list", tasks_path %></p>
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 000000000..66e9889e8
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 000000000..5badb2fde
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 000000000..d87d5f578
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 000000000..e620b4dad
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/bin/spring b/bin/spring
new file mode 100755
index 000000000..fb2ec2ebb
--- /dev/null
+++ b/bin/spring
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
+
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+  if spring
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
+    require 'spring/binstub'
+  end
+end
diff --git a/bin/update b/bin/update
new file mode 100755
index 000000000..a8e4462f2
--- /dev/null
+++ b/bin/update
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/config.ru b/config.ru
new file mode 100644
index 000000000..f7ba0b527
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,5 @@
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application
diff --git a/config/application.rb b/config/application.rb
new file mode 100644
index 000000000..25ee0e0e3
--- /dev/null
+++ b/config/application.rb
@@ -0,0 +1,15 @@
+require_relative 'boot'
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module TaskList
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+  end
+end
diff --git a/config/boot.rb b/config/boot.rb
new file mode 100644
index 000000000..30f5120df
--- /dev/null
+++ b/config/boot.rb
@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 000000000..0bbde6f74
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,9 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1
diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 000000000..1c1a37ca8
--- /dev/null
+++ b/config/database.yml
@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: db/test.sqlite3
+
+production:
+  <<: *default
+  database: db/production.sqlite3
diff --git a/config/environment.rb b/config/environment.rb
new file mode 100644
index 000000000..426333bb4
--- /dev/null
+++ b/config/environment.rb
@@ -0,0 +1,5 @@
+# Load the Rails application.
+require_relative 'application'
+
+# Initialize the Rails application.
+Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
new file mode 100644
index 000000000..6f7197045
--- /dev/null
+++ b/config/environments/development.rb
@@ -0,0 +1,54 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  if Rails.root.join('tmp/caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => 'public, max-age=172800'
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  config.action_mailer.perform_caching = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+end
diff --git a/config/environments/production.rb b/config/environments/production.rb
new file mode 100644
index 000000000..29a40f265
--- /dev/null
+++ b/config/environments/production.rb
@@ -0,0 +1,86 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  config.log_tags = [ :request_id ]
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "TaskList_#{Rails.env}"
+  config.action_mailer.perform_caching = false
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Use a different logger for distributed setups.
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger = ActiveSupport::TaggedLogging.new(logger)
+  end
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+end
diff --git a/config/environments/test.rb b/config/environments/test.rb
new file mode 100644
index 000000000..30587ef6d
--- /dev/null
+++ b/config/environments/test.rb
@@ -0,0 +1,42 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => 'public, max-age=3600'
+  }
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+  config.action_mailer.perform_caching = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 000000000..51639b67a
--- /dev/null
+++ b/config/initializers/application_controller_renderer.rb
@@ -0,0 +1,6 @@
+# Be sure to restart your server when you modify this file.
+
+# ApplicationController.renderer.defaults.merge!(
+#   http_host: 'example.org',
+#   https: false
+# )
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 000000000..01ef3e663
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
new file mode 100644
index 000000000..59385cdf3
--- /dev/null
+++ b/config/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 000000000..5a6a32d37
--- /dev/null
+++ b/config/initializers/cookies_serializer.rb
@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Specify a serializer for the signed and encrypted cookie jars.
+# Valid options are :json, :marshal, and :hybrid.
+Rails.application.config.action_dispatch.cookies_serializer = :json
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
new file mode 100644
index 000000000..4a994e1e7
--- /dev/null
+++ b/config/initializers/filter_parameter_logging.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
new file mode 100644
index 000000000..ac033bf9d
--- /dev/null
+++ b/config/initializers/inflections.rb
@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
new file mode 100644
index 000000000..dc1899682
--- /dev/null
+++ b/config/initializers/mime_types.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
new file mode 100644
index 000000000..671abb69a
--- /dev/null
+++ b/config/initializers/new_framework_defaults.rb
@@ -0,0 +1,24 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 5.0 upgrade.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Enable per-form CSRF tokens. Previous versions had false.
+Rails.application.config.action_controller.per_form_csrf_tokens = true
+
+# Enable origin-checking CSRF mitigation. Previous versions had false.
+Rails.application.config.action_controller.forgery_protection_origin_check = true
+
+# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
+# Previous versions had false.
+ActiveSupport.to_time_preserves_timezone = true
+
+# Require `belongs_to` associations by default. Previous versions had false.
+Rails.application.config.active_record.belongs_to_required_by_default = true
+
+# Do not halt callback chains when a callback returns false. Previous versions had true.
+ActiveSupport.halt_callback_chains_on_return_false = false
+
+# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
+Rails.application.config.ssl_options = { hsts: { subdomains: true } }
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
new file mode 100644
index 000000000..80e157130
--- /dev/null
+++ b/config/initializers/session_store.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.session_store :cookie_store, key: '_TaskList_session'
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
new file mode 100644
index 000000000..bbfc3961b
--- /dev/null
+++ b/config/initializers/wrap_parameters.rb
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#   self.include_root_in_json = true
+# end
diff --git a/config/locales/en.yml b/config/locales/en.yml
new file mode 100644
index 000000000..065395716
--- /dev/null
+++ b/config/locales/en.yml
@@ -0,0 +1,23 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+  hello: "Hello world"
diff --git a/config/puma.rb b/config/puma.rb
new file mode 100644
index 000000000..c7f311f81
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,47 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum, this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
+#
+port        ENV.fetch("PORT") { 3000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory. If you use this option
+# you need to make sure to reconnect any threads in the `on_worker_boot`
+# block.
+#
+# preload_app!
+
+# The code in the `on_worker_boot` will be called if you are using
+# clustered mode by specifying a number of `workers`. After each worker
+# process is booted this block will be run, if you are using `preload_app!`
+# option you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, Ruby
+# cannot share connections between processes.
+#
+# on_worker_boot do
+#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+# end
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart
diff --git a/config/routes.rb b/config/routes.rb
index bcc866ea6..68d5629ab 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,11 @@
 Rails.application.routes.draw do
+  root to: '/tasks#index'
+
   get '/tasks', to: 'tasks#index'
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+  get 'tasks/:id', to: 'tasks#show', as: 'task'
+
+
+
+
 end
diff --git a/config/secrets.yml b/config/secrets.yml
new file mode 100644
index 000000000..e86990e15
--- /dev/null
+++ b/config/secrets.yml
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rails secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: c03be6b2e1e81ae9dbfb317889e723afb91c67b4825e23ecf90802d9cad9aa7855e8b86ae228192f8cbd3fb68dbab0189c31572f010f80a8e976cc97437df467
+
+test:
+  secret_key_base: dfdfaecf9fbfdcae1e061ec0f3a753b35c84eb1cdc6771bf188e3e63e87adf2b63527f73c7ef213ce6087a9ec6da1f45de3654d5128673940366de91449ab352
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 000000000..c9119b40c
--- /dev/null
+++ b/config/spring.rb
@@ -0,0 +1,6 @@
+%w(
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+).each { |path| Spring.watch(path) }
diff --git a/db/migrate/20170321204046_create_tasks.rb b/db/migrate/20170321204046_create_tasks.rb
new file mode 100644
index 000000000..d814e4d5e
--- /dev/null
+++ b/db/migrate/20170321204046_create_tasks.rb
@@ -0,0 +1,12 @@
+class CreateTasks < ActiveRecord::Migration[5.0]
+  def change
+    create_table :tasks do |t|
+      t.string :name
+      t.integer :priority
+      t.text :description
+      t.date :complete_date
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170321204818_add_done_column.rb b/db/migrate/20170321204818_add_done_column.rb
new file mode 100644
index 000000000..759699fe4
--- /dev/null
+++ b/db/migrate/20170321204818_add_done_column.rb
@@ -0,0 +1,5 @@
+class AddDoneColumn < ActiveRecord::Migration[5.0]
+  def change
+    add_column(:tasks, :done?, :boolean )
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..77b576ccc
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,25 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20170321204818) do
+
+  create_table "tasks", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "priority"
+    t.text     "description"
+    t.date     "complete_date"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+    t.boolean  "done?"
+  end
+
+end
diff --git a/db/seeds.rb b/db/seeds.rb
new file mode 100644
index 000000000..1beea2acc
--- /dev/null
+++ b/db/seeds.rb
@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
+#
+# Examples:
+#
+#   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
+#   Character.create(name: 'Luke', movie: movies.first)
diff --git a/lib/assets/.keep b/lib/assets/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/tasks/.keep b/lib/tasks/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/log/.keep b/log/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/404.html b/public/404.html
new file mode 100644
index 000000000..b612547fc
--- /dev/null
+++ b/public/404.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <div>
+      <h1>The page you were looking for doesn't exist.</h1>
+      <p>You may have mistyped the address or the page may have moved.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.html b/public/422.html
new file mode 100644
index 000000000..a21f82b3b
--- /dev/null
+++ b/public/422.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <div>
+      <h1>The change you wanted was rejected.</h1>
+      <p>Maybe you tried to change something you didn't have access to.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/public/500.html b/public/500.html
new file mode 100644
index 000000000..061abc587
--- /dev/null
+++ b/public/500.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 000000000..3c9c7c01f
--- /dev/null
+++ b/public/robots.txt
@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-agent: *
+# Disallow: /
diff --git a/test/controllers/.keep b/test/controllers/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb
new file mode 100644
index 000000000..67683c951
--- /dev/null
+++ b/test/controllers/tasks_controller_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class TasksControllerTest < ActionDispatch::IntegrationTest
+  test "should get index" do
+    get tasks_index_url
+    assert_response :success
+  end
+
+end
diff --git a/test/fixtures/.keep b/test/fixtures/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml
new file mode 100644
index 000000000..01ac651e2
--- /dev/null
+++ b/test/fixtures/tasks.yml
@@ -0,0 +1,13 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  name: 
+  priority: 
+  description: 
+  complete_date: 2017-03-21
+
+two:
+  name: 
+  priority: 
+  description: 
+  complete_date: 2017-03-21
diff --git a/test/helpers/.keep b/test/helpers/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/integration/.keep b/test/integration/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/mailers/.keep b/test/mailers/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/models/.keep b/test/models/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/models/task_test.rb b/test/models/task_test.rb
new file mode 100644
index 000000000..3ca215970
--- /dev/null
+++ b/test/models/task_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TaskTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 000000000..92e39b2d7
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,10 @@
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end
diff --git a/tmp/.keep b/tmp/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep
new file mode 100644
index 000000000..e69de29bb

From c8402f15c7a13b59bafee070bcd59f5309e7c45d Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Tue, 21 Mar 2017 14:26:19 -0700
Subject: [PATCH 03/13] added another task; updated show ERB

---
 app/views/tasks/show.html.erb | 4 ++--
 config/routes.rb              | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
index 812f87724..7b4bdbc4b 100644
--- a/app/views/tasks/show.html.erb
+++ b/app/views/tasks/show.html.erb
@@ -1,7 +1,7 @@
 <h1>tasks tasks tasks</h1>
 <p><%= @selected_task.name %></p>
-<p> <% unless @selected_task.done? %>
-        <%= "This task is incomplete" %>
+<p> <% if @selected_task.done? %>
+        <%= "Nice - this task is done" %>
     <% end %>
 </p>
 <p>Description: <%= @selected_task.description %></p>
diff --git a/config/routes.rb b/config/routes.rb
index 68d5629ab..f7141b369 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
-  root to: '/tasks#index'
+
+  root to: 'tasks#index'
 
   get '/tasks', to: 'tasks#index'
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html

From b738cf9873edb67993dd44c6914735c1115ceff3 Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Wed, 22 Mar 2017 13:10:07 -0700
Subject: [PATCH 04/13] added form to create new task

---
 app/controllers/tasks_controller.rb       | 14 ++++++++++++
 app/views/tasks/index.html.erb            |  2 ++
 app/views/tasks/new.html.erb              | 26 +++++++++++++++++++++++
 app/views/tasks/show.html.erb             |  2 ++
 config/routes.rb                          |  3 +++
 db/migrate/20170322200020_add_due_date.rb |  5 +++++
 db/schema.rb                              |  3 ++-
 7 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 app/views/tasks/new.html.erb
 create mode 100644 db/migrate/20170322200020_add_due_date.rb

diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
index 883a9758c..5948ae8e6 100644
--- a/app/controllers/tasks_controller.rb
+++ b/app/controllers/tasks_controller.rb
@@ -7,4 +7,18 @@ def show
     @selected_task = Task.find params[:id]
   end
 
+  def new
+  end
+
+  def create
+    task = Task.new
+    task.name = params[:name]
+    task.priority = params[:priority]
+    task.description = params[:description]
+    task.due_date = params[:due_date]
+    if task.save
+      redirect_to tasks_path
+    end
+  end
+
 end
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index 59eefd3b0..9490b1f69 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -5,3 +5,5 @@
   <li><%= link_to task.name, task_path(task.id) %> </li>
   <% end %>
 </ul>
+
+<p><%= link_to "add a new task", tasks_new_path %></p>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
new file mode 100644
index 000000000..828da5e57
--- /dev/null
+++ b/app/views/tasks/new.html.erb
@@ -0,0 +1,26 @@
+<form class="" action="/tasks" method="post" accept-charset="utf-8">
+  <!-- SPECIAL INPUT TO ALLOW RAILS TO USE THIS FORM -->
+  <input name="authenticity_token" value="<%= form_authenticity_token %>" type="hidden">
+  <h1>Add a New Task</h1>
+
+  <label for="name">Task</label>
+  <input type="text" name="name" value="" id="title" placeholder="task name">
+
+  <label for="description">Description</label>
+  <input type="text" name="description" value="" id="description" placeholder="describe task">
+
+  <label for="priority">Priority</label>
+  <select class="priority" name="priority">
+      <option value="1">High = 1</option>
+      <option value="2">Medium = 2</option>
+      <option value="3">Low = 3</option>
+  </select>
+
+  <label for="due_date">Due Date</label>
+  <input type="date" name="due_date" value="" placeholder="e.g. yy/mm/dd or dd/mm/yyyy or dd-mm-yy">
+
+
+  <input type="submit" name="submit" value="add new task"></input>
+
+
+</form>
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
index 7b4bdbc4b..15112833f 100644
--- a/app/views/tasks/show.html.erb
+++ b/app/views/tasks/show.html.erb
@@ -5,5 +5,7 @@
     <% end %>
 </p>
 <p>Description: <%= @selected_task.description %></p>
+<p>Complete this task by: <%= @selected_task.due_date %> </p>
 <p>Priority level: <%= @selected_task.priority %></p>
+
 <p><%= link_to "task list", tasks_path %></p>
diff --git a/config/routes.rb b/config/routes.rb
index f7141b369..97f6f7d8a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,9 @@
 
   root to: 'tasks#index'
 
+  get 'tasks/new', to: 'tasks#new'
+  post '/tasks', to: 'tasks#create'
+
   get '/tasks', to: 'tasks#index'
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   get 'tasks/:id', to: 'tasks#show', as: 'task'
diff --git a/db/migrate/20170322200020_add_due_date.rb b/db/migrate/20170322200020_add_due_date.rb
new file mode 100644
index 000000000..106ab0b3b
--- /dev/null
+++ b/db/migrate/20170322200020_add_due_date.rb
@@ -0,0 +1,5 @@
+class AddDueDate < ActiveRecord::Migration[5.0]
+  def change
+    add_column :tasks, :due_date, :date
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 77b576ccc..20c888088 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170321204818) do
+ActiveRecord::Schema.define(version: 20170322200020) do
 
   create_table "tasks", force: :cascade do |t|
     t.string   "name"
@@ -20,6 +20,7 @@
     t.datetime "created_at",    null: false
     t.datetime "updated_at",    null: false
     t.boolean  "done?"
+    t.date     "due_date"
   end
 
 end

From 23a71164b1b418170ef49fadda157235071fae64 Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Wed, 22 Mar 2017 16:18:16 -0700
Subject: [PATCH 05/13] form helper for new task; tinkering with CSS

---
 app/assets/stylesheets/tasks.scss      | 11 ++++++++
 app/controllers/tasks_controller.rb    | 17 ++++++++-----
 app/views/layouts/application.html.erb |  2 +-
 app/views/tasks/index.html.erb         |  1 +
 app/views/tasks/new.html.erb           | 35 +++++++++++---------------
 5 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss
index c5e7712d4..c5a5831d6 100644
--- a/app/assets/stylesheets/tasks.scss
+++ b/app/assets/stylesheets/tasks.scss
@@ -1,3 +1,14 @@
 // Place all the styles related to the Tasks controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+@import url('https://fonts.googleapis.com/css?family=Fjalla+One|Raleway');
+// font-family: 'Raleway', sans-serif;
+
+* {
+  font-family: 'Fjalla One', sans-serif;
+}
+
+body {
+  margin-left: 5%;
+  background-color: skyblue;
+}
diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
index 5948ae8e6..c9dc32ca2 100644
--- a/app/controllers/tasks_controller.rb
+++ b/app/controllers/tasks_controller.rb
@@ -8,17 +8,22 @@ def show
   end
 
   def new
+    @task = Task.new
   end
 
   def create
-    task = Task.new
-    task.name = params[:name]
-    task.priority = params[:priority]
-    task.description = params[:description]
-    task.due_date = params[:due_date]
-    if task.save
+    task = Task.create task_params
+
+    unless task.id == nil
       redirect_to tasks_path
     end
+
+  end
+
+  private
+
+  def task_params
+    params.require(:task).permit(:name, :description, :priority, :due_date)
   end
 
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index be7a9f069..cb9ec1253 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>TaskList</title>
+    <title>Task List</title>
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index 9490b1f69..4c53e6a5d 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -1,4 +1,5 @@
 <h1>Tasks</h1>
+<h4>Hello and welcome to your task list</h4>
 
 <ul>
   <% @tasks.each do |task| %>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
index 828da5e57..360a60d9d 100644
--- a/app/views/tasks/new.html.erb
+++ b/app/views/tasks/new.html.erb
@@ -1,26 +1,19 @@
-<form class="" action="/tasks" method="post" accept-charset="utf-8">
-  <!-- SPECIAL INPUT TO ALLOW RAILS TO USE THIS FORM -->
-  <input name="authenticity_token" value="<%= form_authenticity_token %>" type="hidden">
-  <h1>Add a New Task</h1>
+<h1>Add a New Task</h1>
+<%= form_for @task do |f| %>
+  <%= f.label :name %>
+  <%= f.text_field :name %>
 
-  <label for="name">Task</label>
-  <input type="text" name="name" value="" id="title" placeholder="task name">
+  <%= f.label :description %>
+  <%= f.text_field :description %>
 
-  <label for="description">Description</label>
-  <input type="text" name="description" value="" id="description" placeholder="describe task">
+  <%= f.label :due_date %>
+  <%= f.date_field :due_date %>
 
-  <label for="priority">Priority</label>
-  <select class="priority" name="priority">
-      <option value="1">High = 1</option>
-      <option value="2">Medium = 2</option>
-      <option value="3">Low = 3</option>
-  </select>
+  <%= f.label :priority %>
+  <%= f.select :priority, [['High', 1], ['Medium', 2], ['Low', 3]] %>
 
-  <label for="due_date">Due Date</label>
-  <input type="date" name="due_date" value="" placeholder="e.g. yy/mm/dd or dd/mm/yyyy or dd-mm-yy">
+  <!-- options_for_select([['High', 1], ['Medium', 2], ['Low', 3]]) -->
+  <!-- default name on submit button is "Create + Name of model -->
+  <%= f.submit "add book"%>
 
-
-  <input type="submit" name="submit" value="add new task"></input>
-
-
-</form>
+<% end %>

From 66450205887d6f8a0a1679cdf83cd895a3a6d1d1 Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Wed, 22 Mar 2017 16:38:44 -0700
Subject: [PATCH 06/13] more css styling; applied to new view

---
 app/assets/stylesheets/application.css | 27 ++++++++++++++++++++
 app/assets/stylesheets/tasks.scss      | 34 +++++++++++++++++++-------
 app/views/layouts/application.html.erb |  5 ++++
 app/views/tasks/index.html.erb         | 23 ++++++++++++++---
 app/views/tasks/new.html.erb           |  2 +-
 5 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 0ebd7fe82..728cf8f24 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,3 +13,30 @@
  *= require_tree .
  *= require_self
  */
+
+
+ @import url('https://fonts.googleapis.com/css?family=Fjalla+One|Raleway');
+ // font-family: 'Raleway', sans-serif;
+
+ * {
+   font-family: 'Fjalla One', sans-serif;
+ }
+
+ main {
+   padding-left: 5%;
+   background-color: skyblue;
+   position: absolute;
+   left: 0;
+   width: 100%
+ }
+
+ footer {
+
+   position: absolute;
+   bottom: 0;
+
+ }
+
+ ul {
+   list-style-type: none;
+ }
diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss
index c5a5831d6..c87fa6a15 100644
--- a/app/assets/stylesheets/tasks.scss
+++ b/app/assets/stylesheets/tasks.scss
@@ -1,14 +1,30 @@
 // Place all the styles related to the Tasks controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
-@import url('https://fonts.googleapis.com/css?family=Fjalla+One|Raleway');
-// font-family: 'Raleway', sans-serif;
 
-* {
-  font-family: 'Fjalla One', sans-serif;
-}
 
-body {
-  margin-left: 5%;
-  background-color: skyblue;
-}
+ @import url('https://fonts.googleapis.com/css?family=Fjalla+One|Raleway');
+ // font-family: 'Raleway', sans-serif;
+
+ * {
+   font-family: 'Fjalla One', sans-serif;
+ }
+
+ main {
+   padding-left: 5%;
+   background-color: skyblue;
+   position: absolute;
+   left: 0;
+   width: 100%
+ }
+
+ footer {
+
+   position: absolute;
+   bottom: 0;
+
+ }
+
+ ul {
+   list-style-type: none;
+ }
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index cb9ec1253..f561a917f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -8,7 +8,12 @@
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>
 
+
+
   <body>
+    <header>
+      <h1>most maginificent task list</h1>
+    </header>
     <%= yield %>
   </body>
 </html>
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index 4c53e6a5d..68e66e61d 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -1,10 +1,25 @@
-<h1>Tasks</h1>
-<h4>Hello and welcome to your task list</h4>
+<main>
 
+<h3>welcome to your to-dos!</h4>
+
+<h4>You have some high priority tasks:</h4>
 <ul>
   <% @tasks.each do |task| %>
-  <li><%= link_to task.name, task_path(task.id) %> </li>
+    <% if task.priority == 1 %>
+      <li><%= link_to task.name, task_path(task.id) %> </li>
+    <% end %>
   <% end %>
 </ul>
 
-<p><%= link_to "add a new task", tasks_new_path %></p>
+<h4>The rest of your tasks are not as urgent</h4>
+<ul>
+  <% @tasks.each do |task| %>
+    <% if task.priority != 1 %>
+      <li><%= link_to task.name, task_path(task.id) %> </li>
+    <% end %>
+  <% end %>
+
+</ul>
+</main>
+
+<footer><p><%= link_to "add a new task", tasks_new_path %></p></footer>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
index 360a60d9d..dadccb4cf 100644
--- a/app/views/tasks/new.html.erb
+++ b/app/views/tasks/new.html.erb
@@ -14,6 +14,6 @@
 
   <!-- options_for_select([['High', 1], ['Medium', 2], ['Low', 3]]) -->
   <!-- default name on submit button is "Create + Name of model -->
-  <%= f.submit "add book"%>
+  <%= f.submit "add task"%>
 
 <% end %>

From 36c1f81bacc242dc4f94a9d565f424a949b6414d Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Wed, 22 Mar 2017 16:58:42 -0700
Subject: [PATCH 07/13] moved header footer and nav to application.html; more
 CSS tinkering

---
 app/assets/stylesheets/application.css | 27 -------------------
 app/assets/stylesheets/tasks.scss      | 36 +++++++++++++++++++++++---
 app/views/layouts/application.html.erb |  4 +++
 app/views/tasks/index.html.erb         |  2 --
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 728cf8f24..0ebd7fe82 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,30 +13,3 @@
  *= require_tree .
  *= require_self
  */
-
-
- @import url('https://fonts.googleapis.com/css?family=Fjalla+One|Raleway');
- // font-family: 'Raleway', sans-serif;
-
- * {
-   font-family: 'Fjalla One', sans-serif;
- }
-
- main {
-   padding-left: 5%;
-   background-color: skyblue;
-   position: absolute;
-   left: 0;
-   width: 100%
- }
-
- footer {
-
-   position: absolute;
-   bottom: 0;
-
- }
-
- ul {
-   list-style-type: none;
- }
diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss
index c87fa6a15..4e06f85c4 100644
--- a/app/assets/stylesheets/tasks.scss
+++ b/app/assets/stylesheets/tasks.scss
@@ -8,6 +8,20 @@
 
  * {
    font-family: 'Fjalla One', sans-serif;
+   padding: 0;
+   margin: 0;
+ }
+
+ header {
+  //  padding: 3% 2% 4% 2%;
+   background-color: yellow;
+   width: 100%;
+   top: 0;
+   padding: 5% 3%;
+ }
+
+ header h1 {
+   margin: 0;
  }
 
  main {
@@ -15,16 +29,32 @@
    background-color: skyblue;
    position: absolute;
    left: 0;
-   width: 100%
+   width: 100%;
+   height: 100%;
  }
 
  footer {
+  padding-left: 5%;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  background-color: deeppink;
 
-   position: absolute;
-   bottom: 0;
 
  }
 
  ul {
    list-style-type: none;
  }
+
+ a {
+   text-decoration: none;
+   color: gainsboro;
+   padding: 0 2%;
+ }
+
+ a:hover {
+   background-color: yellow;
+   padding: 0 2%;
+ }
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f561a917f..e58087bb3 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -15,5 +15,9 @@
       <h1>most maginificent task list</h1>
     </header>
     <%= yield %>
+    <nav>
+
+    </nav>
+    <footer><p>&copy; <%= Time.current.year %> </p></footer>
   </body>
 </html>
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index 68e66e61d..ccbe7378d 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -21,5 +21,3 @@
 
 </ul>
 </main>
-
-<footer><p><%= link_to "add a new task", tasks_new_path %></p></footer>

From 1ef87473c47190fa7c338a8199ab4f1d9f74487d Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Wed, 22 Mar 2017 22:06:34 -0700
Subject: [PATCH 08/13] basic styling across all pages; nav bar on all pages

---
 app/assets/stylesheets/tasks.scss      | 93 ++++++++++++++++++++++----
 app/views/layouts/application.html.erb |  3 +-
 app/views/tasks/index.html.erb         | 17 +++--
 app/views/tasks/new.html.erb           | 51 ++++++++++----
 app/views/tasks/show.html.erb          | 25 +++++--
 5 files changed, 149 insertions(+), 40 deletions(-)

diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss
index 4e06f85c4..c95fb7641 100644
--- a/app/assets/stylesheets/tasks.scss
+++ b/app/assets/stylesheets/tasks.scss
@@ -1,6 +1,13 @@
 // Place all the styles related to the Tasks controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+// color: #85144B;
+// color: #EB79B1;
+// color: #AAAAAA;
+// color: #DDDDDD;
+// color: #3d9970;
+// color: #ffdc00;
+
 
 
  @import url('https://fonts.googleapis.com/css?family=Fjalla+One|Raleway');
@@ -12,9 +19,13 @@
    margin: 0;
  }
 
+h4 {
+  padding: 2% 0;
+}
+
  header {
-  //  padding: 3% 2% 4% 2%;
-   background-color: yellow;
+
+   background-color: #85144B;
    width: 100%;
    top: 0;
    padding: 5% 3%;
@@ -22,39 +33,93 @@
 
  header h1 {
    margin: 0;
+   color: #EB79B1;
  }
 
  main {
-   padding-left: 5%;
-   background-color: skyblue;
-   position: absolute;
-   left: 0;
+  padding-bottom: 40%;
+  //  padding: 0 5% 3% 5%;
+   background-color: #DDDDDD;
+  //  position: absolute;
+  //  left: 0;
    width: 100%;
-   height: 100%;
+
  }
 
+section {
+  padding: 2% 0 0 3%;
+}
+
+
  footer {
-  padding-left: 5%;
+  padding-left: 3%;
   position: fixed;
   bottom: 0;
   left: 0;
   width: 100%;
-  background-color: deeppink;
-
+  background-color: #AAAAAA;
+ }
 
+ main ul {
+      width: 20%;
  }
 
  ul {
+   padding: 1% 2%;
    list-style-type: none;
+
  }
 
  a {
+   transition: color .4s;
+   color: #85144B;
    text-decoration: none;
-   color: gainsboro;
-   padding: 0 2%;
+
+ }
+
+ a:link,
+ a:visited { color: #359970; }
+ a:hover   { color: #2ECC40; }
+ a:active  {
+   transition: color .3s;
+   color: #01FF70;
  }
 
- a:hover {
-   background-color: yellow;
+ nav {
    padding: 0 2%;
+   background-color: #AAAAAA;
  }
+
+ nav h3 {
+   display: inline-block;
+   width: 60%
+ }
+
+ nav ul {
+   display: inline-block;
+      text-align: right;
+      width: 35%
+ }
+ nav li {
+
+   padding: 0.5% 2%;
+   display: inline-block;
+ }
+
+ .high ul {
+   border-color: #2ECC40;
+   border-width: thin;
+   border-style: solid;
+
+ }
+
+ section ul {
+   border-color: #AAAAAA;
+   border-width: thin;
+   border-style: solid;
+   padding: 2%;
+ }
+
+.form_new li {
+  padding: 5% 3%;
+}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e58087bb3..c25bbc154 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,10 +14,9 @@
     <header>
       <h1>most maginificent task list</h1>
     </header>
+    
     <%= yield %>
-    <nav>
 
-    </nav>
     <footer><p>&copy; <%= Time.current.year %> </p></footer>
   </body>
 </html>
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index ccbe7378d..476b57cd2 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -1,6 +1,12 @@
 <main>
-
-<h3>welcome to your to-dos!</h4>
+  <nav>
+    <h3>welcome to your to-dos. let's GSD.</h4>
+    <ul>
+      <li><%= link_to "all", tasks_path %></li>
+      <li><%= link_to "new", tasks_new_path %></li>
+    </ul>
+  </nav>
+<section class="high">
 
 <h4>You have some high priority tasks:</h4>
 <ul>
@@ -10,14 +16,17 @@
     <% end %>
   <% end %>
 </ul>
+</section>
 
-<h4>The rest of your tasks are not as urgent</h4>
+<section>
+<h4>Your other tasks are not as urgent:</h4>
 <ul>
   <% @tasks.each do |task| %>
     <% if task.priority != 1 %>
       <li><%= link_to task.name, task_path(task.id) %> </li>
     <% end %>
   <% end %>
-
 </ul>
+</section>
+
 </main>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
index dadccb4cf..51d556bf0 100644
--- a/app/views/tasks/new.html.erb
+++ b/app/views/tasks/new.html.erb
@@ -1,19 +1,42 @@
-<h1>Add a New Task</h1>
-<%= form_for @task do |f| %>
-  <%= f.label :name %>
-  <%= f.text_field :name %>
+<main>
 
-  <%= f.label :description %>
-  <%= f.text_field :description %>
+<nav>
+  <h3>Add a New Task</h3>
+  <ul>
+    <li><%= link_to "all", tasks_path %></li>
+    <li><%= link_to "new", tasks_new_path %></li>
+  </ul>
+</nav>
 
-  <%= f.label :due_date %>
-  <%= f.date_field :due_date %>
+<ul class="form_new">
 
-  <%= f.label :priority %>
-  <%= f.select :priority, [['High', 1], ['Medium', 2], ['Low', 3]] %>
+  <%= form_for @task do |f| %>
 
-  <!-- options_for_select([['High', 1], ['Medium', 2], ['Low', 3]]) -->
-  <!-- default name on submit button is "Create + Name of model -->
-  <%= f.submit "add task"%>
+  <li><%= f.label :name %>
+    <%= f.text_field :name %>
+  </li>
 
-<% end %>
+  <li>
+    <%= f.label :description %>
+    <%= f.text_field :description %>
+  </li>
+
+  <li>
+    <%= f.label :due_date %>
+    <%= f.date_field :due_date %> </li>
+
+  <li>
+    <%= f.label :priority %>
+    <%= f.select :priority, [['High', 1], ['Medium', 2], ['Low', 3]] %>
+  </li>
+
+    <!-- options_for_select([['High', 1], ['Medium', 2], ['Low', 3]]) -->
+    <!-- default name on submit button is "Create + Name of model -->
+  <li><%= f.submit "add task"%></li>
+
+  <% end %>
+
+</ul>
+
+
+</main>
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
index 15112833f..43f48496d 100644
--- a/app/views/tasks/show.html.erb
+++ b/app/views/tasks/show.html.erb
@@ -1,11 +1,24 @@
-<h1>tasks tasks tasks</h1>
-<p><%= @selected_task.name %></p>
+<main>
+
+
+<nav>
+  <h3>here is your task</h3>
+  <ul>
+    <li><%= link_to "all", tasks_path %></li>
+    <li><%= link_to "new", tasks_new_path %></li>
+  </ul>
+</nav>
+
+<section>
+
 <p> <% if @selected_task.done? %>
-        <%= "Nice - this task is done" %>
+        <%= "*Nice! This task is done*  " %>
     <% end %>
 </p>
-<p>Description: <%= @selected_task.description %></p>
-<p>Complete this task by: <%= @selected_task.due_date %> </p>
+<h3><%= @selected_task.name %> (<%= @selected_task.description %>)</h3>
+<p>You need to complete this task by: <%= @selected_task.due_date %> </p>
 <p>Priority level: <%= @selected_task.priority %></p>
 
-<p><%= link_to "task list", tasks_path %></p>
+</section>
+
+</main>

From eec2f7b6e6cf3e5ab48199e67e37438981eb7688 Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Sat, 25 Mar 2017 11:12:46 -0700
Subject: [PATCH 09/13] checkbox for task complete is working. yessss. also
 delete

---
 app/assets/stylesheets/tasks.scss             |  7 ++--
 app/controllers/tasks_controller.rb           | 40 +++++++++++++++++-
 app/views/layouts/application.html.erb        |  8 +++-
 app/views/tasks/_form.html.erb                | 36 ++++++++++++++++
 app/views/tasks/edit.html.erb                 |  7 ++++
 app/views/tasks/index.html.erb                | 22 ++++++----
 app/views/tasks/new.html.erb                  | 41 +------------------
 app/views/tasks/show.html.erb                 | 11 ++---
 config/routes.rb                              | 12 +++++-
 ...20170324225713_change_col_name_for_done.rb |  5 +++
 db/schema.rb                                  |  4 +-
 11 files changed, 128 insertions(+), 65 deletions(-)
 create mode 100644 app/views/tasks/_form.html.erb
 create mode 100644 app/views/tasks/edit.html.erb
 create mode 100644 db/migrate/20170324225713_change_col_name_for_done.rb

diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss
index c95fb7641..9ff301b18 100644
--- a/app/assets/stylesheets/tasks.scss
+++ b/app/assets/stylesheets/tasks.scss
@@ -10,11 +10,12 @@
 
 
 
- @import url('https://fonts.googleapis.com/css?family=Fjalla+One|Raleway');
+ @import url('https://fonts.googleapis.com/css?family=Open-Sans');
  // font-family: 'Raleway', sans-serif;
 
  * {
-   font-family: 'Fjalla One', sans-serif;
+   font-family: 'Open-Sans', sans-serif;
+   font-weight: lighter;
    padding: 0;
    margin: 0;
  }
@@ -61,7 +62,7 @@ section {
  }
 
  main ul {
-      width: 20%;
+      width: 40%;
  }
 
  ul {
diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
index c9dc32ca2..cf4318a58 100644
--- a/app/controllers/tasks_controller.rb
+++ b/app/controllers/tasks_controller.rb
@@ -7,23 +7,61 @@ def show
     @selected_task = Task.find params[:id]
   end
 
+
   def new
     @task = Task.new
   end
 
+  def edit
+    @task = Task.find params[:id]
+  end
+
+  def update
+    task = Task.find params[:id]
+
+    task.name = task_params[:name]
+    task.description = task_params[:description]
+    task.priority = task_params[:priority]
+    task.due_date = task_params[:due_date]
+    if task_params[:done] == "1"
+      task.done = true
+    elsif task_params[:done] == "0"
+      task.done = false
+    end
+
+    if task.save
+      redirect_to task_path(task.id)
+    end
+  end
+
   def create
     task = Task.create task_params
 
     unless task.id == nil
       redirect_to tasks_path
     end
+  end
+
+  def destroy
+    Task.destroy(params[:id])
+
+    redirect_to tasks_path
+  end
+
+  def task_done
+    task = Task.find params[:id]
+    task.done = true
+    task.complete_date = Time.new
 
+    if task.save
+      redirect_to tasks_path
+    end
   end
 
   private
 
   def task_params
-    params.require(:task).permit(:name, :description, :priority, :due_date)
+    params.require(:task).permit(:name, :description, :priority, :due_date, :done)
   end
 
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c25bbc154..edf446bcf 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,7 +14,13 @@
     <header>
       <h1>most maginificent task list</h1>
     </header>
-    
+    <nav>
+      <h3>Let's GSD!</h3>
+      <ul>
+        <li><%= link_to "all", tasks_path %></li>
+        <li><%= link_to "new", tasks_new_path %></li>
+      </ul>
+    </nav>
     <%= yield %>
 
     <footer><p>&copy; <%= Time.current.year %> </p></footer>
diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb
new file mode 100644
index 000000000..0e13b9995
--- /dev/null
+++ b/app/views/tasks/_form.html.erb
@@ -0,0 +1,36 @@
+<ul class="form_new">
+
+  <%= form_for @task, method: form_method do |f| %>
+
+  <li><%= f.label :name %>
+    <%= f.text_field :name %>
+  </li>
+
+  <li>
+    <%= f.label :description %>
+    <%= f.text_field :description %>
+  </li>
+
+  <li>
+    <%= f.label :due_date %>
+    <%= f.date_field :due_date %> </li>
+
+  <li>
+    <%= f.label :priority %>
+    <%= f.select :priority, [['High', 1], ['Medium', 2], ['Low', 3]] %>
+  </li>
+
+  <% unless @task.id == nil %>
+  <li>
+    <%= f.label :done? %>
+    <%= f.check_box :done? %>
+  </li>
+  <% end %>
+
+    <!-- options_for_select([['High', 1], ['Medium', 2], ['Low', 3]]) -->
+    <!-- default name on submit button is "Create + Name of model -->
+  <li><%= f.submit %></li>
+
+  <% end %>
+
+</ul>
diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb
new file mode 100644
index 000000000..1cf8b18a1
--- /dev/null
+++ b/app/views/tasks/edit.html.erb
@@ -0,0 +1,7 @@
+<main>
+<h1>Edit this Task</h1>
+<%= render partial: "form", locals: { form_method: :put } %>
+
+
+
+</main>
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index 476b57cd2..e114621b3 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -1,18 +1,17 @@
 <main>
-  <nav>
-    <h3>welcome to your to-dos. let's GSD.</h4>
-    <ul>
-      <li><%= link_to "all", tasks_path %></li>
-      <li><%= link_to "new", tasks_new_path %></li>
-    </ul>
-  </nav>
+
 <section class="high">
 
 <h4>You have some high priority tasks:</h4>
 <ul>
   <% @tasks.each do |task| %>
     <% if task.priority == 1 %>
-      <li><%= link_to task.name, task_path(task.id) %> </li>
+      <li><%= link_to task.name, task_path(task.id) %>
+        <% if task.done %>
+            ✔︎
+        <% else %>
+        <%= link_to "done", task_done_path(task.id), method: :patch %> </li>
+          <% end %>
     <% end %>
   <% end %>
 </ul>
@@ -23,7 +22,12 @@
 <ul>
   <% @tasks.each do |task| %>
     <% if task.priority != 1 %>
-      <li><%= link_to task.name, task_path(task.id) %> </li>
+    <li><%= link_to task.name, task_path(task.id) %>
+      <% if task.done %>
+          ✔︎
+      <% else %>
+      <%= link_to "done", task_done_path(task.id), method: :patch %> </li>
+      <% end %>
     <% end %>
   <% end %>
 </ul>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
index 51d556bf0..e2f430b9f 100644
--- a/app/views/tasks/new.html.erb
+++ b/app/views/tasks/new.html.erb
@@ -1,42 +1,5 @@
 <main>
-
-<nav>
-  <h3>Add a New Task</h3>
-  <ul>
-    <li><%= link_to "all", tasks_path %></li>
-    <li><%= link_to "new", tasks_new_path %></li>
-  </ul>
-</nav>
-
-<ul class="form_new">
-
-  <%= form_for @task do |f| %>
-
-  <li><%= f.label :name %>
-    <%= f.text_field :name %>
-  </li>
-
-  <li>
-    <%= f.label :description %>
-    <%= f.text_field :description %>
-  </li>
-
-  <li>
-    <%= f.label :due_date %>
-    <%= f.date_field :due_date %> </li>
-
-  <li>
-    <%= f.label :priority %>
-    <%= f.select :priority, [['High', 1], ['Medium', 2], ['Low', 3]] %>
-  </li>
-
-    <!-- options_for_select([['High', 1], ['Medium', 2], ['Low', 3]]) -->
-    <!-- default name on submit button is "Create + Name of model -->
-  <li><%= f.submit "add task"%></li>
-
-  <% end %>
-
-</ul>
-
+<h1>Add a New Task</h1>
+<%= render partial: "form", locals: { form_method: :post } %>
 
 </main>
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
index 43f48496d..06d6a071d 100644
--- a/app/views/tasks/show.html.erb
+++ b/app/views/tasks/show.html.erb
@@ -1,23 +1,18 @@
 <main>
 
 
-<nav>
-  <h3>here is your task</h3>
-  <ul>
-    <li><%= link_to "all", tasks_path %></li>
-    <li><%= link_to "new", tasks_new_path %></li>
-  </ul>
-</nav>
 
 <section>
 
 <p> <% if @selected_task.done? %>
-        <%= "*Nice! This task is done*  " %>
+        Nice! You completed this task on <%= @selected_task.complete_date  %>
     <% end %>
 </p>
 <h3><%= @selected_task.name %> (<%= @selected_task.description %>)</h3>
 <p>You need to complete this task by: <%= @selected_task.due_date %> </p>
 <p>Priority level: <%= @selected_task.priority %></p>
+<p><%= link_to "edit", edit_task_path(@selected_task.id) %></p>
+<h5> <%= link_to "delete", delete_task_path(@selected_task.id), data: {confirm: "Are you sure you want to delete this task?"}, method: :delete %> </h5>
 
 </section>
 
diff --git a/config/routes.rb b/config/routes.rb
index 97f6f7d8a..f24febe1b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,14 +1,22 @@
 Rails.application.routes.draw do
 
-  root to: 'tasks#index'
+  root 'tasks#index'
 
-  get 'tasks/new', to: 'tasks#new'
+  get '/tasks/new', to: 'tasks#new'
   post '/tasks', to: 'tasks#create'
 
   get '/tasks', to: 'tasks#index'
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   get 'tasks/:id', to: 'tasks#show', as: 'task'
 
+  patch '/tasks/:id', to: 'tasks#task_done', as: "task_done"
+
+  get '/tasks/:id/edit', to: 'tasks#edit', as: 'edit_task'
+  put '/tasks/:id', to: 'tasks#update', as: 'update_task'
+
+  #delete action
+  delete 'tasks/:id', to: 'tasks#destroy', as: "delete_task"
+
 
 
 
diff --git a/db/migrate/20170324225713_change_col_name_for_done.rb b/db/migrate/20170324225713_change_col_name_for_done.rb
new file mode 100644
index 000000000..347d177ec
--- /dev/null
+++ b/db/migrate/20170324225713_change_col_name_for_done.rb
@@ -0,0 +1,5 @@
+class ChangeColNameForDone < ActiveRecord::Migration[5.0]
+  def change
+    rename_column(:tasks, :done?, :done)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 20c888088..de1d72ccd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170322200020) do
+ActiveRecord::Schema.define(version: 20170324225713) do
 
   create_table "tasks", force: :cascade do |t|
     t.string   "name"
@@ -19,7 +19,7 @@
     t.date     "complete_date"
     t.datetime "created_at",    null: false
     t.datetime "updated_at",    null: false
-    t.boolean  "done?"
+    t.boolean  "done"
     t.date     "due_date"
   end
 

From c24901c418beb6a39d068b9ef880c602d826d111 Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Sun, 26 Mar 2017 07:45:33 -0700
Subject: [PATCH 10/13] fixed priority field (changed data type in db; tinkered
 with some CSS

---
 app/assets/stylesheets/tasks.scss             | 45 ++++++++++++++-----
 app/views/tasks/_form.html.erb                |  2 +-
 app/views/tasks/edit.html.erb                 |  2 +-
 app/views/tasks/index.html.erb                | 26 ++++++-----
 app/views/tasks/new.html.erb                  |  2 +-
 app/views/tasks/show.html.erb                 | 33 +++++++++++---
 .../20170326143123_change_priority_type.rb    |  5 +++
 db/schema.rb                                  |  4 +-
 8 files changed, 85 insertions(+), 34 deletions(-)
 create mode 100644 db/migrate/20170326143123_change_priority_type.rb

diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss
index 9ff301b18..70a4c7697 100644
--- a/app/assets/stylesheets/tasks.scss
+++ b/app/assets/stylesheets/tasks.scss
@@ -20,8 +20,8 @@
    margin: 0;
  }
 
-h4 {
-  padding: 2% 0;
+h3, h4, h5 {
+  padding: 2% 0 0 0;
 }
 
  header {
@@ -38,7 +38,7 @@ h4 {
  }
 
  main {
-  padding-bottom: 40%;
+  padding: 0 0 40% 3%;
   //  padding: 0 5% 3% 5%;
    background-color: #DDDDDD;
   //  position: absolute;
@@ -48,7 +48,7 @@ h4 {
  }
 
 section {
-  padding: 2% 0 0 3%;
+  padding: 2% 0 0 0;
 }
 
 
@@ -62,11 +62,11 @@ section {
  }
 
  main ul {
-      width: 40%;
+      width: 70%;
  }
 
  ul {
-   padding: 1% 2%;
+   padding-top: 2%;
    list-style-type: none;
 
  }
@@ -87,7 +87,7 @@ section {
  }
 
  nav {
-   padding: 0 2%;
+   padding: 2%;
    background-color: #AAAAAA;
  }
 
@@ -98,11 +98,16 @@ section {
 
  nav ul {
    display: inline-block;
-      text-align: right;
-      width: 35%
+   text-align: right;
+   width: 35%;
+   padding: 0;
  }
- nav li {
 
+li {
+  padding-top: 1%;
+}
+
+ nav li {
    padding: 0.5% 2%;
    display: inline-block;
  }
@@ -122,5 +127,23 @@ section {
  }
 
 .form_new li {
-  padding: 5% 3%;
+  padding: 3% 0;
+}
+
+.task_list p {
+  display: inline-block;
+  padding: 1% 0;
+}
+
+#done {
+  background-color: #AAAAAA;
+
+  margin: 0 0 1% 2%;
+  border-style: solid;
+  border-width: thin;
+  border-radius: 10%;
+  border-color: #AAAAAA;
+  padding: 1% 1%;
+  font-size: 0.80em;
+  vertical-align: middle;
 }
diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb
index 0e13b9995..bce1e11bc 100644
--- a/app/views/tasks/_form.html.erb
+++ b/app/views/tasks/_form.html.erb
@@ -17,7 +17,7 @@
 
   <li>
     <%= f.label :priority %>
-    <%= f.select :priority, [['High', 1], ['Medium', 2], ['Low', 3]] %>
+    <%= f.select :priority, ["high", "medium", "low"] %>
   </li>
 
   <% unless @task.id == nil %>
diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb
index 1cf8b18a1..57f4f3c7d 100644
--- a/app/views/tasks/edit.html.erb
+++ b/app/views/tasks/edit.html.erb
@@ -1,5 +1,5 @@
 <main>
-<h1>Edit this Task</h1>
+<h4>Edit this Task</h4>
 <%= render partial: "form", locals: { form_method: :put } %>
 
 
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index e114621b3..e1d3c451a 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -3,15 +3,17 @@
 <section class="high">
 
 <h4>You have some high priority tasks:</h4>
-<ul>
+<ul class="task_list">
   <% @tasks.each do |task| %>
-    <% if task.priority == 1 %>
-      <li><%= link_to task.name, task_path(task.id) %>
+    <% if task.priority == "high" %>
+      <li>
+        <p><%= link_to task.name, task_path(task.id) %></p>
         <% if task.done %>
-            ✔︎
+          <p >✔︎</p>
         <% else %>
-        <%= link_to "done", task_done_path(task.id), method: :patch %> </li>
-          <% end %>
+          <p id="done"><%= link_to "done!", task_done_path(task.id), method: :patch %></p>
+        <% end %>
+      </li>
     <% end %>
   <% end %>
 </ul>
@@ -19,15 +21,17 @@
 
 <section>
 <h4>Your other tasks are not as urgent:</h4>
-<ul>
+<ul class="task_list">
   <% @tasks.each do |task| %>
-    <% if task.priority != 1 %>
-    <li><%= link_to task.name, task_path(task.id) %>
+    <% if task.priority != "high" %>
+    <li>
+      <p><%= link_to task.name, task_path(task.id) %></p>
       <% if task.done %>
-          ✔︎
+        <p>✔︎</p>
       <% else %>
-      <%= link_to "done", task_done_path(task.id), method: :patch %> </li>
+        <p id="done"><%= link_to "done!", task_done_path(task.id), method: :patch %></p>
       <% end %>
+    </li>
     <% end %>
   <% end %>
 </ul>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
index e2f430b9f..3cfecc979 100644
--- a/app/views/tasks/new.html.erb
+++ b/app/views/tasks/new.html.erb
@@ -1,5 +1,5 @@
 <main>
-<h1>Add a New Task</h1>
+<h4>Add a New Task</h4>
 <%= render partial: "form", locals: { form_method: :post } %>
 
 </main>
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
index 06d6a071d..624c7f5a9 100644
--- a/app/views/tasks/show.html.erb
+++ b/app/views/tasks/show.html.erb
@@ -4,15 +4,34 @@
 
 <section>
 
-<p> <% if @selected_task.done? %>
+
+
+
+<h4> <% if @selected_task.done %>
         Nice! You completed this task on <%= @selected_task.complete_date  %>
+        <% elsif @selected_task.due_date > Date.current %>
+        *This task is due in <%= pluralize((@selected_task.due_date - Date.current).to_i, 'day') %>*
+        <% elsif @selected_task.due_date == Date.current %>
+        *This task is due today*
+        <% elsif @selected_task.due_date < Date.current %>
+        This task is overdue!
+    <% end %>
+</h4>
+
+<h3><%= @selected_task.name %></h3>
+
+<ul>
+  <li><%= @selected_task.description %></li>
+  <li>
+    <% if @selected_task.due_date == nil %>
+    This task has no due date. Click edit below to add one.
+    <% else %>
+    You need to complete this task by: <%= @selected_task.due_date.to_formatted_s(:long_ordinal) %>
     <% end %>
-</p>
-<h3><%= @selected_task.name %> (<%= @selected_task.description %>)</h3>
-<p>You need to complete this task by: <%= @selected_task.due_date %> </p>
-<p>Priority level: <%= @selected_task.priority %></p>
-<p><%= link_to "edit", edit_task_path(@selected_task.id) %></p>
-<h5> <%= link_to "delete", delete_task_path(@selected_task.id), data: {confirm: "Are you sure you want to delete this task?"}, method: :delete %> </h5>
+  </li>
+  <li>This is a <%= @selected_task.priority %> priority task</li>
+</ul>
+<h5><%= link_to "edit", edit_task_path(@selected_task.id) %>   <%= link_to "delete", delete_task_path(@selected_task.id), data: {confirm: "Are you sure you want to delete this task?"}, method: :delete %> </h5>
 
 </section>
 
diff --git a/db/migrate/20170326143123_change_priority_type.rb b/db/migrate/20170326143123_change_priority_type.rb
new file mode 100644
index 000000000..9405873b4
--- /dev/null
+++ b/db/migrate/20170326143123_change_priority_type.rb
@@ -0,0 +1,5 @@
+class ChangePriorityType < ActiveRecord::Migration[5.0]
+  def change
+    change_column(:tasks, :priority, :string)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index de1d72ccd..ced17f7fe 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,11 +10,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170324225713) do
+ActiveRecord::Schema.define(version: 20170326143123) do
 
   create_table "tasks", force: :cascade do |t|
     t.string   "name"
-    t.integer  "priority"
+    t.string   "priority"
     t.text     "description"
     t.date     "complete_date"
     t.datetime "created_at",    null: false

From f1a0f738a995fd87941d24c1840c0987c2a73aaa Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Wed, 5 Apr 2017 14:17:10 -0700
Subject: [PATCH 11/13] Hello, World

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 7db80e4ca..cf7dc4064 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
 # README
 
+Hello, World.
+
+
 This README would normally document whatever steps are necessary to get the
 application up and running.
 

From 7c4694df323373f06b22e275e6f555ab62f71231 Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Wed, 5 Apr 2017 14:27:31 -0700
Subject: [PATCH 12/13] old changes

---
 app/assets/stylesheets/tasks.scss   | 1 +
 app/controllers/tasks_controller.rb | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss
index 70a4c7697..16cfb2681 100644
--- a/app/assets/stylesheets/tasks.scss
+++ b/app/assets/stylesheets/tasks.scss
@@ -94,6 +94,7 @@ section {
  nav h3 {
    display: inline-block;
    width: 60%
+
  }
 
  nav ul {
diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
index cf4318a58..f55c49823 100644
--- a/app/controllers/tasks_controller.rb
+++ b/app/controllers/tasks_controller.rb
@@ -7,7 +7,6 @@ def show
     @selected_task = Task.find params[:id]
   end
 
-
   def new
     @task = Task.new
   end

From aba63260021fd6a62e3c2e66fdabba55873bd983 Mon Sep 17 00:00:00 2001
From: sai samant <saisamant@gmail.com>
Date: Wed, 5 Apr 2017 14:32:52 -0700
Subject: [PATCH 13/13] more README changes

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index cf7dc4064..49bf6f511 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # README
 
 Hello, World.
+Goodbye, World.
 
 
 This README would normally document whatever steps are necessary to get the