From c3c1f281b0d0c817ea92b34cfe8690dd4cfde8cc Mon Sep 17 00:00:00 2001 From: Qlwentt Date: Wed, 28 Sep 2016 14:23:55 -0700 Subject: [PATCH 01/12] create project with tasks controller --- .gitignore | 46 ++--- .ruby-gemset | 1 - .ruby-version | 1 - Gemfile | 47 +++++ Gemfile.lock | 163 ++++++++++++++++++ README.rdoc | 28 +++ Rakefile | 6 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/javascripts/tasks.coffee | 3 + app/assets/stylesheets/application.css | 15 ++ app/assets/stylesheets/tasks.scss | 3 + app/controllers/application_controller.rb | 5 + app/controllers/concerns/.keep | 0 app/controllers/tasks_controller.rb | 19 ++ app/helpers/application_helper.rb | 2 + app/helpers/tasks_helper.rb | 2 + app/mailers/.keep | 0 app/models/.keep | 0 app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/tasks/destroy.html.erb | 2 + app/views/tasks/edit.html.erb | 2 + app/views/tasks/index.html.erb | 2 + app/views/tasks/new.html.erb | 2 + app/views/tasks/show.html.erb | 2 + app/views/tasks/update.html.erb | 2 + 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 | 70 ++++++++ config/secrets.yml | 22 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 public/404.html | 67 +++++++ public/422.html | 67 +++++++ public/500.html | 66 +++++++ public/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/controllers/tasks_controller_test.rb | 34 ++++ 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 70 files changed, 1072 insertions(+), 34 deletions(-) delete mode 100644 .ruby-gemset delete mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 README.rdoc create mode 100644 Rakefile create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/tasks.coffee create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/assets/stylesheets/tasks.scss create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/tasks_controller.rb create mode 100644 app/helpers/application_helper.rb create mode 100644 app/helpers/tasks_helper.rb create mode 100644 app/mailers/.keep create mode 100644 app/models/.keep create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/tasks/destroy.html.erb create mode 100644 app/views/tasks/edit.html.erb create mode 100644 app/views/tasks/index.html.erb create mode 100644 app/views/tasks/new.html.erb create mode 100644 app/views/tasks/show.html.erb create mode 100644 app/views/tasks/update.html.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/controllers/tasks_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep diff --git a/.gitignore b/.gitignore index 28f484983..050c9d95c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,17 @@ -*.gem -*.rbc -/.config -/coverage/ -/InstalledFiles -/pkg/ -/spec/reports/ -/test/tmp/ -/test/version_tmp/ -/tmp/ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' -## Specific to RubyMotion: -.dat* -.repl_history -build/ +# Ignore bundler config. +/.bundle -## Documentation cache and generated files: -/.yardoc/ -/_yardoc/ -/doc/ -/rdoc/ +# Ignore the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal -## Environment normalisation: -/.bundle/ -/vendor/bundle -/lib/bundler/man/ - -# for a library or gem, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# Gemfile.lock -# .ruby-version -# .ruby-gemset - -# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -.rvmrc +# Ignore all logfiles and tempfiles. +/log/* +!/log/.keep +/tmp diff --git a/.ruby-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 deleted file mode 100644 index 276cbf9e2..000000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.3.0 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..e87fad5fc --- /dev/null +++ b/Gemfile @@ -0,0 +1,47 @@ +source 'https://rubygems.org' + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.7' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.1.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks +gem 'turbolinks' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.0' +# bundle exec rake doc:rails generates the API under doc/api. +gem 'sdoc', '~> 0.4.0', group: :doc + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Unicorn as the app server +# gem 'unicorn' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' +end + diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..187046034 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,163 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.7) + activesupport (= 4.2.7) + globalid (>= 0.3.0) + activemodel (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) + arel (~> 6.0) + activesupport (4.2.7) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + arel (6.0.3) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + byebug (9.0.5) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.7.0) + globalid (0.3.7) + activesupport (>= 4.1.0) + i18n (0.7.0) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.2.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + json (1.8.3) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.1) + multi_json (1.12.1) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.7) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.3.0) + rdoc (4.2.2) + json (~> 1.4) + sass (3.4.22) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + spring (1.7.2) + sprockets (3.7.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.11) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.2) + execjs (>= 0.3.0, < 3) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + coffee-rails (~> 4.1.0) + jbuilder (~> 2.0) + jquery-rails + rails (= 4.2.7) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +BUNDLED WITH + 1.13.1 diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 000000000..dd4e97e22 --- /dev/null +++ b/README.rdoc @@ -0,0 +1,28 @@ +== README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... + + +Please feel free to use a different markup language if you do not plan to run +rake doc:app. diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..ba6b733dd --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require File.expand_path('../config/application', __FILE__) + +Rails.application.load_tasks diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..e07c5a830 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require jquery_ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/tasks.coffee b/app/assets/javascripts/tasks.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/tasks.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..f9cd5b348 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss new file mode 100644 index 000000000..c5e7712d4 --- /dev/null +++ b/app/assets/stylesheets/tasks.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Tasks controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..d83690e1b --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb new file mode 100644 index 000000000..bf2528242 --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,19 @@ +class TasksController < ApplicationController + def index + end + + def new + end + + def edit + end + + def show + end + + def update + end + + def destroy + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/helpers/tasks_helper.rb b/app/helpers/tasks_helper.rb new file mode 100644 index 000000000..ce894d00c --- /dev/null +++ b/app/helpers/tasks_helper.rb @@ -0,0 +1,2 @@ +module TasksHelper +end diff --git a/app/mailers/.keep b/app/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/.keep b/app/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..46eeb110b --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + TaskListRails + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + +<%= yield %> + + + diff --git a/app/views/tasks/destroy.html.erb b/app/views/tasks/destroy.html.erb new file mode 100644 index 000000000..a90559f9d --- /dev/null +++ b/app/views/tasks/destroy.html.erb @@ -0,0 +1,2 @@ +

Tasks#destroy

+

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

diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb new file mode 100644 index 000000000..374190308 --- /dev/null +++ b/app/views/tasks/edit.html.erb @@ -0,0 +1,2 @@ +

Tasks#edit

+

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

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

Tasks#index

+

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

diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb new file mode 100644 index 000000000..2484008a3 --- /dev/null +++ b/app/views/tasks/new.html.erb @@ -0,0 +1,2 @@ +

Tasks#new

+

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

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

Tasks#show

+

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

diff --git a/app/views/tasks/update.html.erb b/app/views/tasks/update.html.erb new file mode 100644 index 000000000..fdb1ea609 --- /dev/null +++ b/app/views/tasks/update.html.erb @@ -0,0 +1,2 @@ +

Tasks#update

+

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

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..eeb1c3500 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,70 @@ +Rails.application.routes.draw do + root to: "tasks#index" + + get 'tasks/index' + + get 'tasks/new' + + get 'tasks/edit' + + get 'tasks/show' + + get 'tasks/update' + + get 'tasks/destroy' + + # 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..a37914537 --- /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: 924486ec4d80bd58ce8a121a8e6607912e9cc5576d20f519cbfbc29071f087aac560673bb7d5e54d57f9c7dd0d01a3290ebaf58f5ce567af45ac8da069013a06 + +test: + secret_key_base: 6cd31643372ef0ee4e787cb3c71d2b49dbac4afbd39a2efa5f327c67b29421ef221a472b31e320fa2086764208d6fc8c532dd739044a44dfc04ba51e2b756e68 + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..4edb1e857 --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). +# +# Examples: +# +# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) +# Mayor.create(name: 'Emanuel', city: cities.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..b612547fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb new file mode 100644 index 000000000..5a220e86a --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,34 @@ +require 'test_helper' + +class TasksControllerTest < ActionController::TestCase + test "should get index" do + get :index + assert_response :success + end + + test "should get new" do + get :new + assert_response :success + end + + test "should get edit" do + get :edit + assert_response :success + end + + test "should get show" do + get :show + assert_response :success + end + + test "should get update" do + get :update + assert_response :success + end + + test "should get destroy" do + get :destroy + assert_response :success + end + +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..92e39b2d7 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep new file mode 100644 index 000000000..e69de29bb From 9ccbca84f049a543e631adc79fb3d134c9072945 Mon Sep 17 00:00:00 2001 From: Qlwentt Date: Thu, 29 Sep 2016 16:55:24 -0700 Subject: [PATCH 02/12] yeah did a bunch of stuff --- .DS_Store | Bin 0 -> 8196 bytes app/.DS_Store | Bin 0 -> 6148 bytes app/assets/stylesheets/application.css | 7 +++++ app/controllers/tasks_controller.rb | 35 ++++++++++++++++++++++ app/models/task.rb | 2 ++ app/views/.DS_Store | Bin 0 -> 6148 bytes app/views/layouts/.DS_Store | Bin 0 -> 6148 bytes app/views/tasks/.DS_Store | Bin 0 -> 6148 bytes app/views/tasks/create.html.erb | 7 +++++ app/views/tasks/edit.html.erb | 2 +- app/views/tasks/index.html.erb | 22 ++++++++++++-- app/views/tasks/new.html.erb | 35 ++++++++++++++++++++-- app/views/tasks/show.html.erb | 25 ++++++++++++++-- config/routes.rb | 14 ++++++--- db/migrate/20160929221835_create_tasks.rb | 11 +++++++ db/schema.rb | 24 +++++++++++++++ test/fixtures/tasks.yml | 11 +++++++ test/models/task_test.rb | 7 +++++ 18 files changed, 191 insertions(+), 11 deletions(-) create mode 100644 .DS_Store create mode 100644 app/.DS_Store create mode 100644 app/models/task.rb create mode 100644 app/views/.DS_Store create mode 100644 app/views/layouts/.DS_Store create mode 100644 app/views/tasks/.DS_Store create mode 100644 app/views/tasks/create.html.erb create mode 100644 db/migrate/20160929221835_create_tasks.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/tasks.yml create mode 100644 test/models/task_test.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0831f96ff368f8af7565adcf738eee28fedf5a80 GIT binary patch literal 8196 zcmeHM%Wl&^6ur}g)M;4+L8VG;yev{xwW83nOG69lqEgkMR*0ft$ELCB+L7Zlpej-} zZ1@7!y#E8iiVuK4=r6D;XC4V-hc2N=%tSMHGIP$%^_dwv*C8TS>v~H>vqWSeb6c54 z@tef^c^*p>s$~Y2flpMYlwwNA-wemlrokv+6fg=H1&jhlfqy{(JhOSS&Ux<3UQ-$c zi~|3q0{s49BXe6-b|9^|b)XO-0BjM>BB72rKyYkjtI7_f6;zBVqX(v_OobRs($Q~o zIBZqffwYoNOwx&|nVE`En3x?rTfm7`r8T8dz$h@T0FT|vv_R{K-5YxR9yi@EcF~Ii z#deTS&qNYK6u~&4fYQxS$I(6X&S|)*Ar9CBiiYn7GMukDPJtY1Q#(5{_kiY*+1VLN zB875$owoAxhuaQ=PP(}GolO*qmr9dXd1{(}Dp#f+*IRL~o;qo_Q*)9>;#=VPuBvZ4 zX=_-25Xa%D?zp>w-)mH^-HoHv2_iqysQY_CN}>eqD~Y7kFu_QJL9J{9{nJ zoygw}I)NL6LHgV(^G~BPdvdaTXL;UUT3zkW+b1h4i}UvK&D;Hc<%MNkzj14A>tVb9 z^7Wgy@7{m-`02B_U}EadM_1+dQTgSU9LMz}3ghSiEgW4S7s5w5DZimdU!)Q>u`m%m z<%^WXiUob8EofQCVsR7d<`{fAb;bmFnVpyWn;Frf9c<}CTp?F@ z?D~YC&on>Fz;DnRj^q~X0(9}RGYFq`#&nL6KyxUPWr=IhSw+08^Qn_R#KM0aR{-uP ze;|d|r<&I#I>u;`m^sPLEc_i|-F^-W*Pp%%umQ;Z5#OsGEW>gkXBGoh;STMgyXQIKMYZ~0p*;kvIA++f@FRO N2pLRa6!@zO`~=U*O`ZS% literal 0 HcmV?d00001 diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..dfa56955fa08c3bc9fdead2953429c686409ee08 GIT binary patch literal 6148 zcmeHKO^ee&7=CBB+otU$qQZig92JUmvAXLm)++2lC`NV>S8B2eHV~7Nq%Beky?F5# z?Ah=CA$sx$=uh!fpZVyLZR^!tWZq%sd1vN%=i@1v=@1cX5B(h?lZXstj-?ukHOBjS zUa<|;QUx+GhC?|elv1!Ct*~{2RzNFo(G=j{Zk29QhaBo5pMJl|u@@yCdT}(c$H0@h zFtLF$xs)LV;Ai_$kxLK3xL)Aa=@@513}y<9kOFwiQ9qWVD%1xrqQN@0SWj_|3cbRL z!u4abpG#wx!A{5*<1ep+ufDj`EgE6mfW~WAd;&I`&ruQ;nBF)WDD{4OgDA}MX7d-@ z*eq?8D@L_e=gGWOd+zj;v6H*`Fl)Q%Gf@luz*BzL&HD@gNs>gTzUv)?!MJB$xu3+j z8^%Fe2t7IsV?P~I}^!dxzZ(`HLaPSMetZ)I} z;S?kpIcXdv@k_KWA{I=I=cIu8A&mMt&9A4`3TOo`t^)jgu#h?03TG0<(Sbrd0e~em z3xm(!5WRT*INB}6vlY%H%5Y-p@xj#0OubN;m>uI=f=KjKVGxD5&!@I literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f9cd5b348..aa32ac733 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,10 @@ *= require_tree . *= require_self */ +table { + border: 1px solid black +} + +td, th { + border-right: solid 1px black; +} \ No newline at end of file diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index bf2528242..595287649 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,14 +1,47 @@ class TasksController < ApplicationController def index + @tasks=Task.all end def new + @my_task=Task.new + end + + def create + @params = params + @my_task=Task.new + @my_task.title = params[:task][:title] + @my_task.description = params[:task][:description] + @my_task.completed_at = params[:task][:completed_at] + @my_task.save + redirect_to '/' end def edit end def show + + @tasks=Task.all + + @my_task= Task.find(params[:id].to_i) + # @my_task = nil + + # id = params[:id].to_i + # @id =id + + + # @tasks.each do |task| + # if task[:id] == id + # @my_task = task + # end + # end + + if @my_task == nil + render :file => 'public/404.html', :status => :not_found, :layout => false + # @mypost = { id: number, title: "Did not find", body: ""} + end + end def update @@ -16,4 +49,6 @@ def update def destroy end + + #only need this method because not using database yet 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/.DS_Store b/app/views/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c6df2e35bab2e7fece318f02456233d98a2c7639 GIT binary patch literal 6148 zcmeHK&2G~`5S~rb)=e))fK-Xg9zn_>6@j)l6ABUsq)0}s5Jkbp7Fl6=qu6OwMUi~z zrH{e?dmuRR0z3+*GPAp>(grR)AXLp*Gv9b;X082X&w2qsbVkW0fDZs3Dq+2W<_|(~ z(gmrxkrhN?<`_W<#gk0GjI??cjxl>6RJHH#1 z{h9wv>+H;r;ysm)d;X1wIxi!Yr^C6@gMF1Jdfd^YJSh%BJKw%a%6`wk*&U{bSlW&9 zbWas3R+%b~yfwOd{>Eg|-f1`G=JxiqDJNT7t)^_>y+57$$DViV&b;P#P3u5ojsS>t95#YJ{WMUG zbQn0SEMf#j*iuAWD%=r6*m4|~E-!FcS+wOK+~GsGCkuB%5$5SQzclF}0*h>!0cPMl z155VSr~UuY-_QT&i};QiUy c4OAl-ljI-<4l9c|g2F!nh6Xmwz&~Z+H?;T7YybcN literal 0 HcmV?d00001 diff --git a/app/views/layouts/.DS_Store b/app/views/layouts/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4a1062db40a36c53ca80f9193d365fea988250d3 GIT binary patch literal 6148 zcmeHKu}Z{15PhRp9N1i8VY#K%fq$?Zr(o?5Xih;P8WHW&`PuqrW)(vetSsbBn0dRC zdArFgGFbq&dAU9TRsfcCN4$ENo8Nbz*;RxjvRmBGy3sc7)LTGAO)m=6p#W^;5Q0*@1-pd5*4L@6p#X+ z3i$V-&>d^TF)=Y?E|?DEIL;Ep;t67HI3_Yfv!oJ}YVC+&NoT&ay4r9|Ogb!f z<~nU>YbO+o-I*^@4y%cZQa}n!71+<|%KQH*{fG1al%$yykOKco0b6V@wi~`u>#ehw x^Ilu%m-G)~ZIm-aD<(!O=EPg^(U-d7W8SX~$HbsBA9SLA1Y8%H6!;4T-T?+v9@qc? literal 0 HcmV?d00001 diff --git a/app/views/tasks/.DS_Store b/app/views/tasks/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..80d50f0a210e18f8503ad320ab22839652b8b212 GIT binary patch literal 6148 zcmeHK!AiqG5Pho^TC`d`dEBEX!9NJ43ccD7P}>A5q*kg$z2!6f1V6?P@NeRq*`+RR zq&E?nf!Vj2-M5o@3E3);FnjBrg~J-_*6T+YWF<*VVYh;Ox;7SThF0*{=%;PZYZf6D$0C3^*9<6)Wd zaY@!`!awG$9Cze=Gd(6;>p@p*Si^mCjd%K9T^BQAw_%Ou>>rYy?&_K?aLCN}TER<_ zzmcnzr+0opW`XCeJh|JH*QHuh*0+_ZTBTYaVM$eT+)}M#TV6=5DO>6_GX+cmQ(#>I z?%87P{eae*0;Yf|uu?$251uZVMXUnqr-O|i0f;Sz)!3J_gm8SsEMgUqBQzJN#6WfN zh~WaAaUbVp5vzcK4i^s}E@pP}BTI9do#=T%bD4rQrhqB1roe8v?#cdt@$>nAjb)dn zfGO~w6mYG+UbFf literal 0 HcmV?d00001 diff --git a/app/views/tasks/create.html.erb b/app/views/tasks/create.html.erb new file mode 100644 index 000000000..638380cbb --- /dev/null +++ b/app/views/tasks/create.html.erb @@ -0,0 +1,7 @@ +

Tasks#create

+
+

<%= @my_task %>

+

<%= @my_task.title %>

+

<%= @my_task.description %>

+

<%= @my_task.completed_at %>

+
\ No newline at end of file diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 374190308..80911640e 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,2 +1,2 @@

Tasks#edit

-

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

+

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

\ No newline at end of file diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index b16c10310..c2aff166e 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,2 +1,20 @@ -

Tasks#index

-

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

+

Your Task List

+
+ + + + + + + <% @tasks.each do |task| %> + + + + + + <% end %> +
TitleDescriptionCompleted At
<%= link_to(task.title, show_path(task.id))%><%= task.description%><%= task.completed_at.to_s %>
+
+
+ <%= button_to("Add a New Task", {action: "new" }, method: :get)%> +
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 2484008a3..dcbca6af9 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,2 +1,33 @@ -

Tasks#new

-

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

+

Create a new task

+
+ <%= form_for @my_task, url: {action: "create"} do |f| %> + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :description %> + <%= f.text_field :description %> + + <%= f.label :completed_at %> + <%= f.text_area :completed_at %> + + <%= f.submit %> + + + + <% end %> + +
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 1139224db..a39a4b838 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,2 +1,23 @@ -

Tasks#show

-

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

+

<%= @my_task.title%>

+ + + + + + + + + + + + + + +
TitleDescriptionCompleted AtDone?
<%= @my_task.title%><%= @my_task.description%><%= @my_task.completed_at.to_s %> + <% unless @my_task.completed_at==nil %> + ✅ + <% else %> + ❌ + <% end %> +
+ diff --git a/config/routes.rb b/config/routes.rb index eeb1c3500..6212ee709 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,17 +1,23 @@ Rails.application.routes.draw do root to: "tasks#index" - get 'tasks/index' + get 'tasks/index' => 'tasks#index', as: 'index' - get 'tasks/new' + post 'tasks/index' + + get 'tasks/new' => 'tasks#new', as: 'new' + + post 'tasks/create' => 'tasks#create', as: 'create' get 'tasks/edit' get 'tasks/show' - get 'tasks/update' + get 'tasks/show/:id' => 'tasks#show', as: 'show' + + post 'tasks/update' - get 'tasks/destroy' + delete 'tasks/destroy' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20160929221835_create_tasks.rb b/db/migrate/20160929221835_create_tasks.rb new file mode 100644 index 000000000..0b21e26e4 --- /dev/null +++ b/db/migrate/20160929221835_create_tasks.rb @@ -0,0 +1,11 @@ +class CreateTasks < ActiveRecord::Migration + def change + create_table :tasks do |t| + t.string :title + t.text :description + t.datetime :completed_at + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..1c552a894 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,24 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20160929221835) do + + create_table "tasks", force: :cascade do |t| + t.string "title" + t.text "description" + t.datetime "completed_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 000000000..25ab8524c --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyText + completed_at: 2016-09-29 15:18:35 + +two: + title: MyString + description: MyText + completed_at: 2016-09-29 15:18:35 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 244aef46c461cc80ea596634aade53badf22f57e Mon Sep 17 00:00:00 2001 From: Qlwentt Date: Fri, 30 Sep 2016 10:31:42 -0700 Subject: [PATCH 03/12] add nicely formatted date --- app/controllers/tasks_controller.rb | 2 ++ app/views/tasks/.DS_Store | Bin 6148 -> 6148 bytes app/views/tasks/index.html.erb | 3 ++- app/views/tasks/show.html.erb | 5 ++++- config/routes.rb | 4 +--- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 595287649..155b9e964 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -48,6 +48,8 @@ def update end def destroy + Task.find(params[:id].to_i).destroy + redirect_to '/' end #only need this method because not using database yet diff --git a/app/views/tasks/.DS_Store b/app/views/tasks/.DS_Store index 80d50f0a210e18f8503ad320ab22839652b8b212..02a27cc80cb9c1e9cc87d70763a03b882db19e14 100644 GIT binary patch delta 60 zcmZoMXffE}$i&OfkjzlTkjjwAP{NQpIeH!=J!kz OtP>m9HnVg52L4$0WFU NKa&&dW_FIh`~bC|4-5bR diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index c2aff166e..e41107f74 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -10,7 +10,8 @@ <%= link_to(task.title, show_path(task.id))%> <%= task.description%> - <%= task.completed_at.to_s %> + <%= task.completed_at.strftime("%m/%d/%Y %H:%M") unless task.completed_at ==nil%> + <%= button_to("delete", {action: "destroy", id: task.id}, method: :delete, data: {confirm: "are you sure?"})%> <% end %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index a39a4b838..5ad7a7b19 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -10,7 +10,7 @@ <%= @my_task.title%> <%= @my_task.description%> - <%= @my_task.completed_at.to_s %> + <%= @my_task.completed_at.strftime("%m/%d/%Y %H:%M") unless @my_task.completed_at ==nil %> <% unless @my_task.completed_at==nil %> ✅ @@ -20,4 +20,7 @@ +
+ <%= button_to("delete", {action: "destroy", id: @my_task.id}, method: :delete, data: {confirm: "are you sure?"})%> +
diff --git a/config/routes.rb b/config/routes.rb index 6212ee709..3cb45eace 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,6 @@ get 'tasks/index' => 'tasks#index', as: 'index' - post 'tasks/index' - get 'tasks/new' => 'tasks#new', as: 'new' post 'tasks/create' => 'tasks#create', as: 'create' @@ -17,7 +15,7 @@ post 'tasks/update' - delete 'tasks/destroy' + delete 'tasks/destroy' => 'tasks#destroy', as: 'destroy' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 421d4387a3d3cf8f2da029e156ffabf02b2a35d0 Mon Sep 17 00:00:00 2001 From: Qlwentt Date: Fri, 30 Sep 2016 20:27:12 -0700 Subject: [PATCH 04/12] complete wave 3 --- app/controllers/tasks_controller.rb | 19 +++++++++++++++++++ app/models/task.rb | 11 +++++++++++ app/views/tasks/edit.html.erb | 18 +++++++++++++++++- app/views/tasks/index.html.erb | 13 +++++++++++++ app/views/tasks/show.html.erb | 10 ++++++---- app/views/tasks/update.html.erb | 7 ++++++- config/routes.rb | 10 ++++++++-- 7 files changed, 80 insertions(+), 8 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 155b9e964..c4bec2479 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -18,6 +18,7 @@ def create end def edit + @my_task= Task.find(params[:id].to_i) end def show @@ -44,7 +45,25 @@ def show end + def mark_complete + @my_task= Task.find(params[:id].to_i) + + unless (@my_task.completed_at != nil) || (@my_task.completed?) + @my_task.completed_at = Time.now + @my_task.save + end + + redirect_to '/' + end + def update + @my_task= Task.find(params[:id].to_i) + @my_task.title = params[:task][:title] + @my_task.description = params[:task][:description] + @my_task.completed_at = params[:task][:completed_at] + @my_task.save + + redirect_to '/' end def destroy diff --git a/app/models/task.rb b/app/models/task.rb index 935f76e12..9b42406a1 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,2 +1,13 @@ class Task < ActiveRecord::Base + attr_accessor + + def completed? + completed_at == nil ? false : true + end + + def self.uncompleted_tasks + #returns an array of the uncompleted tasks + uncompleted_tasks=Task.where(completed_at: nil) + uncompleted_tasks.empty? == true ? [] : uncompleted_tasks + end end diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 80911640e..7b04075ff 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,2 +1,18 @@

Tasks#edit

-

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

\ No newline at end of file +

Update a Task

+
+ <%= form_for @my_task, url: update_path do |f| %> + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :description %> + <%= f.text_field :description %> + + <%= f.label :completed_at %> + <%= f.text_field :completed_at %> + + <%= f.submit %> + + + + <% end %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index e41107f74..d0b396883 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -5,12 +5,20 @@ Title Description Completed At + <% @tasks.each do |task| %> <%= link_to(task.title, show_path(task.id))%> <%= task.description%> <%= task.completed_at.strftime("%m/%d/%Y %H:%M") unless task.completed_at ==nil%> + <% if task.completed? %> + ☑ + <% else %> + <%= button_to("mark completed", {action: "mark_complete", id: task.id}, method: :patch)%> + <% end %> + + <%= button_to("edit", {action: "edit", id: task.id}, method: :get, data: {})%> <%= button_to("delete", {action: "destroy", id: task.id}, method: :delete, data: {confirm: "are you sure?"})%> <% end %> @@ -19,3 +27,8 @@
<%= button_to("Add a New Task", {action: "new" }, method: :get)%>
+
+

You've done <%=Task.all.length-Task.uncompleted_tasks.length %> things!

+

Next try to <%= Task.uncompleted_tasks.empty? == true ? "add another task" : Task.uncompleted_tasks.sample.title.downcase %>! +

+
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 5ad7a7b19..1b817f04c 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,3 +1,5 @@ + +

<%= @my_task.title%>

@@ -11,11 +13,11 @@ - diff --git a/app/views/tasks/update.html.erb b/app/views/tasks/update.html.erb index fdb1ea609..93f432f67 100644 --- a/app/views/tasks/update.html.erb +++ b/app/views/tasks/update.html.erb @@ -1,2 +1,7 @@

Tasks#update

-

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

+

<%=@my_task.completed_at %>

+

<%= @my_task.title%> <%= @my_task.description%> <%= @my_task.completed_at.strftime("%m/%d/%Y %H:%M") unless @my_task.completed_at ==nil %> - <% unless @my_task.completed_at==nil %> - ✅ + <% if @my_task.completed? %> + ☑ <% else %> - ❌ + <%= button_to("mark completed", {action: "mark_complete", id: @my_task.id}, method: :patch)%> + <% end %> <% end %>
+ + + +
<%= link_to(@my_task.title, show_path(@my_task.id))%><%= @my_task.description%><%= @my_task.completed_at.strftime("%m/%d/%Y %H:%M") unless @my_task.completed_at ==nil%>
diff --git a/config/routes.rb b/config/routes.rb index 3cb45eace..a103e7bee 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,14 +6,20 @@ get 'tasks/new' => 'tasks#new', as: 'new' post 'tasks/create' => 'tasks#create', as: 'create' + + patch 'tasks/:id/mark_complete' => 'tasks#mark_complete', as: 'mark_complete' + + patch 'tasks/:id/update' => 'tasks#update', as: 'update' - get 'tasks/edit' + + + get 'tasks/:id/edit' => 'tasks#edit' get 'tasks/show' get 'tasks/show/:id' => 'tasks#show', as: 'show' - post 'tasks/update' + delete 'tasks/destroy' => 'tasks#destroy', as: 'destroy' From d173e4ad4164794556c5e9753498160fb574a37c Mon Sep 17 00:00:00 2001 From: Qlwentt Date: Fri, 30 Sep 2016 20:35:58 -0700 Subject: [PATCH 05/12] fix extra end bug --- app/views/tasks/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 1b817f04c..150b40a9f 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -17,7 +17,7 @@ ☑ <% else %> <%= button_to("mark completed", {action: "mark_complete", id: @my_task.id}, method: :patch)%> - <% end %> + <% end %> From a8884f6d04f28c372767c2f0f802c5fcdad3e193 Mon Sep 17 00:00:00 2001 From: Qlwentt Date: Mon, 3 Oct 2016 09:32:37 -0700 Subject: [PATCH 06/12] "add reflection" --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 2b96daf9c..4316f6f8b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,21 @@ +### Task List Reflection + +This was my first rails project. A lot of it was very similiar to live code exercises in class, so it wasn't the most fun thing ever. I did like adding little touches at the end, though. + +I had a hard time getting my completed task feature to work. I was dead-set on having a checkbox, but had a hard time getting the checkbox to actually change an a variable in my model. In the end I found out I couldn't just make variables in my model without having them in the database (from what I understand) and I had to use a method instead. + +My chair pair did more CSS than I did (I only did a line or two). I still am working on harnessing my creativity in regards to designing the frontend of websites. + + + + + + + + + + + # Task List Rails ✅ We are going to build a Task List in Rails. This web application will enable us to keep track of list of tasks with the functionality to add, edit and remove tasks from a list. From ad0ff214150f685490ddab0c36e555aebd644588 Mon Sep 17 00:00:00 2001 From: Qlwentt Date: Tue, 18 Oct 2016 10:06:35 -0700 Subject: [PATCH 07/12] alter gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 050c9d95c..00dabf9b4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,7 @@ /log/* !/log/.keep /tmp +.DS_Store + +#it contains secrets +.env \ No newline at end of file From 4ede08f484d7a8623c0205a7e16d226e179dd232 Mon Sep 17 00:00:00 2001 From: Qlwentt Date: Tue, 18 Oct 2016 10:18:19 -0700 Subject: [PATCH 08/12] add authentication stuff --- .DS_Store | Bin 8196 -> 0 bytes Gemfile | 6 ++++ Gemfile.lock | 36 ++++++++++++++++++++++ app/.DS_Store | Bin 6148 -> 0 bytes app/controllers/tasks_controller.rb | 2 ++ app/models/user.rb | 2 ++ app/views/.DS_Store | Bin 6148 -> 0 bytes app/views/layouts/.DS_Store | Bin 6148 -> 0 bytes app/views/tasks/.DS_Store | Bin 6148 -> 0 bytes app/views/tasks/_form.html.erb | 15 +++++++++ app/views/tasks/edit.html.erb | 16 +++------- app/views/tasks/new.html.erb | 17 +--------- config/initializers/omniauth.rb | 3 ++ config/routes.rb | 3 ++ db/migrate/20161018170210_create_users.rb | 12 ++++++++ db/schema.rb | 11 ++++++- test/fixtures/users.yml | 13 ++++++++ test/models/user_test.rb | 7 +++++ 18 files changed, 114 insertions(+), 29 deletions(-) delete mode 100644 .DS_Store delete mode 100644 app/.DS_Store create mode 100644 app/models/user.rb delete mode 100644 app/views/.DS_Store delete mode 100644 app/views/layouts/.DS_Store delete mode 100644 app/views/tasks/.DS_Store create mode 100644 app/views/tasks/_form.html.erb create mode 100644 config/initializers/omniauth.rb create mode 100644 db/migrate/20161018170210_create_users.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 0831f96ff368f8af7565adcf738eee28fedf5a80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHM%Wl&^6ur}g)M;4+L8VG;yev{xwW83nOG69lqEgkMR*0ft$ELCB+L7Zlpej-} zZ1@7!y#E8iiVuK4=r6D;XC4V-hc2N=%tSMHGIP$%^_dwv*C8TS>v~H>vqWSeb6c54 z@tef^c^*p>s$~Y2flpMYlwwNA-wemlrokv+6fg=H1&jhlfqy{(JhOSS&Ux<3UQ-$c zi~|3q0{s49BXe6-b|9^|b)XO-0BjM>BB72rKyYkjtI7_f6;zBVqX(v_OobRs($Q~o zIBZqffwYoNOwx&|nVE`En3x?rTfm7`r8T8dz$h@T0FT|vv_R{K-5YxR9yi@EcF~Ii z#deTS&qNYK6u~&4fYQxS$I(6X&S|)*Ar9CBiiYn7GMukDPJtY1Q#(5{_kiY*+1VLN zB875$owoAxhuaQ=PP(}GolO*qmr9dXd1{(}Dp#f+*IRL~o;qo_Q*)9>;#=VPuBvZ4 zX=_-25Xa%D?zp>w-)mH^-HoHv2_iqysQY_CN}>eqD~Y7kFu_QJL9J{9{nJ zoygw}I)NL6LHgV(^G~BPdvdaTXL;UUT3zkW+b1h4i}UvK&D;Hc<%MNkzj14A>tVb9 z^7Wgy@7{m-`02B_U}EadM_1+dQTgSU9LMz}3ghSiEgW4S7s5w5DZimdU!)Q>u`m%m z<%^WXiUob8EofQCVsR7d<`{fAb;bmFnVpyWn;Frf9c<}CTp?F@ z?D~YC&on>Fz;DnRj^q~X0(9}RGYFq`#&nL6KyxUPWr=IhSw+08^Qn_R#KM0aR{-uP ze;|d|r<&I#I>u;`m^sPLEc_i|-F^-W*Pp%%umQ;Z5#OsGEW>gkXBGoh;STMgyXQIKMYZ~0p*;kvIA++f@FRO N2pLRa6!@zO`~=U*O`ZS% diff --git a/Gemfile b/Gemfile index e87fad5fc..301b56aa6 100644 --- a/Gemfile +++ b/Gemfile @@ -32,9 +32,15 @@ gem 'sdoc', '~> 0.4.0', group: :doc # Use Capistrano for deployment # gem 'capistrano-rails', group: :development +gem 'omniauth' +gem 'omniauth-github' +gem 'awesome_print' + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' + gem 'dotenv-rails' + gem 'better_errors' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 187046034..0b0859ffb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,10 +37,16 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.3) + awesome_print (1.7.0) + 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) @@ -50,10 +56,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 +76,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 +87,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) pkg-config (1.1.7) rack (1.6.4) rack-test (0.6.3) @@ -146,10 +177,15 @@ PLATFORMS ruby DEPENDENCIES + awesome_print + better_errors byebug coffee-rails (~> 4.1.0) + dotenv-rails jbuilder (~> 2.0) jquery-rails + omniauth + omniauth-github rails (= 4.2.7) sass-rails (~> 5.0) sdoc (~> 0.4.0) diff --git a/app/.DS_Store b/app/.DS_Store deleted file mode 100644 index dfa56955fa08c3bc9fdead2953429c686409ee08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO^ee&7=CBB+otU$qQZig92JUmvAXLm)++2lC`NV>S8B2eHV~7Nq%Beky?F5# z?Ah=CA$sx$=uh!fpZVyLZR^!tWZq%sd1vN%=i@1v=@1cX5B(h?lZXstj-?ukHOBjS zUa<|;QUx+GhC?|elv1!Ct*~{2RzNFo(G=j{Zk29QhaBo5pMJl|u@@yCdT}(c$H0@h zFtLF$xs)LV;Ai_$kxLK3xL)Aa=@@513}y<9kOFwiQ9qWVD%1xrqQN@0SWj_|3cbRL z!u4abpG#wx!A{5*<1ep+ufDj`EgE6mfW~WAd;&I`&ruQ;nBF)WDD{4OgDA}MX7d-@ z*eq?8D@L_e=gGWOd+zj;v6H*`Fl)Q%Gf@luz*BzL&HD@gNs>gTzUv)?!MJB$xu3+j z8^%Fe2t7IsV?P~I}^!dxzZ(`HLaPSMetZ)I} z;S?kpIcXdv@k_KWA{I=I=cIu8A&mMt&9A4`3TOo`t^)jgu#h?03TG0<(Sbrd0e~em z3xm(!5WRT*INB}6vlY%H%5Y-p@xj#0OubN;m>uI=f=KjKVGxD5&!@I diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index c4bec2479..6be2b7ab0 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -5,6 +5,7 @@ def index def new @my_task=Task.new + @path="create" end def create @@ -19,6 +20,7 @@ def create def edit @my_task= Task.find(params[:id].to_i) + @path="update" end def show diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 000000000..4a57cf079 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ActiveRecord::Base +end diff --git a/app/views/.DS_Store b/app/views/.DS_Store deleted file mode 100644 index c6df2e35bab2e7fece318f02456233d98a2c7639..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&2G~`5S~rb)=e))fK-Xg9zn_>6@j)l6ABUsq)0}s5Jkbp7Fl6=qu6OwMUi~z zrH{e?dmuRR0z3+*GPAp>(grR)AXLp*Gv9b;X082X&w2qsbVkW0fDZs3Dq+2W<_|(~ z(gmrxkrhN?<`_W<#gk0GjI??cjxl>6RJHH#1 z{h9wv>+H;r;ysm)d;X1wIxi!Yr^C6@gMF1Jdfd^YJSh%BJKw%a%6`wk*&U{bSlW&9 zbWas3R+%b~yfwOd{>Eg|-f1`G=JxiqDJNT7t)^_>y+57$$DViV&b;P#P3u5ojsS>t95#YJ{WMUG zbQn0SEMf#j*iuAWD%=r6*m4|~E-!FcS+wOK+~GsGCkuB%5$5SQzclF}0*h>!0cPMl z155VSr~UuY-_QT&i};QiUy c4OAl-ljI-<4l9c|g2F!nh6Xmwz&~Z+H?;T7YybcN diff --git a/app/views/layouts/.DS_Store b/app/views/layouts/.DS_Store deleted file mode 100644 index 4a1062db40a36c53ca80f9193d365fea988250d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKu}Z{15PhRp9N1i8VY#K%fq$?Zr(o?5Xih;P8WHW&`PuqrW)(vetSsbBn0dRC zdArFgGFbq&dAU9TRsfcCN4$ENo8Nbz*;RxjvRmBGy3sc7)LTGAO)m=6p#W^;5Q0*@1-pd5*4L@6p#X+ z3i$V-&>d^TF)=Y?E|?DEIL;Ep;t67HI3_Yfv!oJ}YVC+&NoT&ay4r9|Ogb!f z<~nU>YbO+o-I*^@4y%cZQa}n!71+<|%KQH*{fG1al%$yykOKco0b6V@wi~`u>#ehw x^Ilu%m-G)~ZIm-aD<(!O=EPg^(U-d7W8SX~$HbsBA9SLA1Y8%H6!;4T-T?+v9@qc? diff --git a/app/views/tasks/.DS_Store b/app/views/tasks/.DS_Store deleted file mode 100644 index 02a27cc80cb9c1e9cc87d70763a03b882db19e14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOG*Pl5PcORBxp2Cm$P&wc!MECAzO0*HOWAPiIHefcXJGn;9)#~w;5kmH(~OT zaU~*EQ1!a2`=wK_hv{hm(pyf>fi8d+U9r(-*kL-ZzGaP=(Lu4_7~%`{iA#r8V4_TVn>coT{nxqCETme^LLxH`}@9Oz~@%{aOgXLXUz!msU3P`g*?Dtqv zJX^PF)3Y|A-_X@`UJ-CbVZ)AM&efy%gl@)sq77miu?WZv%|8T81`n>luPX2bdzOHG diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..5912b0bd8 --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,15 @@ +<%= form_for @my_task, url: @path do |f| %> + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :description %> + <%= f.text_field :description %> + + + + <%= f.submit %> +<% end %> + + + diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 7b04075ff..30570883e 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,18 +1,10 @@

Tasks#edit

Update a Task

- - <%= form_for @my_task, url: update_path do |f| %> - <%= f.label :title %> - <%= f.text_field :title %> +<%= render partial: "form" %> - <%= f.label :description %> - <%= f.text_field :description %> + + + - <%= f.label :completed_at %> - <%= f.text_field :completed_at %> - <%= f.submit %> - - - <% end %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index dcbca6af9..9c4db372e 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,20 +1,5 @@

Create a new task

- - <%= form_for @my_task, url: {action: "create"} do |f| %> - <%= f.label :title %> - <%= f.text_field :title %> - - <%= f.label :description %> - <%= f.text_field :description %> - - <%= f.label :completed_at %> - <%= f.text_area :completed_at %> - - <%= f.submit %> - - - - <% end %> +<%= render partial: "form" %> + <%= f.submit %> <% end %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index d0b396883..2f5a9c584 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -7,6 +7,7 @@ Completed At + <% if @tasks %> <% @tasks.each do |task| %> <%= link_to(task.title, show_path(task.id))%> @@ -22,13 +23,16 @@ <%= button_to("delete", {action: "destroy", id: task.id}, method: :delete, data: {confirm: "are you sure?"})%> <% end %> + <%end%>
<%= button_to("Add a New Task", {action: "new" }, method: :get)%>
+ <%if @tasks%>
-

You've done <%=Task.all.length-Task.uncompleted_tasks.length %> things!

-

Next try to <%= Task.uncompleted_tasks.empty? == true ? "add another task" : Task.uncompleted_tasks.sample.title.downcase %>! +

You've done <%= @tasks.length-Task.uncompleted_tasks(@this_user_id).length %> things!

+

Next try to <%= Task.uncompleted_tasks(@this_user_id).empty? == true ? "add a task" : Task.uncompleted_tasks(@this_user_id).sample.title.downcase %>!

+ <%end%> diff --git a/config/routes.rb b/config/routes.rb index 7d2020366..1a49e2537 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,8 @@ root to: "tasks#index" get "/auth/:provider/callback" => "sessions#create" + + delete "sessions/destroy" get 'tasks/index' => 'tasks#index', as: 'index' diff --git a/db/migrate/20161023223134_add_user_i_dto_tasks.rb b/db/migrate/20161023223134_add_user_i_dto_tasks.rb new file mode 100644 index 000000000..464802f4e --- /dev/null +++ b/db/migrate/20161023223134_add_user_i_dto_tasks.rb @@ -0,0 +1,5 @@ +class AddUserIDtoTasks < ActiveRecord::Migration + def change + add_column :tasks, :user_id, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 582e73f5c..a1735be89 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: 20161018170210) do +ActiveRecord::Schema.define(version: 20161023223134) do create_table "tasks", force: :cascade do |t| t.string "title" @@ -19,6 +19,7 @@ t.datetime "completed_at" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "user_id" end create_table "users", force: :cascade do |t| From 02e6e9b0f988c1e70ba1d7393a42dc139a5f1294 Mon Sep 17 00:00:00 2001 From: Qlwentt Date: Wed, 26 Oct 2016 21:52:10 -0700 Subject: [PATCH 12/12] changes to controller --- app/controllers/tasks_controller.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 92f0524d1..89717f6a7 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -31,8 +31,10 @@ def edit end def show - - @tasks=Task.where(user_id: session[:user_id]) + @this_user_id=session[:user_id] + return redirect_to '/' unless @this_user_id + + @tasks=Task.where(user_id: @this_user_id) @my_task= Task.find(params[:id].to_i) # @my_task = nil @@ -80,6 +82,6 @@ def update def destroy Task.find(params[:id].to_i).destroy redirect_to '/' - end + end end