From 62f193a0c77f51e5b067b0ac9c127780aae3917e Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Tue, 27 Sep 2016 15:45:08 -0700 Subject: [PATCH 01/15] File Setup --- .gitignore | 46 ++--- .ruby-gemset | 1 - .ruby-version | 2 +- Gemfile | 47 +++++ Gemfile.lock | 163 ++++++++++++++++++ README.rdoc | 28 +++ Rakefile | 6 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/stylesheets/application.css | 15 ++ app/controllers/application_controller.rb | 5 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/mailers/.keep | 0 app/models/.keep | 0 app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 29 ++++ bin/spring | 15 ++ config.ru | 4 + config/application.rb | 26 +++ config/boot.rb | 3 + config/database.yml | 25 +++ config/environment.rb | 5 + config/environments/development.rb | 41 +++++ config/environments/production.rb | 79 +++++++++ config/environments/test.rb | 42 +++++ config/initializers/assets.rb | 11 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 3 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/routes.rb | 56 ++++++ config/secrets.yml | 22 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 public/404.html | 67 +++++++ public/422.html | 67 +++++++ public/500.html | 66 +++++++ public/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 10 ++ vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 59 files changed, 986 insertions(+), 34 deletions(-) delete mode 100644 .ruby-gemset create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 README.rdoc create mode 100644 Rakefile create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/mailers/.keep create mode 100644 app/models/.keep create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep diff --git a/.gitignore b/.gitignore index 28f484983..050c9d95c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,17 @@ -*.gem -*.rbc -/.config -/coverage/ -/InstalledFiles -/pkg/ -/spec/reports/ -/test/tmp/ -/test/version_tmp/ -/tmp/ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' -## Specific to RubyMotion: -.dat* -.repl_history -build/ +# Ignore bundler config. +/.bundle -## Documentation cache and generated files: -/.yardoc/ -/_yardoc/ -/doc/ -/rdoc/ +# Ignore the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal -## Environment normalisation: -/.bundle/ -/vendor/bundle -/lib/bundler/man/ - -# for a library or gem, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# Gemfile.lock -# .ruby-version -# .ruby-gemset - -# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -.rvmrc +# Ignore all logfiles and tempfiles. +/log/* +!/log/.keep +/tmp diff --git a/.ruby-gemset b/.ruby-gemset deleted file mode 100644 index 5d2410e51..000000000 --- a/.ruby-gemset +++ /dev/null @@ -1 +0,0 @@ -TaskListRails diff --git a/.ruby-version b/.ruby-version index 276cbf9e2..2bf1c1ccf 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.0 +2.3.1 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..e87fad5fc --- /dev/null +++ b/Gemfile @@ -0,0 +1,47 @@ +source 'https://rubygems.org' + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.7' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.1.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks +gem 'turbolinks' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.0' +# bundle exec rake doc:rails generates the API under doc/api. +gem 'sdoc', '~> 0.4.0', group: :doc + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Unicorn as the app server +# gem 'unicorn' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' +end + diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..187046034 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,163 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.7) + activesupport (= 4.2.7) + globalid (>= 0.3.0) + activemodel (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) + arel (~> 6.0) + activesupport (4.2.7) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + arel (6.0.3) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + byebug (9.0.5) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.7.0) + globalid (0.3.7) + activesupport (>= 4.1.0) + i18n (0.7.0) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.2.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + json (1.8.3) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.1) + multi_json (1.12.1) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.7) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.3.0) + rdoc (4.2.2) + json (~> 1.4) + sass (3.4.22) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + spring (1.7.2) + sprockets (3.7.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.11) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.2) + execjs (>= 0.3.0, < 3) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + coffee-rails (~> 4.1.0) + jbuilder (~> 2.0) + jquery-rails + rails (= 4.2.7) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +BUNDLED WITH + 1.13.1 diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 000000000..dd4e97e22 --- /dev/null +++ b/README.rdoc @@ -0,0 +1,28 @@ +== README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... + + +Please feel free to use a different markup language if you do not plan to run +rake doc:app. diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..ba6b733dd --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require File.expand_path('../config/application', __FILE__) + +Rails.application.load_tasks diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..e07c5a830 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require jquery_ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..f9cd5b348 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..d83690e1b --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/mailers/.keep b/app/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/.keep b/app/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..46eeb110b --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + TaskListRails + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + +<%= yield %> + + + diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..0138d79b7 --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../../config/application', __FILE__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..acdb2c138 --- /dev/null +++ b/bin/setup @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +Dir.chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file: + + puts "== Installing dependencies ==" + system "gem install bundler --conservative" + system "bundle check || bundle install" + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # system "cp config/database.yml.sample config/database.yml" + # end + + puts "\n== Preparing database ==" + system "bin/rake db:setup" + + puts "\n== Removing old logs and tempfiles ==" + system "rm -f log/*" + system "rm -rf tmp/cache" + + puts "\n== Restarting application server ==" + system "touch tmp/restart.txt" +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..7fe232c3a --- /dev/null +++ b/bin/spring @@ -0,0 +1,15 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)) + Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) } + gem 'spring', match[1] + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..bd83b2541 --- /dev/null +++ b/config.ru @@ -0,0 +1,4 @@ +# This file is used by Rack-based servers to start the application. + +require ::File.expand_path('../config/environment', __FILE__) +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..902432bad --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +require File.expand_path('../boot', __FILE__) + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module TaskListRails + class Application < Rails::Application + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' + + # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + # config.i18n.default_locale = :de + + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..6b750f00b --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..1c1a37ca8 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: 5 + timeout: 5000 + +development: + <<: *default + database: db/development.sqlite3 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: db/test.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..ee8d90dc6 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require File.expand_path('../application', __FILE__) + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..b55e2144b --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,41 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # Adds additional error checking when serving assets at runtime. + # Checks for improperly declared sprockets dependencies. + # Raises helpful error messages. + config.assets.raise_runtime_errors = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5c1b32e48 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,79 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like + # NGINX, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + # config.log_tags = [ :subdomain, :uuid ] + + # Use a different logger for distributed setups. + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..1c19f08b2 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure static file server for tests with Cache-Control for performance. + config.serve_static_files = true + config.static_cache_control = 'public, max-age=3600' + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Randomize the order test cases are executed. + config.active_support.test_order = :random + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..01ef3e663 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,11 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path +# Rails.application.config.assets.paths << Emoji.images_path + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..7f70458de --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 000000000..15d065a84 --- /dev/null +++ b/config/initializers/session_store.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.session_store :cookie_store, key: '_TaskListRails_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..33725e95f --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] if respond_to?(:wrap_parameters) +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..3f66539d5 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,56 @@ +Rails.application.routes.draw do + # The priority is based upon order of creation: first created -> highest priority. + # See how all your routes lay out with "rake routes". + + # You can have the root of your site routed with "root" + # root 'welcome#index' + + # Example of regular route: + # get 'products/:id' => 'catalog#view' + + # Example of named route that can be invoked with purchase_url(id: product.id) + # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase + + # Example resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Example resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Example resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Example resource route with more complex sub-resources: + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', on: :collection + # end + # end + + # Example resource route with concerns: + # concern :toggleable do + # post 'toggle' + # end + # resources :posts, concerns: :toggleable + # resources :photos, concerns: :toggleable + + # Example resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..ab2bf7a54 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rake secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 8354bfa0ce1608987b9d320b6fe0a05a745f01d157d44eb5f0f2a955ebdb1c17041f87eb84cfafbc70672e60f0d5b9661237ebfd08aea52da71d6f6b062efb8a + +test: + secret_key_base: bbf83f21085ba20e68524c0016dc3660ae941ae80a506afac5a920668dde51cc3c383c8525a80c4400b3ae972b733377ec28cc0ccfee83d734a74484e841fbd1 + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..4edb1e857 --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). +# +# Examples: +# +# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) +# Mayor.create(name: 'Emanuel', city: cities.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..b612547fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

+
+ + diff --git a/public/422.html b/public/422.html new file mode 100644 index 000000000..a21f82b3b --- /dev/null +++ b/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

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

+
+

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

+
+ + diff --git a/public/500.html b/public/500.html new file mode 100644 index 000000000..061abc587 --- /dev/null +++ b/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..92e39b2d7 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep new file mode 100644 index 000000000..e69de29bb From 707fffbd598284662d4f28ef178fc0d53207ed3f Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Tue, 27 Sep 2016 17:37:57 -0700 Subject: [PATCH 02/15] Wave 1 Complete, to clean up --- app/controllers/tasks_controller.rb | 24 ++++++++++++++++++++++++ app/views/tasks/index.html.erb | 9 +++++++++ app/views/tasks/show.html.erb | 3 +++ config/routes.rb | 5 +++++ 4 files changed, 41 insertions(+) create mode 100644 app/controllers/tasks_controller.rb create mode 100644 app/views/tasks/index.html.erb create mode 100644 app/views/tasks/show.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb new file mode 100644 index 000000000..6e305743a --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,24 @@ +class TasksController < ApplicationController + def index + @to_do =[ + "Windows", + "Cleats", + "Mushrooms", + "Sweaters", + "Bon Bons", + ] + end + + def show + @full_to_do = + [ + @Windows = {name: "Windows", description: "Wash the windows", status: "Completed", date: Time.now.strftime("%d/%m/%Y %H:%M") }, + @Cleats = {name: "Cleats", description: "Clean the cleats", status: "In Progress", date: Time.now.strftime("%d/%m/%Y %H:%M") }, + @Mushrooms = {name: "Mushrooms", description: "Mush the mushrooms", status: "To Begin", date: Time.now.strftime("%d/%m/%Y %H:%M") }, + @Sweaters = {name: "Sweaters", description: "Sweat in the sweaters", status: "Completed", date: Time.now.strftime("%d/%m/%Y %H:%M") }, + @Bon_Bon = {name: "Bon Bon", description: "Brush the Bon Bons", status: "In Progress", date: Time.now.strftime("%d/%m/%Y %H:%M") }, + ] + + @index = params[:id] + end +end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 000000000..3e46d28fe --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,9 @@ +

Mom's nagging list

+ +
    + <% @to_do.each_with_index do |item, index| %> +
  1. + <%= link_to(@to_do[index], "/tasks/#{index+1}", :alt => " Task #{index}") %> +
    2. + <% end %> +
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb new file mode 100644 index 000000000..f65654bf4 --- /dev/null +++ b/app/views/tasks/show.html.erb @@ -0,0 +1,3 @@ +

Please print anything!

+ +

<%= @full_to_do[@index.to_i] %>

diff --git a/config/routes.rb b/config/routes.rb index 3f66539d5..fea970a44 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,9 @@ Rails.application.routes.draw do + root 'tasks#index' + get '/tasks' => 'tasks#index' + get '/tasks/:id' => 'tasks#show' + + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From bb410ec35a130711f2b1666aef79599d287bac6d Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Wed, 28 Sep 2016 15:59:55 -0700 Subject: [PATCH 03/15] Schema columns are finally correct --- app/controllers/tasks_controller.rb | 21 ++++++++++++---- app/models/task.rb | 2 ++ app/views/tasks/index.html.erb | 3 ++- app/views/tasks/new.html.erb | 24 ++++++++++++++++++ app/views/tasks/show.html.erb | 6 +++++ config/routes.rb | 3 +++ db/migrate/20160928221313_create_tasks.rb | 12 +++++++++ ...60928224201_add_date_completed_to_tasks.rb | 5 ++++ .../20160928225715_remove_due_from_tasks.rb | 5 ++++ db/schema.rb | 25 +++++++++++++++++++ test/fixtures/tasks.yml | 13 ++++++++++ test/models/task_test.rb | 7 ++++++ 12 files changed, 120 insertions(+), 6 deletions(-) create mode 100644 app/models/task.rb create mode 100644 app/views/tasks/new.html.erb create mode 100644 db/migrate/20160928221313_create_tasks.rb create mode 100644 db/migrate/20160928224201_add_date_completed_to_tasks.rb create mode 100644 db/migrate/20160928225715_remove_due_from_tasks.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/tasks.yml create mode 100644 test/models/task_test.rb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 6e305743a..239214f1a 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -7,18 +7,29 @@ def index "Sweaters", "Bon Bons", ] + + end + + def new + end def show @full_to_do = [ - @Windows = {name: "Windows", description: "Wash the windows", status: "Completed", date: Time.now.strftime("%d/%m/%Y %H:%M") }, - @Cleats = {name: "Cleats", description: "Clean the cleats", status: "In Progress", date: Time.now.strftime("%d/%m/%Y %H:%M") }, - @Mushrooms = {name: "Mushrooms", description: "Mush the mushrooms", status: "To Begin", date: Time.now.strftime("%d/%m/%Y %H:%M") }, - @Sweaters = {name: "Sweaters", description: "Sweat in the sweaters", status: "Completed", date: Time.now.strftime("%d/%m/%Y %H:%M") }, - @Bon_Bon = {name: "Bon Bon", description: "Brush the Bon Bons", status: "In Progress", date: Time.now.strftime("%d/%m/%Y %H:%M") }, + @Windows = {name: "Windows", description: "Wash the windows", status: "Completed", date: Time.now.strftime("%m/%d/%Y %H:%M") }, + @Cleats = {name: "Cleats", description: "Clean the cleats", status: "In Progress", date: Time.now.strftime("%m/%d/%Y %H:%M") }, + @Mushrooms = {name: "Mushrooms", description: "Mush the mushrooms", status: "To Begin", date: Time.now.strftime("%m/%d/%Y %H:%M") }, + @Sweaters = {name: "Sweaters", description: "Sweat in the sweaters", status: "Completed", date: Time.now.strftime("%m/%d/%Y %H:%M") }, + @Bon_Bon = {name: "Bon Bon", description: "Brush the Bon Bons", status: "In Progress", date: Time.now.strftime("%m/%d/%Y %H:%M") }, ] @index = params[:id] end + + def create + + redirect_to '/tasks' + + end end diff --git a/app/models/task.rb b/app/models/task.rb new file mode 100644 index 000000000..935f76e12 --- /dev/null +++ b/app/models/task.rb @@ -0,0 +1,2 @@ +class Task < ActiveRecord::Base +end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 3e46d28fe..48fbb547e 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -3,7 +3,8 @@
    <% @to_do.each_with_index do |item, index| %>
  1. - <%= link_to(@to_do[index], "/tasks/#{index+1}", :alt => " Task #{index}") %> + <%= link_to(@to_do[index], "/tasks/#{index}", :alt => " Task #{index}") %> +
    2. <% end %>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb new file mode 100644 index 000000000..f9b977ada --- /dev/null +++ b/app/views/tasks/new.html.erb @@ -0,0 +1,24 @@ +

Create a new task

+ +
+ + + + + + + + + + + + + + + +
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index f65654bf4..bd4a10963 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,3 +1,9 @@

Please print anything!

<%= @full_to_do[@index.to_i] %>

+
    +
  • Task: <%= @full_to_do[@index.to_i][:name]%>
    • +
  • description: <%= @full_to_do[@index.to_i][:description]%>
    • +
  • Status: <%= @full_to_do[@index.to_i][:status]%>
    • +
  • Completion: <%= @full_to_do[@index.to_i][:date]%>
    • +
diff --git a/config/routes.rb b/config/routes.rb index fea970a44..d756fa454 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,10 @@ Rails.application.routes.draw do root 'tasks#index' get '/tasks' => 'tasks#index' + get '/tasks/new' => 'tasks#new' get '/tasks/:id' => 'tasks#show' + post 'tasks' => 'entries#create' + # The priority is based upon order of creation: first created -> highest priority. diff --git a/db/migrate/20160928221313_create_tasks.rb b/db/migrate/20160928221313_create_tasks.rb new file mode 100644 index 000000000..64eef7ad0 --- /dev/null +++ b/db/migrate/20160928221313_create_tasks.rb @@ -0,0 +1,12 @@ +class CreateTasks < ActiveRecord::Migration + def change + create_table :tasks do |t| + t.string :item + t.string :description + t.boolean :is_completed + t.date :due + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20160928224201_add_date_completed_to_tasks.rb b/db/migrate/20160928224201_add_date_completed_to_tasks.rb new file mode 100644 index 000000000..548bbf84f --- /dev/null +++ b/db/migrate/20160928224201_add_date_completed_to_tasks.rb @@ -0,0 +1,5 @@ +class AddDateCompletedToTasks < ActiveRecord::Migration + def change + add_column :tasks, :date_completed, :date + end +end diff --git a/db/migrate/20160928225715_remove_due_from_tasks.rb b/db/migrate/20160928225715_remove_due_from_tasks.rb new file mode 100644 index 000000000..8315f12db --- /dev/null +++ b/db/migrate/20160928225715_remove_due_from_tasks.rb @@ -0,0 +1,5 @@ +class RemoveDueFromTasks < ActiveRecord::Migration + def change + remove_column :tasks, :due, :date + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..bc480e81c --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,25 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20160928225715) do + + create_table "tasks", force: :cascade do |t| + t.string "item" + t.string "description" + t.boolean "is_completed" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.date "date_completed" + end + +end diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 000000000..4489ce6a2 --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + item: MyString + description: MyString + is_completed: false + due: 2016-09-28 + +two: + item: MyString + description: MyString + is_completed: false + due: 2016-09-28 diff --git a/test/models/task_test.rb b/test/models/task_test.rb new file mode 100644 index 000000000..3ca215970 --- /dev/null +++ b/test/models/task_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TaskTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 9d4c2fe9314df93022dcb2bed9da8e3863ace2cd Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Thu, 29 Sep 2016 16:35:32 -0700 Subject: [PATCH 04/15] Middle of Wave 2 --- app/controllers/tasks_controller.rb | 39 +++++++++++++++-------------- app/views/tasks/edit.html.erb | 14 +++++++++++ app/views/tasks/index.html.erb | 15 +++++------ app/views/tasks/new.html.erb | 28 +++++++-------------- app/views/tasks/show.html.erb | 13 +++++----- config/routes.rb | 8 +++--- 6 files changed, 63 insertions(+), 54 deletions(-) create mode 100644 app/views/tasks/edit.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 239214f1a..bfe555cfb 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,35 +1,36 @@ class TasksController < ApplicationController def index - @to_do =[ - "Windows", - "Cleats", - "Mushrooms", - "Sweaters", - "Bon Bons", - ] + @list = Task.all + end def new - + @list = Task.new end def show - @full_to_do = - [ - @Windows = {name: "Windows", description: "Wash the windows", status: "Completed", date: Time.now.strftime("%m/%d/%Y %H:%M") }, - @Cleats = {name: "Cleats", description: "Clean the cleats", status: "In Progress", date: Time.now.strftime("%m/%d/%Y %H:%M") }, - @Mushrooms = {name: "Mushrooms", description: "Mush the mushrooms", status: "To Begin", date: Time.now.strftime("%m/%d/%Y %H:%M") }, - @Sweaters = {name: "Sweaters", description: "Sweat in the sweaters", status: "Completed", date: Time.now.strftime("%m/%d/%Y %H:%M") }, - @Bon_Bon = {name: "Bon Bon", description: "Brush the Bon Bons", status: "In Progress", date: Time.now.strftime("%m/%d/%Y %H:%M") }, - ] - - @index = params[:id] + @list = Task.find(params[:id]) end def create + @list = Task.new(task_params) + @list.save + if @list.save + redirect_to tasks_path + else + render :new + end + end - redirect_to '/tasks' + def edit + @list = Task.find(params[:id]) + end + + private + def task_params + params.require(:task).permit(:item, :description, :is_completed) end + end diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb new file mode 100644 index 000000000..9c4e3e601 --- /dev/null +++ b/app/views/tasks/edit.html.erb @@ -0,0 +1,14 @@ +

Edit or Update a Task

+ +<%= form_for @list, method: :patch do |f| %> + <%= f.label :item %> + <%= f.text_field :item %> + + <%= f.label :description %> + <%= f.text_field :description %> + + <%= f.label :is_completed %> + <%= f.check_box :is_completed %> + + <%= f.submit "Submit" %> +<% end %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 48fbb547e..a93ed71e7 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,10 +1,11 @@

Mom's nagging list

-
    - <% @to_do.each_with_index do |item, index| %> -
  1. - <%= link_to(@to_do[index], "/tasks/#{index}", :alt => " Task #{index}") %> +
      + <% @list.each do |s| %> +
    • + <%= link_to "#{s.item}", task_path(s) %> +
      • + <% end %> +
    -
    2. - <% end %> -
+

<%= link_to "Create New Task", new_task_path %>

diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index f9b977ada..3bb136bfc 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,24 +1,14 @@

Create a new task

-
+<%= form_for @list do |f| %> + <%= f.label :item %> + <%= f.text_field :item %> - - + <%= f.label :description %> + <%= f.text_field :description %> - - + <%= f.label :is_completed %> + <%= f.check_box :is_completed %> - - - - - - - - -
+ <%= f.submit "Submit" %> +<% end %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index bd4a10963..1b2c2997d 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,9 +1,10 @@ -

Please print anything!

+

<%= @list.item%>

-

<%= @full_to_do[@index.to_i] %>

    -
  • Task: <%= @full_to_do[@index.to_i][:name]%>
    • -
  • description: <%= @full_to_do[@index.to_i][:description]%>
    • -
  • Status: <%= @full_to_do[@index.to_i][:status]%>
    • -
  • Completion: <%= @full_to_do[@index.to_i][:date]%>
    • +
  • Task: <%= @list.item%>
    • +
  • Description: <%= @list.description%>
    • +
  • Completed? <%= @list.is_completed%>
    • + <% if @list.is_completed == true %> +
  • Date completed: <%= @list.date_completed%>
    • + <% end %>
diff --git a/config/routes.rb b/config/routes.rb index d756fa454..3061768dd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,11 @@ Rails.application.routes.draw do root 'tasks#index' get '/tasks' => 'tasks#index' - get '/tasks/new' => 'tasks#new' - get '/tasks/:id' => 'tasks#show' - post 'tasks' => 'entries#create' + get '/tasks/new', to: 'tasks#new', as: 'new_task' + post 'tasks/' => 'tasks#create' + get 'tasks/:id/edit' => 'tasks#edit' + get '/tasks/:id', to: 'tasks#show', as: 'task' + From adfeeff8a867fc8d0a6d8df63690f4d9d3408193 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Thu, 29 Sep 2016 16:57:29 -0700 Subject: [PATCH 05/15] Edit and Update Complete --- app/controllers/tasks_controller.rb | 9 +++++++++ app/views/tasks/index.html.erb | 1 + app/views/tasks/show.html.erb | 3 +++ config/routes.rb | 3 ++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index bfe555cfb..0a9cf2171 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -27,6 +27,15 @@ def edit @list = Task.find(params[:id]) end + def update + @list = Task.find(params[:id]) + if @list.update(task_params) + redirect_to tasks_path + else + render :edit + end + end + private def task_params diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index a93ed71e7..4af6d92b5 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -4,6 +4,7 @@ <% @list.each do |s| %>
  • <%= link_to "#{s.item}", task_path(s) %> + <%= link_to "Edit", edit_task_path(s) %>
    • <% end %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 1b2c2997d..d779df54b 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -7,4 +7,7 @@ <% if @list.is_completed == true %>
  • Date completed: <%= @list.date_completed%>
    • <% end %> + + +<%= link_to "Edit", edit_task_path %> diff --git a/config/routes.rb b/config/routes.rb index 3061768dd..827c656e1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,8 @@ get '/tasks' => 'tasks#index' get '/tasks/new', to: 'tasks#new', as: 'new_task' post 'tasks/' => 'tasks#create' - get 'tasks/:id/edit' => 'tasks#edit' + get 'tasks/:id/edit', to: 'tasks#edit', as: 'edit_task' + patch 'tasks/:id' => 'tasks#update' get '/tasks/:id', to: 'tasks#show', as: 'task' From 718ec7007d6a374988206edf126255f316266e44 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Fri, 30 Sep 2016 11:08:26 -0700 Subject: [PATCH 06/15] Added a Destroy Feature --- app/controllers/tasks_controller.rb | 7 ++++++- app/views/tasks/confirm_deletion.html.erb | 2 ++ app/views/tasks/index.html.erb | 17 +++++++++++++++++ config/routes.rb | 2 ++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 app/views/tasks/confirm_deletion.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 0a9cf2171..bfe2a6290 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -33,7 +33,12 @@ def update redirect_to tasks_path else render :edit - end + end + end + + def destroy + @list = Task.find(params[:id]).destroy + redirect_to tasks_path end private diff --git a/app/views/tasks/confirm_deletion.html.erb b/app/views/tasks/confirm_deletion.html.erb new file mode 100644 index 000000000..5f57936e4 --- /dev/null +++ b/app/views/tasks/confirm_deletion.html.erb @@ -0,0 +1,2 @@ +<%= link_to "Yes, I am absolutely sure I want to delete this task", task_path(@list), method: :delete %> + diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 4af6d92b5..f94b49e75 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,11 +1,28 @@

    Mom's nagging list

    +

    To Do List

      <% @list.each do |s| %> + <% if s.is_completed == false %>
    • <%= link_to "#{s.item}", task_path(s) %> <%= link_to "Edit", edit_task_path(s) %> + <%= link_to "DESTROY!!", task_path(s), method: :delete , data: {confirm: "Are you really sure?"}%>
      • + <%end%> + <% end %> +
    + +

    Completed Tasks

    +
      + <% @list.each do |s| %> + <% if s.is_completed == true %> +
    • + <%= link_to "#{s.item}", task_path(s) %> + <%= link_to "Edit", edit_task_path(s) %> + <%= link_to "DESTROY!!", task_path(s), method: :delete , data: {confirm: "Are you really sure?"}%> +
      • + <%end%> <% end %>
    diff --git a/config/routes.rb b/config/routes.rb index 827c656e1..96b4e3b53 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,8 @@ get 'tasks/:id/edit', to: 'tasks#edit', as: 'edit_task' patch 'tasks/:id' => 'tasks#update' get '/tasks/:id', to: 'tasks#show', as: 'task' + delete '/tasks/:id' => 'tasks#destroy' + From f48d60f85e128b30c5e785b5f2326fbbbc1d91e2 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Fri, 30 Sep 2016 15:04:40 -0700 Subject: [PATCH 07/15] Botton for Task Completed --- app/controllers/tasks_controller.rb | 6 +++++- app/views/tasks/edit.html.erb | 3 +++ app/views/tasks/index.html.erb | 15 ++++++++++----- app/views/tasks/new.html.erb | 3 +++ .../20160930211430_change_completed_date_type.rb | 5 +++++ db/schema.rb | 4 ++-- 6 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20160930211430_change_completed_date_type.rb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index bfe2a6290..81d7a1159 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -29,7 +29,11 @@ def edit def update @list = Task.find(params[:id]) + if @list.update(task_params) + if @list.is_completed = false + @list.completed_date = date.now + end redirect_to tasks_path else render :edit @@ -44,7 +48,7 @@ def destroy private def task_params - params.require(:task).permit(:item, :description, :is_completed) + params.require(:task).permit(:item, :description, :is_completed, :date_completed) end end diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 9c4e3e601..b6e722642 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -10,5 +10,8 @@ <%= f.label :is_completed %> <%= f.check_box :is_completed %> + <%= f.label :date_completed %> + <%= f.date_field :date_completed %> + <%= f.submit "Submit" %> <% end %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index f94b49e75..11892d5ff 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -4,11 +4,16 @@
      <% @list.each do |s| %> <% if s.is_completed == false %> -
    • - <%= link_to "#{s.item}", task_path(s) %> - <%= link_to "Edit", edit_task_path(s) %> - <%= link_to "DESTROY!!", task_path(s), method: :delete , data: {confirm: "Are you really sure?"}%> -
      • +
    • + <%= link_to "#{s.item}", task_path(s) %> + <%= link_to "Edit", edit_task_path(s) %> + <%= link_to "DESTROY!!", task_path(s), method: :delete , data: {confirm: "Are you really sure?"}%> + <%= form_for s do |f|%> + <%= f.hidden_field :is_completed, :value => true %> + <%= f.hidden_field :date_completed, :value => Time.now %> + <%= f.submit "Task is complete!" %> + <% end %> +
      • <%end%> <% end %>
    diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 3bb136bfc..5984a685e 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -10,5 +10,8 @@ <%= f.label :is_completed %> <%= f.check_box :is_completed %> + <%= f.label :date_completed %> + <%= f.date_field :date_completed %> + <%= f.submit "Submit" %> <% end %> diff --git a/db/migrate/20160930211430_change_completed_date_type.rb b/db/migrate/20160930211430_change_completed_date_type.rb new file mode 100644 index 000000000..4cc415861 --- /dev/null +++ b/db/migrate/20160930211430_change_completed_date_type.rb @@ -0,0 +1,5 @@ +class ChangeCompletedDateType < ActiveRecord::Migration + def change + change_column :tasks, :date_completed, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index bc480e81c..f9275604c 100644 --- a/db/schema.rb +++ b/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: 20160928225715) do +ActiveRecord::Schema.define(version: 20160930211430) do create_table "tasks", force: :cascade do |t| t.string "item" @@ -19,7 +19,7 @@ t.boolean "is_completed" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.date "date_completed" + t.datetime "date_completed" end end From c80da3fd1d74535c2666b0aeb248b1a3fdbfc3a4 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Thu, 6 Oct 2016 08:59:06 -0700 Subject: [PATCH 08/15] WIP Overall, to clean up --- config/routes.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 96b4e3b53..5069032d0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,8 +10,6 @@ - - # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 3b80b777eab4fac5ea6376e9ce18fb76b2f862f9 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Fri, 7 Oct 2016 09:32:29 -0700 Subject: [PATCH 09/15] Getting Ready to Deploy Heroku --- Gemfile | 10 ++++++++-- Gemfile.lock | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e87fad5fc..3b4e5dd3c 100644 --- a/Gemfile +++ b/Gemfile @@ -4,8 +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 gem 'uglifier', '>= 1.3.0' @@ -35,6 +33,8 @@ 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' + # Use SCSS for stylesheets end group :development do @@ -43,5 +43,11 @@ group :development do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' + + end +group :production do + gem 'pg' + gem 'rails_12factor' +end diff --git a/Gemfile.lock b/Gemfile.lock index 187046034..8f5268410 100644 --- a/Gemfile.lock +++ b/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 53c6ad1ae979a49af633194b02f4ddaec2273c4b Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Mon, 17 Oct 2016 14:43:12 -0700 Subject: [PATCH 10/15] Configure app to use Github --- .gitignore | 1 + Gemfile | 7 +++++++ Gemfile.lock | 28 ++++++++++++++++++++++++++++ config/initializers/omniauth.rb | 3 +++ 4 files changed, 39 insertions(+) create mode 100644 config/initializers/omniauth.rb diff --git a/.gitignore b/.gitignore index 050c9d95c..72dcca089 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /log/* !/log/.keep /tmp +.env diff --git a/Gemfile b/Gemfile index 3b4e5dd3c..52d4108fa 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,10 @@ 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' @@ -35,6 +39,9 @@ group :development, :test do gem 'byebug' gem 'sqlite3' # Use SCSS for stylesheets + + gem 'byebug' + gem 'dotenv-rails' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 8f5268410..45c3c5b37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,10 +50,17 @@ 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) + 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 +70,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 +81,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) @@ -154,8 +179,11 @@ PLATFORMS DEPENDENCIES byebug coffee-rails (~> 4.1.0) + dotenv-rails jbuilder (~> 2.0) jquery-rails + omniauth + omniauth-github pg rails (= 4.2.7) rails_12factor diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 000000000..fd4416122 --- /dev/null +++ b/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 30b78627cee820ae0f428042fade1c492cebea13 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Mon, 17 Oct 2016 14:53:36 -0700 Subject: [PATCH 11/15] set up --- Gemfile | 3 ++- Gemfile.lock | 7 +++++++ app/assets/javascripts/sessions.coffee | 3 +++ app/assets/stylesheets/sessions.scss | 3 +++ app/controllers/sessions_controller.rb | 6 ++++++ app/helpers/sessions_helper.rb | 2 ++ config/routes.rb | 3 +++ test/controllers/sessions_controller_test.rb | 7 +++++++ 8 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/sessions.coffee create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 test/controllers/sessions_controller_test.rb diff --git a/Gemfile b/Gemfile index 52d4108fa..dba13316d 100644 --- a/Gemfile +++ b/Gemfile @@ -40,8 +40,9 @@ group :development, :test do gem 'sqlite3' # Use SCSS for stylesheets - gem 'byebug' gem 'dotenv-rails' + gem 'better_errors' + gem 'binding_of_caller' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 45c3c5b37..29fb9027a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,10 +37,15 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.3) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) byebug (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 diff --git a/app/assets/javascripts/sessions.coffee b/app/assets/javascripts/sessions.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/sessions.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 000000000..7bef9cf82 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the sessions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 000000000..abbfcf164 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,6 @@ +class SessionsController < ApplicationController + def create + auth_hash = request.env['omniauth.auth'] + raise + end +end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb new file mode 100644 index 000000000..309f8b2eb --- /dev/null +++ b/app/helpers/sessions_helper.rb @@ -0,0 +1,2 @@ +module SessionsHelper +end diff --git a/config/routes.rb b/config/routes.rb index 5069032d0..8496a55cd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,9 @@ get '/tasks/:id', to: 'tasks#show', as: 'task' delete '/tasks/:id' => 'tasks#destroy' + get 'auth/:provider/callback' => 'sessions#create' + + # The priority is based upon order of creation: first created -> highest priority. diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 000000000..d30ebc380 --- /dev/null +++ b/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 From 569b035a9f33657f75135c2dd84775c22ad3c397 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Mon, 17 Oct 2016 15:05:46 -0700 Subject: [PATCH 12/15] Setup Users Model --- app/models/user.rb | 14 ++++++++++++++ db/migrate/20161017215739_create_users.rb | 12 ++++++++++++ db/schema.rb | 11 ++++++++++- test/fixtures/users.yml | 11 +++++++++++ test/models/user_test.rb | 7 +++++++ 5 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 app/models/user.rb create mode 100644 db/migrate/20161017215739_create_users.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 000000000..c2111299d --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,14 @@ +class User < ActiveRecord::Base + + validates :email, :uid, :provider, presence: true + + def self.build_from_github(auth_hash) + user = User.new + user.uid = auth_hash[:uid] + user.provider = 'github' + user.name = auth_hash['info']['name'] + user.email = auth_hash['info']['email'] + + return user + end +end diff --git a/db/migrate/20161017215739_create_users.rb b/db/migrate/20161017215739_create_users.rb new file mode 100644 index 000000000..605ce98fa --- /dev/null +++ b/db/migrate/20161017215739_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/db/schema.rb b/db/schema.rb index f9275604c..06e364172 100644 --- a/db/schema.rb +++ b/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: 20160930211430) do +ActiveRecord::Schema.define(version: 20161017215739) do create_table "tasks", force: :cascade do |t| t.string "item" @@ -22,4 +22,13 @@ t.datetime "date_completed" 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/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 000000000..937a0c002 --- /dev/null +++ b/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/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 000000000..82f61e010 --- /dev/null +++ b/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 ae2449578ccf9cb4de0f52a9baf3e8c2acaf2991 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Mon, 17 Oct 2016 15:11:32 -0700 Subject: [PATCH 13/15] Sessions Controller --- app/controllers/sessions_controller.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index abbfcf164..19e24103d 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,6 +1,17 @@ class SessionsController < ApplicationController def create auth_hash = request.env['omniauth.auth'] - raise + redirect_to login_failure_path unless auth_hash['uid'] + + @user = User.find_by(uid: auth_hash[:uid], provider: 'github') + if @user.nil? + # User doesn't match anything in the DB. + # Attempt to create a new user. + @user = User.build_from_github(auth_hash) + render :creation_failure unless @user.save + end + session[:user_id] = @user.id + + redirect_to sessions_path end end From 89131056bfd71a07e42b4b97aa473e7c32de1dc9 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Wed, 19 Oct 2016 22:15:26 -0700 Subject: [PATCH 14/15] Destroy method now resolved --- app/controllers/sessions_controller.rb | 20 +++++++++++++++++++- app/views/sessions/creation_failure.html.erb | 0 app/views/sessions/index.html.erb | 3 +++ app/views/sessions/login_failure.html.erb | 1 + config/routes.rb | 5 ++++- 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 app/views/sessions/creation_failure.html.erb create mode 100644 app/views/sessions/index.html.erb create mode 100644 app/views/sessions/login_failure.html.erb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 19e24103d..71dc1cd55 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,7 +1,7 @@ class SessionsController < ApplicationController def create auth_hash = request.env['omniauth.auth'] - redirect_to login_failure_path unless auth_hash['uid'] + redirect to login_failure_path unless auth_hash['uid'] @user = User.find_by(uid: auth_hash[:uid], provider: 'github') if @user.nil? @@ -10,8 +10,26 @@ def create @user = User.build_from_github(auth_hash) render :creation_failure unless @user.save end + + # Save the user ID in the session session[:user_id] = @user.id redirect_to sessions_path end + + def index + if session[:user_id].nil? + redirect_to login_failure_path + else + @user = User.find(session[:user_id]) # < recalls the value set in a previous request + end + end + + def login_failure + end + + def destroy + session.delete(:user_id) + redirect_to root_path + end end diff --git a/app/views/sessions/creation_failure.html.erb b/app/views/sessions/creation_failure.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/sessions/index.html.erb b/app/views/sessions/index.html.erb new file mode 100644 index 000000000..33d6718ec --- /dev/null +++ b/app/views/sessions/index.html.erb @@ -0,0 +1,3 @@ +

    Welcome, <%= @user.name %>

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

    You failed to login

    diff --git a/config/routes.rb b/config/routes.rb index 8496a55cd..4cc2cb5a9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,10 +8,13 @@ get '/tasks/:id', to: 'tasks#show', as: 'task' delete '/tasks/:id' => 'tasks#destroy' - get 'auth/:provider/callback' => 'sessions#create' + get "/auth/:provider/callback" => "sessions#create" + get "/sessions/login_failure", to: "sessions#login_failure", as: "login_failure" + get "/sessions", to: "sessions#index", as: "sessions" + delete "/sessions", to: "sessions#destroy" # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From b604178b9063125089b46716169b545281ef1909 Mon Sep 17 00:00:00 2001 From: Madeleine Johnson Date: Sun, 30 Oct 2016 19:23:56 -0700 Subject: [PATCH 15/15] add login/logout button --- app/assets/javascripts/mains.coffee | 3 +++ app/assets/stylesheets/mains.scss | 3 +++ app/controllers/application_controller.rb | 15 +++++++++++++++ app/controllers/mains_controller.rb | 7 +++++++ app/controllers/sessions_controller.rb | 5 +++-- app/controllers/tasks_controller.rb | 18 ++++++++---------- app/helpers/mains_helper.rb | 2 ++ app/views/layouts/application.html.erb | 10 ++++++++++ app/views/mains/index.html.erb | 1 + app/views/sessions/index.html.erb | 2 ++ config/routes.rb | 3 ++- test/controllers/mains_controller_test.rb | 7 +++++++ 12 files changed, 63 insertions(+), 13 deletions(-) create mode 100644 app/assets/javascripts/mains.coffee create mode 100644 app/assets/stylesheets/mains.scss create mode 100644 app/controllers/mains_controller.rb create mode 100644 app/helpers/mains_helper.rb create mode 100644 app/views/mains/index.html.erb create mode 100644 test/controllers/mains_controller_test.rb diff --git a/app/assets/javascripts/mains.coffee b/app/assets/javascripts/mains.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/mains.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/mains.scss b/app/assets/stylesheets/mains.scss new file mode 100644 index 000000000..ef5bed62e --- /dev/null +++ b/app/assets/stylesheets/mains.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the mains controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e1b..2ea974474 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,19 @@ 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 + @user ||=User.find(session[:user_id]) if session[:user_id] + end + + def require_login + if current_user.nil? + flash[:error] = "You must be logged in to view this section" + redirect_to root_path + end + end end diff --git a/app/controllers/mains_controller.rb b/app/controllers/mains_controller.rb new file mode 100644 index 000000000..44e79ecce --- /dev/null +++ b/app/controllers/mains_controller.rb @@ -0,0 +1,7 @@ +class MainsController < ApplicationController + skip_before_action :require_login + + def index + + end +end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 71dc1cd55..0566674c5 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,4 +1,6 @@ class SessionsController < ApplicationController + skip_before_action :require_login, only: [:index, :create] + def create auth_hash = request.env['omniauth.auth'] redirect to login_failure_path unless auth_hash['uid'] @@ -25,8 +27,7 @@ def index end end - def login_failure - end + def login_failure; end def destroy session.delete(:user_id) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 81d7a1159..b00bfe56e 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,17 +1,15 @@ class TasksController < ApplicationController + before_action :find_task, only: [:show, :edit, :update] + def index @list = Task.all - - end def new @list = Task.new end - def show - @list = Task.find(params[:id]) - end + def show; end def create @list = Task.new(task_params) @@ -23,13 +21,9 @@ def create end end - def edit - @list = Task.find(params[:id]) - end + def edit; end def update - @list = Task.find(params[:id]) - if @list.update(task_params) if @list.is_completed = false @list.completed_date = date.now @@ -47,6 +41,10 @@ def destroy private + def find_task + @list = Task.find(params[:id]) + end + def task_params params.require(:task).permit(:item, :description, :is_completed, :date_completed) end diff --git a/app/helpers/mains_helper.rb b/app/helpers/mains_helper.rb new file mode 100644 index 000000000..b0bc38200 --- /dev/null +++ b/app/helpers/mains_helper.rb @@ -0,0 +1,2 @@ +module MainsHelper +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 46eeb110b..84ffb084d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,16 @@ +
    + +
    + <%= yield %> diff --git a/app/views/mains/index.html.erb b/app/views/mains/index.html.erb new file mode 100644 index 000000000..99a9f290f --- /dev/null +++ b/app/views/mains/index.html.erb @@ -0,0 +1 @@ +

    This is the main page

    diff --git a/app/views/sessions/index.html.erb b/app/views/sessions/index.html.erb index 33d6718ec..52d94f167 100644 --- a/app/views/sessions/index.html.erb +++ b/app/views/sessions/index.html.erb @@ -1,3 +1,5 @@

    Welcome, <%= @user.name %>

    <%= button_to "log out", sessions_path, method: :delete%> + +

    View my <%= link_to "Tasks", tasks_path %>

    diff --git a/config/routes.rb b/config/routes.rb index 4cc2cb5a9..f2d5c7d82 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - root 'tasks#index' + root 'mains#index' get '/tasks' => 'tasks#index' get '/tasks/new', to: 'tasks#new', as: 'new_task' post 'tasks/' => 'tasks#create' @@ -10,6 +10,7 @@ get "/auth/:provider/callback" => "sessions#create" + get "/sessions/login_failure", to: "sessions#login_failure", as: "login_failure" get "/sessions", to: "sessions#index", as: "sessions" diff --git a/test/controllers/mains_controller_test.rb b/test/controllers/mains_controller_test.rb new file mode 100644 index 000000000..79776250e --- /dev/null +++ b/test/controllers/mains_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class MainsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end