From 2bae75f1d4082705bef8e085f3a191d7c70bf7ae Mon Sep 17 00:00:00 2001 From: Yasmin Date: Wed, 28 Sep 2016 17:11:49 -0700 Subject: [PATCH 01/37] reached baselines (both of them) --- TaskListRails/.gitignore | 17 ++ TaskListRails/Gemfile | 47 +++++ TaskListRails/Gemfile.lock | 163 ++++++++++++++++++ TaskListRails/README.rdoc | 28 +++ TaskListRails/Rakefile | 6 + TaskListRails/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 + TaskListRails/app/controllers/concerns/.keep | 0 .../app/controllers/tasks_controller.rb | 2 + .../app/helpers/application_helper.rb | 2 + TaskListRails/app/helpers/tasks_helper.rb | 2 + TaskListRails/app/mailers/.keep | 0 TaskListRails/app/models/.keep | 0 TaskListRails/app/models/concerns/.keep | 0 TaskListRails/app/models/task.rb | 2 + .../app/views/layouts/application.html.erb | 14 ++ TaskListRails/bin/bundle | 3 + TaskListRails/bin/rails | 9 + TaskListRails/bin/rake | 9 + TaskListRails/bin/setup | 29 ++++ TaskListRails/bin/spring | 15 ++ TaskListRails/config.ru | 4 + TaskListRails/config/application.rb | 26 +++ TaskListRails/config/boot.rb | 3 + TaskListRails/config/database.yml | 25 +++ TaskListRails/config/environment.rb | 5 + .../config/environments/development.rb | 41 +++++ .../config/environments/production.rb | 79 +++++++++ TaskListRails/config/environments/test.rb | 42 +++++ TaskListRails/config/initializers/assets.rb | 11 ++ .../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 ++ TaskListRails/config/locales/en.yml | 23 +++ TaskListRails/config/routes.rb | 56 ++++++ TaskListRails/config/secrets.yml | 22 +++ .../db/migrate/20160928215522_create_tasks.rb | 11 ++ TaskListRails/db/schema.rb | 24 +++ TaskListRails/db/seeds.rb | 7 + TaskListRails/lib/assets/.keep | 0 TaskListRails/lib/tasks/.keep | 0 TaskListRails/log/.keep | 0 TaskListRails/public/404.html | 67 +++++++ TaskListRails/public/422.html | 67 +++++++ TaskListRails/public/500.html | 66 +++++++ TaskListRails/public/favicon.ico | 0 TaskListRails/public/robots.txt | 5 + TaskListRails/test/controllers/.keep | 0 .../test/controllers/tasks_controller_test.rb | 7 + TaskListRails/test/fixtures/.keep | 0 TaskListRails/test/fixtures/tasks.yml | 11 ++ TaskListRails/test/helpers/.keep | 0 TaskListRails/test/integration/.keep | 0 TaskListRails/test/mailers/.keep | 0 TaskListRails/test/models/.keep | 0 TaskListRails/test/models/task_test.rb | 7 + TaskListRails/test/test_helper.rb | 10 ++ TaskListRails/vendor/assets/javascripts/.keep | 0 TaskListRails/vendor/assets/stylesheets/.keep | 0 67 files changed, 1060 insertions(+) create mode 100644 TaskListRails/.gitignore create mode 100644 TaskListRails/Gemfile create mode 100644 TaskListRails/Gemfile.lock create mode 100644 TaskListRails/README.rdoc create mode 100644 TaskListRails/Rakefile create mode 100644 TaskListRails/app/assets/images/.keep create mode 100644 TaskListRails/app/assets/javascripts/application.js create mode 100644 TaskListRails/app/assets/javascripts/tasks.coffee create mode 100644 TaskListRails/app/assets/stylesheets/application.css create mode 100644 TaskListRails/app/assets/stylesheets/tasks.scss create mode 100644 TaskListRails/app/controllers/application_controller.rb create mode 100644 TaskListRails/app/controllers/concerns/.keep create mode 100644 TaskListRails/app/controllers/tasks_controller.rb create mode 100644 TaskListRails/app/helpers/application_helper.rb create mode 100644 TaskListRails/app/helpers/tasks_helper.rb create mode 100644 TaskListRails/app/mailers/.keep create mode 100644 TaskListRails/app/models/.keep create mode 100644 TaskListRails/app/models/concerns/.keep create mode 100644 TaskListRails/app/models/task.rb create mode 100644 TaskListRails/app/views/layouts/application.html.erb create mode 100755 TaskListRails/bin/bundle create mode 100755 TaskListRails/bin/rails create mode 100755 TaskListRails/bin/rake create mode 100755 TaskListRails/bin/setup create mode 100755 TaskListRails/bin/spring create mode 100644 TaskListRails/config.ru create mode 100644 TaskListRails/config/application.rb create mode 100644 TaskListRails/config/boot.rb create mode 100644 TaskListRails/config/database.yml create mode 100644 TaskListRails/config/environment.rb create mode 100644 TaskListRails/config/environments/development.rb create mode 100644 TaskListRails/config/environments/production.rb create mode 100644 TaskListRails/config/environments/test.rb create mode 100644 TaskListRails/config/initializers/assets.rb create mode 100644 TaskListRails/config/initializers/backtrace_silencers.rb create mode 100644 TaskListRails/config/initializers/cookies_serializer.rb create mode 100644 TaskListRails/config/initializers/filter_parameter_logging.rb create mode 100644 TaskListRails/config/initializers/inflections.rb create mode 100644 TaskListRails/config/initializers/mime_types.rb create mode 100644 TaskListRails/config/initializers/session_store.rb create mode 100644 TaskListRails/config/initializers/wrap_parameters.rb create mode 100644 TaskListRails/config/locales/en.yml create mode 100644 TaskListRails/config/routes.rb create mode 100644 TaskListRails/config/secrets.yml create mode 100644 TaskListRails/db/migrate/20160928215522_create_tasks.rb create mode 100644 TaskListRails/db/schema.rb create mode 100644 TaskListRails/db/seeds.rb create mode 100644 TaskListRails/lib/assets/.keep create mode 100644 TaskListRails/lib/tasks/.keep create mode 100644 TaskListRails/log/.keep create mode 100644 TaskListRails/public/404.html create mode 100644 TaskListRails/public/422.html create mode 100644 TaskListRails/public/500.html create mode 100644 TaskListRails/public/favicon.ico create mode 100644 TaskListRails/public/robots.txt create mode 100644 TaskListRails/test/controllers/.keep create mode 100644 TaskListRails/test/controllers/tasks_controller_test.rb create mode 100644 TaskListRails/test/fixtures/.keep create mode 100644 TaskListRails/test/fixtures/tasks.yml create mode 100644 TaskListRails/test/helpers/.keep create mode 100644 TaskListRails/test/integration/.keep create mode 100644 TaskListRails/test/mailers/.keep create mode 100644 TaskListRails/test/models/.keep create mode 100644 TaskListRails/test/models/task_test.rb create mode 100644 TaskListRails/test/test_helper.rb create mode 100644 TaskListRails/vendor/assets/javascripts/.keep create mode 100644 TaskListRails/vendor/assets/stylesheets/.keep diff --git a/TaskListRails/.gitignore b/TaskListRails/.gitignore new file mode 100644 index 000000000..050c9d95c --- /dev/null +++ b/TaskListRails/.gitignore @@ -0,0 +1,17 @@ +# 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' + +# Ignore bundler config. +/.bundle + +# Ignore the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal + +# Ignore all logfiles and tempfiles. +/log/* +!/log/.keep +/tmp diff --git a/TaskListRails/Gemfile b/TaskListRails/Gemfile new file mode 100644 index 000000000..e87fad5fc --- /dev/null +++ b/TaskListRails/Gemfile @@ -0,0 +1,47 @@ +source 'https://rubygems.org' + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.7' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.1.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks +gem 'turbolinks' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.0' +# bundle exec rake doc:rails generates the API under doc/api. +gem 'sdoc', '~> 0.4.0', group: :doc + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Unicorn as the app server +# gem 'unicorn' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' +end + diff --git a/TaskListRails/Gemfile.lock b/TaskListRails/Gemfile.lock new file mode 100644 index 000000000..187046034 --- /dev/null +++ b/TaskListRails/Gemfile.lock @@ -0,0 +1,163 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.7) + activesupport (= 4.2.7) + globalid (>= 0.3.0) + activemodel (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) + arel (~> 6.0) + activesupport (4.2.7) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + arel (6.0.3) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + byebug (9.0.5) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.7.0) + globalid (0.3.7) + activesupport (>= 4.1.0) + i18n (0.7.0) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.2.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + json (1.8.3) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.1) + multi_json (1.12.1) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.7) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.3.0) + rdoc (4.2.2) + json (~> 1.4) + sass (3.4.22) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + spring (1.7.2) + sprockets (3.7.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.11) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.2) + execjs (>= 0.3.0, < 3) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + coffee-rails (~> 4.1.0) + jbuilder (~> 2.0) + jquery-rails + rails (= 4.2.7) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +BUNDLED WITH + 1.13.1 diff --git a/TaskListRails/README.rdoc b/TaskListRails/README.rdoc new file mode 100644 index 000000000..dd4e97e22 --- /dev/null +++ b/TaskListRails/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/TaskListRails/Rakefile b/TaskListRails/Rakefile new file mode 100644 index 000000000..ba6b733dd --- /dev/null +++ b/TaskListRails/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/TaskListRails/app/assets/images/.keep b/TaskListRails/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/app/assets/javascripts/application.js b/TaskListRails/app/assets/javascripts/application.js new file mode 100644 index 000000000..e07c5a830 --- /dev/null +++ b/TaskListRails/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/TaskListRails/app/assets/javascripts/tasks.coffee b/TaskListRails/app/assets/javascripts/tasks.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/TaskListRails/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/TaskListRails/app/assets/stylesheets/application.css b/TaskListRails/app/assets/stylesheets/application.css new file mode 100644 index 000000000..f9cd5b348 --- /dev/null +++ b/TaskListRails/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/TaskListRails/app/assets/stylesheets/tasks.scss b/TaskListRails/app/assets/stylesheets/tasks.scss new file mode 100644 index 000000000..c5e7712d4 --- /dev/null +++ b/TaskListRails/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/TaskListRails/app/controllers/application_controller.rb b/TaskListRails/app/controllers/application_controller.rb new file mode 100644 index 000000000..d83690e1b --- /dev/null +++ b/TaskListRails/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/TaskListRails/app/controllers/concerns/.keep b/TaskListRails/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb new file mode 100644 index 000000000..1ad33d04b --- /dev/null +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -0,0 +1,2 @@ +class TasksController < ApplicationController +end diff --git a/TaskListRails/app/helpers/application_helper.rb b/TaskListRails/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/TaskListRails/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/TaskListRails/app/helpers/tasks_helper.rb b/TaskListRails/app/helpers/tasks_helper.rb new file mode 100644 index 000000000..ce894d00c --- /dev/null +++ b/TaskListRails/app/helpers/tasks_helper.rb @@ -0,0 +1,2 @@ +module TasksHelper +end diff --git a/TaskListRails/app/mailers/.keep b/TaskListRails/app/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/app/models/.keep b/TaskListRails/app/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/app/models/concerns/.keep b/TaskListRails/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/app/models/task.rb b/TaskListRails/app/models/task.rb new file mode 100644 index 000000000..935f76e12 --- /dev/null +++ b/TaskListRails/app/models/task.rb @@ -0,0 +1,2 @@ +class Task < ActiveRecord::Base +end diff --git a/TaskListRails/app/views/layouts/application.html.erb b/TaskListRails/app/views/layouts/application.html.erb new file mode 100644 index 000000000..46eeb110b --- /dev/null +++ b/TaskListRails/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/TaskListRails/bin/bundle b/TaskListRails/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/TaskListRails/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/TaskListRails/bin/rails b/TaskListRails/bin/rails new file mode 100755 index 000000000..0138d79b7 --- /dev/null +++ b/TaskListRails/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/TaskListRails/bin/rake b/TaskListRails/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/TaskListRails/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/TaskListRails/bin/setup b/TaskListRails/bin/setup new file mode 100755 index 000000000..acdb2c138 --- /dev/null +++ b/TaskListRails/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/TaskListRails/bin/spring b/TaskListRails/bin/spring new file mode 100755 index 000000000..7fe232c3a --- /dev/null +++ b/TaskListRails/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/TaskListRails/config.ru b/TaskListRails/config.ru new file mode 100644 index 000000000..bd83b2541 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/application.rb b/TaskListRails/config/application.rb new file mode 100644 index 000000000..902432bad --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/boot.rb b/TaskListRails/config/boot.rb new file mode 100644 index 000000000..6b750f00b --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/database.yml b/TaskListRails/config/database.yml new file mode 100644 index 000000000..1c1a37ca8 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/environment.rb b/TaskListRails/config/environment.rb new file mode 100644 index 000000000..ee8d90dc6 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/environments/development.rb b/TaskListRails/config/environments/development.rb new file mode 100644 index 000000000..b55e2144b --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/environments/production.rb b/TaskListRails/config/environments/production.rb new file mode 100644 index 000000000..5c1b32e48 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/environments/test.rb b/TaskListRails/config/environments/test.rb new file mode 100644 index 000000000..1c19f08b2 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/initializers/assets.rb b/TaskListRails/config/initializers/assets.rb new file mode 100644 index 000000000..01ef3e663 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/initializers/backtrace_silencers.rb b/TaskListRails/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/initializers/cookies_serializer.rb b/TaskListRails/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..7f70458de --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/initializers/filter_parameter_logging.rb b/TaskListRails/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/initializers/inflections.rb b/TaskListRails/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/initializers/mime_types.rb b/TaskListRails/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/initializers/session_store.rb b/TaskListRails/config/initializers/session_store.rb new file mode 100644 index 000000000..15d065a84 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/initializers/wrap_parameters.rb b/TaskListRails/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..33725e95f --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/locales/en.yml b/TaskListRails/config/locales/en.yml new file mode 100644 index 000000000..065395716 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/routes.rb b/TaskListRails/config/routes.rb new file mode 100644 index 000000000..3f66539d5 --- /dev/null +++ b/TaskListRails/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/TaskListRails/config/secrets.yml b/TaskListRails/config/secrets.yml new file mode 100644 index 000000000..64a190c55 --- /dev/null +++ b/TaskListRails/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: d45fbcfd678fa3eb391cf24fd39af0220c24823fcb573ca358d0bdf7279d9fbf77ecd548243144dea401a45fe5493a4a0a41788161a3baabf690830f31b6506c + +test: + secret_key_base: 97a1ffc45a72ddefa96684588af006c5c68e1934b1c1731eb36b6124209a3be72cf2ccf902fe0257b1991297792e1a6d52ebd37b7b7691f02d154d954a4f6bb5 + +# 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/TaskListRails/db/migrate/20160928215522_create_tasks.rb b/TaskListRails/db/migrate/20160928215522_create_tasks.rb new file mode 100644 index 000000000..59d90b417 --- /dev/null +++ b/TaskListRails/db/migrate/20160928215522_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/TaskListRails/db/schema.rb b/TaskListRails/db/schema.rb new file mode 100644 index 000000000..6f8d40190 --- /dev/null +++ b/TaskListRails/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: 20160928215522) do + + create_table "tasks", force: :cascade do |t| + t.string "name" + t.string "description" + t.boolean "completion" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/TaskListRails/db/seeds.rb b/TaskListRails/db/seeds.rb new file mode 100644 index 000000000..4edb1e857 --- /dev/null +++ b/TaskListRails/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). +# +# Examples: +# +# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) +# Mayor.create(name: 'Emanuel', city: cities.first) diff --git a/TaskListRails/lib/assets/.keep b/TaskListRails/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/lib/tasks/.keep b/TaskListRails/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/log/.keep b/TaskListRails/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/public/404.html b/TaskListRails/public/404.html new file mode 100644 index 000000000..b612547fc --- /dev/null +++ b/TaskListRails/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/TaskListRails/public/422.html b/TaskListRails/public/422.html new file mode 100644 index 000000000..a21f82b3b --- /dev/null +++ b/TaskListRails/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/TaskListRails/public/500.html b/TaskListRails/public/500.html new file mode 100644 index 000000000..061abc587 --- /dev/null +++ b/TaskListRails/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/TaskListRails/public/favicon.ico b/TaskListRails/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/public/robots.txt b/TaskListRails/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/TaskListRails/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/TaskListRails/test/controllers/.keep b/TaskListRails/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/test/controllers/tasks_controller_test.rb b/TaskListRails/test/controllers/tasks_controller_test.rb new file mode 100644 index 000000000..ab48b116d --- /dev/null +++ b/TaskListRails/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/TaskListRails/test/fixtures/.keep b/TaskListRails/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/test/fixtures/tasks.yml b/TaskListRails/test/fixtures/tasks.yml new file mode 100644 index 000000000..18969b9d7 --- /dev/null +++ b/TaskListRails/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/TaskListRails/test/helpers/.keep b/TaskListRails/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/test/integration/.keep b/TaskListRails/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/test/mailers/.keep b/TaskListRails/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/test/models/.keep b/TaskListRails/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/test/models/task_test.rb b/TaskListRails/test/models/task_test.rb new file mode 100644 index 000000000..3ca215970 --- /dev/null +++ b/TaskListRails/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/TaskListRails/test/test_helper.rb b/TaskListRails/test/test_helper.rb new file mode 100644 index 000000000..92e39b2d7 --- /dev/null +++ b/TaskListRails/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/TaskListRails/vendor/assets/javascripts/.keep b/TaskListRails/vendor/assets/javascripts/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/TaskListRails/vendor/assets/stylesheets/.keep b/TaskListRails/vendor/assets/stylesheets/.keep new file mode 100644 index 000000000..e69de29bb From 05d38e4e1af3b568ea349f7cd524c089a520fbf2 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Thu, 29 Sep 2016 16:23:48 -0700 Subject: [PATCH 02/37] Generated two migrations: one to change the completion columns datatype from boolean to datetime, and the other to change the name from completion to completed_at --- TaskListRails/db/schema.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TaskListRails/db/schema.rb b/TaskListRails/db/schema.rb index 6f8d40190..acbd6ee89 100644 --- a/TaskListRails/db/schema.rb +++ b/TaskListRails/db/schema.rb @@ -11,14 +11,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160928215522) do +ActiveRecord::Schema.define(version: 20160929223520) do create_table "tasks", force: :cascade do |t| t.string "name" t.string "description" - t.boolean "completion" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "completed_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end end From 1d29b178195d6628718f29e35448c280dc129134 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Thu, 29 Sep 2016 16:29:08 -0700 Subject: [PATCH 03/37] Set up Wave 1 requirements except for links to a show action --- .../app/controllers/tasks_controller.rb | 8 ++++++++ TaskListRails/app/views/tasks/index.html.erb | 16 ++++++++++++++++ TaskListRails/app/views/tasks/show.html.erb | 13 +++++++++++++ TaskListRails/config/routes.rb | 8 ++++++++ ...929222914_change_completed_column_datatype.rb | 5 +++++ ...0160929223520_change_completed_column_name.rb | 5 +++++ 6 files changed, 55 insertions(+) create mode 100644 TaskListRails/app/views/tasks/index.html.erb create mode 100644 TaskListRails/app/views/tasks/show.html.erb create mode 100644 TaskListRails/db/migrate/20160929222914_change_completed_column_datatype.rb create mode 100644 TaskListRails/db/migrate/20160929223520_change_completed_column_name.rb diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb index 1ad33d04b..946b707c9 100644 --- a/TaskListRails/app/controllers/tasks_controller.rb +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -1,2 +1,10 @@ class TasksController < ApplicationController + def index + @tasks = Task.all + end + + def show # should render a new view for the user + @task = Task.find(params[:id]) + end + end diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb new file mode 100644 index 000000000..f284d96e7 --- /dev/null +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -0,0 +1,16 @@ +

Tasks

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

+ <%= "Task #{t.id}:" %> +

    +
  • <%= "#{t.name}" %>
    • +
  • <%= "#{t.description}" %>
    • + +
  • <%= "#{t.completed_at}" %>
    • +
+ + + +

+ <% end %> diff --git a/TaskListRails/app/views/tasks/show.html.erb b/TaskListRails/app/views/tasks/show.html.erb new file mode 100644 index 000000000..4f9b3e12c --- /dev/null +++ b/TaskListRails/app/views/tasks/show.html.erb @@ -0,0 +1,13 @@ + + +

Task#show

+ +
    +
  • name: <%= @task.name %>
    • +
  • description: <%= @task.description %>
    • + +
  • completed at: <%= @task.completed_at %>
    • + +
diff --git a/TaskListRails/config/routes.rb b/TaskListRails/config/routes.rb index 3f66539d5..001436206 100644 --- a/TaskListRails/config/routes.rb +++ b/TaskListRails/config/routes.rb @@ -1,4 +1,12 @@ Rails.application.routes.draw do + + root 'tasks#index' + + get 'tasks' => 'tasks#index' + get 'tasks/:id', to: 'tasks#show', as: 'soil_sample' #this route shows a specifically identified task from the database + + + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/TaskListRails/db/migrate/20160929222914_change_completed_column_datatype.rb b/TaskListRails/db/migrate/20160929222914_change_completed_column_datatype.rb new file mode 100644 index 000000000..f38b764af --- /dev/null +++ b/TaskListRails/db/migrate/20160929222914_change_completed_column_datatype.rb @@ -0,0 +1,5 @@ +class ChangeCompletedColumnDatatype < ActiveRecord::Migration + def change + change_column :tasks, :completion, :datetime + end +end diff --git a/TaskListRails/db/migrate/20160929223520_change_completed_column_name.rb b/TaskListRails/db/migrate/20160929223520_change_completed_column_name.rb new file mode 100644 index 000000000..6a6691a5e --- /dev/null +++ b/TaskListRails/db/migrate/20160929223520_change_completed_column_name.rb @@ -0,0 +1,5 @@ +class ChangeCompletedColumnName < ActiveRecord::Migration + def change + rename_column :tasks, :completion, :completed_at + end +end From 40c1652850c459bbe703147b9cfe5c27e91290ec Mon Sep 17 00:00:00 2001 From: Yasmin Date: Thu, 29 Sep 2016 16:38:38 -0700 Subject: [PATCH 04/37] updated so that each task name on the index page links to a show action that will render as a new view for the user --- TaskListRails/app/views/tasks/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index f284d96e7..fc1623f5f 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -10,7 +10,7 @@
  • <%= "#{t.completed_at}" %>
    • - - + <%= link_to "Find it here", task_path(t) %> +

    <% end %> From 43f539cd26efdacc5f3f2e79e4ba62e355f8b829 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Fri, 30 Sep 2016 10:45:10 -0700 Subject: [PATCH 05/37] Fixed a bug in the show view so that the correct path displayed (among other things) --- .../app/controllers/tasks_controller.rb | 31 +++++++++++++++++++ TaskListRails/app/views/tasks/create.html.erb | 2 ++ TaskListRails/app/views/tasks/index.html.erb | 6 ++-- TaskListRails/app/views/tasks/new.html.erb | 12 +++++++ TaskListRails/app/views/tasks/show.html.erb | 1 - TaskListRails/config/routes.rb | 8 +++-- 6 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 TaskListRails/app/views/tasks/create.html.erb create mode 100644 TaskListRails/app/views/tasks/new.html.erb diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb index 946b707c9..829a9656a 100644 --- a/TaskListRails/app/controllers/tasks_controller.rb +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -7,4 +7,35 @@ def show # should render a new view for the user @task = Task.find(params[:id]) end + def new # add a new task! + @task = Task.new + end + + def create + @task = Task.new(task_params) + + if @task.save + #SAVED SUCCESSFULLY + redirect_to tasks_path + else + #DID NOT SAVE + render :new + end + end + + def update + @task = Task.find(params[:id]) + if @task.update(task_params) + # SUCCESS + redirect_to tasks_path + else + render :edit + end + end + + private + + def task_params + params.require(:task).permit(:name, :description, :completed_at) + end end diff --git a/TaskListRails/app/views/tasks/create.html.erb b/TaskListRails/app/views/tasks/create.html.erb new file mode 100644 index 000000000..fcad439c4 --- /dev/null +++ b/TaskListRails/app/views/tasks/create.html.erb @@ -0,0 +1,2 @@ +

    Tasks#create

    +

    Find me in app/views/tasks/create.html.erb

    diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index fc1623f5f..47cdb2e2e 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -1,16 +1,16 @@

    Tasks

    + <%= link_to "Add a new task", tasks_new_path %> + <% @tasks.each do |t| %>

    <%= "Task #{t.id}:" %>

    • <%= "#{t.name}" %>
    • <%= "#{t.description}" %>
      • -
    • <%= "#{t.completed_at}" %>
    - <%= link_to "Find it here", task_path(t) %> - + <%= link_to "View task", task_path(t.id) %>

    <% end %> diff --git a/TaskListRails/app/views/tasks/new.html.erb b/TaskListRails/app/views/tasks/new.html.erb new file mode 100644 index 000000000..f48b8281c --- /dev/null +++ b/TaskListRails/app/views/tasks/new.html.erb @@ -0,0 +1,12 @@ +<%= 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 "Submit" %> +<% end %> diff --git a/TaskListRails/app/views/tasks/show.html.erb b/TaskListRails/app/views/tasks/show.html.erb index 4f9b3e12c..cb7d0d3d8 100644 --- a/TaskListRails/app/views/tasks/show.html.erb +++ b/TaskListRails/app/views/tasks/show.html.erb @@ -7,7 +7,6 @@ completion date/time -->
    • name: <%= @task.name %>
    • description: <%= @task.description %>
      • -
    • completed at: <%= @task.completed_at %>
    diff --git a/TaskListRails/config/routes.rb b/TaskListRails/config/routes.rb index 001436206..a36530a1e 100644 --- a/TaskListRails/config/routes.rb +++ b/TaskListRails/config/routes.rb @@ -1,11 +1,13 @@ Rails.application.routes.draw do - root 'tasks#index' - get 'tasks' => 'tasks#index' - get 'tasks/:id', to: 'tasks#show', as: 'soil_sample' #this route shows a specifically identified task from the database + get 'tasks' => 'tasks#index' + get 'tasks/new' => 'tasks#new' + post 'tasks' => 'tasks#create' + root 'tasks#index' + get 'tasks/:id', to: 'tasks#show', as: 'task' #this route shows a specifically identified task from the database # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 85f469d7ce0431c313140dfc68264786b046242c Mon Sep 17 00:00:00 2001 From: Yasmin Date: Fri, 30 Sep 2016 10:59:49 -0700 Subject: [PATCH 06/37] Added the ability to delete a task from the database --- .../app/controllers/tasks_controller.rb | 21 ++++++++++++------- TaskListRails/app/views/tasks/index.html.erb | 4 +++- TaskListRails/config/routes.rb | 4 ++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb index 829a9656a..c8440fd48 100644 --- a/TaskListRails/app/controllers/tasks_controller.rb +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -23,14 +23,19 @@ def create end end - def update - @task = Task.find(params[:id]) - if @task.update(task_params) - # SUCCESS - redirect_to tasks_path - else - render :edit - end + # def update + # @task = Task.find(params[:id]) + # if @task.update(task_params) + # # SUCCESS + # redirect_to tasks_path + # else + # render :edit + # end + # end + + def destroy + Task.find(params[:id]).destroy + redirect_to tasks_path end private diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index 47cdb2e2e..8b6c9fe49 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -11,6 +11,8 @@
  • <%= "#{t.completed_at}" %>
    • - <%= link_to "View task", task_path(t.id) %> + <%= link_to "View this task", task_path(t.id) %> + <%= link_to "Delete this task", task_path(t.id), method: :delete, + data: { confirm: "Are you really really sure?" } %>

    <% end %> diff --git a/TaskListRails/config/routes.rb b/TaskListRails/config/routes.rb index a36530a1e..ee67f4054 100644 --- a/TaskListRails/config/routes.rb +++ b/TaskListRails/config/routes.rb @@ -9,6 +9,10 @@ get 'tasks/:id', to: 'tasks#show', as: 'task' #this route shows a specifically identified task from the database + delete 'tasks/:id', to: 'tasks#destroy' + + + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From c6a07c9228e7ca138655843b186a1db9c6f8d941 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Fri, 30 Sep 2016 12:32:06 -0700 Subject: [PATCH 07/37] Added a completion status column, added a button on the form to mark a task as completed --- TaskListRails/app/views/tasks/index.html.erb | 7 ++++--- TaskListRails/app/views/tasks/new.html.erb | 5 ++++- TaskListRails/app/views/tasks/show.html.erb | 1 + TaskListRails/config/routes.rb | 6 ++++-- .../20160930182141_add_completion_status_to_tasks.rb | 5 +++++ TaskListRails/db/schema.rb | 7 ++++--- 6 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 TaskListRails/db/migrate/20160930182141_add_completion_status_to_tasks.rb diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index 8b6c9fe49..2ccab7c8f 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -6,9 +6,10 @@

    <%= "Task #{t.id}:" %>

      -
    • <%= "#{t.name}" %>
      • -
    • <%= "#{t.description}" %>
      • -
    • <%= "#{t.completed_at}" %>
      • +
    • <%= "Title: #{t.name}" %>
      • +
    • <%= "Description: #{t.description}" %>
      • +
    • <%= "Completion status: #{t.completion_status}" %>
      • +
    • <%= "Completed at: #{t.completed_at}" %>
    <%= link_to "View this task", task_path(t.id) %> diff --git a/TaskListRails/app/views/tasks/new.html.erb b/TaskListRails/app/views/tasks/new.html.erb index f48b8281c..4f2ab7bb4 100644 --- a/TaskListRails/app/views/tasks/new.html.erb +++ b/TaskListRails/app/views/tasks/new.html.erb @@ -5,8 +5,11 @@ <%= f.label :description %> <%= f.text_field :description %> + <%= f.label :completion_status %> + <%= f.radio_button :completion_status, true %> + <%= f.label :completed_at %> - <%= f.text_field :completed_at %> + <%= f.datetime_field :completed_at %> <%= f.submit "Submit" %> <% end %> diff --git a/TaskListRails/app/views/tasks/show.html.erb b/TaskListRails/app/views/tasks/show.html.erb index cb7d0d3d8..1ad93ff37 100644 --- a/TaskListRails/app/views/tasks/show.html.erb +++ b/TaskListRails/app/views/tasks/show.html.erb @@ -7,6 +7,7 @@ completion date/time -->
    • name: <%= @task.name %>
    • description: <%= @task.description %>
      • +
    • completion status: <%= @task.completion_status %>
    • completed at: <%= @task.completed_at %>
    diff --git a/TaskListRails/config/routes.rb b/TaskListRails/config/routes.rb index ee67f4054..105fa5145 100644 --- a/TaskListRails/config/routes.rb +++ b/TaskListRails/config/routes.rb @@ -1,14 +1,16 @@ Rails.application.routes.draw do + root 'tasks#index' get 'tasks' => 'tasks#index' get 'tasks/new' => 'tasks#new' post 'tasks' => 'tasks#create' - root 'tasks#index' - get 'tasks/:id', to: 'tasks#show', as: 'task' #this route shows a specifically identified task from the database + get 'tasks/:id/edit' => 'tasks#edit', as: 'tasks_edit' + patch 'tasks/:id' => 'tasks#update' + delete 'tasks/:id', to: 'tasks#destroy' diff --git a/TaskListRails/db/migrate/20160930182141_add_completion_status_to_tasks.rb b/TaskListRails/db/migrate/20160930182141_add_completion_status_to_tasks.rb new file mode 100644 index 000000000..709d478c6 --- /dev/null +++ b/TaskListRails/db/migrate/20160930182141_add_completion_status_to_tasks.rb @@ -0,0 +1,5 @@ +class AddCompletionStatusToTasks < ActiveRecord::Migration + def change + add_column :tasks, :completion_status, :boolean + end +end diff --git a/TaskListRails/db/schema.rb b/TaskListRails/db/schema.rb index acbd6ee89..f2a386b57 100644 --- a/TaskListRails/db/schema.rb +++ b/TaskListRails/db/schema.rb @@ -11,14 +11,15 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160929223520) do +ActiveRecord::Schema.define(version: 20160930182141) do create_table "tasks", force: :cascade do |t| t.string "name" t.string "description" t.datetime "completed_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "completion_status" end end From b0cf5806a4b3bd464d6a44c6b3e4a65a42f0e699 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Fri, 30 Sep 2016 13:53:15 -0700 Subject: [PATCH 08/37] added the ability to edit a task using update method --- .../app/controllers/tasks_controller.rb | 22 +++++++++++-------- TaskListRails/app/views/tasks/edit.html.erb | 15 +++++++++++++ TaskListRails/app/views/tasks/index.html.erb | 3 ++- 3 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 TaskListRails/app/views/tasks/edit.html.erb diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb index c8440fd48..9c1f6df70 100644 --- a/TaskListRails/app/controllers/tasks_controller.rb +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -11,6 +11,10 @@ def new # add a new task! @task = Task.new end + def edit + @task = Task.find(params[:id]) + end + def create @task = Task.new(task_params) @@ -23,15 +27,15 @@ def create end end - # def update - # @task = Task.find(params[:id]) - # if @task.update(task_params) - # # SUCCESS - # redirect_to tasks_path - # else - # render :edit - # end - # end + def update + @task = Task.find(params[:id]) + if @task.update(task_params) + # SUCCESS + redirect_to tasks_path + else + render :edit + end + end def destroy Task.find(params[:id]).destroy diff --git a/TaskListRails/app/views/tasks/edit.html.erb b/TaskListRails/app/views/tasks/edit.html.erb new file mode 100644 index 000000000..4f2ab7bb4 --- /dev/null +++ b/TaskListRails/app/views/tasks/edit.html.erb @@ -0,0 +1,15 @@ +<%= form_for @task do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :description %> + <%= f.text_field :description %> + + <%= f.label :completion_status %> + <%= f.radio_button :completion_status, true %> + + <%= f.label :completed_at %> + <%= f.datetime_field :completed_at %> + + <%= f.submit "Submit" %> +<% end %> diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index 2ccab7c8f..e9613428b 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -8,11 +8,12 @@
    • <%= "Title: #{t.name}" %>
    • <%= "Description: #{t.description}" %>
      • -
    • <%= "Completion status: #{t.completion_status}" %>
      • +
    • <%= "Completion status: #{t.completion_status}" %>
    • <%= "Completed at: #{t.completed_at}" %>
    <%= link_to "View this task", task_path(t.id) %> + <%= link_to "Edit this task", tasks_edit_path(t) %> <%= link_to "Delete this task", task_path(t.id), method: :delete, data: { confirm: "Are you really really sure?" } %>

    From 35689ff5af7383f6fdcd07b5cba38d58043b591b Mon Sep 17 00:00:00 2001 From: Yasmin Date: Fri, 30 Sep 2016 14:45:32 -0700 Subject: [PATCH 09/37] Fixed bug so that completion status will display properly --- TaskListRails/app/controllers/tasks_controller.rb | 8 +++++++- TaskListRails/app/views/tasks/edit.html.erb | 2 +- TaskListRails/app/views/tasks/new.html.erb | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb index 9c1f6df70..0ab97813f 100644 --- a/TaskListRails/app/controllers/tasks_controller.rb +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -18,6 +18,12 @@ def edit def create @task = Task.new(task_params) + if task_params[:completion_status] + task_params[:completion_status] = true + else + task_params[:completion_status] = false + end + if @task.save #SAVED SUCCESSFULLY redirect_to tasks_path @@ -45,6 +51,6 @@ def destroy private def task_params - params.require(:task).permit(:name, :description, :completed_at) + params.require(:task).permit(:name, :description, :completion_status, :completed_at) end end diff --git a/TaskListRails/app/views/tasks/edit.html.erb b/TaskListRails/app/views/tasks/edit.html.erb index 4f2ab7bb4..c4bee4e26 100644 --- a/TaskListRails/app/views/tasks/edit.html.erb +++ b/TaskListRails/app/views/tasks/edit.html.erb @@ -6,7 +6,7 @@ <%= f.text_field :description %> <%= f.label :completion_status %> - <%= f.radio_button :completion_status, true %> + <%= f.check_box :completion_status %> <%= f.label :completed_at %> <%= f.datetime_field :completed_at %> diff --git a/TaskListRails/app/views/tasks/new.html.erb b/TaskListRails/app/views/tasks/new.html.erb index 4f2ab7bb4..c4bee4e26 100644 --- a/TaskListRails/app/views/tasks/new.html.erb +++ b/TaskListRails/app/views/tasks/new.html.erb @@ -6,7 +6,7 @@ <%= f.text_field :description %> <%= f.label :completion_status %> - <%= f.radio_button :completion_status, true %> + <%= f.check_box :completion_status %> <%= f.label :completed_at %> <%= f.datetime_field :completed_at %> From 0f5846c2b3c9fce94c44c01e935c4b739aca30ba Mon Sep 17 00:00:00 2001 From: Yasmin Date: Fri, 30 Sep 2016 15:49:12 -0700 Subject: [PATCH 10/37] Added a helper method in Applications Helper to format the DateTime, also changed the completed_at field in the form for easier entry --- TaskListRails/app/controllers/tasks_controller.rb | 1 + TaskListRails/app/helpers/application_helper.rb | 5 +++++ TaskListRails/app/views/tasks/edit.html.erb | 4 +++- TaskListRails/app/views/tasks/index.html.erb | 2 +- TaskListRails/app/views/tasks/new.html.erb | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb index 0ab97813f..c10425e14 100644 --- a/TaskListRails/app/controllers/tasks_controller.rb +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -39,6 +39,7 @@ def update # SUCCESS redirect_to tasks_path else + # UNSUCCESSFUL render :edit end end diff --git a/TaskListRails/app/helpers/application_helper.rb b/TaskListRails/app/helpers/application_helper.rb index de6be7945..fc36160fc 100644 --- a/TaskListRails/app/helpers/application_helper.rb +++ b/TaskListRails/app/helpers/application_helper.rb @@ -1,2 +1,7 @@ module ApplicationHelper + def datetime_formatter(task) + if task.completed_at != nil + return task.completed_at.to_formatted_s(:short) + end + end end diff --git a/TaskListRails/app/views/tasks/edit.html.erb b/TaskListRails/app/views/tasks/edit.html.erb index c4bee4e26..b8a4eb171 100644 --- a/TaskListRails/app/views/tasks/edit.html.erb +++ b/TaskListRails/app/views/tasks/edit.html.erb @@ -1,3 +1,5 @@ +

    Edit Task

    + <%= form_for @task do |f| %> <%= f.label :name %> <%= f.text_field :name %> @@ -9,7 +11,7 @@ <%= f.check_box :completion_status %> <%= f.label :completed_at %> - <%= f.datetime_field :completed_at %> + <%= f.date_field :completed_at %> <%= f.submit "Submit" %> <% end %> diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index e9613428b..c44f21b71 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -9,7 +9,7 @@
  • <%= "Title: #{t.name}" %>
  • <%= "Description: #{t.description}" %>
  • <%= "Completion status: #{t.completion_status}" %>
    • -
  • <%= "Completed at: #{t.completed_at}" %>
    • +
  • <%= "Completed at: #{datetime_formatter(t)}" %>
    • <%= link_to "View this task", task_path(t.id) %> diff --git a/TaskListRails/app/views/tasks/new.html.erb b/TaskListRails/app/views/tasks/new.html.erb index c4bee4e26..7be49c719 100644 --- a/TaskListRails/app/views/tasks/new.html.erb +++ b/TaskListRails/app/views/tasks/new.html.erb @@ -9,7 +9,7 @@ <%= f.check_box :completion_status %> <%= f.label :completed_at %> - <%= f.datetime_field :completed_at %> + <%= f.date_field :completed_at %> <%= f.submit "Submit" %> <% end %> From 3ccb3e0e7dda5a37e75976c106da261ac59917fb Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 2 Oct 2016 20:42:02 -0700 Subject: [PATCH 11/37] Added link to return to main list of tasks page --- TaskListRails/app/views/tasks/show.html.erb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/TaskListRails/app/views/tasks/show.html.erb b/TaskListRails/app/views/tasks/show.html.erb index 1ad93ff37..4cf76b5c1 100644 --- a/TaskListRails/app/views/tasks/show.html.erb +++ b/TaskListRails/app/views/tasks/show.html.erb @@ -2,12 +2,15 @@ about the task: name, description, completion status, and completion date/time --> -

    Task#show

    +
    +

    Task: <%= @task.name %>

    +
    -
      -
    • name: <%= @task.name %>
      • -
    • description: <%= @task.description %>
      • -
    • completion status: <%= @task.completion_status %>
      • -
    • completed at: <%= @task.completed_at %>
      • - -
    +
    +
      +
    • description: <%= @task.description %>
      • +
    • completion status: <%= @task.completion_status %>
      • +
    • completed at: <%= @task.completed_at %>
      • +
    + <%= link_to "Return to Tasks List", tasks_path %> +
    From 8177fbb40f5579ee3adc4ce1408ec71bb11ad7f9 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 2 Oct 2016 20:43:20 -0700 Subject: [PATCH 12/37] Added some minor css styling --- .../app/assets/stylesheets/application.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/TaskListRails/app/assets/stylesheets/application.css b/TaskListRails/app/assets/stylesheets/application.css index f9cd5b348..6f1226df8 100644 --- a/TaskListRails/app/assets/stylesheets/application.css +++ b/TaskListRails/app/assets/stylesheets/application.css @@ -13,3 +13,17 @@ *= require_tree . *= require_self */ + +html { + font: 14px/18px Arial, Serif; +} + +header.task-list { + display: inline-block; +} + +main.task-list { + display: inline-block; + float: right; + margin: 95px 270px 0px auto; +} From 563075195f97aa50c345a8647802e87216d4f1a2 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 2 Oct 2016 20:44:43 -0700 Subject: [PATCH 13/37] Removed unnecessary attributes from displaying and added an image --- TaskListRails/app/views/tasks/index.html.erb | 33 ++++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index c44f21b71..08b38ebbf 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -1,20 +1,19 @@ -

    Tasks

    +
    + <%= image_tag "https://pbs.twimg.com/profile_images/1084277916/Logo.gif", + :alt => "get it done" %> +
    +
    +

    Task List

    <%= link_to "Add a new task", tasks_new_path %> + <% @tasks.each do |t| %> +

    + <%= "Task #{t.id}: #{t.name}" %> - <% @tasks.each do |t| %> -

    - <%= "Task #{t.id}:" %> -

      -
    • <%= "Title: #{t.name}" %>
      • -
    • <%= "Description: #{t.description}" %>
      • -
    • <%= "Completion status: #{t.completion_status}" %>
      • -
    • <%= "Completed at: #{datetime_formatter(t)}" %>
      • -
    - - <%= link_to "View this task", task_path(t.id) %> - <%= link_to "Edit this task", tasks_edit_path(t) %> - <%= link_to "Delete this task", task_path(t.id), method: :delete, - data: { confirm: "Are you really really sure?" } %> -

    - <% end %> + <%= link_to "View this task", task_path(t.id) %> + <%= link_to "Edit this task", tasks_edit_path(t) %> + <%= link_to "Delete this task", task_path(t.id), method: :delete, + data: { confirm: "Are you really really sure?" } %> +

    + <% end %> +
    From 7e72d21b445dee4e34bc6426277432b014c9bd5c Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 2 Oct 2016 21:10:07 -0700 Subject: [PATCH 14/37] Added a link to edit a task from its show page --- TaskListRails/app/views/tasks/show.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TaskListRails/app/views/tasks/show.html.erb b/TaskListRails/app/views/tasks/show.html.erb index 4cf76b5c1..8def4a934 100644 --- a/TaskListRails/app/views/tasks/show.html.erb +++ b/TaskListRails/app/views/tasks/show.html.erb @@ -9,8 +9,9 @@ completion date/time -->
    • description: <%= @task.description %>
      • -
    • completion status: <%= @task.completion_status %>
      • +
    • completed?: <%= @task.completion_status %>
    • completed at: <%= @task.completed_at %>
    + <%= link_to "Edit this task", tasks_edit_path(@task) %> <%= link_to "Return to Tasks List", tasks_path %>
    From 93a856fa360a972387fbed1b5865f4c464ad297c Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 2 Oct 2016 21:11:53 -0700 Subject: [PATCH 15/37] Added some semantic html tags --- TaskListRails/app/views/tasks/edit.html.erb | 36 ++++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/TaskListRails/app/views/tasks/edit.html.erb b/TaskListRails/app/views/tasks/edit.html.erb index b8a4eb171..e59990e95 100644 --- a/TaskListRails/app/views/tasks/edit.html.erb +++ b/TaskListRails/app/views/tasks/edit.html.erb @@ -1,17 +1,29 @@ -

    Edit Task

    +
    +

    Edit Task

    +
    -<%= form_for @task do |f| %> - <%= f.label :name %> - <%= f.text_field :name %> +
    + <%= form_for @task do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> +

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

    - <%= f.label :completion_status %> - <%= f.check_box :completion_status %> + <%= f.label :completion_status %> + <%= f.check_box :completion_status %> +

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

    - <%= f.submit "Submit" %> -<% end %> + <%= f.submit "Submit" %> + <% end %> + +

    +

    Changed your mind? <%= link_to "Return to Tasks List", tasks_path %>

    + +
    From d5ee65280adfa038325a03b2b36e74cb1ff192dc Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 2 Oct 2016 21:12:36 -0700 Subject: [PATCH 16/37] Added some semantic html tags --- TaskListRails/app/views/tasks/new.html.erb | 35 +++++++++++++++------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/TaskListRails/app/views/tasks/new.html.erb b/TaskListRails/app/views/tasks/new.html.erb index 7be49c719..0fffbdfba 100644 --- a/TaskListRails/app/views/tasks/new.html.erb +++ b/TaskListRails/app/views/tasks/new.html.erb @@ -1,15 +1,28 @@ -<%= form_for @task do |f| %> - <%= f.label :name %> - <%= f.text_field :name %> +
    +

    Add A New Task

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

    - <%= f.label :completion_status %> - <%= f.check_box :completion_status %> + <%= f.label :description %> + <%= f.text_field :description %> +

    - <%= f.label :completed_at %> - <%= f.date_field :completed_at %> + <%= f.label :completion_status %> + <%= f.check_box :completion_status %> +

    - <%= f.submit "Submit" %> -<% end %> + <%= f.label :completed_at %> + <%= f.date_field :completed_at %> +

    + + <%= f.submit "Submit" %> + <% end %> + +

    +

    Changed your mind? <%= link_to "Return to Tasks List", tasks_path %>

    +
    From 187bda951f714840d66dd3f79bf338c7ba44999a Mon Sep 17 00:00:00 2001 From: Yasmin Date: Fri, 7 Oct 2016 09:33:58 -0700 Subject: [PATCH 17/37] modified gems --- TaskListRails/Gemfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/TaskListRails/Gemfile b/TaskListRails/Gemfile index e87fad5fc..03d602497 100644 --- a/TaskListRails/Gemfile +++ b/TaskListRails/Gemfile @@ -4,7 +4,6 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.7' # Use sqlite3 as the database for Active Record -gem 'sqlite3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -35,8 +34,14 @@ gem 'sdoc', '~> 0.4.0', group: :doc group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' + + gem 'sqlite3' end +group :production do + gem 'pg' + gem 'rails_12factor' +end group :development do # Access an IRB console on exception pages or by using <%= console %> in views gem 'web-console', '~> 2.0' @@ -44,4 +49,3 @@ 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 - From 54ff3e10375f8e3210f8711852520a850d138e74 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Fri, 7 Oct 2016 09:40:17 -0700 Subject: [PATCH 18/37] added gemfile.lock --- TaskListRails/Gemfile.lock | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/TaskListRails/Gemfile.lock b/TaskListRails/Gemfile.lock index 187046034..8f5268410 100644 --- a/TaskListRails/Gemfile.lock +++ b/TaskListRails/Gemfile.lock @@ -76,6 +76,7 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) + pg (0.19.0) pkg-config (1.1.7) rack (1.6.4) rack-test (0.6.3) @@ -99,6 +100,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.7) actionpack (= 4.2.7) activesupport (= 4.2.7) @@ -150,7 +156,9 @@ DEPENDENCIES coffee-rails (~> 4.1.0) jbuilder (~> 2.0) jquery-rails + pg rails (= 4.2.7) + rails_12factor sass-rails (~> 5.0) sdoc (~> 0.4.0) spring From 077ced6411fe1323abb0929713bf379f6e339aca Mon Sep 17 00:00:00 2001 From: Yasmin Date: Mon, 17 Oct 2016 14:39:25 -0700 Subject: [PATCH 19/37] Added omniauth gems to the gemfile and installed --- TaskListRails/Gemfile | 4 +++- TaskListRails/Gemfile.lock | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/TaskListRails/Gemfile b/TaskListRails/Gemfile index 03d602497..e856610e2 100644 --- a/TaskListRails/Gemfile +++ b/TaskListRails/Gemfile @@ -22,6 +22,8 @@ gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc +gem "omniauth" +gem "omniauth-github" # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' @@ -34,7 +36,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' - + gem 'sqlite3' end diff --git a/TaskListRails/Gemfile.lock b/TaskListRails/Gemfile.lock index 8f5268410..e1f6384a9 100644 --- a/TaskListRails/Gemfile.lock +++ b/TaskListRails/Gemfile.lock @@ -52,8 +52,11 @@ GEM debug_inspector (0.0.2) erubis (2.7.0) execjs (2.7.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) globalid (0.3.7) activesupport (>= 4.1.0) + hashie (3.4.6) i18n (0.7.0) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) @@ -63,6 +66,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) + jwt (1.5.6) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) @@ -73,9 +77,26 @@ GEM mini_portile2 (2.1.0) minitest (5.9.1) multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (2.0.0) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) + oauth2 (1.2.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) + omniauth (~> 1.2) pg (0.19.0) pkg-config (1.1.7) rack (1.6.4) @@ -156,6 +177,8 @@ DEPENDENCIES coffee-rails (~> 4.1.0) jbuilder (~> 2.0) jquery-rails + omniauth + omniauth-github pg rails (= 4.2.7) rails_12factor From 3bc967c4315d7cc3ce47863235e3507e8b8b7011 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Mon, 17 Oct 2016 14:46:26 -0700 Subject: [PATCH 20/37] Added the dotenv-rails gem so that I can use a .env file with Rails and also added the .env file to .gitignore --- TaskListRails/.gitignore | 6 ++++++ TaskListRails/Gemfile | 2 ++ TaskListRails/Gemfile.lock | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/TaskListRails/.gitignore b/TaskListRails/.gitignore index 050c9d95c..592aa6a73 100644 --- a/TaskListRails/.gitignore +++ b/TaskListRails/.gitignore @@ -15,3 +15,9 @@ /log/* !/log/.keep /tmp + +../.ruby_version +../.DS_Store + +# Ignore the .env file (it's full of secrets!) +.env diff --git a/TaskListRails/Gemfile b/TaskListRails/Gemfile index e856610e2..08d018c75 100644 --- a/TaskListRails/Gemfile +++ b/TaskListRails/Gemfile @@ -38,6 +38,8 @@ group :development, :test do gem 'byebug' gem 'sqlite3' + + gem 'dotenv-rails' end group :production do diff --git a/TaskListRails/Gemfile.lock b/TaskListRails/Gemfile.lock index e1f6384a9..45c3c5b37 100644 --- a/TaskListRails/Gemfile.lock +++ b/TaskListRails/Gemfile.lock @@ -50,6 +50,10 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) debug_inspector (0.0.2) + dotenv (2.1.1) + dotenv-rails (2.1.1) + dotenv (= 2.1.1) + railties (>= 4.0, < 5.1) erubis (2.7.0) execjs (2.7.0) faraday (0.9.2) @@ -175,6 +179,7 @@ PLATFORMS DEPENDENCIES byebug coffee-rails (~> 4.1.0) + dotenv-rails jbuilder (~> 2.0) jquery-rails omniauth From 06a50b1fff107917e8ff7b51ac626b72562a21de Mon Sep 17 00:00:00 2001 From: Yasmin Date: Mon, 17 Oct 2016 14:50:04 -0700 Subject: [PATCH 21/37] created an initialized file to configure Rails to use the github credentials available in the .env file --- TaskListRails/config/initializers/omniauth.rb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 TaskListRails/config/initializers/omniauth.rb diff --git a/TaskListRails/config/initializers/omniauth.rb b/TaskListRails/config/initializers/omniauth.rb new file mode 100644 index 000000000..fd4416122 --- /dev/null +++ b/TaskListRails/config/initializers/omniauth.rb @@ -0,0 +1,3 @@ +Rails.application.config.middleware.use OmniAuth::Builder do + provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email" +end From 3a9c0653b5df0a7e5b19ad4c5d06f8306eb826c3 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Mon, 17 Oct 2016 14:59:01 -0700 Subject: [PATCH 22/37] Added better-errors and binding of caller gems --- TaskListRails/Gemfile | 2 ++ TaskListRails/Gemfile.lock | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/TaskListRails/Gemfile b/TaskListRails/Gemfile index 08d018c75..e7d9d7dda 100644 --- a/TaskListRails/Gemfile +++ b/TaskListRails/Gemfile @@ -40,6 +40,8 @@ group :development, :test do gem 'sqlite3' gem 'dotenv-rails' + gem 'better_errors' + gem 'binding_of_caller' end group :production do diff --git a/TaskListRails/Gemfile.lock b/TaskListRails/Gemfile.lock index 45c3c5b37..29fb9027a 100644 --- a/TaskListRails/Gemfile.lock +++ b/TaskListRails/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 (9.0.5) + coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -177,6 +182,8 @@ PLATFORMS ruby DEPENDENCIES + better_errors + binding_of_caller byebug coffee-rails (~> 4.1.0) dotenv-rails From 62ab9883531b53dce79e4129957283dddacdecd6 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sat, 22 Oct 2016 19:33:49 -0700 Subject: [PATCH 23/37] Did a lot of stuff before remembering to commit, did things mostly around setting up relationships between tasks and users as well as tinkering with authentication routes --- .DS_Store | Bin 0 -> 6148 bytes .ruby-version | 2 +- .../app/assets/javascripts/sessions.coffee | 3 ++ .../app/assets/stylesheets/sessions.scss | 3 ++ .../app/controllers/sessions_controller.rb | 38 ++++++++++++++++++ .../app/controllers/tasks_controller.rb | 12 +++++- TaskListRails/app/helpers/sessions_helper.rb | 2 + TaskListRails/app/models/task.rb | 1 + TaskListRails/app/models/user.rb | 15 +++++++ .../views/sessions/creation_failure.html.erb | 1 + .../app/views/sessions/index.html.erb | 3 ++ .../app/views/sessions/login_failure.html.erb | 1 + TaskListRails/app/views/tasks/index.html.erb | 7 ++++ TaskListRails/config/routes.rb | 5 +++ .../db/migrate/20161017221325_create_users.rb | 12 ++++++ TaskListRails/db/schema.rb | 11 ++++- .../controllers/sessions_controller_test.rb | 7 ++++ TaskListRails/test/fixtures/users.yml | 11 +++++ TaskListRails/test/models/user_test.rb | 7 ++++ 19 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 .DS_Store create mode 100644 TaskListRails/app/assets/javascripts/sessions.coffee create mode 100644 TaskListRails/app/assets/stylesheets/sessions.scss create mode 100644 TaskListRails/app/controllers/sessions_controller.rb create mode 100644 TaskListRails/app/helpers/sessions_helper.rb create mode 100644 TaskListRails/app/models/user.rb create mode 100644 TaskListRails/app/views/sessions/creation_failure.html.erb create mode 100644 TaskListRails/app/views/sessions/index.html.erb create mode 100644 TaskListRails/app/views/sessions/login_failure.html.erb create mode 100644 TaskListRails/db/migrate/20161017221325_create_users.rb create mode 100644 TaskListRails/test/controllers/sessions_controller_test.rb create mode 100644 TaskListRails/test/fixtures/users.yml create mode 100644 TaskListRails/test/models/user_test.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0a3caa3090cb7d6740c0f39da4da4920a797c167 GIT binary patch literal 6148 zcmeHKyG{c!5S)b+K?o@&rAsO#{=h^Rq)5;JA3#Eyh(jp?{dN2t{{*uSP>zF^0(Pa{ z@ngrno5E`Ykm>X44442I(-rZeVQ4z9KCrzQQ50L_3NxJI5vzGS$o_snxd*r=?;H(w z_?!D>yIFEpKkb5k@@B>saD-bdu*Cx|u_iuog#}wJw)3{feEq^SdWKXW6-WhAfmGlh zE5MqqHa>LBm$}d66xGAdding a User to the DB failed diff --git a/TaskListRails/app/views/sessions/index.html.erb b/TaskListRails/app/views/sessions/index.html.erb new file mode 100644 index 000000000..db123067c --- /dev/null +++ b/TaskListRails/app/views/sessions/index.html.erb @@ -0,0 +1,3 @@ +

    Login Successful! Welcome, <%= @user.email %>

    + +<%= button_to "Log out", sessions_path, method: :delete %> diff --git a/TaskListRails/app/views/sessions/login_failure.html.erb b/TaskListRails/app/views/sessions/login_failure.html.erb new file mode 100644 index 000000000..ea00abd68 --- /dev/null +++ b/TaskListRails/app/views/sessions/login_failure.html.erb @@ -0,0 +1 @@ +

    You failed to login

    diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index 08b38ebbf..2d351d3d4 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -1,6 +1,13 @@
    <%= image_tag "https://pbs.twimg.com/profile_images/1084277916/Logo.gif", :alt => "get it done" %> + + <% if current_user %> + <%= button_to "Log out", sessions_path, { method: :delete, data: { confirm: "Are you sure you want to log out?" }, class: "log-out-button"} %> + <% else %> + <%= button_to "Log in with Github", '/auth/github', method: :post, class: "github-button" %> + <% end %> +
    diff --git a/TaskListRails/config/routes.rb b/TaskListRails/config/routes.rb index 105fa5145..fc0f4118f 100644 --- a/TaskListRails/config/routes.rb +++ b/TaskListRails/config/routes.rb @@ -13,6 +13,11 @@ delete 'tasks/:id', to: 'tasks#destroy' + # User authentication + get "/auth/:provider/callback" => "sessions#create" + #get "/sessions", to: "sessions#index", as: "sessions" + # get "/auth/login", to: "sessions#login", as: "login" + delete "/auth/logout", to: "sessions#logout", as: "logout" # The priority is based upon order of creation: first created -> highest priority. diff --git a/TaskListRails/db/migrate/20161017221325_create_users.rb b/TaskListRails/db/migrate/20161017221325_create_users.rb new file mode 100644 index 000000000..605ce98fa --- /dev/null +++ b/TaskListRails/db/migrate/20161017221325_create_users.rb @@ -0,0 +1,12 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.integer :uid, null: false # this is the identifier provided by Github + t.string :provider, null: false # this tells us who provided the identifier + + t.timestamps null: false + end + end +end diff --git a/TaskListRails/db/schema.rb b/TaskListRails/db/schema.rb index f2a386b57..0226de5b9 100644 --- a/TaskListRails/db/schema.rb +++ b/TaskListRails/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160930182141) do +ActiveRecord::Schema.define(version: 20161017221325) do create_table "tasks", force: :cascade do |t| t.string "name" @@ -22,4 +22,13 @@ t.boolean "completion_status" end + create_table "users", force: :cascade do |t| + t.string "name" + t.string "email" + t.integer "uid", null: false + t.string "provider", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end diff --git a/TaskListRails/test/controllers/sessions_controller_test.rb b/TaskListRails/test/controllers/sessions_controller_test.rb new file mode 100644 index 000000000..d30ebc380 --- /dev/null +++ b/TaskListRails/test/controllers/sessions_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class SessionsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/TaskListRails/test/fixtures/users.yml b/TaskListRails/test/fixtures/users.yml new file mode 100644 index 000000000..937a0c002 --- /dev/null +++ b/TaskListRails/test/fixtures/users.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/TaskListRails/test/models/user_test.rb b/TaskListRails/test/models/user_test.rb new file mode 100644 index 000000000..82f61e010 --- /dev/null +++ b/TaskListRails/test/models/user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 6e3bb349e3a1e9289314d318098fba6a35c36b61 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 10:46:41 -0700 Subject: [PATCH 24/37] Generated migration to create user_id column in tasks (which adjusted the schema) and added validations to the task model --- TaskListRails/app/models/task.rb | 5 +++++ .../db/migrate/20161023023805_add_user_id_to_tasks.rb | 5 +++++ TaskListRails/db/schema.rb | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 TaskListRails/db/migrate/20161023023805_add_user_id_to_tasks.rb diff --git a/TaskListRails/app/models/task.rb b/TaskListRails/app/models/task.rb index 5c58542c4..6e2850193 100644 --- a/TaskListRails/app/models/task.rb +++ b/TaskListRails/app/models/task.rb @@ -1,3 +1,8 @@ class Task < ActiveRecord::Base belongs_to :user + + validates :name, presence: true + validates :user_id, presence: true + validates :completion_status, presence: true + end diff --git a/TaskListRails/db/migrate/20161023023805_add_user_id_to_tasks.rb b/TaskListRails/db/migrate/20161023023805_add_user_id_to_tasks.rb new file mode 100644 index 000000000..1bf998537 --- /dev/null +++ b/TaskListRails/db/migrate/20161023023805_add_user_id_to_tasks.rb @@ -0,0 +1,5 @@ +class AddUserIdToTasks < ActiveRecord::Migration + def change + add_column :tasks, :user_id, :integer + end +end diff --git a/TaskListRails/db/schema.rb b/TaskListRails/db/schema.rb index 0226de5b9..f5f8cd37e 100644 --- a/TaskListRails/db/schema.rb +++ b/TaskListRails/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20161017221325) do +ActiveRecord::Schema.define(version: 20161023023805) do create_table "tasks", force: :cascade do |t| t.string "name" @@ -20,6 +20,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "completion_status" + t.integer "user_id" end create_table "users", force: :cascade do |t| From 9f66916cb1e5c5701cb9711afef63a6d2b0579c6 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 10:49:06 -0700 Subject: [PATCH 25/37] Defined current user in the application controller and added a require login method to be required before every action --- .../app/controllers/application_controller.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/TaskListRails/app/controllers/application_controller.rb b/TaskListRails/app/controllers/application_controller.rb index d83690e1b..e9373d4c3 100644 --- a/TaskListRails/app/controllers/application_controller.rb +++ b/TaskListRails/app/controllers/application_controller.rb @@ -2,4 +2,22 @@ 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 + + before_action :require_login + + private + def current_user + begin + @current_user ||= User.find(session[:user_id]) if session[:user_id] + rescue ActiveRecord::RecordNotFound + nil + end + end + + def require_login + if current_user.nil? + flash[:error] = "You must be logged in to view this section" + redirect_to login_path + end + end end From 44d892a1640fb52126218a1753956493941cfdee Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 10:51:07 -0700 Subject: [PATCH 26/37] WIP: Figuring out routes and views depending on whether a user is authenticated or not --- .../app/controllers/sessions_controller.rb | 7 +++-- .../app/controllers/tasks_controller.rb | 18 +++++------ TaskListRails/app/views/tasks/index.html.erb | 31 +++++++++++-------- TaskListRails/config/routes.rb | 2 +- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/TaskListRails/app/controllers/sessions_controller.rb b/TaskListRails/app/controllers/sessions_controller.rb index 226b849f9..e1f172eb4 100644 --- a/TaskListRails/app/controllers/sessions_controller.rb +++ b/TaskListRails/app/controllers/sessions_controller.rb @@ -1,9 +1,9 @@ class SessionsController < ApplicationController skip_before_action :require_login, only: [:create] - # def login - # # Just a boring static page - # end + def login + # Just a boring static page + end def index if session[:user_id].nil? @@ -33,6 +33,7 @@ def create def logout session.delete(:user_id) + redirect_to root_path end end diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb index faa724744..d2c5e94ba 100644 --- a/TaskListRails/app/controllers/tasks_controller.rb +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -3,22 +3,20 @@ class TasksController < ApplicationController def index @tasks = @current_user.tasks + #@tasks = Task.all end - def show # should render a new view for the user - @task = Task.find(params[:id]) - end + def show; end def new # add a new task! @task = Task.new end - def edit - @task = Task.find(params[:id]) - end + def edit; end def create @task = Task.new(task_params) + @task.user_id = session[:user_id] if task_params[:completion_status] task_params[:completion_status] = true @@ -27,16 +25,14 @@ def create end if @task.save - #SAVED SUCCESSFULLY - redirect_to tasks_path + redirect_to tasks_path #tasks_path or task_path? else - #DID NOT SAVE render :new end + end def update - @task = Task.find(params[:id]) if @task.update(task_params) # SUCCESS redirect_to tasks_path @@ -54,7 +50,7 @@ def destroy private def task_params - params.require(:task).permit(:name, :description, :completion_status, :completed_at) + params.require(:task).permit(:name, :description, :completion_status, :completed_at, :user_id) end def find_task diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index 2d351d3d4..e14842e6a 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -2,25 +2,30 @@ <%= image_tag "https://pbs.twimg.com/profile_images/1084277916/Logo.gif", :alt => "get it done" %> - <% if current_user %> - <%= button_to "Log out", sessions_path, { method: :delete, data: { confirm: "Are you sure you want to log out?" }, class: "log-out-button"} %> + <% if @current_user %> + <%= button_to "Log out", logout_path, { method: :delete, data: { confirm: "Are you sure you want to log out?" }, class: "log-out-button"} %> <% else %> <%= button_to "Log in with Github", '/auth/github', method: :post, class: "github-button" %> <% end %> - +
    -

    Task List

    - <%= link_to "Add a new task", tasks_new_path %> - <% @tasks.each do |t| %> -

    - <%= "Task #{t.id}: #{t.name}" %> + <% if @current_user %> + +

    Task List

    + <%= link_to "Add a new task", tasks_new_path %> + <% @tasks.each do |t| %> +

    + <%= "User: #{ t.user_id }: (Task #{ t.id }) #{ t.name }" %> - <%= link_to "View this task", task_path(t.id) %> - <%= link_to "Edit this task", tasks_edit_path(t) %> - <%= link_to "Delete this task", task_path(t.id), method: :delete, + <%= link_to "View this task", task_path(t.id) %> + <%= link_to "Edit this task", tasks_edit_path(t) %> + <%= link_to "Delete this task", task_path(t.id), method: :delete, data: { confirm: "Are you really really sure?" } %> -

    - <% end %> +

    + <% end %> + <% else %> + + <% end %>
    diff --git a/TaskListRails/config/routes.rb b/TaskListRails/config/routes.rb index fc0f4118f..1f26217cf 100644 --- a/TaskListRails/config/routes.rb +++ b/TaskListRails/config/routes.rb @@ -15,7 +15,7 @@ # User authentication get "/auth/:provider/callback" => "sessions#create" - #get "/sessions", to: "sessions#index", as: "sessions" + get "/sessions", to: "sessions#index", as: "sessions" # get "/auth/login", to: "sessions#login", as: "login" delete "/auth/logout", to: "sessions#logout", as: "logout" From 675c9cc9304169cb3bec1100db74c68a7f467a04 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 12:28:38 -0700 Subject: [PATCH 27/37] Added a login view which unauthenticated users will be redirected to, added the route and the action for login, also adjusted controller filter --- TaskListRails/app/controllers/sessions_controller.rb | 6 +++--- TaskListRails/app/views/sessions/login.html.erb | 3 +++ TaskListRails/config/routes.rb | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 TaskListRails/app/views/sessions/login.html.erb diff --git a/TaskListRails/app/controllers/sessions_controller.rb b/TaskListRails/app/controllers/sessions_controller.rb index e1f172eb4..c33345b7a 100644 --- a/TaskListRails/app/controllers/sessions_controller.rb +++ b/TaskListRails/app/controllers/sessions_controller.rb @@ -1,8 +1,8 @@ class SessionsController < ApplicationController - skip_before_action :require_login, only: [:create] + skip_before_action :require_login, only: [:login, :create] + + def login # Ensure that users who are not authenticated see a welcome message and a link to authenticate. No other pages should be viewable by the guest user - def login - # Just a boring static page end def index diff --git a/TaskListRails/app/views/sessions/login.html.erb b/TaskListRails/app/views/sessions/login.html.erb new file mode 100644 index 000000000..5c6d4efd1 --- /dev/null +++ b/TaskListRails/app/views/sessions/login.html.erb @@ -0,0 +1,3 @@ +<%# Ensure that users who are not authenticated see a welcome message and a link to authenticate. No other pages should be viewable by the guest user %> +

    Welcome!

    +<%= link_to "Log in with GitHub", "/auth/github" %> diff --git a/TaskListRails/config/routes.rb b/TaskListRails/config/routes.rb index 1f26217cf..678bc2506 100644 --- a/TaskListRails/config/routes.rb +++ b/TaskListRails/config/routes.rb @@ -16,7 +16,7 @@ # User authentication get "/auth/:provider/callback" => "sessions#create" get "/sessions", to: "sessions#index", as: "sessions" - # get "/auth/login", to: "sessions#login", as: "login" + get "/auth/login", to: "sessions#login", as: "login" delete "/auth/logout", to: "sessions#logout", as: "logout" From 764c1161a163550890944a177092782965229ea3 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 13:12:38 -0700 Subject: [PATCH 28/37] Formatted the html and css for clearer presentation --- .../app/assets/stylesheets/application.css | 7 +++- .../app/controllers/sessions_controller.rb | 5 +-- .../app/views/layouts/application.html.erb | 25 ++++++++----- .../app/views/sessions/login.html.erb | 7 +++- TaskListRails/app/views/tasks/create.html.erb | 2 - TaskListRails/app/views/tasks/edit.html.erb | 4 +- TaskListRails/app/views/tasks/index.html.erb | 37 +++++++------------ TaskListRails/app/views/tasks/new.html.erb | 5 +-- TaskListRails/app/views/tasks/show.html.erb | 8 +--- 9 files changed, 46 insertions(+), 54 deletions(-) delete mode 100644 TaskListRails/app/views/tasks/create.html.erb diff --git a/TaskListRails/app/assets/stylesheets/application.css b/TaskListRails/app/assets/stylesheets/application.css index 6f1226df8..a75109246 100644 --- a/TaskListRails/app/assets/stylesheets/application.css +++ b/TaskListRails/app/assets/stylesheets/application.css @@ -22,8 +22,13 @@ header.task-list { display: inline-block; } -main.task-list { +main { display: inline-block; float: right; + margin: 95px 470px 0px auto; + +} + +main.task-list { margin: 95px 270px 0px auto; } diff --git a/TaskListRails/app/controllers/sessions_controller.rb b/TaskListRails/app/controllers/sessions_controller.rb index c33345b7a..e7fa4549a 100644 --- a/TaskListRails/app/controllers/sessions_controller.rb +++ b/TaskListRails/app/controllers/sessions_controller.rb @@ -1,9 +1,8 @@ class SessionsController < ApplicationController skip_before_action :require_login, only: [:login, :create] - def login # Ensure that users who are not authenticated see a welcome message and a link to authenticate. No other pages should be viewable by the guest user - - end + # Ensure that users who are not authenticated see a welcome message and a link to authenticate. No other pages should be viewable by the guest user + def login; end def index if session[:user_id].nil? diff --git a/TaskListRails/app/views/layouts/application.html.erb b/TaskListRails/app/views/layouts/application.html.erb index 46eeb110b..683b7f05d 100644 --- a/TaskListRails/app/views/layouts/application.html.erb +++ b/TaskListRails/app/views/layouts/application.html.erb @@ -1,14 +1,21 @@ - - TaskListRails - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> - - + + TaskListRails + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + +
    + <%= image_tag "https://pbs.twimg.com/profile_images/1084277916/Logo.gif", + :alt => "get it done" %> -<%= yield %> + - +
    + + <%= yield %> + + diff --git a/TaskListRails/app/views/sessions/login.html.erb b/TaskListRails/app/views/sessions/login.html.erb index 5c6d4efd1..2f9f218c3 100644 --- a/TaskListRails/app/views/sessions/login.html.erb +++ b/TaskListRails/app/views/sessions/login.html.erb @@ -1,3 +1,6 @@ <%# Ensure that users who are not authenticated see a welcome message and a link to authenticate. No other pages should be viewable by the guest user %> -

    Welcome!

    -<%= link_to "Log in with GitHub", "/auth/github" %> + +
    +

    Welcome!

    + <%= button_to "Log in with Github", '/auth/github', method: :post, class: "github-button" %> +
    diff --git a/TaskListRails/app/views/tasks/create.html.erb b/TaskListRails/app/views/tasks/create.html.erb deleted file mode 100644 index fcad439c4..000000000 --- a/TaskListRails/app/views/tasks/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

    Tasks#create

    -

    Find me in app/views/tasks/create.html.erb

    diff --git a/TaskListRails/app/views/tasks/edit.html.erb b/TaskListRails/app/views/tasks/edit.html.erb index e59990e95..107a0b2f0 100644 --- a/TaskListRails/app/views/tasks/edit.html.erb +++ b/TaskListRails/app/views/tasks/edit.html.erb @@ -1,8 +1,6 @@ -
    +

    Edit Task

    -
    -
    <%= form_for @task do |f| %> <%= f.label :name %> <%= f.text_field :name %> diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index e14842e6a..e61be4db1 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -1,31 +1,20 @@ -
    - <%= image_tag "https://pbs.twimg.com/profile_images/1084277916/Logo.gif", - :alt => "get it done" %> - - <% if @current_user %> - <%= button_to "Log out", logout_path, { method: :delete, data: { confirm: "Are you sure you want to log out?" }, class: "log-out-button"} %> - <% else %> - <%= button_to "Log in with Github", '/auth/github', method: :post, class: "github-button" %> - <% end %> - -
    -
    - <% if @current_user %> - -

    Task List

    - <%= link_to "Add a new task", tasks_new_path %> - <% @tasks.each do |t| %> -

    - <%= "User: #{ t.user_id }: (Task #{ t.id }) #{ t.name }" %> +

    Task List

    + <% if @current_user %> + <%= button_to "Log out", logout_path, { method: :delete, data: { confirm: "Are you sure you want to log out?" }, class: "log-out-button"} %> + <% else %> + <%= button_to "Log in with Github", '/auth/github', method: :post, class: "github-button" %> + <% end %> - <%= link_to "View this task", task_path(t.id) %> - <%= link_to "Edit this task", tasks_edit_path(t) %> - <%= link_to "Delete this task", task_path(t.id), method: :delete, + <%= link_to "Add a new task", tasks_new_path %> + <% @tasks.each do |t| %> +

    + <%= "(User #{ t.user_id }) Task #{ t.id }: #{ t.name }" %> + <%= link_to "View this task", task_path(t.id) %> + <%= link_to "Edit this task", tasks_edit_path(t) %> + <%= link_to "Delete this task", task_path(t.id), method: :delete, data: { confirm: "Are you really really sure?" } %>

    <% end %> - <% else %> - <% end %>
    diff --git a/TaskListRails/app/views/tasks/new.html.erb b/TaskListRails/app/views/tasks/new.html.erb index 0fffbdfba..3190419d6 100644 --- a/TaskListRails/app/views/tasks/new.html.erb +++ b/TaskListRails/app/views/tasks/new.html.erb @@ -1,8 +1,7 @@ -
    -

    Add A New Task

    -
    +

    Add A New Task

    + <%= form_for @task do |f| %> <%= f.label :name %> <%= f.text_field :name %> diff --git a/TaskListRails/app/views/tasks/show.html.erb b/TaskListRails/app/views/tasks/show.html.erb index 8def4a934..a23991254 100644 --- a/TaskListRails/app/views/tasks/show.html.erb +++ b/TaskListRails/app/views/tasks/show.html.erb @@ -1,12 +1,6 @@ - - -
    +

    Task: <%= @task.name %>

    -
    -
    • description: <%= @task.description %>
    • completed?: <%= @task.completion_status %>
      • From e2b5ba011d555895596117a5e0edd66dccee8ab6 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 17:39:07 -0700 Subject: [PATCH 29/37] Added YAML fixtures for testing --- TaskListRails/test/fixtures/tasks.yml | 38 ++++++++++++++++++++------- TaskListRails/test/fixtures/users.yml | 34 ++++++++++++++++++++---- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/TaskListRails/test/fixtures/tasks.yml b/TaskListRails/test/fixtures/tasks.yml index 18969b9d7..3dcd178c6 100644 --- a/TaskListRails/test/fixtures/tasks.yml +++ b/TaskListRails/test/fixtures/tasks.yml @@ -1,11 +1,31 @@ # 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 +post_office: + name: Post Office + description: pick up packages + completion_status: true + user_id: 1 + +missing_info: + name: + description: + completion_status: + user_id: + +no_name: + name: + description: buy gifts + completion_status: false + user_id: 2 + +no_user_id: + name: exercise + description: swimming + completion_status: false + user_id: + +no_completion_status: + name: groceries + description: food shopping + completion_status: + user_id: 3 diff --git a/TaskListRails/test/fixtures/users.yml b/TaskListRails/test/fixtures/users.yml index 937a0c002..9356d9e19 100644 --- a/TaskListRails/test/fixtures/users.yml +++ b/TaskListRails/test/fixtures/users.yml @@ -4,8 +4,32 @@ # 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 +one: + name: Erin + email: erinoshkosh@gmail.com + provider: github + uid: 37923 + +missing_info: + name: + email: + provider: github + uid: 24233 + +email: + name: Cihangir + email: + provider: github + uid: 42789 + +same_uid: + name: Jamila + email: jamjam@yahoo.com + provider: github + uid: 37923 + +no_uid: + name: Kaan + email: kaanoshkosh@gmail.com + provider: github + uid: 23423 From 3cfaa4395a522a232650f9b0a769b41a64fefb4c Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 17:40:02 -0700 Subject: [PATCH 30/37] Added tests for task and user models --- TaskListRails/test/models/task_test.rb | 31 +++++++++++++++++++++-- TaskListRails/test/models/user_test.rb | 35 ++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/TaskListRails/test/models/task_test.rb b/TaskListRails/test/models/task_test.rb index 3ca215970..6eeae4c58 100644 --- a/TaskListRails/test/models/task_test.rb +++ b/TaskListRails/test/models/task_test.rb @@ -1,7 +1,34 @@ require 'test_helper' class TaskTest < ActiveSupport::TestCase - # test "the truth" do - # assert true + test "can create a valid task" do + assert tasks(:post_office).valid? + end + + test "cannot create a task with missing information" do + assert_not tasks(:missing_info).valid? + assert_includes tasks(:missing_info).errors, :name + assert_includes tasks(:missing_info).errors, :user_id + assert_includes tasks(:missing_info).errors, :completion_status + end + + test "cannot create a task without a name" do + assert_not tasks(:no_name).valid? + assert_includes tasks(:no_name).errors, :name + end + + test "cannot create a task with no user_id" do + assert_not tasks(:no_user_id).valid? + assert_includes tasks(:no_user_id).errors, :user_id + end + + test "cannot create a task doesn't have a completion status" do + assert_not tasks(:no_completion_status).valid? + assert_includes tasks(:no_completion_status).errors, :completion_status + end + + #How to test this relationship? + # test "a task's user_id must match the id of the user creating the task" do + # # end end diff --git a/TaskListRails/test/models/user_test.rb b/TaskListRails/test/models/user_test.rb index 82f61e010..3c1bc71d8 100644 --- a/TaskListRails/test/models/user_test.rb +++ b/TaskListRails/test/models/user_test.rb @@ -1,7 +1,38 @@ require 'test_helper' class UserTest < ActiveSupport::TestCase - # test "the truth" do - # assert true + test "can create a valid user" do + assert users(:one).valid? + end + + test "cannot create a user with missing information" do + assert_not users(:missing_info).valid? + + assert_includes users(:missing_info).errors, :email + # assert_includes users(:missing_info).errors, :uid + # assert_includes users(:missing_info).errors, :provider + end + + # test "cannot create a user without a uid" do + # assert_not users(:no_uid).valid? + # assert_includes users(:no_uid).errors, :uid # end + + test "cannot create a user without a email" do + assert_not users(:email).valid? + assert_includes users(:email).errors, :email + end + + # test "cannot create a user without a provider" do + # assert_not users(:).valid? + # assert_includes user.errors, :provider + # end + + test "can create a user from github" do + auth_hash = OmniAuth.config.mock_auth[:github] + user_gh_built = User.build_from_github(auth_hash) + + assert user_gh_built.valid? + end + end From efd172d6307669fe5c6a9b72dbe626e45a590777 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 17:40:47 -0700 Subject: [PATCH 31/37] Added setup method to test_helper to mock the auth_hash github would send --- TaskListRails/test/test_helper.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/TaskListRails/test/test_helper.rb b/TaskListRails/test/test_helper.rb index 92e39b2d7..cb67fde04 100644 --- a/TaskListRails/test/test_helper.rb +++ b/TaskListRails/test/test_helper.rb @@ -7,4 +7,13 @@ class ActiveSupport::TestCase fixtures :all # Add more helper methods to be used by all tests here... + def setup + # Turn on test mode - auth requests will be short-circuited + OmniAuth.config.test_mode = true + # What data should we get back from auth requests? + OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new({ + provider: 'github', uid: '99999', info: { email: "a@b.com", name: "Ada" } + }) + end + end From e7e0c5e799e98b46ba7b29ec85bf9c6ed751b006 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 17:42:20 -0700 Subject: [PATCH 32/37] Modified validations on the task and user models --- TaskListRails/app/models/task.rb | 5 +---- TaskListRails/app/models/user.rb | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/TaskListRails/app/models/task.rb b/TaskListRails/app/models/task.rb index 6e2850193..a2c614887 100644 --- a/TaskListRails/app/models/task.rb +++ b/TaskListRails/app/models/task.rb @@ -1,8 +1,5 @@ class Task < ActiveRecord::Base belongs_to :user - validates :name, presence: true - validates :user_id, presence: true - validates :completion_status, presence: true - + validates :name, :user_id, :completion_status, presence: true end diff --git a/TaskListRails/app/models/user.rb b/TaskListRails/app/models/user.rb index 87c55f52b..efb6d2b77 100644 --- a/TaskListRails/app/models/user.rb +++ b/TaskListRails/app/models/user.rb @@ -2,6 +2,7 @@ class User < ActiveRecord::Base has_many :tasks validates :email, :uid, :provider, presence: true + validates :email, format: {with: /@/} def self.build_from_github(auth_hash) user = User.new From e93bc43a4040faac0aa4b6fd2546bd40c44f2eab Mon Sep 17 00:00:00 2001 From: Yasmin Date: Sun, 23 Oct 2016 17:43:15 -0700 Subject: [PATCH 33/37] small change to html --- TaskListRails/app/views/tasks/index.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index e61be4db1..143ebf5e3 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -5,6 +5,7 @@ <% else %> <%= button_to "Log in with Github", '/auth/github', method: :post, class: "github-button" %> <% end %> +

      <%= link_to "Add a new task", tasks_new_path %> <% @tasks.each do |t| %> From e7f1a0386091b914264c85ea83221c7b87fed4b0 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Mon, 24 Oct 2016 20:46:41 -0700 Subject: [PATCH 34/37] Fixed a bug with saving a task with an unmarked completion status and used a view helper method to format the date --- TaskListRails/app/controllers/tasks_controller.rb | 2 +- TaskListRails/app/models/task.rb | 2 +- TaskListRails/app/views/tasks/new.html.erb | 1 - TaskListRails/app/views/tasks/show.html.erb | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb index d2c5e94ba..411dae7a0 100644 --- a/TaskListRails/app/controllers/tasks_controller.rb +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -25,7 +25,7 @@ def create end if @task.save - redirect_to tasks_path #tasks_path or task_path? + redirect_to tasks_path else render :new end diff --git a/TaskListRails/app/models/task.rb b/TaskListRails/app/models/task.rb index a2c614887..fb2fa5cfe 100644 --- a/TaskListRails/app/models/task.rb +++ b/TaskListRails/app/models/task.rb @@ -1,5 +1,5 @@ class Task < ActiveRecord::Base belongs_to :user - validates :name, :user_id, :completion_status, presence: true + validates :name, :user_id, presence: true end diff --git a/TaskListRails/app/views/tasks/new.html.erb b/TaskListRails/app/views/tasks/new.html.erb index 3190419d6..c6965d587 100644 --- a/TaskListRails/app/views/tasks/new.html.erb +++ b/TaskListRails/app/views/tasks/new.html.erb @@ -1,4 +1,3 @@ -

      Add A New Task

      diff --git a/TaskListRails/app/views/tasks/show.html.erb b/TaskListRails/app/views/tasks/show.html.erb index a23991254..cb9ff9080 100644 --- a/TaskListRails/app/views/tasks/show.html.erb +++ b/TaskListRails/app/views/tasks/show.html.erb @@ -3,8 +3,8 @@
      • description: <%= @task.description %>
        • -
      • completed?: <%= @task.completion_status %>
        • -
      • completed at: <%= @task.completed_at %>
        • +
      • completed: <%= @task.completion_status ? "yes" : "no" %>
        • +
      • completed at: <%= datetime_formatter(@task) %>
      <%= link_to "Edit this task", tasks_edit_path(@task) %> <%= link_to "Return to Tasks List", tasks_path %> From dbe532531025e2647185719a6dd9999955ca654d Mon Sep 17 00:00:00 2001 From: Yasmin Date: Mon, 24 Oct 2016 20:56:46 -0700 Subject: [PATCH 35/37] DRYed up html with a partial form --- TaskListRails/app/views/tasks/_form.html.erb | 22 +++++++++++++++++ TaskListRails/app/views/tasks/edit.html.erb | 25 +------------------- TaskListRails/app/views/tasks/index.html.erb | 4 ++-- TaskListRails/app/views/tasks/new.html.erb | 24 +------------------ 4 files changed, 26 insertions(+), 49 deletions(-) create mode 100644 TaskListRails/app/views/tasks/_form.html.erb diff --git a/TaskListRails/app/views/tasks/_form.html.erb b/TaskListRails/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..1d1c14a49 --- /dev/null +++ b/TaskListRails/app/views/tasks/_form.html.erb @@ -0,0 +1,22 @@ +<%= form_for @task do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> +

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

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

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

      + + <%= f.submit "Submit" %> +<% end %> + +

      +

      Changed your mind? <%= link_to "Return to Tasks List", tasks_path %>

      diff --git a/TaskListRails/app/views/tasks/edit.html.erb b/TaskListRails/app/views/tasks/edit.html.erb index 107a0b2f0..788306243 100644 --- a/TaskListRails/app/views/tasks/edit.html.erb +++ b/TaskListRails/app/views/tasks/edit.html.erb @@ -1,27 +1,4 @@

      Edit Task

      - - <%= form_for @task do |f| %> - <%= f.label :name %> - <%= f.text_field :name %> -

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

      - - <%= f.label :completion_status %> - <%= f.check_box :completion_status %> -

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

      - - <%= f.submit "Submit" %> - <% end %> - -

      -

      Changed your mind? <%= link_to "Return to Tasks List", tasks_path %>

      - + <%= render partial: "form" %>
      diff --git a/TaskListRails/app/views/tasks/index.html.erb b/TaskListRails/app/views/tasks/index.html.erb index 143ebf5e3..58988566b 100644 --- a/TaskListRails/app/views/tasks/index.html.erb +++ b/TaskListRails/app/views/tasks/index.html.erb @@ -10,12 +10,12 @@ <%= link_to "Add a new task", tasks_new_path %> <% @tasks.each do |t| %>

      - <%= "(User #{ t.user_id }) Task #{ t.id }: #{ t.name }" %> + <%= "Task #{ t.id }: #{ t.name }" %> <%= link_to "View this task", task_path(t.id) %> <%= link_to "Edit this task", tasks_edit_path(t) %> <%= link_to "Delete this task", task_path(t.id), method: :delete, data: { confirm: "Are you really really sure?" } %> -

      +

      <% end %>
      diff --git a/TaskListRails/app/views/tasks/new.html.erb b/TaskListRails/app/views/tasks/new.html.erb index c6965d587..77e6b1858 100644 --- a/TaskListRails/app/views/tasks/new.html.erb +++ b/TaskListRails/app/views/tasks/new.html.erb @@ -1,26 +1,4 @@

      Add A New Task

      - - <%= form_for @task do |f| %> - <%= f.label :name %> - <%= f.text_field :name %> -

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

      - - <%= f.label :completion_status %> - <%= f.check_box :completion_status %> -

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

      - - <%= f.submit "Submit" %> - <% end %> - -

      -

      Changed your mind? <%= link_to "Return to Tasks List", tasks_path %>

      + <%= render partial: "form" %>
      From 5be06007e1f9fa053ee0473a287ca83ad06e345b Mon Sep 17 00:00:00 2001 From: Yasmin Date: Mon, 24 Oct 2016 20:58:27 -0700 Subject: [PATCH 36/37] Cleaned up comments --- TaskListRails/app/controllers/tasks_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TaskListRails/app/controllers/tasks_controller.rb b/TaskListRails/app/controllers/tasks_controller.rb index 411dae7a0..deeb8fec5 100644 --- a/TaskListRails/app/controllers/tasks_controller.rb +++ b/TaskListRails/app/controllers/tasks_controller.rb @@ -3,12 +3,11 @@ class TasksController < ApplicationController def index @tasks = @current_user.tasks - #@tasks = Task.all end def show; end - def new # add a new task! + def new @task = Task.new end From 67a71a61effcd2a69e36685add6f10c27a91cf8b Mon Sep 17 00:00:00 2001 From: Yasmin Date: Mon, 24 Oct 2016 21:12:42 -0700 Subject: [PATCH 37/37] Deleted unnecessary tests after making changes to the task model --- TaskListRails/test/models/task_test.rb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/TaskListRails/test/models/task_test.rb b/TaskListRails/test/models/task_test.rb index 6eeae4c58..6651a7a62 100644 --- a/TaskListRails/test/models/task_test.rb +++ b/TaskListRails/test/models/task_test.rb @@ -9,7 +9,6 @@ class TaskTest < ActiveSupport::TestCase assert_not tasks(:missing_info).valid? assert_includes tasks(:missing_info).errors, :name assert_includes tasks(:missing_info).errors, :user_id - assert_includes tasks(:missing_info).errors, :completion_status end test "cannot create a task without a name" do @@ -22,13 +21,4 @@ class TaskTest < ActiveSupport::TestCase assert_includes tasks(:no_user_id).errors, :user_id end - test "cannot create a task doesn't have a completion status" do - assert_not tasks(:no_completion_status).valid? - assert_includes tasks(:no_completion_status).errors, :completion_status - end - - #How to test this relationship? - # test "a task's user_id must match the id of the user creating the task" do - # - # end end