From 9d6e537647d6076faf3819ff084f4b53f9bbb544 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 21 Mar 2017 13:49:33 -0700 Subject: [PATCH 01/16] added files to gitignore from deafault rails gitignore --- .gitignore | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.gitignore b/.gitignore index 28f484983..5d3ee7658 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,25 @@ build/ # unless supporting rvm < 1.11.0 or doing something fancy, ignore this: .rvmrc + +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore Byebug command history file. +.byebug_history From 1fa877da8b80cdee240f19f618125c0ff1416982 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 21 Mar 2017 16:07:32 -0700 Subject: [PATCH 02/16] added gem awesome print --- Gemfile | 53 ++++++ Gemfile.lock | 174 ++++++++++++++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/javascripts/cable.js | 13 ++ app/assets/javascripts/channels/.keep | 0 app/assets/javascripts/tasks.coffee | 3 + app/assets/stylesheets/application.css | 15 ++ app/assets/stylesheets/tasks.scss | 3 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 3 + app/controllers/concerns/.keep | 0 app/controllers/tasks_controller.rb | 10 + app/helpers/application_helper.rb | 2 + app/helpers/tasks_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + app/views/tasks/index.html.erb | 9 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 34 ++++ bin/spring | 17 ++ bin/update | 29 +++ config.ru | 5 + config/application.rb | 15 ++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 25 +++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 86 +++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 6 + config/initializers/assets.rb | 11 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/new_framework_defaults.rb | 24 +++ config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/puma.rb | 47 +++++ config/routes.rb | 5 + config/secrets.yml | 22 +++ config/spring.rb | 6 + 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/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/controllers/tasks_controller_test.rb | 9 + test/fixtures/.keep | 0 test/fixtures/files/.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 78 files changed, 1130 insertions(+) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep 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/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb 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/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100644 app/views/tasks/index.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 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml 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/application_controller_renderer.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/new_framework_defaults.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/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb 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/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/controllers/tasks_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.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/Gemfile b/Gemfile new file mode 100644 index 000000000..568a39f6a --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + +gem 'awesome_print' +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.2' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# 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.2' +# 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 navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# 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', platform: :mri +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..559a4476d --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,174 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + arel (7.1.4) + builder (3.2.3) + byebug (9.0.6) + coffee-rails (4.2.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.2.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + globalid (0.3.7) + activesupport (>= 4.1.0) + i18n (0.8.1) + jbuilder (2.6.3) + activesupport (>= 3.0.0, < 5.2) + multi_json (~> 1.2) + jquery-rails (4.2.2) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + multi_json (1.12.1) + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + puma (3.8.2) + rack (2.0.1) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + sass (3.4.23) + 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) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + 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.13) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.7) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.1.9) + execjs (>= 0.3.0, < 3) + web-console (3.4.0) + actionview (>= 5.0) + activemodel (>= 5.0) + debug_inspector + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + coffee-rails (~> 4.2) + jbuilder (~> 2.5) + jquery-rails + listen (~> 3.0.5) + puma (~> 3.0) + rails (~> 5.0.2) + sass-rails (~> 5.0) + spring + spring-watcher-listen (~> 2.0.0) + sqlite3 + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.14.6 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /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_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css 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..b12018d09 --- /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. JavaScript code in this file should be added after the last require_* statement. +// +// 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/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 000000000..71ee1e66d --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the rails generate channel command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 000000000..e69de29bb 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..0ebd7fe82 --- /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 other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * 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/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..1c07694e9 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + 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..2b917a7b7 --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,10 @@ +class TasksController < ApplicationController + def index + @tasks = [ + { do: "walk the dog" }, + { do: "homework" }, + { do: "clean dishes" }, + { do: "see a movie" } + ] + 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/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end 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..be7a9f069 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + TaskList + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 000000000..716495852 --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,9 @@ +

Tasks#index

+

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

+ +

To Do List

+ 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..5badb2fde --- /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', __dir__) +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..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +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') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/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' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..25ee0e0e3 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,15 @@ +require_relative 'boot' + +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 TaskList + 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. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 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..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# 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..6f7197045 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +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. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = 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 + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..29a40f265 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,86 @@ +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 + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = 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 + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # 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 + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # 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 = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "TaskList_#{Rails.env}" + config.action_mailer.perform_caching = false + + # 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 + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # 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..30587ef6d --- /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 public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + '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 + config.action_mailer.perform_caching = 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 + + # 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/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) 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..5a6a32d37 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +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/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..671abb69a --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,24 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Enable per-form CSRF tokens. Previous versions had false. +Rails.application.config.action_controller.per_form_csrf_tokens = true + +# Enable origin-checking CSRF mitigation. Previous versions had false. +Rails.application.config.action_controller.forgery_protection_origin_check = true + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 000000000..80e157130 --- /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: '_TaskList_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /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] +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/puma.rb b/config/puma.rb new file mode 100644 index 000000000..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum, this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..ecfb504d4 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,5 @@ +Rails.application.routes.draw do + get '/tasks', to: 'tasks#index' + + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..83ecf334c --- /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 `rails 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: e402bafdda6d70c969a9c97801155115dee6d500435177df51f70b656ae63085426f239ea9992c0dbb92c4194d8ad56576364ab2f4d38c79d3f6de3b1de787de + +test: + secret_key_base: ffb2027c9fefc4e85fde90416d6c858c899e53b8ff0640ce00e3a902f71f6d8bd6681ea76eeef847975a44e9b1a701f3cde9c2a761964725e3caf276071f8284 + +# 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/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..1beea2acc --- /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 rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.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/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 000000000..e69de29bb 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..67683c951 --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class TasksControllerTest < ActionDispatch::IntegrationTest + test "should get index" do + get tasks_index_url + 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/fixtures/files/.keep b/test/fixtures/files/.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 bae8b91c2fc918f5a35380fdb50e95af8b7ac547 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 21 Mar 2017 16:11:25 -0700 Subject: [PATCH 03/16] baseline and wave 1 --- Gemfile.lock | 2 ++ app/controllers/tasks_controller.rb | 7 +----- app/models/task.rb | 2 ++ app/views/tasks/index.html.erb | 11 +++++---- config/routes.rb | 1 - db/migrate/20170321210920_create_tasks.rb | 11 +++++++++ .../20170321211755_add_columns_to_tasks.rb | 5 ++++ db/schema.rb | 24 +++++++++++++++++++ test/fixtures/tasks.yml | 11 +++++++++ test/models/task_test.rb | 7 ++++++ 10 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 app/models/task.rb create mode 100644 db/migrate/20170321210920_create_tasks.rb create mode 100644 db/migrate/20170321211755_add_columns_to_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/Gemfile.lock b/Gemfile.lock index 559a4476d..d0a32a07d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) arel (7.1.4) + awesome_print (1.7.0) builder (3.2.3) byebug (9.0.6) coffee-rails (4.2.1) @@ -154,6 +155,7 @@ PLATFORMS ruby DEPENDENCIES + awesome_print byebug coffee-rails (~> 4.2) jbuilder (~> 2.5) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 2b917a7b7..5501f0bb8 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,10 +1,5 @@ class TasksController < ApplicationController def index - @tasks = [ - { do: "walk the dog" }, - { do: "homework" }, - { do: "clean dishes" }, - { do: "see a movie" } - ] + @tasks = Task.all end end diff --git a/app/models/task.rb b/app/models/task.rb new file mode 100644 index 000000000..3c2342421 --- /dev/null +++ b/app/models/task.rb @@ -0,0 +1,2 @@ +class Task < ApplicationRecord +end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 716495852..0a34180a4 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,9 +1,10 @@ -

Tasks#index

-

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

- -

To Do List

+

Awesome To Do List

    <% @tasks.each do |task| %> -
  • <%= task[:do] %>
    • +

    <%= task.name %>

    +
  • ID: <%= task.id %>
    • +
  • Description: <%= task.description %>
    • +
  • Completion Date: <%= task.completion_date %>
    • +
  • Completed: <%= task.completed %>
    • <% end %>
diff --git a/config/routes.rb b/config/routes.rb index ecfb504d4..bcc866ea6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,4 @@ Rails.application.routes.draw do get '/tasks', to: 'tasks#index' - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20170321210920_create_tasks.rb b/db/migrate/20170321210920_create_tasks.rb new file mode 100644 index 000000000..b8bd9b613 --- /dev/null +++ b/db/migrate/20170321210920_create_tasks.rb @@ -0,0 +1,11 @@ +class CreateTasks < ActiveRecord::Migration[5.0] + def change + create_table :tasks do |t| + t.string :name + t.text :description + t.datetime :completion_date + + t.timestamps + end + end +end diff --git a/db/migrate/20170321211755_add_columns_to_tasks.rb b/db/migrate/20170321211755_add_columns_to_tasks.rb new file mode 100644 index 000000000..9c57615bc --- /dev/null +++ b/db/migrate/20170321211755_add_columns_to_tasks.rb @@ -0,0 +1,5 @@ +class AddColumnsToTasks < ActiveRecord::Migration[5.0] + def change + add_column :tasks, :completed, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..298db928e --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,24 @@ +# 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: 20170321211755) do + + create_table "tasks", force: :cascade do |t| + t.string "name" + t.text "description" + t.datetime "completion_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "completed" + end + +end diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 000000000..810f04abf --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + description: MyText + completion_date: 2017-03-21 14:09:20 + +two: + name: MyString + description: MyText + completion_date: 2017-03-21 14:09:20 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 35fa527a11ce823c033edd6618624a04739dfb30 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Wed, 22 Mar 2017 12:37:19 -0700 Subject: [PATCH 04/16] added show task --- app/controllers/tasks_controller.rb | 4 ++++ app/views/tasks/index.html.erb | 6 +----- app/views/tasks/show.html.erb | 12 ++++++++++++ config/routes.rb | 2 ++ 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 app/views/tasks/show.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 5501f0bb8..8fdbfd093 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -2,4 +2,8 @@ class TasksController < ApplicationController def index @tasks = Task.all end + + def show + @result_task = Task.find(params[:id]) + end end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 0a34180a4..6eda676f0 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,10 +1,6 @@

Awesome To Do List

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

    <%= task.name %>

    -
  • ID: <%= task.id %>
    • -
  • Description: <%= task.description %>
    • -
  • Completion Date: <%= task.completion_date %>
    • -
  • Completed: <%= task.completed %>
    • +
  • Task <%= task.id %>: <%= link_to task.name, task_path(task.id) %>
    • <% end %>
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb new file mode 100644 index 000000000..adcce2198 --- /dev/null +++ b/app/views/tasks/show.html.erb @@ -0,0 +1,12 @@ +

Task Show

+ + + +

Current Task:

+
    +
  • Name: <%= @result_task.name %>
    • +
  • Description: <%= @result_task.description %>
    • +
  • ID: <%= @result_task.id %>
    • +
  • Completion Date: <%= @result_task.completion_date %>
    • +
  • Completed: <%= @result_task.completed %>
    • +
diff --git a/config/routes.rb b/config/routes.rb index bcc866ea6..70579d53d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do get '/tasks', to: 'tasks#index' + + get '/tasks/:id', to: 'tasks#show', as: 'task' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 7c4ca70a8c406d4e9c92b6b6342cba2dc22ec98a Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Wed, 22 Mar 2017 13:03:39 -0700 Subject: [PATCH 05/16] added new task --- app/controllers/tasks_controller.rb | 3 +++ app/views/tasks/new.html.erb | 21 +++++++++++++++++++++ config/routes.rb | 3 ++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 app/views/tasks/new.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 8fdbfd093..5a1be6098 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -6,4 +6,7 @@ def index def show @result_task = Task.find(params[:id]) end + + def new + end end diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb new file mode 100644 index 000000000..86b423f83 --- /dev/null +++ b/app/views/tasks/new.html.erb @@ -0,0 +1,21 @@ +

Add New Task

+ +
+ + + + + + + + + + + + + + + + + +
diff --git a/config/routes.rb b/config/routes.rb index 70579d53d..3986427f6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ Rails.application.routes.draw do - get '/tasks', to: 'tasks#index' + get "/tasks/new", to: "tasks#new", as: "new_task" + get '/tasks', to: 'tasks#index' get '/tasks/:id', to: 'tasks#show', as: 'task' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 5cb24bc920b5ef748425fdc6af4a18158b46ea53 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Wed, 22 Mar 2017 14:50:03 -0700 Subject: [PATCH 06/16] added create task --- app/controllers/tasks_controller.rb | 11 +++++++++++ app/views/tasks/new.html.erb | 2 +- config/routes.rb | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 5a1be6098..4fc6e9db3 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -9,4 +9,15 @@ def show def new end + + def create + task = Task.new + task.name = params[:name] + task.description = params[:description] + task.completion_date = params[:completion_date] + task.completed = params[:completed] + if task.save + redirect_to tasks_path + end + end end diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 86b423f83..ab80d16d6 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -15,7 +15,7 @@ - + diff --git a/config/routes.rb b/config/routes.rb index 3986427f6..73449fd9e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do get "/tasks/new", to: "tasks#new", as: "new_task" + post "/tasks", to: "tasks#create" get '/tasks', to: 'tasks#index' get '/tasks/:id', to: 'tasks#show', as: 'task' From a1a0ad8d6be2c7d3de01fa59a9d522e67581956a Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Wed, 22 Mar 2017 15:33:07 -0700 Subject: [PATCH 07/16] rewrote new and create to make it more rails happy --- app/controllers/tasks_controller.rb | 18 ++++++++++-------- app/views/tasks/new.html.erb | 25 +++++++++++-------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 4fc6e9db3..f0d6e5203 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -8,16 +8,18 @@ def show end def new + @task = Task.new end def create - task = Task.new - task.name = params[:name] - task.description = params[:description] - task.completion_date = params[:completion_date] - task.completed = params[:completed] - if task.save - redirect_to tasks_path - end + task = Task.create task_params + + redirect_to tasks_path + end + + private + + def task_params + params.require(:task).permit(:name, :description, :completion_date, :completed) end end diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index ab80d16d6..16b34891a 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,21 +1,18 @@

Add New Task

-
- - +<%= form_for @task do |f| %> + <%= f.label :name, class: "name" %> + <%= f.text_field :name %> + <%= f.label :description %> + <%= f.text_area :description, size: "50x12" %> - - + <%= f.label :completion_date %> + <%= f.datetime_field :completion_date %> - - + <%= f.label :completed %> + <%= f.check_box :completed %> - - + <%= f.submit "Add Task" %> - - - - -
+<% end %> From 46801ebfd71ef865b9f7e0ee5a6fd3ab1e844c10 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Thu, 23 Mar 2017 15:21:04 -0700 Subject: [PATCH 08/16] added fonts and background --- app/assets/stylesheets/application.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 0ebd7fe82..73d7cd464 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,10 @@ *= require_tree . *= require_self */ +@import url('https://fonts.googleapis.com/css?family=Cabin+Sketch|Fredericka+the+Great|Jacques+Francois+Shadow|Londrina+Sketch|Love+Ya+Like+A+Sister|Poiret+One|Raleway+Dots|Rock+Salt|Special+Elite'); + +body { + background: #E8CBC0; /* fallback for old browsers */ + background: -webkit-linear-gradient(to left, #E8CBC0 , #636FA4); /* Chrome 10-25, Safari 5.1-6 */ + background: linear-gradient(to left, #E8CBC0 , #636FA4); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ +} From 30dc46334891c058040ec89115e6400c470747f6 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Thu, 23 Mar 2017 15:22:06 -0700 Subject: [PATCH 09/16] removed image, changed how completed is displayed --- app/views/tasks/show.html.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index adcce2198..e57a8252c 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,12 +1,14 @@ -

Task Show

- - -

Current Task:

  • Name: <%= @result_task.name %>
  • Description: <%= @result_task.description %>
    • -
  • ID: <%= @result_task.id %>
  • Completion Date: <%= @result_task.completion_date %>
    • -
  • Completed: <%= @result_task.completed %>
    • +
  • Completed: + <% if @result_task.completed == false %> + Not yet! + <% else %> + You are done! + <% end %> +
+<%= link_to "Task list", tasks_path %> From 4e7bb2e0439b85af93e6359bca1dfc3d0da1457f Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Thu, 23 Mar 2017 15:54:52 -0700 Subject: [PATCH 10/16] added edit task --- app/controllers/tasks_controller.rb | 4 ++++ app/views/tasks/edit.html.erb | 18 ++++++++++++++++++ config/routes.rb | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 app/views/tasks/edit.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index f0d6e5203..03a208f28 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -7,6 +7,10 @@ def show @result_task = Task.find(params[:id]) end + def edit + @task = Task.find(params[:id]) + end + def new @task = Task.new end diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb new file mode 100644 index 000000000..b9ee003ee --- /dev/null +++ b/app/views/tasks/edit.html.erb @@ -0,0 +1,18 @@ +

Edit a Task

+ +<%= form_for @task do |f| %> + + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :description %> + <%= f.text_area :description, size: "50x12" %> + + <%= f.label :completion_date %> + <%= f.datetime_field :completion_date %> + + <%= f.label :completed %> + <%= f.check_box :completed %> + + <%= f.submit "Edit a Task" %> +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 73449fd9e..f291588be 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,6 @@ get '/tasks', to: 'tasks#index' get '/tasks/:id', to: 'tasks#show', as: 'task' - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + get "/tasks/:id/edit", to: "tasks#edit", as: "edit_task" end From e7014c0ef8428dc18cec879d7c71869d4d913b6f Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Fri, 24 Mar 2017 15:51:26 -0700 Subject: [PATCH 11/16] improved edit task, added delete task, asking user for confirmation, added button to mark the task complete --- app/controllers/tasks_controller.rb | 31 +++++++++++++++++++++++++++-- app/views/tasks/edit.html.erb | 4 ++-- app/views/tasks/index.html.erb | 5 ++++- app/views/tasks/new.html.erb | 2 +- app/views/tasks/show.html.erb | 25 +++++++++++++++-------- 5 files changed, 53 insertions(+), 14 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 03a208f28..317b06ede 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -11,14 +11,41 @@ def edit @task = Task.find(params[:id]) end + def update + task = Task.find(params[:id]) + if task.update(task_params) + redirect_to task_path + end + end + + def completed + task = Task.find(params[:id]) + if task.completed + task.completed = false + else + task.completion_date = Time.now + task.completed = true + end + + if task.save + redirect_to task_path + end + end + + def destroy + Task.destroy(params[:id]) + redirect_to tasks_path + end + def new @task = Task.new end def create task = Task.create task_params - - redirect_to tasks_path + unless task.id == nil + redirect_to tasks_path + end end private diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index b9ee003ee..c3f9123fc 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,6 +1,6 @@

Edit a Task

-<%= form_for @task do |f| %> +<%= form_for @task, method: :put do |f| %> <%= f.label :name %> <%= f.text_field :name %> @@ -9,7 +9,7 @@ <%= f.text_area :description, size: "50x12" %> <%= f.label :completion_date %> - <%= f.datetime_field :completion_date %> + <%= f.date_field :completion_date %> <%= f.label :completed %> <%= f.check_box :completed %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 6eda676f0..fa65d0d38 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,6 +1,9 @@

Awesome To Do List

    <% @tasks.each do |task| %> -
  • Task <%= task.id %>: <%= link_to task.name, task_path(task.id) %>
    • +
  • <%= button_to "Completed", completed_task_path(task.id), method: :patch, class: "button" %>
    • +
  • Task <%= task.id %>: <%= link_to task.name, task_path(task.id) %>
    • <% end %>
+ +<%= link_to "Add Task", new_task_path %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 16b34891a..fa16629fe 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -8,7 +8,7 @@ <%= f.text_area :description, size: "50x12" %> <%= f.label :completion_date %> - <%= f.datetime_field :completion_date %> + <%= f.date_field :completion_date %> <%= f.label :completed %> <%= f.check_box :completed %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index e57a8252c..d049fafbc 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -2,13 +2,22 @@
  • Name: <%= @result_task.name %>
  • Description: <%= @result_task.description %>
    • -
  • Completion Date: <%= @result_task.completion_date %>
    • -
  • Completed: - <% if @result_task.completed == false %> - Not yet! - <% else %> - You are done! - <% end %> -
    • + +
  • Completed: <%= @result_task.completion_date %>
    • +
  • + <% if @result_task.completed == false %> + Not yet! + <% else %> + You are done! + <% end %> + <%= button_to "Undo Completed", completed_task_path(@result_task.id), method: :patch %> +
+ <%= link_to "Task list", tasks_path %> + +<%= link_to "Edit Task", edit_task_path(@result_task.id) %> + +<%= link_to "Delete Task", delete_task_path(@result_task.id), + data: {confirm: "Are you sure you want to delete this task?"}, + method: :delete %> From e38039ee4b6520fb3d11d9c463b89cca8e1ea437 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Sat, 25 Mar 2017 18:16:12 -0700 Subject: [PATCH 12/16] added button that toggles between complete and incomplete task, and put it in a partial that is shared between index and show.html.erb, added root --- app/assets/stylesheets/application.css | 6 ++++-- app/models/task.rb | 5 +++++ app/views/tasks/_form.html.erb | 13 +++++++++++++ app/views/tasks/_toggle-button.html.erb | 5 +++++ app/views/tasks/edit.html.erb | 17 +---------------- app/views/tasks/index.html.erb | 4 ++-- app/views/tasks/new.html.erb | 17 +---------------- app/views/tasks/show.html.erb | 9 ++++----- config/routes.rb | 7 +++++++ 9 files changed, 42 insertions(+), 41 deletions(-) create mode 100644 app/views/tasks/_form.html.erb create mode 100644 app/views/tasks/_toggle-button.html.erb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 73d7cd464..0b00c0cbb 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -16,7 +16,9 @@ @import url('https://fonts.googleapis.com/css?family=Cabin+Sketch|Fredericka+the+Great|Jacques+Francois+Shadow|Londrina+Sketch|Love+Ya+Like+A+Sister|Poiret+One|Raleway+Dots|Rock+Salt|Special+Elite'); body { - background: #E8CBC0; /* fallback for old browsers */ - background: -webkit-linear-gradient(to left, #E8CBC0 , #636FA4); /* Chrome 10-25, Safari 5.1-6 */ background: linear-gradient(to left, #E8CBC0 , #636FA4); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ } + +.toggle-button { + display: inline-block; +} diff --git a/app/models/task.rb b/app/models/task.rb index 3c2342421..5f3dab3fe 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,2 +1,7 @@ class Task < ApplicationRecord + after_initialize :init + + def init + self.completed ||= false + end end diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..eaef27204 --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,13 @@ +<%= form_for @task, method: form_method do |f| %> + + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :description %> + <%= f.text_area :description, size: "50x12" %> + + <%= f.label :completion_date %> + <%= f.date_field :completion_date %> + + <%= f.submit action_name %> +<% end %> diff --git a/app/views/tasks/_toggle-button.html.erb b/app/views/tasks/_toggle-button.html.erb new file mode 100644 index 000000000..df50d13e3 --- /dev/null +++ b/app/views/tasks/_toggle-button.html.erb @@ -0,0 +1,5 @@ +<% if task.completed %> + <%= button_to "Mark Incomplete", completed_task_path(task.id), method: :patch, form_class: "toggle-button" %> + <% else %> + <%= button_to "Mark Complete", completed_task_path(task.id), method: :patch, form_class: "toggle-button" %> +<% end %> diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index c3f9123fc..89f93a5b9 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,18 +1,3 @@

Edit a Task

-<%= form_for @task, method: :put do |f| %> - - <%= f.label :name %> - <%= f.text_field :name %> - - <%= f.label :description %> - <%= f.text_area :description, size: "50x12" %> - - <%= f.label :completion_date %> - <%= f.date_field :completion_date %> - - <%= f.label :completed %> - <%= f.check_box :completed %> - - <%= f.submit "Edit a Task" %> -<% end %> +<%= render partial: "form", locals: { action_name: "Edit Task", form_method: :put } %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index fa65d0d38..8a2b47913 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,8 +1,8 @@

Awesome To Do List

    <% @tasks.each do |task| %> -
  • <%= button_to "Completed", completed_task_path(task.id), method: :patch, class: "button" %>
    • -
  • Task <%= task.id %>: <%= link_to task.name, task_path(task.id) %>
    • +
  • <%= render partial: "toggle-button", locals: { task: task } %> + Task <%= task.id %>: <%= link_to task.name, task_path(task.id) %>
    • <% end %>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index fa16629fe..9069e4826 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,18 +1,3 @@

Add New Task

-<%= form_for @task do |f| %> - <%= f.label :name, class: "name" %> - <%= f.text_field :name %> - - <%= f.label :description %> - <%= f.text_area :description, size: "50x12" %> - - <%= f.label :completion_date %> - <%= f.date_field :completion_date %> - - <%= f.label :completed %> - <%= f.check_box :completed %> - - <%= f.submit "Add Task" %> - -<% end %> +<%= render partial: "form", locals: { action_name: "Add Task", form_method: :post } %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index d049fafbc..daa48c774 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,16 +1,15 @@

Current Task:

    -
  • Name: <%= @result_task.name %>
    • -
  • Description: <%= @result_task.description %>
    • - -
  • Completed: <%= @result_task.completion_date %>
    • +
  • Name: <%= @result_task.name %>
    • +
  • Description: <%= @result_task.description %>
    • +
  • Completion Date: <%= @result_task.completion_date if @result_task.completed %>
  • <% if @result_task.completed == false %> Not yet! <% else %> You are done! <% end %> - <%= button_to "Undo Completed", completed_task_path(@result_task.id), method: :patch %> + <%= render partial: "toggle-button", locals: { task: @result_task } %>
diff --git a/config/routes.rb b/config/routes.rb index f291588be..4f6193304 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,16 @@ Rails.application.routes.draw do + root "tasks#index" + get "/tasks/new", to: "tasks#new", as: "new_task" post "/tasks", to: "tasks#create" get '/tasks', to: 'tasks#index' get '/tasks/:id', to: 'tasks#show', as: 'task' + patch "tasks/:id/completed", to: "tasks#completed", as: "completed_task" + get "/tasks/:id/edit", to: "tasks#edit", as: "edit_task" + put "tasks/:id", to: "tasks#update" + + delete "tasks/:id", to: "tasks#destroy", as: "delete_task" end From ec50dab989d7c6a3d6c47fb2d9acdd73c710fdda Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Sun, 26 Mar 2017 16:47:20 -0700 Subject: [PATCH 13/16] Changed datatype of completion date from datetime to date --- .../20170326011804_change_datatype_of_completion_date.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20170326011804_change_datatype_of_completion_date.rb diff --git a/db/migrate/20170326011804_change_datatype_of_completion_date.rb b/db/migrate/20170326011804_change_datatype_of_completion_date.rb new file mode 100644 index 000000000..7dfbeb005 --- /dev/null +++ b/db/migrate/20170326011804_change_datatype_of_completion_date.rb @@ -0,0 +1,5 @@ +class ChangeDatatypeOfCompletionDate < ActiveRecord::Migration[5.0] + def change + change_column(:tasks, :completion_date, :date) + end +end diff --git a/db/schema.rb b/db/schema.rb index 298db928e..70b5c7923 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,12 +10,12 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170321211755) do +ActiveRecord::Schema.define(version: 20170326011804) do create_table "tasks", force: :cascade do |t| t.string "name" t.text "description" - t.datetime "completion_date" + t.date "completion_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "completed" From 23ceff61879374c32d30161bb768ef9581e3c6c5 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Sun, 26 Mar 2017 21:01:54 -0700 Subject: [PATCH 14/16] added header and styling for forms, deleted completion date from new task form, added classes to elements, changed lsiting of tasks in index page from id to actual listing in the list --- app/assets/stylesheets/application.css | 58 ++++++++++++++++++++++++++ app/views/layouts/application.html.erb | 17 +++++++- app/views/tasks/_form.html.erb | 24 ++++++----- app/views/tasks/index.html.erb | 18 ++++---- app/views/tasks/new.html.erb | 2 +- app/views/tasks/show.html.erb | 13 +++--- 6 files changed, 106 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 0b00c0cbb..0ac6fef51 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -17,8 +17,66 @@ body { background: linear-gradient(to left, #E8CBC0 , #636FA4); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ + font-family: "Fredericka the Great"; +} + +header { + /*background-color: #C9B1FF;*/ + box-sizing: border-box; + padding: 0 3%; + position: fixed; + width: 100%; + top: 0; + z-index: 100; + display: flex; + justify-content: space-between; +} + +header li { + display: inline; + font-size: 1.5em; +} + +body { + margin: 0; +} + +main { + margin-top: 72px; + text-align: center; +} + +h1 { + font-weight: normal; +} + +a { + text-decoration: none; + font-weight: normal; + padding-left: 10px; +} + +.button_links { + padding: 0 1%; +} + +a:visited { + color: blue; } .toggle-button { display: inline-block; } + +ul { + list-style: none; +} + +.new_task, div { + display: inline-block; + text-align: left; +} + +.new_task li { + padding: 1% 1%; +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index be7a9f069..47b1e75dd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,21 @@ - <%= yield %> +
+

<%= link_to "Awesome Task List", tasks_path %>

+ + +
+ +
+ <%= yield %> +
diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index eaef27204..474755cac 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,13 +1,17 @@ <%= form_for @task, method: form_method do |f| %> +
    +
  • + <%= f.label :task %> + <%= f.text_field :name %> +
    • - <%= f.label :name %> - <%= f.text_field :name %> - - <%= f.label :description %> - <%= f.text_area :description, size: "50x12" %> - - <%= f.label :completion_date %> - <%= f.date_field :completion_date %> - - <%= f.submit action_name %> +
  • + <%= f.label :description, class: :description_label %> + <%= f.text_area :description, size: "50x12" %> +
    • + +
  • + <%= f.submit action_name %> +
    • +
<% end %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 8a2b47913..2362f1117 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,9 +1,11 @@ -

Awesome To Do List

-
    - <% @tasks.each do |task| %> -
  • <%= render partial: "toggle-button", locals: { task: task } %> - Task <%= task.id %>: <%= link_to task.name, task_path(task.id) %>
    • - <% end %> -
+

To Do List

+
+
    + <% @tasks.each_with_index do |task, index| %> +
  • <%= render partial: "toggle-button", locals: { task: task } %> + Task <%= index + 1 %>: <%= link_to task.name, task_path(task.id) %>
    • + <% end %> +
+
-<%= link_to "Add Task", new_task_path %> +
<%= link_to "Add Task", new_task_path %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 9069e4826..fc1e151d9 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,3 +1,3 @@ -

Add New Task

+

Add New Task:

<%= render partial: "form", locals: { action_name: "Add Task", form_method: :post } %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index daa48c774..8b24f72dc 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,6 +1,7 @@ -

Current Task:

-
    -
  • Name: <%= @result_task.name %>
    • +

    Current Task:

    + +
      +
    • Task: <%= @result_task.name %>
    • Description: <%= @result_task.description %>
    • Completion Date: <%= @result_task.completion_date if @result_task.completed %>
    • @@ -13,10 +14,10 @@
    -<%= link_to "Task list", tasks_path %> +<%= link_to "Task list", tasks_path, class: :button_links %> -<%= link_to "Edit Task", edit_task_path(@result_task.id) %> +<%= link_to "Edit Task", edit_task_path(@result_task.id), class: :button_links %> <%= link_to "Delete Task", delete_task_path(@result_task.id), data: {confirm: "Are you sure you want to delete this task?"}, - method: :delete %> + method: :delete, class: :button_links %> From 30c5ae69a8f0713c1c03bad5ee119bb4bb149202 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Wed, 5 Apr 2017 14:17:11 -0700 Subject: [PATCH 15/16] added testing sentence in readme file --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 399dc287c..4361e5749 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +We are learning about branching! + # Task List Let's build a Task List in Rails! We will solve the problem of tracking tasks in a web application. This project will enable us to keep track of and persist, add, edit and remove tasks. This is an individual Stage 1 project. From 6cecd8087344cba05683e77fe6869a8a6fc0ec5c Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Wed, 5 Apr 2017 14:32:29 -0700 Subject: [PATCH 16/16] added sentence to readme file again for learning purposes --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4361e5749..6a044100c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ We are learning about branching! +Another testing sentence! # Task List Let's build a Task List in Rails! We will solve the problem of tracking tasks in a web application. This project will enable us to keep track of and persist, add, edit and remove tasks. This is an individual Stage 1 project.