final wave of task list by Audrey

task-list/app/assets/javascripts/people.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/

task-list/app/assets/stylesheets/application.css

@@ -1,3 +1,6 @@
+@import url('https://fonts.googleapis.com/css?family=Crimson Text|Open Sans|');
+
+
 a {
   text-decoration: none;
   color: #000;
@@ -13,9 +16,7 @@ a:hover {
 }
 
 body {
-  margin: 0 auto;
   text-align: center;
-  width: 500px;
   font-family: Helvetica, Verdana, sans-serif;
   font-size: 15px;
   background-image: url('wood-background.jpg');
@@ -30,18 +31,25 @@ body {
 
 }
 
-.complete_button {
+#complete_button {
+  -webkit-appearance: checkbox;
+  height:30px;
   vertical-align: middle;
   transform: translateZ(0);
   box-shadow: 0 0 1px rgba(0, 0, 0, 0);
   backface-visibility: hidden;
   transition-property: transform;
 }
 
-.complete_button:hover {
+#complete_button:hover {
+  -webkit-appearance: push button;
   transform: scale(1.1);
 }
 
+div.container {
+  margin: 0 auto;
+}
+
 label {
   float: left;
   width: 40%;
@@ -67,7 +75,7 @@ fieldset input {
 }
 
 h1 {
-  padding-top: 30px;
+  padding-top: 50px;
   padding-bottom: 10px;
 }
 
@@ -77,17 +85,28 @@ h2 {
   padding: 0;
 }
 
-.incomplete_button {
+h3 {
+  font: 400 40px/1.5 Crimson Text, Helvetica, Verdana, sans-serif;
+  font-style: italic;
+  font-size: 0.5cm;
+  margin-top: 0;
+  margin-bottom: 10px;
+}
+
+#incomplete_button {
+  -webkit-appearance: checkbox;
+  height:30px;
   color: #E6E3E1;
   display: inline;
   vertical-align: middle;
   transform: translateZ(0);
   box-shadow: 0 0 1px rgba(0, 0, 0, 0);
   backface-visibility: hidden;
   transition-property: transform;
+  text-align: center;
 }
 
-.incomplete_button:hover {
+#incomplete_button:hover {
   transform: scale(1.1);
 }
 
@@ -119,7 +138,6 @@ li a {
   color: #000;
   width: 300px;
   text-align: center;
-  padding-left: 20px;
 }
 
 li a:hover {
@@ -133,6 +151,10 @@ li a:hover {
   padding: 20px;
 }
 
+#person_name {
+  padding-left: 40px;
+}
+
 section {
   background-color: white;
   width: 400px;
@@ -145,6 +167,22 @@ section {
   margin: 20px;
 }
 
+#left.task_list {
+  display: inline-block;
+  float: left;
+}
+
+#second_to_left.task_list {
+  padding-left: 10px;
+  display: inline-block;
+  max-width: 180px;
+  text-align: left;
+}
+
+#right.task_list {
+  float: right;
+}
+
 ul {
   max-width: 350px;
   list-style-type: none;
@@ -154,6 +192,29 @@ ul {
   align-self: center;
 }
 
+.welcome_links {
+  margin-left: 35px;
+  margin-right: 35px;
+  padding: 5px;
+}
+
+.welcome_links a {
+  font-weight: 200;
+}
+
+#welcome_link_holder {
+  margin: 0 auto;
+}
+
+#welcome_title {
+  padding-bottom: 0px;
+  margin-bottom: 5px;
+}
+
+#welcome_subtitle {
+  padding-bottom: 40px;
+}
+
 /*all css below is for buttons to navigate from index page- add, edit, delete */
 .button_holder {
   display: inline-block;

task-list/app/assets/stylesheets/people.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the people controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

task-list/app/controllers/people_controller.rb

@@ -0,0 +1,19 @@
+class PeopleController < ApplicationController
+
+  def index
+    @people = Person.all
+  end
+
+
+  def show
+    id = params[:id]
+    @person = Person.find(id)
+  end
+
+  def show_tasks
+    id = params[:id]
+    @person = Person.find(id)
+    @tasks = @person.tasks
+  end
+
+end

task-list/app/controllers/tasks_controller.rb

@@ -53,7 +53,7 @@ def update
   private
 
   def task_params
-    params.permit(task:[:name, :description, :completed_date])
+    params.permit(task:[:name, :description, :completed_date, :person_id])
   end
 
 end

task-list/app/helpers/layout_helper.rb

@@ -0,0 +1,8 @@
+module LayoutHelper
+
+  def bootstrap_version
+    # Choose the Bootstrap version you would like to use from the CDN
+    "3.3.5"
+  end
+
+end

task-list/app/helpers/people_helper.rb

@@ -0,0 +1,2 @@
+module PeopleHelper
+end

task-list/app/models/person.rb

@@ -0,0 +1,10 @@
+class Person < ActiveRecord::Base
+  has_many :tasks
+
+  def count_incomplete
+    t = self.tasks
+    incomplete = t.where(completed_date: nil)
+    incomplete.length
+  end
+
+end

task-list/app/models/task.rb

@@ -1,2 +1,3 @@
 class Task < ActiveRecord::Base
+  belongs_to :person
 end

task-list/app/views/layouts/application.html.erb

@@ -1,14 +1,16 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>TaskList</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
+  <head>
+    <title>TaskList with Bootstrap</title>
+    <link href="//netdna.bootstrapcdn.com/bootstrap/<%= bootstrap_version %>/css/bootstrap.min.css" rel="stylesheet">
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <div class="container">
+      <%= yield %>
+    </div>
+    <script src="//netdna.bootstrapcdn.com/bootstrap/<%= bootstrap_version %>/js/bootstrap.min.js"></script>
+  </body>
 </html>

task-list/app/views/people/index.html.erb

@@ -0,0 +1,15 @@
+<section>
+  <h1>Employees</h1>
+  <ul>
+    <% @people.each do |person| %>
+      <li>
+        <div>
+          <a href= "/people/<%= person.id %>"><%= person.name %></a>
+        </div>
+        <div>
+          <p>Incomplete tasks: <%= person.count_incomplete %></p>
+        </div>
+      </li>
+    <% end %>
+  </ul>
+</section>

task-list/app/views/people/show.html.erb

@@ -0,0 +1,5 @@
+<section>
+  <h1><%= @person.name %></h1>
+  <p><%= @person.job_title %></p>
+  <%= link_to 'Tasks',  { action: :show_tasks, id: @person.id }, method: :get %>
+</section>

task-list/app/views/people/show_tasks.html.erb

@@ -0,0 +1,8 @@
+<section>
+<h1> Tasks for <%= @person.name %> </h1>
+  <ul>
+    <% @tasks.each do |task|%>
+      <li><%= task.name %></li>
+    <% end %>
+  </ul>
+</section>

task-list/app/views/shared/_task_form.html.erb

@@ -17,6 +17,10 @@
       <%= f.text_field :completed_date %><br />
     </div>
 
+    <div>
+      <%= f.collection_select(:person_id, Person.all, :id, :name, prompt: "Person to do task:") %>
+    </div>
+
     <div id="submit_button_holder">
       <%= f.submit %>
     </div>

task-list/app/views/tasks/index.html.erb

@@ -3,28 +3,37 @@
   <ul>
     <% @tasks.each do |task| %>
       <% if task.completed_date == nil %>
-        <% @completion_class = "incomplete_button" %>
+        <% @completion_id = "incomplete_button" %>
       <% else %>
-        <% @completion_class = "complete_button" %>
+        <% @completion_id = "complete_button" %>
       <% end %>
-      <li>
-        <%= button_to "✓","/tasks/#{task.id}/complete", method: :patch, class: @completion_class %>
-        <a href= "/tasks/<%= task.id %>"><%= task.name %></a>
+      <li class="task_list", id="holder">
+        <div class="task_list", id="left">
+          <%= button_to "✓","/tasks/#{task.id}/complete", method: :patch, id: @completion_id %>
+        </div>
+        <div class="task_list", id="second_to_left">
+          <a href= "/tasks/<%= task.id %>"><%= task.name %></a>
+        </div>
+        <div class="task_list", id="right">
+          <% if !task.person.nil? %>
+            <a href= "/people/<%= task.person.id %>"><%= task.person.name %></a>
+          <% end %>
+        <div>
       </li>
     <% end %>
   </ul>
 
-<section id="index_buttons">
-  <div class="button_holder">
-    <a href="/tasks/new" class="button plus"></a>
-  </div>
+  <section id="index_buttons">
+    <div class="button_holder">
+      <a href="/tasks/new" class="button plus"></a>
+    </div>
 
-  <div class="button_holder">
-    <a href="/tasks/pre_edit" class="button pencil"></a>
-  </div>
+    <div class="button_holder">
+      <a href="/tasks/pre_edit" class="button pencil"></a>
+    </div>
 
-  <div class="button_holder">
-    <a href="/tasks/remove" class="button cross"></a>
-  </div>
-</section>
+    <div class="button_holder">
+      <a href="/tasks/remove" class="button cross"></a>
+    </div>
+  </section>
 </section>

task-list/app/views/tasks/remove.html.erb

@@ -9,4 +9,5 @@
   </ul>
 
   <a href="/tasks/" class="bottom_of_page_link">Back to List</a>
+
 </section>

task-list/app/views/tasks/show.html.erb

@@ -2,6 +2,7 @@
 <h1><%= @task.name %></h1>
 
     <p><%= @task.description %></p>
+    <p><%= @task.person.name %></p>
     <% if @task.completed_date != nil %>
       <p>Completed!</p>
     <% else %>
@@ -11,5 +12,4 @@
 
     <%= link_to 'Edit',  { action: :edit, id: @task.id }, method: :get %>
 
-
 </section>

task-list/app/views/welcome/index.html.erb

@@ -1,6 +1,16 @@
 <section>
-  <h1>Tasks</h1>
-  <%= link_to "Let's jot it all down.", "/tasks/" %>
-
+  <h1 id="welcome_title">Things to Do</h1>
+  <h3 id="welcome_subtitle">for the staff of Maggy Magazine</h3>
+  <div id="welcome_link_holder">
+    <div class="welcome_links">
+      <%= link_to "Tasks", "/tasks/" %>
+    </div>
+    <div class="welcome_links">
+      <%= link_to "Employees", "/people/" %>
+    </div>
+    <div class="welcome_links">
+      <%= link_to "Inspiration", "http://worstcats.tumblr.com/" %>
+    </div>
+  </div>
   <%= link_to (image_tag "pencil_shavings.jpg", :id => "pencil_shavings"), "/tasks/" %>
 </section>

task-list/config/routes.rb

@@ -13,6 +13,11 @@
   get 'tasks/:id/edit' => 'tasks#edit'
   patch 'tasks/:id/complete' => 'tasks#complete'
 
+  get 'people/' => 'people#index'
+  get 'people/:id' => 'people#show'
+  get 'people/:id/tasks' => 'people#show_tasks'
+
+
   resources :tasks, :path => 'tasks'
 
   # The priority is based upon order of creation: first created -> highest priority.