Finished with Wave1

amb54 · amb54 · commit f3526dad1ba0 · 2017-03-21T16:28:07.000-07:00
diff --git a/app/assets/javascripts/tasks.coffee 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/javascripts/welcome.coffee b/app/assets/javascripts/welcome.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/tasks.css b/app/assets/stylesheets/tasks.css
@@ -0,0 +1,38 @@
+/*// 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/*/
+
+
+/*********************************************************
+HEADER
+**********************************************************/
+
+#index_header {
+  position: fixed;
+  top: 100px;
+  width: 100%;
+  height: 50px;
+  text-align: center;
+  vertical-align: middle;
+  background-color: black;
+  color: white;
+}
+
+#index_main{
+margin-top: 50px
+}
+
+#index_main nav {
+  display: inline-block;
+  width: 50%;
+  text-align: center;
+  list-style-type: none;
+}
+
+#index_main li {
+  list-style-type: none;
+}
+
+#index_main a {
+  text-decoration: none;
+}
diff --git a/app/assets/stylesheets/welcome.css b/app/assets/stylesheets/welcome.css
@@ -0,0 +1,3 @@
+/*// Place all the styles related to the Welcome controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/*/
diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
@@ -0,0 +1,22 @@
+class TasksController < ApplicationController
+  # TASKS = [{ name: "The First Task", description: "This is a description for the first task.", completed_at: "random_time "},
+  #   { name: "Go to Brunch", description: "This is a description for the brunch." },
+  #   { name: "Go to Lunch", description: "This is a description for the lunch.", completed_at: "random_time" },
+  #   { name: "Go to Second Lunch", description: "This is a description for the second lunch." },
+  #   { name: "Play Video Games", description: "This is a description for playing video games.", completed_at: "random_time "},
+  #   { name: "High Five Somebody You Don't Know", description: "This is a description for highfiving someone.", completed_at: "random_time" },
+  #   { name: "Plant Flowers", description: "This is a description for planting flowers.", completed_at: "random_time "},
+  #   { name: "Call Mom", description: "This is a description for playing video games." },
+  #   { name: "She worries, you know.", description: "This is a description for how to worry." },
+  #   { name: "Nap.", description: "This is a description for taking a nap.", completed_at: "random_time "}]
+
+  def index
+    puts ">>>>>>amb<<<<<<<<:  Inside tasks index!"
+    @tasks = Task.all
+  end
+
+  def show
+    id = params[:id].to_i
+    @task = Task.find(id)
+  end
+end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
@@ -0,0 +1,4 @@
+class WelcomeController < ApplicationController
+  def index
+  end
+end
diff --git a/app/helpers/tasks_helper.rb b/app/helpers/tasks_helper.rb
@@ -0,0 +1,2 @@
+module TasksHelper
+end
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
@@ -0,0 +1,2 @@
+module WelcomeHelper
+end
diff --git a/app/models/task.rb 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
@@ -8,6 +8,10 @@
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>
 
+  <header>
+    <h1>This is the header in the application.html code</h1>
+  </header>
+
   <body>
     <%= yield %>
   </body>
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
@@ -0,0 +1,30 @@
+
+<header id = "index_header">
+  <h1>Tasks list</h1>
+</header>
+
+
+
+
+<main id = "index_main">
+  <nav>
+    <ul>
+      <% @tasks.each_with_index do |task| %>
+        <li>
+          <%= link_to task[:name], task_path(task.id) %>
+        </li>
+      <% end %>
+    </ul>
+  </nav>
+
+</main>
+
+
+
+
+
+<!-- <% 10.times do %>
+  <p>
+    This will be there 10 times
+  </p>
+<% end %> -->
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
@@ -0,0 +1,7 @@
+<h1><%= @task[:name]%></h1>
+<p>
+  Description: <%= @task[:description] %>
+</p>
+<p>
+  <%= link_to "Back to books", tasks_path %>
+</p>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
@@ -0,0 +1,8 @@
+<h1>Welcome!</h1>
+<p>
+  This is the welcome page for the rails project TaskList.
+</p>
+
+<div>
+  <%=link_to "List of all tasks", tasks_path %>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,3 +1,12 @@
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+  root 'welcome#index', as: 'welcome'
+
+  get 'tasks', to: 'tasks#index', as: 'tasks' #The index always requires the controllers?????
+
+
+  # get 'tasks/:id', to: 'tasks#show'
+
+  get 'tasks/:id', to: 'tasks#show', as: 'task'
+
 end
diff --git a/db/development.sqlite3 b/db/development.sqlite3
diff --git a/db/migrate/20170321193054_create_tasks.rb b/db/migrate/20170321193054_create_tasks.rb
@@ -0,0 +1,10 @@
+class CreateTasks < ActiveRecord::Migration[5.0]
+  def change
+    create_table :tasks do |t|
+      t.string :name
+      t.string :description
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170321212217_add_completion_date_column_to_tasks_table.rb b/db/migrate/20170321212217_add_completion_date_column_to_tasks_table.rb
@@ -0,0 +1,5 @@
+class AddCompletionDateColumnToTasksTable < ActiveRecord::Migration[5.0]
+  def change
+    add_column :tasks, :completion_date, :datetime
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -0,0 +1,23 @@
+# 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: 20170321212217) do
+
+  create_table "tasks", force: :cascade do |t|
+    t.string   "name"
+    t.string   "description"
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
+    t.datetime "completion_date"
+  end
+
+end
diff --git a/log/development.log b/log/development.log
diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb
diff --git a/test/controllers/welcome_controller_test.rb b/test/controllers/welcome_controller_test.rb
diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml
diff --git a/test/models/task_test.rb b/test/models/task_test.rb

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Place all the behaviors and hooks related to the matching controller here.`
	`2`	`+# All this logic will automatically be available in application.js.`
	`3`	`+# You can use CoffeeScript in this file: http://coffeescript.org/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/*// Place all the styles related to the Welcome controller here.`
	`2`	`+// They will automatically be included in application.css.`
	`3`	`+// You can use Sass (SCSS) here: http://sass-lang.com/*/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class Task < ApplicationRecord`
	`2`	`+end`