From 6708a702ac14909da27a0857ed4d2eba3c8255aa Mon Sep 17 00:00:00 2001 From: Valerie Date: Tue, 19 Apr 2016 14:25:50 -0700 Subject: [PATCH 01/21] Created Tasks controller and Task model, and made some migrations to make the columns work the right way --- .gitignore | 46 ++--- Gemfile | 47 +++++ Gemfile.lock | 160 ++++++++++++++++++ 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 | 2 + 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/models/task.rb | 2 + app/views/layouts/application.html.erb | 14 ++ 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 | 56 ++++++ config/secrets.yml | 22 +++ db/migrate/20160419205521_create_tasks.rb | 11 ++ ...20160419210858_remove_completion_column.rb | 5 + ...211346_add_completed_at_column_to_tasks.rb | 5 + ...change_completed_at_column_to_time_type.rb | 5 + db/schema.rb | 24 +++ seeds.rb => db/seeds.rb | 0 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/fixtures/tasks.yml | 11 ++ 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 ++ vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 70 files changed, 1062 insertions(+), 32 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/models/task.rb create mode 100644 app/views/layouts/application.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/migrate/20160419205521_create_tasks.rb create mode 100644 db/migrate/20160419210858_remove_completion_column.rb create mode 100644 db/migrate/20160419211346_add_completed_at_column_to_tasks.rb create mode 100644 db/migrate/20160419212326_change_completed_at_column_to_time_type.rb create mode 100644 db/schema.rb rename seeds.rb => db/seeds.rb (100%) 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/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 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/Gemfile b/Gemfile new file mode 100644 index 000000000..d0ca1fdd6 --- /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.6' +# 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..c45949a77 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,160 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) + 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.6) + activesupport (= 4.2.6) + 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.6) + activesupport (= 4.2.6) + globalid (>= 0.3.0) + activemodel (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) + arel (~> 6.0) + activesupport (4.2.6) + 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 (8.2.4) + 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.1) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.6.0) + globalid (0.3.6) + activesupport (>= 4.1.0) + i18n (0.7.0) + jbuilder (2.4.1) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.1.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.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) + mini_portile2 (2.0.0) + minitest (5.8.4) + multi_json (1.11.2) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.6) + 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.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.1.2) + rdoc (4.2.2) + json (~> 1.4) + sass (3.4.22) + sass-rails (5.0.4) + railties (>= 4.0.0, < 5.0) + 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.1) + sprockets (3.6.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.0.4) + 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.2) + turbolinks (2.5.3) + coffee-rails + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.0) + 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.6) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +BUNDLED WITH + 1.11.2 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..1ad33d04b --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,2 @@ +class TasksController < ApplicationController +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/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/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/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..3f66539d5 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,56 @@ +Rails.application.routes.draw do + # 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..7d05d0c96 --- /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: caa2584fccf0c65701d19d6aea91b2f4e94c14692dd575640d2af0e90088d5e5c3c63508982ca63b490809deebb2b353d153e49216fcbfa5284eed7d45e93709 + +test: + secret_key_base: 66ee2150de67afe43b44b6ba0da7c4f4a8a395a58162af544bf8edfadf8766e452c2df7b5ab1ff13c33e45e8720a5c4de4039a1df075ef190a160ade838f5ef1 + +# 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/migrate/20160419205521_create_tasks.rb b/db/migrate/20160419205521_create_tasks.rb new file mode 100644 index 000000000..59d90b417 --- /dev/null +++ b/db/migrate/20160419205521_create_tasks.rb @@ -0,0 +1,11 @@ +class CreateTasks < ActiveRecord::Migration + def change + create_table :tasks do |t| + t.string :name + t.string :description + t.boolean :completion + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20160419210858_remove_completion_column.rb b/db/migrate/20160419210858_remove_completion_column.rb new file mode 100644 index 000000000..1ea408dea --- /dev/null +++ b/db/migrate/20160419210858_remove_completion_column.rb @@ -0,0 +1,5 @@ +class RemoveCompletionColumn < ActiveRecord::Migration + def change + remove_column(:tasks, :completion) + end +end diff --git a/db/migrate/20160419211346_add_completed_at_column_to_tasks.rb b/db/migrate/20160419211346_add_completed_at_column_to_tasks.rb new file mode 100644 index 000000000..d6a3548b2 --- /dev/null +++ b/db/migrate/20160419211346_add_completed_at_column_to_tasks.rb @@ -0,0 +1,5 @@ +class AddCompletedAtColumnToTasks < ActiveRecord::Migration + def change + add_column(:tasks, :completed_at, :datetime) + end +end diff --git a/db/migrate/20160419212326_change_completed_at_column_to_time_type.rb b/db/migrate/20160419212326_change_completed_at_column_to_time_type.rb new file mode 100644 index 000000000..ce8a3068f --- /dev/null +++ b/db/migrate/20160419212326_change_completed_at_column_to_time_type.rb @@ -0,0 +1,5 @@ +class ChangeCompletedAtColumnToTimeType < ActiveRecord::Migration + def change + change_column(:tasks, :completed_at, :time) + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..126291e20 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,24 @@ +# 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: 20160419212326) 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.time "completed_at" + end + +end diff --git a/seeds.rb b/db/seeds.rb similarity index 100% rename from seeds.rb rename to db/seeds.rb 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/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 000000000..18969b9d7 --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + description: MyString + completion: false + +two: + name: MyString + description: MyString + completion: false 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/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 07a17e4e24c16edbd457f2f235598bf0b794daa8 Mon Sep 17 00:00:00 2001 From: Valerie Date: Thu, 21 Apr 2016 15:09:48 -0700 Subject: [PATCH 02/21] Added and bundled BetterErrors gem --- Gemfile | 4 ++-- Gemfile.lock | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index d0ca1fdd6..c8a842f83 100644 --- a/Gemfile +++ b/Gemfile @@ -40,8 +40,8 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> in views gem 'web-console', '~> 2.0' - + gem "better_errors" + gem "binding_of_caller" # 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 index c45949a77..abfecdc5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,10 +37,15 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.3) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) byebug (8.2.4) + coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -143,6 +148,8 @@ PLATFORMS ruby DEPENDENCIES + better_errors + binding_of_caller byebug coffee-rails (~> 4.1.0) jbuilder (~> 2.0) From 90a5564d5a7d8717df4a6de9b25c65080c0c97d4 Mon Sep 17 00:00:00 2001 From: Valerie Date: Thu, 21 Apr 2016 15:11:48 -0700 Subject: [PATCH 03/21] Rearranged CSS to make it more readable and utilized classes so I could be more specific with my styling. --- app/assets/stylesheets/tasks.scss | 77 +++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index c5e7712d4..c64935d9e 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -1,3 +1,80 @@ // 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/ + + +/***** GLOBAL *****/ + +body { + font-size: 16px; + font-family: 'Calibri', Arial, sans-serif; +} + +header { + background-color: pink; +} + +h1 { + font-size: 3rem; + margin-top: 0; + text-align: center; + font-family: 'Coming Soon', cursive; +} + +h2 { + text-align: center; +} + +a { + text-decoration: none; + color: black; +} + +form { + margin: 1rem; +} + +/***** INDEX *****/ + +.add_link { + font-family: 'Coming Soon', cursive; + display: block; + text-align: center; + margin: 1rem auto; + font-size: 2rem; +} + +.tasklist { + padding: 0; + list-style-type: none; +} + +.tasklist > li { + width: 30%; + background-color: pink; + padding: 1rem; + margin: 1rem auto; + border-radius: 15%; + font-family: 'Coming Soon', cursive; + font-weight: bold; + font-size: 1.25rem; +} + +.options { + margin: 0 0.25rem; + font-size: smaller; + list-style-type: none; + text-align: right; +} + +.options li { + display: inline; +} + +/***** SHOW TASK *****/ + +.info_item { + margin-top: 0.25rem; + font-weight: bold; + font-size: 1.5rem; +} From 05322574283b7a82fa071e493821d955f0b0449c Mon Sep 17 00:00:00 2001 From: Valerie Date: Thu, 21 Apr 2016 15:12:45 -0700 Subject: [PATCH 04/21] Ahhhhh I forgot to use git for so long oh no. Hard to remember all that I did. I'm about to start working on the Edit button. --- app/controllers/tasks_controller.rb | 44 ++++++++++++++++++++++++++ app/views/layouts/application.html.erb | 6 ++++ app/views/tasks/add_task.html.erb | 9 ++++++ app/views/tasks/index.html.erb | 17 ++++++++++ app/views/tasks/show_task.html.erb | 13 ++++++++ config/routes.rb | 12 ++++++- 6 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 app/views/tasks/add_task.html.erb create mode 100644 app/views/tasks/index.html.erb create mode 100644 app/views/tasks/show_task.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 1ad33d04b..912bdd3fa 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,2 +1,46 @@ class TasksController < ApplicationController + def index + @all_tasks = Task.all + end + + def show + @shown_task = Task.find(params[:id]) + render :show_task + end + + def new + @task = Task.new #empty task + render :add_task + end + + def create + @task = Task.create(task_create_params[:task]) #task with data + # if you want a new request, you use redirect + redirect_to tasks_path + # if you want to show a view for the current request, use render + # we need to protect our database from unsanitary people when we use data from other sources + + # @new_task = Task.create(name: params[:task_name], description: params[:task_desc], completed_at: params[:task_completion]) + # @all_tasks = Task.all + # render :index + end + + def destroy + @task = Task.find(params[:id]) + @task.destroy + + redirect_to tasks_path + end + + private + + def task_create_params + params.permit(task: [:name, :description, :completed_at]) + end + + ## do I need this? I'm deleting the whole task, no chance to touch individual params I think + # def task_delete_params + # params_permit(task: [:name, :description, :completed_at]) + # end + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 46eeb110b..5d59e1660 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -3,12 +3,18 @@ TaskListRails <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> +
+

Task Tracker

+
<%= yield %> +<%= link_to "All Tasks", tasks_path %> + diff --git a/app/views/tasks/add_task.html.erb b/app/views/tasks/add_task.html.erb new file mode 100644 index 000000000..94a3e2b98 --- /dev/null +++ b/app/views/tasks/add_task.html.erb @@ -0,0 +1,9 @@ +<%= form_for @task do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> + <%= f.label :description %> + <%= f.text_field :description %> + <%= f.label :completed_at %> + <%= f.text_field :completed_at %> + <%= f.submit %> +<% end %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 000000000..6667d8e16 --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,17 @@ +<%= link_to " » Add New Task « ", tasks_new_path %> + +
    +<% @all_tasks.each do |task| %> +
  • + <%= link_to task.name, task_path(task.id) %>
    +
      +
    • DONE!
      • +
    • Edit
      • +
    • + <%= link_to "Delete", delete_path(task.id), method: :delete, + data: { confirm: 'Are you sure you want to delete this task?' } %> +
      • +
    +
    • +<% end %> +
diff --git a/app/views/tasks/show_task.html.erb b/app/views/tasks/show_task.html.erb new file mode 100644 index 000000000..28728827f --- /dev/null +++ b/app/views/tasks/show_task.html.erb @@ -0,0 +1,13 @@ +

oh wow cool A TASK

+ +
    +

  • Name:

    <%= @shown_task.name %>
    • +

  • Description:

    <%= @shown_task.description %>
    • +

  • Completed At:

    +<% if @shown_task.completed_at == nil %> + Still Incomplete +<% else %> + <%= @shown_task.completed_at %> +<% end %> +
    • +
diff --git a/config/routes.rb b/config/routes.rb index 3f66539d5..6101556cb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,17 @@ # See how all your routes lay out with "rake routes". # You can have the root of your site routed with "root" - # root 'welcome#index' + root 'tasks#index' + + get '/tasks' => 'tasks#index' + + get '/tasks/new' => 'tasks#new' + + post '/tasks' => 'tasks#create' + + get '/tasks/:id' => 'tasks#show', as: 'task' + + delete '/tasks/:id' => 'tasks#destroy', as: 'delete' # Example of regular route: # get 'products/:id' => 'catalog#view' From 529ff63755485503a25aabaf310e6c6677bfa0d4 Mon Sep 17 00:00:00 2001 From: Valerie Date: Thu, 21 Apr 2016 15:32:03 -0700 Subject: [PATCH 05/21] Fixed CSS once more for show_task page --- app/assets/stylesheets/tasks.scss | 23 ++++++++++++++++++++--- app/views/tasks/show_task.html.erb | 21 ++++++++++----------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index c64935d9e..719d3fa41 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -7,7 +7,7 @@ body { font-size: 16px; - font-family: 'Calibri', Arial, sans-serif; + font-family: 'Times New Roman', serif; } header { @@ -22,6 +22,7 @@ h1 { } h2 { + font-size: 2rem; text-align: center; } @@ -73,8 +74,24 @@ form { /***** SHOW TASK *****/ -.info_item { - margin-top: 0.25rem; +.task_info { + padding: 0; + list-style-type: none; +} + +.task_info li { + width: 30%; + background-color: pink; + padding: 1rem; + margin: 1rem auto; + border-radius: 15%; + font-weight: bold; + font-size: 1rem; +} + +.task_info h3 { + margin: 0.25rem; + font-family: 'Coming Soon', cursive; font-weight: bold; font-size: 1.5rem; } diff --git a/app/views/tasks/show_task.html.erb b/app/views/tasks/show_task.html.erb index 28728827f..a1db12722 100644 --- a/app/views/tasks/show_task.html.erb +++ b/app/views/tasks/show_task.html.erb @@ -1,13 +1,12 @@ -

oh wow cool A TASK

+

<%= @shown_task.name %>

-
    -

  • Name:

    <%= @shown_task.name %>
    • -

  • Description:

    <%= @shown_task.description %>
    • -

  • Completed At:

    -<% if @shown_task.completed_at == nil %> - Still Incomplete -<% else %> - <%= @shown_task.completed_at %> -<% end %> -
    • +
      +

    • Description:

      <%= @shown_task.description %>
      • +

    • Completed At:

      + <% if @shown_task.completed_at == nil %> + Still Incomplete + <% else %> + <%= @shown_task.completed_at %> + <% end %> +
    From adc47b4b1f7a0c931b9365d0305e0322d6a18010 Mon Sep 17 00:00:00 2001 From: Valerie Date: Thu, 21 Apr 2016 17:06:02 -0700 Subject: [PATCH 06/21] Got it so the completed functionality works --- app/assets/stylesheets/tasks.scss | 20 ++++++++++++++++++-- app/controllers/tasks_controller.rb | 24 +++++++++++++++++++----- app/views/tasks/index.html.erb | 26 +++++++++++++++----------- config/routes.rb | 2 ++ 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index 719d3fa41..ffc1163c6 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -8,6 +8,7 @@ body { font-size: 16px; font-family: 'Times New Roman', serif; + margin: 0; } header { @@ -50,7 +51,7 @@ form { list-style-type: none; } -.tasklist > li { +.incomplete { width: 30%; background-color: pink; padding: 1rem; @@ -72,6 +73,22 @@ form { display: inline; } +.options form { + margin: 0; + display: inline; +} + +.complete { + width: 30%; + background-color: yellow; + padding: 1rem; + margin: 1rem auto; + border-radius: 15%; + font-family: 'Coming Soon', cursive; + font-weight: bold; + font-size: 1.25rem; +} + /***** SHOW TASK *****/ .task_info { @@ -85,7 +102,6 @@ form { padding: 1rem; margin: 1rem auto; border-radius: 15%; - font-weight: bold; font-size: 1rem; } diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 912bdd3fa..692a2e208 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -28,19 +28,33 @@ def create def destroy @task = Task.find(params[:id]) @task.destroy - + redirect_to tasks_path end + def complete + @task = Task.find(params[:id]) + @task.update(completed_at: Time.now) + + redirect_to tasks_path + end + + # def update + # @task = Task.find(params[:id]) + # @task.update(task_update_params[:task]) + # + # redirect_to tasks_path + # end + private def task_create_params params.permit(task: [:name, :description, :completed_at]) end - - ## do I need this? I'm deleting the whole task, no chance to touch individual params I think - # def task_delete_params - # params_permit(task: [:name, :description, :completed_at]) + # + # def task_update_params + # params.permit(task: [:name, :description, :completed_at]) # end + # do I need one for delete? I'm deleting the whole task, no chance to touch individual params I think end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 6667d8e16..3f957d481 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -2,16 +2,20 @@
      <% @all_tasks.each do |task| %> -
    • - <%= link_to task.name, task_path(task.id) %>
      -
        -
      • DONE!
        • -
      • Edit
        • -
      • - <%= link_to "Delete", delete_path(task.id), method: :delete, - data: { confirm: 'Are you sure you want to delete this task?' } %> -
        • -
      -
      • + <% if !task.completed_at.nil? %> +
    • + <% else %> +
    • + <% end %> + <%= link_to task.name, task_path(task.id) %>
      +
        +
      • <%= button_to "DONE!", complete_path(task.id), method: :put %>
        • +
      • Edit
        • +
      • + <%= link_to "Delete", delete_path(task.id), method: :delete, + data: { confirm: 'Are you sure you want to delete this task?' } %> +
        • +
      +
      • <% end %>
    diff --git a/config/routes.rb b/config/routes.rb index 6101556cb..cb3d2a3ce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,6 +13,8 @@ get '/tasks/:id' => 'tasks#show', as: 'task' + put '/tasks/:id' => 'tasks#complete', as: 'complete' + delete '/tasks/:id' => 'tasks#destroy', as: 'delete' # Example of regular route: From 182e4125b54f78e724626d1b44aa399fb99630f0 Mon Sep 17 00:00:00 2001 From: Valerie Date: Thu, 21 Apr 2016 21:29:11 -0700 Subject: [PATCH 07/21] Started putting in default values for edit page, which is the same as add page. Need to figure out how to make this update route work. --- app/assets/stylesheets/tasks.scss | 2 +- app/controllers/tasks_controller.rb | 5 +++++ app/views/tasks/add_task.html.erb | 6 +++--- config/routes.rb | 2 ++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index ffc1163c6..26512fddc 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -80,7 +80,7 @@ form { .complete { width: 30%; - background-color: yellow; + background-color: #BBA3D0; padding: 1rem; margin: 1rem auto; border-radius: 15%; diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 692a2e208..2bc66ad47 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -13,6 +13,11 @@ def new render :add_task end + def edit + @task = Task.find(params[:id]) + render :add_task + end + def create @task = Task.create(task_create_params[:task]) #task with data # if you want a new request, you use redirect diff --git a/app/views/tasks/add_task.html.erb b/app/views/tasks/add_task.html.erb index 94a3e2b98..53b7e8132 100644 --- a/app/views/tasks/add_task.html.erb +++ b/app/views/tasks/add_task.html.erb @@ -1,9 +1,9 @@ <%= form_for @task do |f| %> <%= f.label :name %> - <%= f.text_field :name %> + <%= f.text_field :name, :value => @task.name %> <%= f.label :description %> - <%= f.text_field :description %> + <%= f.text_field :description, :value => @task.description %> <%= f.label :completed_at %> - <%= f.text_field :completed_at %> + <%= f.text_field :completed_at, :value => @task.completed_at %> <%= f.submit %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index cb3d2a3ce..264d76818 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,6 +9,8 @@ get '/tasks/new' => 'tasks#new' + get '/tasks/:id/edit' => 'tasks#edit' + post '/tasks' => 'tasks#create' get '/tasks/:id' => 'tasks#show', as: 'task' From 49ffdd2218a2c9b8fa063ea74254998fd82a11f9 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Apr 2016 09:29:33 -0700 Subject: [PATCH 08/21] Changed it so as: path for complete and delete are just task_path, because it's the verb that determines what to do with a route too --- app/views/tasks/index.html.erb | 4 ++-- config/routes.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 3f957d481..a8d94e11b 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -9,10 +9,10 @@ <% end %> <%= link_to task.name, task_path(task.id) %>
      -
    • <%= button_to "DONE!", complete_path(task.id), method: :put %>
      • +
    • <%= button_to "DONE!", task_path(task.id), method: :put %>
    • Edit
    • - <%= link_to "Delete", delete_path(task.id), method: :delete, + <%= link_to "Delete", task_path(task.id), method: :delete, data: { confirm: 'Are you sure you want to delete this task?' } %>
    diff --git a/config/routes.rb b/config/routes.rb index 264d76818..63a7f0bed 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,13 +11,13 @@ get '/tasks/:id/edit' => 'tasks#edit' - post '/tasks' => 'tasks#create' - get '/tasks/:id' => 'tasks#show', as: 'task' - put '/tasks/:id' => 'tasks#complete', as: 'complete' + post '/tasks' => 'tasks#create' + + put '/tasks/:id' => 'tasks#complete' - delete '/tasks/:id' => 'tasks#destroy', as: 'delete' + delete '/tasks/:id' => 'tasks#destroy' # Example of regular route: # get 'products/:id' => 'catalog#view' From 4e38162435de07402c81dafd9c9f0975626ff336 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Apr 2016 13:45:18 -0700 Subject: [PATCH 09/21] Got complete and edit both working despite same update method by adding name attribute to DONE button, which allows the update method to use the right params depending on if it was the DONE button or edit button --- app/controllers/tasks_controller.rb | 46 ++++++++++++++++------------- app/views/tasks/index.html.erb | 5 ++-- config/routes.rb | 6 ++-- 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 2bc66ad47..508b2038e 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -3,21 +3,11 @@ def index @all_tasks = Task.all end - def show - @shown_task = Task.find(params[:id]) - render :show_task - end - def new @task = Task.new #empty task render :add_task end - def edit - @task = Task.find(params[:id]) - render :add_task - end - def create @task = Task.create(task_create_params[:task]) #task with data # if you want a new request, you use redirect @@ -30,36 +20,52 @@ def create # render :index end - def destroy + def show + @shown_task = Task.find(params[:id]) + render :show_task + end + + def edit @task = Task.find(params[:id]) - @task.destroy + render :add_task + end + + def update + @task = Task.find(params[:id]) + + if params[:done] + @task.update(completed_at: Time.now) + else + @task.update(task_update_params[:task]) + end redirect_to tasks_path end - def complete + def destroy @task = Task.find(params[:id]) - @task.update(completed_at: Time.now) + @task.destroy redirect_to tasks_path end - # def update + # def complete # @task = Task.find(params[:id]) - # @task.update(task_update_params[:task]) + # @task.update(completed_at: Time.now) # # redirect_to tasks_path # end + private def task_create_params params.permit(task: [:name, :description, :completed_at]) end - # - # def task_update_params - # params.permit(task: [:name, :description, :completed_at]) - # end + + def task_update_params + params.permit(task: [:name, :description, :completed_at]) + end # do I need one for delete? I'm deleting the whole task, no chance to touch individual params I think end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index a8d94e11b..c94dd6435 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -9,8 +9,9 @@ <% end %> <%= link_to task.name, task_path(task.id) %>
      -
    • <%= button_to "DONE!", task_path(task.id), method: :put %>
      • -
    • Edit
      • + <% # this button's name attribute is so I can identify when the request is coming from the DONE! button as opposed to the edit form %> +
    • <%= button_to "DONE!", task_path(task.id), method: :patch, name: "done" %>
      • +
    • <%= link_to "Edit", edit_task_path(task.id) %>
    • <%= link_to "Delete", task_path(task.id), method: :delete, data: { confirm: 'Are you sure you want to delete this task?' } %> diff --git a/config/routes.rb b/config/routes.rb index 63a7f0bed..64161b02c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,13 +9,13 @@ get '/tasks/new' => 'tasks#new' - get '/tasks/:id/edit' => 'tasks#edit' - get '/tasks/:id' => 'tasks#show', as: 'task' + get '/tasks/:id/edit' => 'tasks#edit', as: 'edit_task' + post '/tasks' => 'tasks#create' - put '/tasks/:id' => 'tasks#complete' + patch '/tasks/:id' => 'tasks#update' delete '/tasks/:id' => 'tasks#destroy' From c44eb2a838c3374deaf384b2f07f238e894a5864 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Apr 2016 13:56:03 -0700 Subject: [PATCH 10/21] Renamed add_task view to task_editor since it's used for both adding and editing tasks now --- app/controllers/tasks_controller.rb | 4 ++-- app/views/tasks/{add_task.html.erb => task_editor.html.erb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename app/views/tasks/{add_task.html.erb => task_editor.html.erb} (100%) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 508b2038e..c1bade749 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -5,7 +5,7 @@ def index def new @task = Task.new #empty task - render :add_task + render :task_editor end def create @@ -27,7 +27,7 @@ def show def edit @task = Task.find(params[:id]) - render :add_task + render :task_editor end def update diff --git a/app/views/tasks/add_task.html.erb b/app/views/tasks/task_editor.html.erb similarity index 100% rename from app/views/tasks/add_task.html.erb rename to app/views/tasks/task_editor.html.erb From fb90a0e339a01d9c12095e61a729b2599ec0b2bb Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Apr 2016 14:39:15 -0700 Subject: [PATCH 11/21] Updated database to include Person model, created relationship with Task model, and made it so layout only shows DONE button if the task is still incomplete --- app/models/person.rb | 3 ++ app/models/task.rb | 1 + app/views/tasks/index.html.erb | 7 +++-- db/migrate/20160422205724_create_people.rb | 8 +++++ ...422211255_add_person_id_column_to_tasks.rb | 5 ++++ ...k_name_and_person_id_to_not_accept_null.rb | 6 ++++ db/schema.rb | 11 +++++-- db/seeds.rb | 30 ++++++++++++------- test/fixtures/people.yml | 11 +++++++ test/models/person_test.rb | 7 +++++ 10 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 app/models/person.rb create mode 100644 db/migrate/20160422205724_create_people.rb create mode 100644 db/migrate/20160422211255_add_person_id_column_to_tasks.rb create mode 100644 db/migrate/20160422211917_change_task_name_and_person_id_to_not_accept_null.rb create mode 100644 test/fixtures/people.yml create mode 100644 test/models/person_test.rb diff --git a/app/models/person.rb b/app/models/person.rb new file mode 100644 index 000000000..4ed22ba8b --- /dev/null +++ b/app/models/person.rb @@ -0,0 +1,3 @@ +class Person < ActiveRecord::Base + has_many :tasks +end diff --git a/app/models/task.rb b/app/models/task.rb index 935f76e12..c3c534741 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,2 +1,3 @@ class Task < ActiveRecord::Base + belongs_to :person end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index c94dd6435..f17640556 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -9,8 +9,11 @@ <% end %> <%= link_to task.name, task_path(task.id) %>
        - <% # this button's name attribute is so I can identify when the request is coming from the DONE! button as opposed to the edit form %> -
      • <%= button_to "DONE!", task_path(task.id), method: :patch, name: "done" %>
        • + <% # so that the DONE! button only shows up if it's still incomplete %> + <% if task.completed_at.nil? %> + <% # this button's name attribute is so I can identify when the request is coming from the DONE! button as opposed to the edit form %> +
      • <%= button_to "DONE!", task_path(task.id), method: :patch, name: "done" %>
        • + <% end %>
      • <%= link_to "Edit", edit_task_path(task.id) %>
      • <%= link_to "Delete", task_path(task.id), method: :delete, diff --git a/db/migrate/20160422205724_create_people.rb b/db/migrate/20160422205724_create_people.rb new file mode 100644 index 000000000..6aacffb27 --- /dev/null +++ b/db/migrate/20160422205724_create_people.rb @@ -0,0 +1,8 @@ +class CreatePeople < ActiveRecord::Migration + def change + create_table :people do |t| + t.string :name, null: false + t.timestamps null: false + end + end +end diff --git a/db/migrate/20160422211255_add_person_id_column_to_tasks.rb b/db/migrate/20160422211255_add_person_id_column_to_tasks.rb new file mode 100644 index 000000000..df9f91afd --- /dev/null +++ b/db/migrate/20160422211255_add_person_id_column_to_tasks.rb @@ -0,0 +1,5 @@ +class AddPersonIdColumnToTasks < ActiveRecord::Migration + def change + add_column :tasks, :person_id, :integer + end +end diff --git a/db/migrate/20160422211917_change_task_name_and_person_id_to_not_accept_null.rb b/db/migrate/20160422211917_change_task_name_and_person_id_to_not_accept_null.rb new file mode 100644 index 000000000..343de5c18 --- /dev/null +++ b/db/migrate/20160422211917_change_task_name_and_person_id_to_not_accept_null.rb @@ -0,0 +1,6 @@ +class ChangeTaskNameAndPersonIdToNotAcceptNull < ActiveRecord::Migration + def change + change_column_null :tasks, :name, false + change_column_null :tasks, :person_id, false + end +end diff --git a/db/schema.rb b/db/schema.rb index 126291e20..55d60dd03 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,14 +11,21 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160419212326) do +ActiveRecord::Schema.define(version: 20160422211917) do + + create_table "people", force: :cascade do |t| + t.string "name", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end create_table "tasks", force: :cascade do |t| - t.string "name" + t.string "name", null: false t.string "description" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.time "completed_at" + t.integer "person_id", null: false end end diff --git a/db/seeds.rb b/db/seeds.rb index de6ef27a7..c9e51ba9f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,18 +3,28 @@ def random_time end tasks = [ - { name: "The First Task", description: "", completed_at: random_time }, - { name: "Go to Brunch", description: "" }, - { name: "Go to Lunch", description: "", completed_at: random_time }, - { name: "Go to Second Lunch", description: "" }, - { name: "Play Video Games", description: "", completed_at: random_time }, - { name: "High Five Somebody You Don't Know", description: "", completed_at: random_time }, - { name: "Plant Flowers", description: "", completed_at: random_time }, - { name: "Call Mom", description: "" }, - { name: "She worries, you know.", description: "" }, - { name: "Nap.", description: "", completed_at: random_time } + { name: "The First Task", description: "", completed_at: random_time, person_id: 1 }, + { name: "Go to Brunch", description: "", person_id: 1 }, + { name: "Go to Lunch", description: "", completed_at: random_time, person_id: 1 }, + { name: "Go to Second Lunch", description: "", person_id: 1 }, + { name: "Play Video Games", description: "", completed_at: random_time, person_id: 2 }, + { name: "High Five Somebody You Don't Know", description: "", completed_at: random_time, person_id: 2 }, + { name: "Plant Flowers", description: "", completed_at: random_time, person_id: 2 }, + { name: "Call Mom", description: "", person_id: 3 }, + { name: "She worries, you know.", description: "", person_id: 3 }, + { name: "Nap.", description: "", completed_at: random_time, person_id: 1 } +] + +people = [ + { name: "Llama L. Llama" }, + { name: "Hank Harvey Hicks" }, + { name: "Mario" } ] tasks.each do |task| Task.create task end + +people.each do |person| + Person.create person +end diff --git a/test/fixtures/people.yml b/test/fixtures/people.yml new file mode 100644 index 000000000..937a0c002 --- /dev/null +++ b/test/fixtures/people.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/person_test.rb b/test/models/person_test.rb new file mode 100644 index 000000000..ad04ed813 --- /dev/null +++ b/test/models/person_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PersonTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From d3593ddeed8ccda0061487b0e8c5155ce3771a33 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Apr 2016 14:53:45 -0700 Subject: [PATCH 12/21] Index page now shows name of task's owner --- app/assets/stylesheets/tasks.scss | 4 ++++ app/controllers/tasks_controller.rb | 1 + app/views/tasks/index.html.erb | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index 26512fddc..51c5262bf 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -62,6 +62,10 @@ form { font-size: 1.25rem; } +.person_name { + font-size: 1rem; +} + .options { margin: 0 0.25rem; font-size: smaller; diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index c1bade749..249f84f0d 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,6 +1,7 @@ class TasksController < ApplicationController def index @all_tasks = Task.all + @all_people = Person.all end def new diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index f17640556..f6902a5ae 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -8,6 +8,11 @@
      • <% end %> <%= link_to task.name, task_path(task.id) %>
        + + + <%= @all_people.find(task.person_id).name %> + +
          <% # so that the DONE! button only shows up if it's still incomplete %> <% if task.completed_at.nil? %> From 571f743c17293da102cb9ff642d39753cb8feff0 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Apr 2016 15:13:39 -0700 Subject: [PATCH 13/21] task owner name shown on show_task page --- app/controllers/tasks_controller.rb | 1 + app/views/tasks/show_task.html.erb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 249f84f0d..701511f07 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -23,6 +23,7 @@ def create def show @shown_task = Task.find(params[:id]) + @task_owner = Person.find(@shown_task.person_id) render :show_task end diff --git a/app/views/tasks/show_task.html.erb b/app/views/tasks/show_task.html.erb index a1db12722..5efd88655 100644 --- a/app/views/tasks/show_task.html.erb +++ b/app/views/tasks/show_task.html.erb @@ -1,6 +1,7 @@

          <%= @shown_task.name %>

            +

          • Owner:

            <%= @task_owner.name %>

          • Description:

            <%= @shown_task.description %>

          • Completed At:

            <% if @shown_task.completed_at == nil %> From d96640ad4aa9519e7df1ec461c0e1c6e315f8970 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Apr 2016 15:39:44 -0700 Subject: [PATCH 14/21] task editor now has dropdown menu to change owner of a task --- app/controllers/tasks_controller.rb | 3 ++- app/views/tasks/task_editor.html.erb | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 701511f07..b38584222 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -29,6 +29,7 @@ def show def edit @task = Task.find(params[:id]) + @all_people = Person.all render :task_editor end @@ -66,7 +67,7 @@ def task_create_params end def task_update_params - params.permit(task: [:name, :description, :completed_at]) + params.permit(task: [:name, :description, :completed_at, :person_id]) end # do I need one for delete? I'm deleting the whole task, no chance to touch individual params I think diff --git a/app/views/tasks/task_editor.html.erb b/app/views/tasks/task_editor.html.erb index 53b7e8132..b165bf45b 100644 --- a/app/views/tasks/task_editor.html.erb +++ b/app/views/tasks/task_editor.html.erb @@ -5,5 +5,10 @@ <%= f.text_field :description, :value => @task.description %> <%= f.label :completed_at %> <%= f.text_field :completed_at, :value => @task.completed_at %> + + <% #just the following in a partial, just for the edit page... how to do this? %> + <%= f.label :person_id %> + <%= f.select "person_id", options_from_collection_for_select(@all_people, "id", "name") %> + <%= f.submit %> <% end %> From e62e043722540c3bc90ffdef9932c2cd85453dbc Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Apr 2016 15:58:54 -0700 Subject: [PATCH 15/21] fixed create task functionality by including person_id in permitted params --- app/controllers/tasks_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index b38584222..1e042015d 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -6,6 +6,7 @@ def index def new @task = Task.new #empty task + @all_people = Person.all render :task_editor end @@ -63,7 +64,7 @@ def destroy private def task_create_params - params.permit(task: [:name, :description, :completed_at]) + params.permit(task: [:name, :description, :completed_at, :person_id]) end def task_update_params From f8b2c15d941e60f60ca528bff0a5d42b7bcd498b Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Apr 2016 16:18:50 -0700 Subject: [PATCH 16/21] people controller, and view and get route for people index now exists --- app/assets/javascripts/people.coffee | 3 +++ app/assets/stylesheets/people.scss | 3 +++ app/controllers/people_controller.rb | 7 +++++++ app/helpers/people_helper.rb | 2 ++ app/views/people/index.html.erb | 6 ++++++ config/routes.rb | 6 ++++++ test/controllers/people_controller_test.rb | 7 +++++++ 7 files changed, 34 insertions(+) create mode 100644 app/assets/javascripts/people.coffee create mode 100644 app/assets/stylesheets/people.scss create mode 100644 app/controllers/people_controller.rb create mode 100644 app/helpers/people_helper.rb create mode 100644 app/views/people/index.html.erb create mode 100644 test/controllers/people_controller_test.rb diff --git a/app/assets/javascripts/people.coffee b/app/assets/javascripts/people.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/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/ diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss new file mode 100644 index 000000000..e6ee13d8f --- /dev/null +++ b/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/ diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb new file mode 100644 index 000000000..21233e2da --- /dev/null +++ b/app/controllers/people_controller.rb @@ -0,0 +1,7 @@ +class PeopleController < ApplicationController + + def index + @all_people = Person.all + render :index + end +end diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb new file mode 100644 index 000000000..b682fbf12 --- /dev/null +++ b/app/helpers/people_helper.rb @@ -0,0 +1,2 @@ +module PeopleHelper +end diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb new file mode 100644 index 000000000..652058add --- /dev/null +++ b/app/views/people/index.html.erb @@ -0,0 +1,6 @@ + +
              + <% @all_people.each do |person| %> +
            • <%= person.name %>
              • + <% end %> +
            diff --git a/config/routes.rb b/config/routes.rb index 64161b02c..87f8494e0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,8 @@ # You can have the root of your site routed with "root" root 'tasks#index' + #### TASKS #### + get '/tasks' => 'tasks#index' get '/tasks/new' => 'tasks#new' @@ -19,6 +21,10 @@ delete '/tasks/:id' => 'tasks#destroy' + #### PEOPLE #### + + get '/people' => 'people#index' + # Example of regular route: # get 'products/:id' => 'catalog#view' diff --git a/test/controllers/people_controller_test.rb b/test/controllers/people_controller_test.rb new file mode 100644 index 000000000..e75205679 --- /dev/null +++ b/test/controllers/people_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PeopleControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end From 1cfc25790648c2e58eccbb8fbba5b802ad3fb89f Mon Sep 17 00:00:00 2001 From: Valerie Date: Mon, 25 Apr 2016 15:02:06 -0700 Subject: [PATCH 17/21] show_person page now shows a list of the person's incomplete tasks --- app/views/people/index.html.erb | 2 +- app/views/people/show_person.html.erb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 app/views/people/show_person.html.erb diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb index 652058add..def2a2025 100644 --- a/app/views/people/index.html.erb +++ b/app/views/people/index.html.erb @@ -1,6 +1,6 @@
              <% @all_people.each do |person| %> -
            • <%= person.name %>
              • +
            • <%= link_to person.name, person_path(person.id) %>
              • <% end %>
            diff --git a/app/views/people/show_person.html.erb b/app/views/people/show_person.html.erb new file mode 100644 index 000000000..a76bae1ef --- /dev/null +++ b/app/views/people/show_person.html.erb @@ -0,0 +1,13 @@ +

            <%= @person.name %>

            + +
              +

            • Task Owner:

              <%= @person.name %>
              • +

            • Tasks To Do:

              + <% # @tasks returns a collection, but you can't see the contents unless you iterate over it %> +
                + <% @tasks.each do |task| %> +
              • <%= task.name %>
                • + <% end %> +
              +
              • +
            From b87d109b8a2873167ed86ad6ec52e10904163bdc Mon Sep 17 00:00:00 2001 From: Valerie Date: Mon, 25 Apr 2016 15:22:30 -0700 Subject: [PATCH 18/21] Fixed CSS so that it applies to show_people as well --- app/views/layouts/application.html.erb | 6 ++++-- app/views/people/show_person.html.erb | 2 +- app/views/tasks/show_task.html.erb | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5d59e1660..4ccbc3ea2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,11 +10,13 @@

            Task Tracker

            +
            <%= yield %> -<%= link_to "All Tasks", tasks_path %> - diff --git a/app/views/people/show_person.html.erb b/app/views/people/show_person.html.erb index a76bae1ef..04e2edc72 100644 --- a/app/views/people/show_person.html.erb +++ b/app/views/people/show_person.html.erb @@ -1,6 +1,6 @@

            <%= @person.name %>

            -
              +

              • Task Owner:

                <%= @person.name %>

              • Tasks To Do:

                <% # @tasks returns a collection, but you can't see the contents unless you iterate over it %> diff --git a/app/views/tasks/show_task.html.erb b/app/views/tasks/show_task.html.erb index 5efd88655..9cb40a289 100644 --- a/app/views/tasks/show_task.html.erb +++ b/app/views/tasks/show_task.html.erb @@ -1,6 +1,6 @@

                <%= @shown_task.name %>

                -
                  +

                  • Owner:

                    <%= @task_owner.name %>

                  • Description:

                    <%= @shown_task.description %>

                  • Completed At:

                    From e1c992c0513d05f6f8530e502f60ae84928d9741 Mon Sep 17 00:00:00 2001 From: Valerie Date: Mon, 25 Apr 2016 15:28:08 -0700 Subject: [PATCH 19/21] Updated Gemfile and stuff to get ready for deployment to Heroku --- Gemfile | 9 +- app/assets/stylesheets/application.css | 130 +++++++++++++++++++++++++ app/assets/stylesheets/tasks.scss | 114 ---------------------- app/controllers/people_controller.rb | 6 ++ config/routes.rb | 2 + 5 files changed, 145 insertions(+), 116 deletions(-) diff --git a/Gemfile b/Gemfile index c8a842f83..18510fd28 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,6 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.6' -# 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 @@ -33,6 +31,8 @@ gem 'sdoc', '~> 0.4.0', group: :doc # gem 'capistrano-rails', group: :development group :development, :test do + # Use sqlite3 as the database for Active Record in development environment + gem 'sqlite3' # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' end @@ -45,3 +45,8 @@ group :development do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' end + +group :production do + gem 'pg' + gem 'rails_12factor' +end diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f9cd5b348..703a579f7 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,3 +1,133 @@ +/***** GLOBAL *****/ + +body { + font-size: 16px; + font-family: 'Times New Roman', serif; + margin: 0; +} + +header { + background-color: pink; +} + +.topnav { + text-align: center; + font-size: 2.5rem; +} + +.topnav a { + display: inline-block; + margin: 0 1rem 0.25rem 1rem; +} + +.topnav a:hover { + color: white; +} + +h1 { + font-size: 3rem; + margin-top: 0; + text-align: center; + font-family: 'Coming Soon', cursive; +} + +h2 { + font-size: 2rem; + text-align: center; +} + +a { + text-decoration: none; + color: black; +} + +form { + margin: 1rem; +} + +/***** INDEX *****/ + +.add_link { + font-family: 'Coming Soon', cursive; + display: block; + text-align: center; + margin: 1rem auto; + font-size: 2rem; +} + +.tasklist { + padding: 0; + list-style-type: none; +} + +.incomplete { + width: 30%; + background-color: pink; + padding: 1rem; + margin: 1rem auto; + border-radius: 15%; + font-family: 'Coming Soon', cursive; + font-weight: bold; + font-size: 1.25rem; +} + +.person_name { + font-size: 1rem; +} + +.options { + margin: 0 0.25rem; + font-size: smaller; + list-style-type: none; + text-align: right; +} + +.options li { + display: inline; +} + +.options form { + margin: 0; + display: inline; +} + +.complete { + width: 30%; + background-color: #BBA3D0; + padding: 1rem; + margin: 1rem auto; + border-radius: 15%; + font-family: 'Coming Soon', cursive; + font-weight: bold; + font-size: 1.25rem; +} + +/***** SHOW TASK *****/ + +.info { + padding: 0; + list-style-type: none; +} + +.info > li { + width: 30%; + background-color: pink; + padding: 1rem; + margin: 1rem auto; + border-radius: 15%; + font-size: 1rem; +} + +.info h3 { + margin: 0.25rem; + font-family: 'Coming Soon', cursive; + font-weight: bold; + font-size: 1.5rem; +} + + + + /* * This is a manifest file that'll be compiled into application.css, which will include all the files * listed below. diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index 51c5262bf..c5e7712d4 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -1,117 +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/ - - -/***** GLOBAL *****/ - -body { - font-size: 16px; - font-family: 'Times New Roman', serif; - margin: 0; -} - -header { - background-color: pink; -} - -h1 { - font-size: 3rem; - margin-top: 0; - text-align: center; - font-family: 'Coming Soon', cursive; -} - -h2 { - font-size: 2rem; - text-align: center; -} - -a { - text-decoration: none; - color: black; -} - -form { - margin: 1rem; -} - -/***** INDEX *****/ - -.add_link { - font-family: 'Coming Soon', cursive; - display: block; - text-align: center; - margin: 1rem auto; - font-size: 2rem; -} - -.tasklist { - padding: 0; - list-style-type: none; -} - -.incomplete { - width: 30%; - background-color: pink; - padding: 1rem; - margin: 1rem auto; - border-radius: 15%; - font-family: 'Coming Soon', cursive; - font-weight: bold; - font-size: 1.25rem; -} - -.person_name { - font-size: 1rem; -} - -.options { - margin: 0 0.25rem; - font-size: smaller; - list-style-type: none; - text-align: right; -} - -.options li { - display: inline; -} - -.options form { - margin: 0; - display: inline; -} - -.complete { - width: 30%; - background-color: #BBA3D0; - padding: 1rem; - margin: 1rem auto; - border-radius: 15%; - font-family: 'Coming Soon', cursive; - font-weight: bold; - font-size: 1.25rem; -} - -/***** SHOW TASK *****/ - -.task_info { - padding: 0; - list-style-type: none; -} - -.task_info li { - width: 30%; - background-color: pink; - padding: 1rem; - margin: 1rem auto; - border-radius: 15%; - font-size: 1rem; -} - -.task_info h3 { - margin: 0.25rem; - font-family: 'Coming Soon', cursive; - font-weight: bold; - font-size: 1.5rem; -} diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 21233e2da..c2f08b5b1 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -4,4 +4,10 @@ def index @all_people = Person.all render :index end + + def show + @person = Person.find(params[:id]) + @tasks = @person.tasks.where(completed_at: nil) + render :show_person + end end diff --git a/config/routes.rb b/config/routes.rb index 87f8494e0..7f95a48d0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -25,6 +25,8 @@ get '/people' => 'people#index' + get '/people/:id' => 'people#show', as: 'person' + # Example of regular route: # get 'products/:id' => 'catalog#view' From caea7b56b6e6308301175ba2634cda7d7031a9cb Mon Sep 17 00:00:00 2001 From: Valerie Date: Mon, 25 Apr 2016 15:35:11 -0700 Subject: [PATCH 20/21] Bundled without postgres for now --- Gemfile.lock | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index abfecdc5c..8c1f700d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,6 +80,7 @@ GEM multi_json (1.11.2) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) + pg (0.18.4) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -102,6 +103,11 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) + rails_12factor (0.0.3) + rails_serve_static_assets + rails_stdout_logging + rails_serve_static_assets (0.0.5) + rails_stdout_logging (0.0.5) railties (4.2.6) actionpack (= 4.2.6) activesupport (= 4.2.6) @@ -154,7 +160,9 @@ DEPENDENCIES coffee-rails (~> 4.1.0) jbuilder (~> 2.0) jquery-rails + pg rails (= 4.2.6) + rails_12factor sass-rails (~> 5.0) sdoc (~> 0.4.0) spring From c40ed9bc905eb9722581c9a51cfa89acb1a54375 Mon Sep 17 00:00:00 2001 From: Valerie Date: Mon, 25 Apr 2016 16:33:04 -0700 Subject: [PATCH 21/21] Added page that shows both complete and incomplete tasks, and styled the link between them --- app/assets/stylesheets/application.css | 43 +++++++++++++++++++++++--- app/controllers/people_controller.rb | 7 +++++ app/views/people/all_tasks.html.erb | 20 ++++++++++++ app/views/people/index.html.erb | 8 +++-- app/views/people/show_person.html.erb | 4 ++- config/routes.rb | 2 ++ 6 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 app/views/people/all_tasks.html.erb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 703a579f7..815f343f2 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -20,10 +20,6 @@ header { margin: 0 1rem 0.25rem 1rem; } -.topnav a:hover { - color: white; -} - h1 { font-size: 3rem; margin-top: 0; @@ -41,11 +37,15 @@ a { color: black; } +a:hover { + color: white; +} + form { margin: 1rem; } -/***** INDEX *****/ +/***** TASK INDEX *****/ .add_link { font-family: 'Coming Soon', cursive; @@ -55,6 +55,10 @@ form { font-size: 2rem; } +.add_link a:hover { + color: pink; +} + .tasklist { padding: 0; list-style-type: none; @@ -125,6 +129,35 @@ form { font-size: 1.5rem; } +/**** PEOPLE INDEX ****/ + +.people-list { + font-size: 1.5rem; + width: 25%; + border-radius: 15%; + background-color: pink; + margin: 3rem auto; + padding: 1rem; + list-style-type: none; + text-align: center; +} + +.people-list li { + margin: 0.5rem 0; +} + +/**** SHOW PEOPLE ****/ + +.more { + font-size: 1.75rem; + font-family: 'Coming Soon', cursive; + display: block; + text-align: center; +} + +.more:hover { + color: pink; +} diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index c2f08b5b1..864532b42 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -10,4 +10,11 @@ def show @tasks = @person.tasks.where(completed_at: nil) render :show_person end + + def all + @person = Person.find(params[:id]) + @incomplete_tasks = @person.tasks.where(completed_at: nil) + @complete_tasks = @person.tasks.where.not(completed_at: nil) + render :all_tasks + end end diff --git a/app/views/people/all_tasks.html.erb b/app/views/people/all_tasks.html.erb new file mode 100644 index 000000000..608c89994 --- /dev/null +++ b/app/views/people/all_tasks.html.erb @@ -0,0 +1,20 @@ +

                    <%= @person.name %>

                    + +
                      +

                    • Task Owner:

                      <%= @person.name %>
                      • +

                    • Tasks Still Incomplete:

                      +
                        + <% @incomplete_tasks.each do |task| %> +
                      • <%= task.name %>
                        • + <% end %> +
                      +
                      • + +

                    • Tasks Completed:

                      +
                        + <% @complete_tasks.each do |task| %> +
                      • <%= task.name %>
                        • + <% end %> +
                      +
                      • +
                    diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb index def2a2025..3340f9160 100644 --- a/app/views/people/index.html.erb +++ b/app/views/people/index.html.erb @@ -1,6 +1,10 @@ +

                    Task Owners

                    -
                      +
                        <% @all_people.each do |person| %> -
                      • <%= link_to person.name, person_path(person.id) %>
                        • +
                      • + <%= link_to person.name, person_path(person.id) %> + (<%= person.tasks.where(completed_at: nil).count %>) +
                        • <% end %>
                      diff --git a/app/views/people/show_person.html.erb b/app/views/people/show_person.html.erb index 04e2edc72..7daf13bd7 100644 --- a/app/views/people/show_person.html.erb +++ b/app/views/people/show_person.html.erb @@ -2,7 +2,7 @@

                      • Task Owner:

                        <%= @person.name %>
                        • -

                      • Tasks To Do:

                        +

                      • Tasks Still Incomplete:

                        <% # @tasks returns a collection, but you can't see the contents unless you iterate over it %>
                          <% @tasks.each do |task| %> @@ -11,3 +11,5 @@
                      + +<%= link_to "View Completed", all_tasks_path, class: "more" %> diff --git a/config/routes.rb b/config/routes.rb index 7f95a48d0..fbe6e312d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -27,6 +27,8 @@ get '/people/:id' => 'people#show', as: 'person' + get '/people/:id/tasks' => 'people#all', as: 'all_tasks' + # Example of regular route: # get 'products/:id' => 'catalog#view'