From 0563710efd219cf7295db59687efa50e68b0f965 Mon Sep 17 00:00:00 2001 From: heatherherrington Date: Tue, 27 Sep 2016 21:59:48 -0700 Subject: [PATCH 01/25] Baseline and Wave 1 requirements satisfied --- .gitignore | 46 ++--- .ruby-version | 2 +- Gemfile | 47 +++++ Gemfile.lock | 163 ++++++++++++++++++ README.rdoc | 28 +++ Rakefile | 6 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/javascripts/tasks.coffee | 3 + app/assets/stylesheets/application.css | 15 ++ app/assets/stylesheets/tasks.scss | 3 + app/controllers/application_controller.rb | 5 + app/controllers/concerns/.keep | 0 app/controllers/tasks_controller.rb | 37 ++++ app/helpers/application_helper.rb | 2 + app/helpers/tasks_helper.rb | 2 + app/mailers/.keep | 0 app/models/.keep | 0 app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/tasks/index.html.erb | 8 + app/views/tasks/show.html.erb | 20 +++ bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 29 ++++ bin/spring | 15 ++ config.ru | 4 + config/application.rb | 26 +++ config/boot.rb | 3 + config/database.yml | 25 +++ config/environment.rb | 5 + config/environments/development.rb | 41 +++++ config/environments/production.rb | 79 +++++++++ config/environments/test.rb | 42 +++++ config/initializers/assets.rb | 11 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 3 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/routes.rb | 59 +++++++ config/secrets.yml | 22 +++ 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/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/controllers/tasks_controller_test.rb | 7 + test/fixtures/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 10 ++ vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 65 files changed, 1069 insertions(+), 33 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 README.rdoc create mode 100644 Rakefile create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js 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/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/tasks_controller.rb create mode 100644 app/helpers/application_helper.rb create mode 100644 app/helpers/tasks_helper.rb create mode 100644 app/mailers/.keep create mode 100644 app/models/.keep create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/tasks/index.html.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 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb 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/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/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/routes.rb create mode 100644 config/secrets.yml 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/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/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep diff --git a/.gitignore b/.gitignore index 28f484983..050c9d95c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,17 @@ -*.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/ - -# 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 all logfiles and tempfiles. +/log/* +!/log/.keep +/tmp diff --git a/.ruby-version b/.ruby-version index 276cbf9e2..2bf1c1ccf 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.0 +2.3.1 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..e87fad5fc --- /dev/null +++ b/Gemfile @@ -0,0 +1,47 @@ +source 'https://rubygems.org' + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.7' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# 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.1.0' +# 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 following links in your web application faster. Read more: https://github.com/rails/turbolinks +gem 'turbolinks' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.0' +# bundle exec rake doc:rails generates the API under doc/api. +gem 'sdoc', '~> 0.4.0', group: :doc + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Unicorn as the app server +# gem 'unicorn' + +# 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' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' +end + diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..187046034 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,163 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.7) + activesupport (= 4.2.7) + globalid (>= 0.3.0) + activemodel (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) + arel (~> 6.0) + activesupport (4.2.7) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + arel (6.0.3) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + byebug (9.0.5) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.7.0) + globalid (0.3.7) + activesupport (>= 4.1.0) + i18n (0.7.0) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.2.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + json (1.8.3) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.1) + multi_json (1.12.1) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.7) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.3.0) + rdoc (4.2.2) + json (~> 1.4) + sass (3.4.22) + 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) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + spring (1.7.2) + sprockets (3.7.0) + 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.11) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.2) + execjs (>= 0.3.0, < 3) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + coffee-rails (~> 4.1.0) + jbuilder (~> 2.0) + jquery-rails + rails (= 4.2.7) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +BUNDLED WITH + 1.13.1 diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 000000000..dd4e97e22 --- /dev/null +++ b/README.rdoc @@ -0,0 +1,28 @@ +== README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... + + +Please feel free to use a different markup language if you do not plan to run +rake doc:app. diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..ba6b733dd --- /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 File.expand_path('../config/application', __FILE__) + +Rails.application.load_tasks 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..e07c5a830 --- /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. +// +// 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/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..f9cd5b348 --- /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 styles + * defined in the other CSS/SCSS files in this directory. 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/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..d83690e1b --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + 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 new file mode 100644 index 000000000..41c6f1257 --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,37 @@ +class TasksController < ApplicationController + def index + @id = params[:id] + @tasks = [ + { + task: "Grocery shopping", + description: "fruit, bread, turkey", + completion_status: "incomplete", + completion_date: "Sept 27, 2016" + }, + { + task: "Laundry", + description: "darks", + completion_status: "in-progress", + completion_date: "Sept 30, 2016" + } + ] + end + + def show + @id = params[:id] + @tasks = [ + { + task: "Grocery shopping", + description: "fruit, bread, turkey", + completion_status: "incomplete", + completion_date: "Sept 27, 2016" + }, + { + task: "Laundry", + description: "darks", + completion_status: "in-progress", + completion_date: "Sept 30, 2016" + } + ] + 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/mailers/.keep b/app/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/.keep b/app/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..46eeb110b --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + TaskListRails + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + +<%= yield %> + + + diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 000000000..de537211d --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,8 @@ +

Hello! Welcome to the Task List!

+ + diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb new file mode 100644 index 000000000..284f9384d --- /dev/null +++ b/app/views/tasks/show.html.erb @@ -0,0 +1,20 @@ +

Here is the task you have selected!

+ +

Title: + <%= @tasks[@id.to_i][:task] %> +

+ +

+ Description: + <%= @tasks[@id.to_i][:description] %> +

+ +

+ Completion status: + <%= @tasks[@id.to_i][:completion_status] %> +

+ +

+ Completion due date: + <%= @tasks[@id.to_i][:completion_date] %> +

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..0138d79b7 --- /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', __FILE__) +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..acdb2c138 --- /dev/null +++ b/bin/setup @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +Dir.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 || bundle install" + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # system "cp config/database.yml.sample config/database.yml" + # end + + puts "\n== Preparing database ==" + system "bin/rake db:setup" + + puts "\n== Removing old logs and tempfiles ==" + system "rm -f log/*" + system "rm -rf tmp/cache" + + puts "\n== Restarting application server ==" + system "touch tmp/restart.txt" +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..7fe232c3a --- /dev/null +++ b/bin/spring @@ -0,0 +1,15 @@ +#!/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' + + if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)) + Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) } + gem 'spring', match[1] + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..bd83b2541 --- /dev/null +++ b/config.ru @@ -0,0 +1,4 @@ +# This file is used by Rack-based servers to start the application. + +require ::File.expand_path('../config/environment', __FILE__) +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..902432bad --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +require File.expand_path('../boot', __FILE__) + +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 TaskListRails + 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. + + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' + + # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + # config.i18n.default_locale = :de + + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..6b750f00b --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. 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..ee8d90dc6 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require File.expand_path('../application', __FILE__) + +# 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..b55e2144b --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,41 @@ +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 and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # Adds additional error checking when serving assets at runtime. + # Checks for improperly declared sprockets dependencies. + # Raises helpful error messages. + config.assets.raise_runtime_errors = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5c1b32e48 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,79 @@ +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 + + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like + # NGINX, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.serve_static_files = 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # 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 + + # 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 = [ :subdomain, :uuid ] + + # Use a different logger for distributed setups. + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # 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 + + # 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..1c19f08b2 --- /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 static file server for tests with Cache-Control for performance. + config.serve_static_files = true + config.static_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 + + # 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 + + # Randomize the order test cases are executed. + config.active_support.test_order = :random + + # 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/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..7f70458de --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +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/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 000000000..15d065a84 --- /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: '_TaskListRails_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..33725e95f --- /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] if respond_to?(:wrap_parameters) +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/routes.rb b/config/routes.rb new file mode 100644 index 000000000..394a38f8d --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,59 @@ +Rails.application.routes.draw do + root 'tasks#index' + get '/tasks' => 'tasks#index' + get '/tasks/:id' => 'tasks#show' + # The priority is based upon order of creation: first created -> highest priority. + # See how all your routes lay out with "rake routes". + + # You can have the root of your site routed with "root" + # root 'welcome#index' + + # Example of regular route: + # get 'products/:id' => 'catalog#view' + + # Example of named route that can be invoked with purchase_url(id: product.id) + # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase + + # Example resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Example resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Example resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Example resource route with more complex sub-resources: + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', on: :collection + # end + # end + + # Example resource route with concerns: + # concern :toggleable do + # post 'toggle' + # end + # resources :posts, concerns: :toggleable + # resources :photos, concerns: :toggleable + + # Example resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..8a4bc7e55 --- /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 `rake 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: 814d782bfa9a8697ffd3ad81532f7a48c56aef17bec66e146223933829abdfb03a7f1d4848d1a93ec7f346e9259510461d9164ad893eabaa0193350340b9d8e4 + +test: + secret_key_base: 188631562aa626acf1e5d9510a3662acfef73e6f22b797fa919ea7c797d277518697e88660c6dd8d4db8e735d1f91343c92b191cbca46f1f12599ba3c92b07a3 + +# 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/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..4edb1e857 --- /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 rake db:seed (or created alongside the db with db:setup). +# +# Examples: +# +# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) +# Mayor.create(name: 'Emanuel', city: cities.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 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + 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 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + 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 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + 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..ab48b116d --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TasksControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb 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/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/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 f66746dfe180aabe00ffe93fcf14693be43fd8d0 Mon Sep 17 00:00:00 2001 From: heatherherrington Date: Wed, 28 Sep 2016 15:53:54 -0700 Subject: [PATCH 02/25] Wave 1 complete, form done, need to connect to DB --- app/controllers/tasks_controller.rb | 39 ++++++----------------- app/models/task.rb | 2 ++ app/views/tasks/index.html.erb | 16 ++++++---- app/views/tasks/new.html.erb | 24 ++++++++++++++ app/views/tasks/show.html.erb | 10 +++--- config/routes.rb | 5 ++- db/migrate/20160928221310_create_tasks.rb | 12 +++++++ db/schema.rb | 25 +++++++++++++++ test/fixtures/tasks.yml | 13 ++++++++ test/models/task_test.rb | 7 ++++ 10 files changed, 112 insertions(+), 41 deletions(-) create mode 100644 app/models/task.rb create mode 100644 app/views/tasks/new.html.erb create mode 100644 db/migrate/20160928221310_create_tasks.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/tasks.yml create mode 100644 test/models/task_test.rb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 41c6f1257..f85da658a 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,37 +1,16 @@ class TasksController < ApplicationController def index - @id = params[:id] - @tasks = [ - { - task: "Grocery shopping", - description: "fruit, bread, turkey", - completion_status: "incomplete", - completion_date: "Sept 27, 2016" - }, - { - task: "Laundry", - description: "darks", - completion_status: "in-progress", - completion_date: "Sept 30, 2016" - } - ] + @tasks = Task.all end def show - @id = params[:id] - @tasks = [ - { - task: "Grocery shopping", - description: "fruit, bread, turkey", - completion_status: "incomplete", - completion_date: "Sept 27, 2016" - }, - { - task: "Laundry", - description: "darks", - completion_status: "in-progress", - completion_date: "Sept 30, 2016" - } - ] + @task = Task.find(params[:id]) + end + + def new; end + + def create + # Here is where we would save to the database + redirect_to tasks_path end end diff --git a/app/models/task.rb b/app/models/task.rb new file mode 100644 index 000000000..935f76e12 --- /dev/null +++ b/app/models/task.rb @@ -0,0 +1,2 @@ +class Task < ActiveRecord::Base +end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index de537211d..9ae2463e3 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,8 +1,12 @@

Hello! Welcome to the Task List!

- +<% @tasks.each do |t| %> +

+ <%= "Task: #{ t.name }" %> + <%= link_to "Find more info here", task_path(t) %> +

+<% end %> + +

+ Would you like to add a new task? If so, <%= link_to "click here", tasks_new_path %> +

diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb new file mode 100644 index 000000000..9c22c7c0e --- /dev/null +++ b/app/views/tasks/new.html.erb @@ -0,0 +1,24 @@ +
+ + + + + +
+ + +
+ + + + Yes + No + +
+ + +
+ +
+ +<%= link_to("Back to the Tasks", tasks_path) %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 284f9384d..0f5cfe390 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,20 +1,22 @@

Here is the task you have selected!

Title: - <%= @tasks[@id.to_i][:task] %> + <%= @task.name %>

Description: - <%= @tasks[@id.to_i][:description] %> + <%= @task.description %>

Completion status: - <%= @tasks[@id.to_i][:completion_status] %> + <%= @task.is_completed %>

Completion due date: - <%= @tasks[@id.to_i][:completion_date] %> + <%= @task.completed_at %>

+ +<%= link_to "Return back to the list", tasks_path %> diff --git a/config/routes.rb b/config/routes.rb index 394a38f8d..b8676cbef 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,10 @@ Rails.application.routes.draw do root 'tasks#index' get '/tasks' => 'tasks#index' - get '/tasks/:id' => 'tasks#show' + get '/tasks/new' => 'tasks#new' + get '/tasks/:id', to: 'tasks#show', as: 'task' + + post '/tasks' => 'tasks#create' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20160928221310_create_tasks.rb b/db/migrate/20160928221310_create_tasks.rb new file mode 100644 index 000000000..c1ca76f53 --- /dev/null +++ b/db/migrate/20160928221310_create_tasks.rb @@ -0,0 +1,12 @@ +class CreateTasks < ActiveRecord::Migration + def change + create_table :tasks do |t| + t.string :name + t.string :description + t.boolean :is_completed + t.datetime :completed_at + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..70d5fa310 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,25 @@ +# encoding: UTF-8 +# 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: 20160928221310) do + + create_table "tasks", force: :cascade do |t| + t.string "name" + t.string "description" + t.boolean "is_completed" + t.datetime "completed_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 000000000..f39266e37 --- /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: MyString + description: MyString + is_completed: false + completed_at: 2016-09-28 15:13:10 + +two: + name: MyString + description: MyString + is_completed: false + completed_at: 2016-09-28 15:13:10 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 From dd999f7915bacb76110df9dbae36b004ddd7c69a Mon Sep 17 00:00:00 2001 From: heatherherrington Date: Thu, 29 Sep 2016 16:39:36 -0700 Subject: [PATCH 03/25] Satisfied Wave 2 requirements --- app/controllers/tasks_controller.rb | 41 +++++++++++++++++++++++-- app/views/tasks/delete_confirm.html.erb | 7 +++++ app/views/tasks/edit.html.erb | 17 ++++++++++ app/views/tasks/index.html.erb | 2 ++ app/views/tasks/new.html.erb | 31 ++++++++----------- config/routes.rb | 11 ++++++- 6 files changed, 86 insertions(+), 23 deletions(-) create mode 100644 app/views/tasks/delete_confirm.html.erb create mode 100644 app/views/tasks/edit.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index f85da658a..5d7b9e482 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -7,10 +7,45 @@ def show @task = Task.find(params[:id]) end - def new; end + def new + @task = Task.new + end def create - # Here is where we would save to the database - redirect_to tasks_path + @task = Task.new(task_params) + if @task.save + redirect_to root_path + else + render :new + end + end + + def delete_confirm + @task = Task.find(params[:id]) + end + + def delete + @task = Task.find(params[:id]) + @task.destroy + redirect_to root_path + end + + def edit # Will give the form, like new + @task = Task.find(params[:id]) + end + + def update # Actually do the update, like create + @task = Task.find(params[:id]) + if @task.update(task_params) + redirect_to root_path + else + render :edit + end + end + + private + + def task_params + params.require(:task).permit(:name, :description, :is_completed, :completed_at) end end diff --git a/app/views/tasks/delete_confirm.html.erb b/app/views/tasks/delete_confirm.html.erb new file mode 100644 index 000000000..a8723a7ae --- /dev/null +++ b/app/views/tasks/delete_confirm.html.erb @@ -0,0 +1,7 @@ +

<%= @task.name %>

+<%= form_for @task, method: :delete do |f| %> +

Are you sure you want to delete this task?

+ <%= f.submit "Delete" %> +<% end %> + +<%= link_to("Back to the Tasks", tasks_path) %> diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb new file mode 100644 index 000000000..cf4e4c5b2 --- /dev/null +++ b/app/views/tasks/edit.html.erb @@ -0,0 +1,17 @@ +<%= form_for @task, method: :patch do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :description %> + <%= f.text_field :description %> + + <%= f.label :is_completed %> + <%= f.check_box :is_completed %> + + <%= f.label :completed_at %> + <%= f.date_field :completed_at %> + + <%= f.submit %> +<% end %> + +<%= link_to("Back to the Tasks", tasks_path) %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 9ae2463e3..014befa31 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -4,6 +4,8 @@

<%= "Task: #{ t.name }" %> <%= link_to "Find more info here", task_path(t) %> + <%= link_to "Edit", task_edit_path(t) %> + <%= link_to "Delete", task_delete_confirm_path(t) %>

<% end %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 9c22c7c0e..64cce05e0 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,24 +1,17 @@ -
- - +<%= form_for @task do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> - - -
- - -
- - + <%= f.label :description %> + <%= f.text_field :description %> - Yes - No + <%= f.label :is_completed %> + <%= f.check_box :is_completed %> -
- - -
- -
+ <%= f.label :completed_at %> + <%= f.date_field :completed_at %> + + <%= f.submit %> +<% end %> <%= link_to("Back to the Tasks", tasks_path) %> diff --git a/config/routes.rb b/config/routes.rb index b8676cbef..c60b79cc6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,18 @@ root 'tasks#index' get '/tasks' => 'tasks#index' get '/tasks/new' => 'tasks#new' + post '/tasks' => 'tasks#create' + + get 'tasks/:id/edit', to: 'tasks#edit', as: 'task_edit' + patch 'tasks/:id' => 'tasks#update' + + get 'tasks/:id/delete_confirm', to: 'tasks#delete_confirm', as: 'task_delete_confirm' + + delete 'tasks/:id' => 'tasks#delete' + get '/tasks/:id', to: 'tasks#show', as: 'task' - post '/tasks' => 'tasks#create' + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 8131255213e2ddde0ad9a47f2630f64fc0a4ac65 Mon Sep 17 00:00:00 2001 From: heatherherrington Date: Thu, 29 Sep 2016 16:57:30 -0700 Subject: [PATCH 04/25] Edit working, completed_by button in progress --- app/views/tasks/index.html.erb | 1 + config/routes.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 014befa31..b1bca0320 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -6,6 +6,7 @@ <%= link_to "Find more info here", task_path(t) %> <%= link_to "Edit", task_edit_path(t) %> <%= link_to "Delete", task_delete_confirm_path(t) %> + <%= button_to "Done!" %>

<% end %> diff --git a/config/routes.rb b/config/routes.rb index c60b79cc6..9c797948e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,7 +8,6 @@ patch 'tasks/:id' => 'tasks#update' get 'tasks/:id/delete_confirm', to: 'tasks#delete_confirm', as: 'task_delete_confirm' - delete 'tasks/:id' => 'tasks#delete' get '/tasks/:id', to: 'tasks#show', as: 'task' From bb3b8ca4fa676cd0fc749ef0591df1b13ce466b0 Mon Sep 17 00:00:00 2001 From: heatherherrington Date: Fri, 30 Sep 2016 10:24:45 -0700 Subject: [PATCH 05/25] Delete and confirm working --- app/controllers/tasks_controller.rb | 9 ++------- app/views/tasks/delete_confirm.html.erb | 7 ------- app/views/tasks/index.html.erb | 3 +-- app/views/tasks/show.html.erb | 1 + config/routes.rb | 3 +-- 5 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 app/views/tasks/delete_confirm.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 5d7b9e482..894e6c798 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -20,13 +20,8 @@ def create end end - def delete_confirm - @task = Task.find(params[:id]) - end - - def delete - @task = Task.find(params[:id]) - @task.destroy + def destroy + @task = Task.find(params[:id]).destroy redirect_to root_path end diff --git a/app/views/tasks/delete_confirm.html.erb b/app/views/tasks/delete_confirm.html.erb deleted file mode 100644 index a8723a7ae..000000000 --- a/app/views/tasks/delete_confirm.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -

<%= @task.name %>

-<%= form_for @task, method: :delete do |f| %> -

Are you sure you want to delete this task?

- <%= f.submit "Delete" %> -<% end %> - -<%= link_to("Back to the Tasks", tasks_path) %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index b1bca0320..133315e63 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -5,8 +5,7 @@ <%= "Task: #{ t.name }" %> <%= link_to "Find more info here", task_path(t) %> <%= link_to "Edit", task_edit_path(t) %> - <%= link_to "Delete", task_delete_confirm_path(t) %> - <%= button_to "Done!" %> + <%= link_to "Destroy", task_path(t), method: :delete, data: { confirm: "Are you really sure?" } %>

<% end %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 0f5cfe390..96b0df29c 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -19,4 +19,5 @@ <%= @task.completed_at %>

+<%= link_to "Edit", task_edit_path(@task) %> <%= link_to "Return back to the list", tasks_path %> diff --git a/config/routes.rb b/config/routes.rb index 9c797948e..9264138ca 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,8 +7,7 @@ get 'tasks/:id/edit', to: 'tasks#edit', as: 'task_edit' patch 'tasks/:id' => 'tasks#update' - get 'tasks/:id/delete_confirm', to: 'tasks#delete_confirm', as: 'task_delete_confirm' - delete 'tasks/:id' => 'tasks#delete' + delete 'tasks/:id' => 'tasks#destroy' get '/tasks/:id', to: 'tasks#show', as: 'task' From bfe29fd3a0688bd7e2f364f6f8e60e2ed3e9fde4 Mon Sep 17 00:00:00 2001 From: heatherherrington Date: Fri, 30 Sep 2016 10:51:34 -0700 Subject: [PATCH 06/25] Task complete button updates is_completed and completed_at time --- app/views/tasks/index.html.erb | 5 +++++ app/views/tasks/show.html.erb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 133315e63..3f643988e 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -6,6 +6,11 @@ <%= link_to "Find more info here", task_path(t) %> <%= link_to "Edit", task_edit_path(t) %> <%= link_to "Destroy", task_path(t), method: :delete, data: { confirm: "Are you really sure?" } %> + <%= form_for t do |f| %> + <%= f.hidden_field :is_completed, :value=>true %> + <%= f.hidden_field :completed_at, :value=>Time.now %> + <%= f.submit "Task is complete" %> + <% end %>

<% end %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 96b0df29c..768007a16 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -20,4 +20,4 @@

<%= link_to "Edit", task_edit_path(@task) %> -<%= link_to "Return back to the list", tasks_path %> +

<%= link_to "Return back to the list", tasks_path %>

From 10424d68d1242887c9ba53dcaa1a9f86ca3e587e Mon Sep 17 00:00:00 2001 From: heatherherrington Date: Fri, 30 Sep 2016 11:03:10 -0700 Subject: [PATCH 07/25] Optional DRY using _form.html.erb completed --- app/views/tasks/_form.html.erb | 17 +++++++++++++++++ app/views/tasks/edit.html.erb | 18 +----------------- app/views/tasks/new.html.erb | 18 +----------------- 3 files changed, 19 insertions(+), 34 deletions(-) create mode 100644 app/views/tasks/_form.html.erb diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..64cce05e0 --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,17 @@ +<%= form_for @task do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :description %> + <%= f.text_field :description %> + + <%= f.label :is_completed %> + <%= f.check_box :is_completed %> + + <%= f.label :completed_at %> + <%= f.date_field :completed_at %> + + <%= f.submit %> +<% end %> + +<%= link_to("Back to the Tasks", tasks_path) %> diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index cf4e4c5b2..612e47954 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,17 +1 @@ -<%= form_for @task, method: :patch do |f| %> - <%= f.label :name %> - <%= f.text_field :name %> - - <%= f.label :description %> - <%= f.text_field :description %> - - <%= f.label :is_completed %> - <%= f.check_box :is_completed %> - - <%= f.label :completed_at %> - <%= f.date_field :completed_at %> - - <%= f.submit %> -<% end %> - -<%= link_to("Back to the Tasks", tasks_path) %> +<%= render partial: "form", method: :patch %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 64cce05e0..d44c608b6 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,17 +1 @@ -<%= form_for @task do |f| %> - <%= f.label :name %> - <%= f.text_field :name %> - - <%= f.label :description %> - <%= f.text_field :description %> - - <%= f.label :is_completed %> - <%= f.check_box :is_completed %> - - <%= f.label :completed_at %> - <%= f.date_field :completed_at %> - - <%= f.submit %> -<% end %> - -<%= link_to("Back to the Tasks", tasks_path) %> +<%= render partial: "form" %> From bda3ad021dcdbb0bbf741c1684dbfc17878b424f Mon Sep 17 00:00:00 2001 From: heatherherrington Date: Fri, 30 Sep 2016 11:52:18 -0700 Subject: [PATCH 08/25] Aesthetic improvements to project --- app/assets/stylesheets/application.css | 22 ++++++++++++++++++++++ app/views/tasks/_form.html.erb | 26 +++++++++++++++----------- app/views/tasks/index.html.erb | 14 +++++++------- app/views/tasks/show.html.erb | 6 +++--- 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f9cd5b348..fc79ab5f1 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,25 @@ *= require_tree . *= require_self */ + + html { + font: normal normal 14px/1 "Helvetica Neue", Helvetica, Arial, sans-serif; + } + + .task_header { + margin-top: 0px; + margin-bottom: 5px; + } + + .task_list { + width: 25%; + float: left; + border: blue 1px solid; + padding: 10px; + margin: 10px; + } + + footer { + clear: both; + margin-top: 100px; + } diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 64cce05e0..dd0bcf80f 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,17 +1,21 @@ +

Please enter or update your task!

+ <%= form_for @task do |f| %> <%= f.label :name %> <%= f.text_field :name %> - - <%= f.label :description %> - <%= f.text_field :description %> - - <%= f.label :is_completed %> - <%= f.check_box :is_completed %> - - <%= f.label :completed_at %> - <%= f.date_field :completed_at %> - +

+ <%= f.label :description %> + <%= f.text_field :description %> +

+

+ <%= f.label :is_completed %> + <%= f.check_box :is_completed %> +

+

+ <%= f.label :completed_at %> + <%= f.date_field :completed_at %> +

<%= f.submit %> <% end %> -<%= link_to("Back to the Tasks", tasks_path) %> +

<%= link_to("Back to the Tasks", tasks_path) %>

diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 3f643988e..fde681db3 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,19 +1,19 @@ -

Hello! Welcome to the Task List!

+

Hello! Welcome to your Task List!

<% @tasks.each do |t| %> -

- <%= "Task: #{ t.name }" %> - <%= link_to "Find more info here", task_path(t) %> +

+

<%= link_to "#{ t.name }", task_path(t) %>

<%= link_to "Edit", task_edit_path(t) %> +
<%= link_to "Destroy", task_path(t), method: :delete, data: { confirm: "Are you really sure?" } %> <%= form_for t do |f| %> <%= f.hidden_field :is_completed, :value=>true %> <%= f.hidden_field :completed_at, :value=>Time.now %> <%= f.submit "Task is complete" %> <% end %> -

+
<% end %> -

+

Would you like to add a new task? If so, <%= link_to "click here", tasks_new_path %> -

+
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 768007a16..258d799d2 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,6 +1,6 @@

Here is the task you have selected!

-

Title: +

<%= @task.name %>

@@ -15,9 +15,9 @@

- Completion due date: + Completion date: <%= @task.completed_at %>

-<%= link_to "Edit", task_edit_path(@task) %> +<%= link_to "Edit task", task_edit_path(@task) %>

<%= link_to "Return back to the list", tasks_path %>

From 6eb15413a31f653693bd02ca42edb55727a4d9be Mon Sep 17 00:00:00 2001 From: heatherherrington Date: Fri, 30 Sep 2016 12:02:03 -0700 Subject: [PATCH 09/25] More CSS improvements - borders, colors --- app/assets/stylesheets/application.css | 16 ++++++++++++--- app/views/tasks/index.html.erb | 28 ++++++++++++++------------ 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index fc79ab5f1..2a2233fe9 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -18,20 +18,30 @@ font: normal normal 14px/1 "Helvetica Neue", Helvetica, Arial, sans-serif; } + body { + padding-left: 20px; + padding-right: 20px; + } + .task_header { - margin-top: 0px; + margin-top: 0; margin-bottom: 5px; } + .all_tasks { + max-width: 90%; + } + .task_list { width: 25%; float: left; - border: blue 1px solid; + border: green 2px dotted; padding: 10px; margin: 10px; } footer { clear: both; - margin-top: 100px; + padding-top: 30px; + padding-left: 30px; } diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index fde681db3..91e3959b2 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,18 +1,20 @@

Hello! Welcome to your Task List!

-<% @tasks.each do |t| %> -
-

<%= link_to "#{ t.name }", task_path(t) %>

- <%= link_to "Edit", task_edit_path(t) %> -
- <%= link_to "Destroy", task_path(t), method: :delete, data: { confirm: "Are you really sure?" } %> - <%= form_for t do |f| %> - <%= f.hidden_field :is_completed, :value=>true %> - <%= f.hidden_field :completed_at, :value=>Time.now %> - <%= f.submit "Task is complete" %> - <% end %> -
-<% end %> +
+ <% @tasks.each do |t| %> +
+

<%= link_to "#{ t.name }", task_path(t) %>

+ <%= link_to "Edit", task_edit_path(t) %> +
+ <%= link_to "Destroy", task_path(t), method: :delete, data: { confirm: "Are you really sure?" } %> + <%= form_for t do |f| %> + <%= f.hidden_field :is_completed, :value=>true %> + <%= f.hidden_field :completed_at, :value=>Time.now %> + <%= f.submit "Task is complete" %> + <% end %> +
+ <% end %> +