From b9fa534d500e5fc048d8e49b99d0960787fd7327 Mon Sep 17 00:00:00 2001 From: murog Date: Mon, 18 Sep 2017 15:27:29 -0700 Subject: [PATCH 01/19] set up rails app and Tasks controller --- .gitignore | 46 ++-- Gemfile | 54 +++++ Gemfile.lock | 196 ++++++++++++++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 15 ++ 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 | 22 ++ 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/create.html.erb | 2 + 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 | 38 ++++ bin/spring | 17 ++ bin/update | 29 +++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 18 ++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 ++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 +++++ config/environments/production.rb | 91 ++++++++ config/environments/test.rb | 42 ++++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 ++ 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/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 56 +++++ config/routes.rb | 17 ++ config/secrets.yml | 32 +++ config/spring.rb | 6 + db/schema.rb | 18 ++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + 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 | 1 + test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/controllers/tasks_controller_test.rb | 39 ++++ 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/system/.keep | 0 test/test_helper.rb | 9 + tmp/.keep | 0 vendor/.keep | 0 88 files changed, 1340 insertions(+), 31 deletions(-) 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/create.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 100755 bin/update create mode 100755 bin/yarn 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/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/schema.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 package.json 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/application_system_test_case.rb 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/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore index 28f484983..82701fedc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,19 @@ -*.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 all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep -## Environment normalisation: -/.bundle/ -/vendor/bundle -/lib/bundler/man/ +/node_modules +/yarn-error.log -# 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 +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..504af8615 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +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 + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.4' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.2' +# 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', platforms: [:mri, :mingw, :x64_mingw] + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '~> 2.13' + gem 'selenium-webdriver' +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', '< 3.2' + # 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..457ab61d1 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,196 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.4) + activesupport (= 5.1.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.4) + activesupport (= 5.1.4) + globalid (>= 0.3.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + arel (8.0.0) + bindex (0.5.0) + builder (3.2.3) + byebug (9.1.0) + capybara (2.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.7.1) + ffi (~> 1.0, >= 1.0.11) + coffee-rails (4.2.2) + coffee-script (>= 2.2.0) + railties (>= 4.0.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + erubi (1.6.1) + execjs (2.7.0) + ffi (1.9.18) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.6) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.6) + 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_mime (0.1.4) + mini_portile2 (2.2.0) + minitest (5.10.3) + multi_json (1.12.2) + nio4r (2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + pg (0.21.0) + public_suffix (3.0.0) + puma (3.10.0) + rack (2.0.3) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.1.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby_dep (1.5.0) + rubyzip (1.2.1) + sass (3.5.1) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + 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) + selenium-webdriver (3.5.2) + childprocess (~> 0.5) + rubyzip (~> 1.0) + spring (2.0.2) + 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.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.3) + thread_safe (~> 0.1) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.5.1) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + xpath (2.1.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + capybara (~> 2.13) + coffee-rails (~> 4.2) + jbuilder (~> 2.5) + listen (>= 3.0.5, < 3.2) + pg (~> 0.18) + puma (~> 3.7) + rails (~> 5.1.4) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.16.0.pre.2 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..46b20359f --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,15 @@ +// 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, 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 rails-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..739aa5f02 --- /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..d05ea0f51 --- /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, 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..e65a296fa --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,22 @@ +class TasksController < ApplicationController + def index + end + + def show + end + + def edit + end + + def update + end + + def new + end + + def create + 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/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/create.html.erb b/app/views/tasks/create.html.erb new file mode 100644 index 000000000..fcad439c4 --- /dev/null +++ b/app/views/tasks/create.html.erb @@ -0,0 +1,2 @@ +

Tasks#create

+

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

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..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..78c4e861d --- /dev/null +++ b/bin/setup @@ -0,0 +1,38 @@ +#!/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') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + + # 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/bin/yarn b/bin/yarn new file mode 100755 index 000000000..c2bacef83 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +VENDOR_PATH = File.expand_path('..', __dir__) +Dir.chdir(VENDOR_PATH) do + begin + exec "yarnpkg #{ARGV.join(" ")}" + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +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..16136d34f --- /dev/null +++ b/config/application.rb @@ -0,0 +1,18 @@ +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 + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # 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..cc73740fa --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: TaskList_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..40243c8b5 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: TaskList_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: TaskList + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# 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: TaskList_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: TaskList_production + username: TaskList + password: <%= ENV['TASKLIST_DATABASE_PASSWORD'] %> 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..5187e2218 --- /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=#{2.days.seconds.to_i}" + } + 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..fcd7d8b14 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,91 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = 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..8e5cbde53 --- /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=#{1.hour.seconds.to_i}" + } + + # 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..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..4b828e80c --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# 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 +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) 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/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..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# 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. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# 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..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# 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 } +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! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# 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 the `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, as 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..cfb1d25f2 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,17 @@ +Rails.application.routes.draw do + get 'tasks/index' + + get 'tasks/show' + + get 'tasks/edit' + + get 'tasks/update' + + get 'tasks/new' + + get 'tasks/create' + + get 'tasks/destroy' + + # 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..c05b5696a --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# 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. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: c90a4f555e6de3dec14c2baa274978d6c56c28b9f82c15f2d1ace7cb593c1e6873ae0ab9bdfccaa4f53ef9cf064c9b75c5e2c3aab90bedc6846fd9af07d03bca + +test: + secret_key_base: 360fa1fe34c4521fe66eece7ba648ee8cb9e3f41e842545e1d249fbb5e7eb6d1bb37146c356174a1bc3d56ddcbc6f852da39ae669b6b77444601d5ef6a8ff584 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +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/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end 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/package.json b/package.json new file mode 100644 index 000000000..f9cbc5515 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "TaskList", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..2be3af26f --- /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..c08eac0d1 --- /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..78a030af2 --- /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..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 000000000..d19212abd --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end 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..e765b3fc2 --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,39 @@ +require 'test_helper' + +class TasksControllerTest < ActionDispatch::IntegrationTest + test "should get index" do + get tasks_index_url + assert_response :success + end + + test "should get show" do + get tasks_show_url + assert_response :success + end + + test "should get edit" do + get tasks_edit_url + assert_response :success + end + + test "should get update" do + get tasks_update_url + assert_response :success + end + + test "should get new" do + get tasks_new_url + assert_response :success + end + + test "should get create" do + get tasks_create_url + assert_response :success + end + + test "should get destroy" do + get tasks_destroy_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/system/.keep b/test/system/.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..e3c4ff0b8 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,9 @@ +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/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From b41afb9d8af156d7082982dea8320f992a842694 Mon Sep 17 00:00:00 2001 From: murog Date: Mon, 18 Sep 2017 15:36:46 -0700 Subject: [PATCH 02/19] updated controller --- app/controllers/tasks_controller.rb | 21 +++++++++++++++++++++ config/routes.rb | 15 ++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index e65a296fa..64d1db9e7 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,5 +1,26 @@ class TasksController < ApplicationController +TASKS = [ + {id: 1, + title:"pay car insurance", + status:"incomplete" +}, +{id: 2, +title:"laundry", +status:"incomplete"}, +{id: 3, +title:"buy groceries", +status:"incomplete", +description:"spinach, maybe new bread"} +] + def index + id = params[:id].to_i + @task = nil + TASKS.each do |task| + if task[:id] == id + @task = task + end + end end def show diff --git a/config/routes.rb b/config/routes.rb index cfb1d25f2..e3787453f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,17 +1,18 @@ Rails.application.routes.draw do - get 'tasks/index' + get '/', to: 'tasks#index' + get '/tasks', to: 'tasks#index', as: 'tasks' # tasks_path - get 'tasks/show' + get 'tasks/:id/edit', to: 'tasks#edit', as: 'edit_tasks' # edit_tasks_path - get 'tasks/edit' + get 'tasks/new', to: 'tasks#new', as: 'new_task' # new_task_path - get 'tasks/update' + get 'tasks/:id', to: 'tasks#show', as: 'task' # task_path - get 'tasks/new' + patch 'tasks/:id', to: 'tasks#update', as: 'update_task' # update_task_path - get 'tasks/create' + post '/tasks', to: 'tasks#create', as: 'create_task' # create_task_path - get 'tasks/destroy' + delete '/tasks', to: 'tasks#destroy', as: 'delete_task' # delete_task_path # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 17582a4ab23730105020b6204511b98ac2baafa4 Mon Sep 17 00:00:00 2001 From: murog Date: Mon, 18 Sep 2017 17:09:12 -0700 Subject: [PATCH 03/19] update application and index views --- app/assets/stylesheets/application.css | 75 ++++++++++++++++++++++++++ app/controllers/tasks_controller.rb | 23 +++++--- app/views/layouts/application.html.erb | 14 +++++ app/views/tasks/index.html.erb | 22 +++++++- app/views/tasks/show.html.erb | 13 ++++- 5 files changed, 136 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f51..a8d3e85b6 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,78 @@ *= require_tree . *= require_self */ + +header { + margin-left: 5px; + color: red; + font-style: oblique; + display: block; + padding: 0; + margin: 0; + text-shadow: #AAA 0px 10px 40px; + font-size: 1.3em; +} + +.nav_box { + background-color: #EEE; + height: 100%; + width: 150px; + position: absolute; + top: 0px; + display: float; + z-index: -100; +} +nav { +display: inline-block; +} + +.button { + margin-top: 100px; + margin-left: 20px; + z-index: 100; +} + +.button a:hover { + text-shadow: yellow 0px 5px 20px; +} + +a { + color: blue; + font-weight: bolder; +} + +.content { + display: inline-block; + margin-left: 120px; + padding-left: 10px; + padding-right: 200px; + max-width: 300px; + min-height: 500px; + line-height: 2em; + background-color: yellow; + border-bottom-right-radius: 10%; + box-shadow: #AAA 0px 15px 20px; +} + +.content li { + font-size: 2em; + line-height: 1.25em; +} + +.completed { + text-decoration: line-through; + font-style: italic; + font-weight: 200; +} + +.task_edits a { + text-decoration: none; + font-weight: lighter; + margin-right: 5px; + color: black; +} + +.task_edits a:hover { + text-shadow: blue 5px 5px 30px; + +} diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 64d1db9e7..f4bb98db4 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -2,34 +2,43 @@ class TasksController < ApplicationController TASKS = [ {id: 1, title:"pay car insurance", - status:"incomplete" + completed: false, }, {id: 2, title:"laundry", -status:"incomplete"}, +completed: false}, {id: 3, title:"buy groceries", -status:"incomplete", +completed: true, description:"spinach, maybe new bread"} ] def index + @tasks = TASKS + end + + def show id = params[:id].to_i @task = nil TASKS.each do |task| if task[:id] == id @task = task end - end - end - - def show + end end def edit end def update + id = params[:id].to_i + @task = nil + TASKS.each do |task| + if task[:id] == id + @task = task + @task[:completed]= true + end + end end def new diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index be7a9f069..1bfa748e5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,20 @@ +
+

Much Tasks, Many Lists

+
+ +
<%= yield %> +
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index b16c10310..0b58bebff 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

+

List of Tasks

+ +
+
    + +<% @tasks.each do |task| %> + + + <% if !(task[:completed]) %> +
  1. <%= link_to(task[:title], task_path(task[:id])) %>
    2. + <%else%> +
  2. <%= link_to(task[:title], task_path(task[:id])) %>
    3. + <% end %> +
    + <%= link_to "mark complete", update_task_path(task[:id]), method: :patch %> + <%= link_to "edit", edit_tasks_path(task[:id]) %> + <%= link_to "delete", delete_task_path(task[:id]), method: :delete %>
    +<% end %> +
+
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 1139224db..1b457140a 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,2 +1,11 @@ -

Tasks#show

-

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

+<% if !(@task) %> +

Task does not exist

+<% else %> +

<%= @task[:title] %>

+
+

description:

+

+ <%= @task[:description] %> +

+
+<% end %> From 373e6181b2e3258c60de644e61abe65be4459f79 Mon Sep 17 00:00:00 2001 From: murog Date: Tue, 19 Sep 2017 15:32:09 -0700 Subject: [PATCH 04/19] added a database --- app/controllers/tasks_controller.rb | 63 ++++++++++--------- app/models/task.rb | 2 + app/views/tasks/index.html.erb | 12 ++-- app/views/tasks/mark_complete.html.erb | 0 config/routes.rb | 3 + db/migrate/20170919221016_create_tasks.rb | 13 ++++ ...170919221910_rename_status_to_completed.rb | 5 ++ db/schema.rb | 12 +++- test/fixtures/tasks.yml | 15 +++++ test/models/task_test.rb | 7 +++ 10 files changed, 96 insertions(+), 36 deletions(-) create mode 100644 app/models/task.rb create mode 100644 app/views/tasks/mark_complete.html.erb create mode 100644 db/migrate/20170919221016_create_tasks.rb create mode 100644 db/migrate/20170919221910_rename_status_to_completed.rb create mode 100644 test/fixtures/tasks.yml create mode 100644 test/models/task_test.rb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index f4bb98db4..34def0463 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,44 +1,49 @@ class TasksController < ApplicationController -TASKS = [ - {id: 1, - title:"pay car insurance", - completed: false, -}, -{id: 2, -title:"laundry", -completed: false}, -{id: 3, -title:"buy groceries", -completed: true, -description:"spinach, maybe new bread"} -] +# TASKS = [ +# {id: 1, +# title:"pay car insurance", +# completed: false, +# }, +# {id: 2, +# title:"laundry", +# completed: false}, +# {id: 3, +# title:"buy groceries", +# completed: true, +# description:"spinach, maybe new bread"} +# ] def index - @tasks = TASKS + # @tasks = TASKS + @tasks = Task.all end def show - id = params[:id].to_i - @task = nil - TASKS.each do |task| - if task[:id] == id - @task = task - end - end + @task = Task.find(params[:id].to_i) + # id = params[:id].to_i + # @task = nil + # TASKS.each do |task| + # if task[:id] == id + # @task = task + # end + # end end def edit end def update - id = params[:id].to_i - @task = nil - TASKS.each do |task| - if task[:id] == id - @task = task - @task[:completed]= true - end - end + # id = params[:id].to_i + # @task = nil + # TASKS.each do |task| + # if task[:id] == id + # @task = task + # @task[:completed]= true + # end + # end + end + + def mark_complete end def new 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 0b58bebff..6e7946299 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -6,15 +6,15 @@ <% @tasks.each do |task| %> - <% if !(task[:completed]) %> -
  • <%= link_to(task[:title], task_path(task[:id])) %>
    • + <% if !(task.completed) %> +
  • <%= link_to(task.title, task_path(task.id)) %>
    • <%else%> -
  • <%= link_to(task[:title], task_path(task[:id])) %>
    • +
  • <%= link_to(task.title, task_path(task.id)) %>
    • <% end %>
    - <%= link_to "mark complete", update_task_path(task[:id]), method: :patch %> - <%= link_to "edit", edit_tasks_path(task[:id]) %> - <%= link_to "delete", delete_task_path(task[:id]), method: :delete %>
    + <%= link_to "mark complete", mark_complete_task_path(task.id), method: :patch %> + <%= link_to "edit", edit_tasks_path(task.id) %> + <%= link_to "delete", delete_task_path(task.id), method: :delete %> <% end %> diff --git a/app/views/tasks/mark_complete.html.erb b/app/views/tasks/mark_complete.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/config/routes.rb b/config/routes.rb index e3787453f..95bf31d24 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,10 +4,13 @@ get 'tasks/:id/edit', to: 'tasks#edit', as: 'edit_tasks' # edit_tasks_path + get 'tasks/new', to: 'tasks#new', as: 'new_task' # new_task_path get 'tasks/:id', to: 'tasks#show', as: 'task' # task_path + patch '/tasks/:id/mark_complete', to: 'tasks#mark_complete', as: 'mark_complete_task' # mark_complete_task_path + patch 'tasks/:id', to: 'tasks#update', as: 'update_task' # update_task_path post '/tasks', to: 'tasks#create', as: 'create_task' # create_task_path diff --git a/db/migrate/20170919221016_create_tasks.rb b/db/migrate/20170919221016_create_tasks.rb new file mode 100644 index 000000000..7ae44f8c1 --- /dev/null +++ b/db/migrate/20170919221016_create_tasks.rb @@ -0,0 +1,13 @@ +class CreateTasks < ActiveRecord::Migration[5.1] + def change + create_table :tasks do |t| + t.string :owner + t.string :title + t.string :description + t.timestamp :deadline + t.boolean :status + + t.timestamps + end + end +end diff --git a/db/migrate/20170919221910_rename_status_to_completed.rb b/db/migrate/20170919221910_rename_status_to_completed.rb new file mode 100644 index 000000000..2dc0c0049 --- /dev/null +++ b/db/migrate/20170919221910_rename_status_to_completed.rb @@ -0,0 +1,5 @@ +class RenameStatusToCompleted < ActiveRecord::Migration[5.1] + def change + rename_column(:tasks, :status, :completed) + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..f689929b6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,19 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20170919221910) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "tasks", force: :cascade do |t| + t.string "owner" + t.string "title" + t.string "description" + t.datetime "deadline" + t.boolean "completed" + 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..e5cb6a283 --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + owner: MyString + title: MyString + description: MyString + deadline: 2017-09-19 15:10:16 + status: false + +two: + owner: MyString + title: MyString + description: MyString + deadline: 2017-09-19 15:10:16 + status: false 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 20a5a66bdc142981f8d9a41fd920fb6077f34997 Mon Sep 17 00:00:00 2001 From: murog Date: Tue, 19 Sep 2017 16:17:29 -0700 Subject: [PATCH 05/19] updated css --- app/assets/stylesheets/application.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a8d3e85b6..5753050c4 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -35,7 +35,7 @@ header { z-index: -100; } nav { -display: inline-block; +float: left; } .button { @@ -88,3 +88,9 @@ a { text-shadow: blue 5px 5px 30px; } + +@media (max-width: 800px) { + .content { + max-width: 200px + } +} From 873cca22b3ab9f15582180ee588e1498ef7a2395 Mon Sep 17 00:00:00 2001 From: murog Date: Wed, 20 Sep 2017 09:48:20 -0700 Subject: [PATCH 06/19] mark complete toggles --- app/assets/stylesheets/application.css | 63 +++++++++++++++++++++----- app/controllers/tasks_controller.rb | 12 ++++- app/views/layouts/application.html.erb | 7 ++- app/views/tasks/index.html.erb | 9 +++- app/views/tasks/mark_complete.html.erb | 1 + config/routes.rb | 3 +- 6 files changed, 76 insertions(+), 19 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5753050c4..95682fe12 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -18,30 +18,39 @@ header { margin-left: 5px; color: red; font-style: oblique; - display: block; padding: 0; margin: 0; text-shadow: #AAA 0px 10px 40px; font-size: 1.3em; + position: absolute; + /*top: -1em;*/ } -.nav_box { +/*.nav_box { background-color: #EEE; height: 100%; width: 150px; position: absolute; top: 0px; - display: float; z-index: -100; +}*/ + +.fixed { + float: left; + width: 20%; + max-width: 150px; + height: 45em; + background-color: #EEE; } -nav { -float: left; + +.fluid { + margin-left: 25%; } .button { - margin-top: 100px; +line-height: 12em; margin-left: 20px; - z-index: 100; + } .button a:hover { @@ -54,11 +63,12 @@ a { } .content { + margin-top: 5em; display: inline-block; - margin-left: 120px; padding-left: 10px; - padding-right: 200px; - max-width: 300px; + /*max-width: 300px;*/ + width: 70%; + min-height: 500px; line-height: 2em; background-color: yellow; @@ -88,9 +98,38 @@ a { text-shadow: blue 5px 5px 30px; } +@media (max-width: 500px) { + .fixed { + float: none; + height: 5em; + background-color: #EEE; + max-width: none; + /*display: flex;*/ + width: 200%; + margin-left: 0; + box-shadow: #AAA 0px 1px 5px; + } -@media (max-width: 800px) { + .nav { + width: 100%; + } + + .button { + line-height: 5em; + display: inline; + margin-left: 10%; + } + + header { + position: static; + } + + .fluid { + margin: 0; + } .content { - max-width: 200px + margin-top: 1em; + width: 95%; } + } diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 34def0463..85e72d88c 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -15,12 +15,12 @@ class TasksController < ApplicationController def index # @tasks = TASKS - @tasks = Task.all + @tasks = Task.order(:completed) end def show @task = Task.find(params[:id].to_i) - # id = params[:id].to_i + # id params[:id].to_i # @task = nil # TASKS.each do |task| # if task[:id] == id @@ -44,6 +44,14 @@ def update end def mark_complete + @task = Task.find(params[:id].to_i) + if @task.completed == true + @task.completed = false + else + @task.completed = true + end + @task.save + redirect_to '/tasks' end def new diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1bfa748e5..8c3daa18a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,17 +12,20 @@

    Much Tasks, Many Lists

    - +
    <%= yield %>
    +
    diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 6e7946299..da8d51af0 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -8,13 +8,18 @@ <% if !(task.completed) %>
  • <%= link_to(task.title, task_path(task.id)) %>
    • +
    + <%= link_to "mark complete", mark_complete_task_path(task.id), method: :patch %> + <%= link_to "edit", edit_tasks_path(task.id) %> + <%= link_to "delete", delete_task_path(task.id), method: :delete %>
    <%else%>
  • <%= link_to(task.title, task_path(task.id)) %>
    • - <% end %>
    - <%= link_to "mark complete", mark_complete_task_path(task.id), method: :patch %> + <%= link_to "mark incomplete", mark_complete_task_path(task.id), method: :patch %> <%= link_to "edit", edit_tasks_path(task.id) %> <%= link_to "delete", delete_task_path(task.id), method: :delete %>
    + <% end %> + <% end %> diff --git a/app/views/tasks/mark_complete.html.erb b/app/views/tasks/mark_complete.html.erb index e69de29bb..e9e350772 100644 --- a/app/views/tasks/mark_complete.html.erb +++ b/app/views/tasks/mark_complete.html.erb @@ -0,0 +1 @@ +Params are <%= params %> diff --git a/config/routes.rb b/config/routes.rb index 95bf31d24..c29841978 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,12 +4,13 @@ get 'tasks/:id/edit', to: 'tasks#edit', as: 'edit_tasks' # edit_tasks_path + get 'tasks/:id/mark_complete', to: 'tasks#index' get 'tasks/new', to: 'tasks#new', as: 'new_task' # new_task_path get 'tasks/:id', to: 'tasks#show', as: 'task' # task_path - patch '/tasks/:id/mark_complete', to: 'tasks#mark_complete', as: 'mark_complete_task' # mark_complete_task_path + patch '/tasks/:id/mark_complete', to: 'tasks#mark_complete', as: 'mark_complete_task' # mark_complete patch 'tasks/:id', to: 'tasks#update', as: 'update_task' # update_task_path From 22843372d260fe56bc41085a01b72bd709ad2ab2 Mon Sep 17 00:00:00 2001 From: murog Date: Wed, 20 Sep 2017 16:43:56 -0700 Subject: [PATCH 07/19] new task form working --- app/assets/stylesheets/application.css | 6 +++--- app/assets/stylesheets/tasks.scss | 3 +++ app/controllers/tasks_controller.rb | 8 ++++++++ app/views/tasks/new.html.erb | 19 +++++++++++++++++++ app/views/tasks/show.html.erb | 10 ++++++---- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 95682fe12..b12b43d22 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -23,7 +23,7 @@ header { text-shadow: #AAA 0px 10px 40px; font-size: 1.3em; position: absolute; - /*top: -1em;*/ + top: -1em; } /*.nav_box { @@ -105,7 +105,7 @@ a { background-color: #EEE; max-width: none; /*display: flex;*/ - width: 200%; + width: 100%; margin-left: 0; box-shadow: #AAA 0px 1px 5px; } @@ -117,7 +117,7 @@ a { .button { line-height: 5em; display: inline; - margin-left: 10%; + margin-left: 20%; } header { diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index c5e7712d4..e3fc30e2f 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -1,3 +1,6 @@ // 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/ +.task_deadline strong { + font-style: oblique; +} diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 85e72d88c..9471f0116 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -55,9 +55,17 @@ def mark_complete end def new + @task = Task.new end def create + task = Task.new(owner: params[:task][:owner], title: params[:task][:title], description: params[:task][:description], deadline: Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i)) + if task.save + redirect_to '/tasks' + else + render :new + end + end def destroy diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 2484008a3..a5319f5ff 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,2 +1,21 @@

    Tasks#new

    + +<%= form_for @task do |f| %> + <%= f.label :owner %> + <%= f.text_field :owner %> + + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :description %> + <%= f.text_field :description %> + <%= text_area_tag(:message, "Haha", size: "24x6") %> + +
    + <%= select_date Date.today, prefix: :start_date %> + + <%= f.submit %> +<% end %> + +

    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 index 1b457140a..668399d05 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -2,10 +2,12 @@

    Task does not exist

    <% else %>

    <%= @task[:title] %>

    +

    owner: <%= @task[:owner] %>

    +

    deadline: <%= (@task[:deadline]).to_s.chomp('00:00:00 UTC') %>

    +
    -

    description:

    -

    - <%= @task[:description] %> -

    +

    description:

    <%= @task[:description] %> +
    + <% end %> From 87cadfc13ff8deb654623108e56f99e7b378822a Mon Sep 17 00:00:00 2001 From: murog Date: Fri, 22 Sep 2017 13:39:36 -0700 Subject: [PATCH 08/19] updated styling --- app/assets/stylesheets/application.css | 11 ++++++ app/assets/stylesheets/tasks.scss | 4 ++ app/controllers/tasks_controller.rb | 32 +++++++++++----- app/views/layouts/application.html.erb | 45 ++++++++++++----------- app/views/tasks/_form.html.erb | 13 +++++++ app/views/tasks/edit.html.erb | 15 ++++++++ app/views/tasks/index.html.erb | 3 +- app/views/tasks/new.html.erb | 1 - config/routes.rb | 5 ++- db/migrate/20170922203753_add_priority.rb | 4 ++ 10 files changed, 100 insertions(+), 33 deletions(-) create mode 100644 app/views/tasks/_form.html.erb create mode 100644 db/migrate/20170922203753_add_priority.rb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index b12b43d22..d5e3a5d31 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -47,6 +47,16 @@ header { margin-left: 25%; } +.notice { + font-size: 1em; + text-shadow: pink 0px 10px 40px; + display: block; + position: absolute; + margin-left: 50%; + text-align: right; + margin-right: 5%; +} + .button { line-height: 12em; margin-left: 20px; @@ -74,6 +84,7 @@ a { background-color: yellow; border-bottom-right-radius: 10%; box-shadow: #AAA 0px 15px 20px; + overflow-y: scroll; } .content li { diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index e3fc30e2f..b75089f1d 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -4,3 +4,7 @@ .task_deadline strong { font-style: oblique; } + +textarea { + width: 500px; +} diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 9471f0116..171c2b864 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -30,17 +30,20 @@ def show end def edit + @task = Task.find(params[:id].to_i) end def update - # id = params[:id].to_i - # @task = nil - # TASKS.each do |task| - # if task[:id] == id - # @task = task - # @task[:completed]= true - # end - # end + @task = Task.find(params[:id].to_i) + @task.owner = params[:task][:owner] + @task.title = params[:task][:title] + @task.description = params[:task][:description] + @task.deadline = Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i) + if @task.save + redirect_to '/tasks' + else + render :new + end end def mark_complete @@ -59,8 +62,9 @@ def new end def create - task = Task.new(owner: params[:task][:owner], title: params[:task][:title], description: params[:task][:description], deadline: Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i)) + task = Task.new(owner: params[:task][:owner], title: params[:task][:title], description: params[:task][:description], deadline: Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i), completed: false) if task.save + flash[:notice] = "#{task.title} by #{task.owner} was successfully created" redirect_to '/tasks' else render :new @@ -69,5 +73,15 @@ def create end def destroy + @task = Task.find(params[:id].to_i) + owner = @task.owner + title = @task.title + completed = @task.completed + if @task.destroy + completed ? (flash[:notice] = "#{title} was successfully deleted, great job #{owner}!") : (flash[:notice] = "#{title} was successfully deleted, better luck next time #{owner}!") + redirect_to '/tasks' + else + render :new + end end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8c3daa18a..7cb624e0e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,31 +1,34 @@ - - TaskList - <%= csrf_meta_tags %> + + TaskList + <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + - -
    -

    Much Tasks, Many Lists

    -
    + +
    +

    Much Tasks, Many Lists

    +
    -
    -
    -
    +
    +
    + <%= link_to "all tasks", tasks_path %> +
    +
    + +
    + <% if flash[:notice] %> +
    <%= flash[:notice] %>
    + <% end %> +
    <%= yield %>
    - + diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..e1c982769 --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,13 @@ +<%= form_for @book do |f| %> + <%= f.label :author %> + <%= f.text_field :author %> + + <%= 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 374190308..bd75da9d6 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,2 +1,17 @@

    Tasks#edit

    +<%= form_for @task do |f| %> + <%= f.label :owner %> + <%= f.text_field :owner %> + + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :description %> + <%= f.text_field :description %> + +
    + <%= select_date Date.today, prefix: :start_date %> + + <%= f.submit %> +<% end %>

    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 index da8d51af0..38f4d9169 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -17,7 +17,8 @@
    <%= link_to "mark incomplete", mark_complete_task_path(task.id), method: :patch %> <%= link_to "edit", edit_tasks_path(task.id) %> - <%= link_to "delete", delete_task_path(task.id), method: :delete %>
    + <%= link_to "delete", delete_task_path(task.id), method: :delete, data: { confirm: "ARE YOU SURE?!!?" } %> + <% end %> <% end %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index a5319f5ff..f0d0a2144 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -9,7 +9,6 @@ <%= f.label :description %> <%= f.text_field :description %> - <%= text_area_tag(:message, "Haha", size: "24x6") %>
    <%= select_date Date.today, prefix: :start_date %> diff --git a/config/routes.rb b/config/routes.rb index c29841978..1f7f61326 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,7 +16,10 @@ post '/tasks', to: 'tasks#create', as: 'create_task' # create_task_path - delete '/tasks', to: 'tasks#destroy', as: 'delete_task' # delete_task_path + delete '/tasks/:id/', to: 'tasks#destroy', as: 'delete_task' # delete_task_path + + + # delete '/tasks', to: 'tasks#destroy', as: 'delete_task' # delete_task_path # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20170922203753_add_priority.rb b/db/migrate/20170922203753_add_priority.rb new file mode 100644 index 000000000..7f55825e5 --- /dev/null +++ b/db/migrate/20170922203753_add_priority.rb @@ -0,0 +1,4 @@ +class AddPriority < ActiveRecord::Migration[5.1] + def change + end +end From 1e1b6ead9514cd752fbcc4edfd6c861ff7c53459 Mon Sep 17 00:00:00 2001 From: murog Date: Fri, 22 Sep 2017 13:58:34 -0700 Subject: [PATCH 09/19] added priority column --- db/migrate/20170922203753_add_priority.rb | 1 + db/schema.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/db/migrate/20170922203753_add_priority.rb b/db/migrate/20170922203753_add_priority.rb index 7f55825e5..d533120a9 100644 --- a/db/migrate/20170922203753_add_priority.rb +++ b/db/migrate/20170922203753_add_priority.rb @@ -1,4 +1,5 @@ class AddPriority < ActiveRecord::Migration[5.1] def change + add_column(:tasks, :priority, :Integer, :default => 0) end end diff --git a/db/schema.rb b/db/schema.rb index f689929b6..60836739f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170919221910) do +ActiveRecord::Schema.define(version: 20170922203753) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -23,6 +23,7 @@ t.boolean "completed" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "priority", default: 0 end end From abbeb60fcd498af017a92d22453aad04e59dad23 Mon Sep 17 00:00:00 2001 From: murog Date: Fri, 22 Sep 2017 14:40:15 -0700 Subject: [PATCH 10/19] edit and new render partial from form --- app/views/tasks/_form.html.erb | 15 ++++++++++----- app/views/tasks/edit.html.erb | 5 +++-- app/views/tasks/new.html.erb | 17 +---------------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index e1c982769..23fb14e0e 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,13 +1,18 @@ -<%= form_for @book do |f| %> - <%= f.label :author %> - <%= f.text_field :author %> +<%= form_for @task do |f| %> + <%= f.label :owner %> + <%= f.text_field :owner %> <%= f.label :title %> <%= f.text_field :title %> -
    + <%= f.label :description %> <%= f.text_field :description %> +
    + <%= select_date Date.today, prefix: :start_date %> +
    + <%= f.label :priority %> + <%= f.text_field :priority %> - <%= f.submit %> + <%= f.submit action_name %> <% end %> diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index bd75da9d6..a7656687c 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,5 +1,6 @@

    Tasks#edit

    -<%= form_for @task do |f| %> +<%= render partial: "form", locals: { action_name: "Edit! The! Task!" } %> + diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index f0d0a2144..f1e1fec1f 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,20 +1,5 @@

    Tasks#new

    -<%= form_for @task do |f| %> - <%= f.label :owner %> - <%= f.text_field :owner %> - - <%= f.label :title %> - <%= f.text_field :title %> - - <%= f.label :description %> - <%= f.text_field :description %> - -
    - <%= select_date Date.today, prefix: :start_date %> - - <%= f.submit %> -<% end %> - +<%= render partial: "form", locals: { action_name: "Save! The! Task!" } %>

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

    From 4b0642cb618239f3d409f05aa8825c8e2ac69777 Mon Sep 17 00:00:00 2001 From: murog Date: Fri, 22 Sep 2017 14:57:48 -0700 Subject: [PATCH 11/19] separate boxes for task bases on priority --- app/controllers/tasks_controller.rb | 3 +- app/views/layouts/application.html.erb | 2 - app/views/tasks/_priority.erb | 43 +++++++++++++++++ app/views/tasks/index.html.erb | 64 ++++++++++++++++++-------- 4 files changed, 89 insertions(+), 23 deletions(-) create mode 100644 app/views/tasks/_priority.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 171c2b864..85e52a2c1 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -16,6 +16,7 @@ class TasksController < ApplicationController def index # @tasks = TASKS @tasks = Task.order(:completed) + # @priority_one = Task.find_by end def show @@ -62,7 +63,7 @@ def new end def create - task = Task.new(owner: params[:task][:owner], title: params[:task][:title], description: params[:task][:description], deadline: Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i), completed: false) + task = Task.new(owner: params[:task][:owner], title: params[:task][:title], description: params[:task][:description], deadline: Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i), completed: false, priority: params[:task][:priority].to_i) if task.save flash[:notice] = "#{task.title} by #{task.owner} was successfully created" redirect_to '/tasks' diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7cb624e0e..1b106642f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -26,9 +26,7 @@ <% if flash[:notice] %>
    <%= flash[:notice] %>
    <% end %> -
    <%= yield %> -
    diff --git a/app/views/tasks/_priority.erb b/app/views/tasks/_priority.erb new file mode 100644 index 000000000..fe1ec5a57 --- /dev/null +++ b/app/views/tasks/_priority.erb @@ -0,0 +1,43 @@ +<% if input_priority == 0 + tag = "Unsorted" + elsif input_priority == 1 + tag = "Do right away!!!!" + elsif input_priority == 2 + tag = "Plan to do ASAP" + elsif input_priority == 3 + tag = "Delegate later" + elsif input_priority == 4 + tag = "Just for fun (-:" + end%> + + +

    <%="Priority Level #{input_priority}" %>

    +

    <%="#{tag}" %>

    + + +
    +
      + + +<%= @tasks.each do |task| %> + + + +<% if !(task.completed) && task.priority == input_priority %> +
    1. <%= link_to(task.title, task_path(task.id)) %>
      2. +
      +<%= link_to "mark complete", mark_complete_task_path(task.id), method: :patch %> +<%= link_to "edit", edit_tasks_path(task.id) %> +<%= link_to "delete", delete_task_path(task.id), method: :delete %>
      +<%elsif task.priority == input_priority%> +
    2. <%= link_to(task.title, task_path(task.id)) %>
      3. +
      + <%= link_to "mark incomplete", mark_complete_task_path(task.id), method: :patch %> + <%= link_to "edit", edit_tasks_path(task.id) %> + <%= link_to "delete", delete_task_path(task.id), method: :delete, data: { confirm: "ARE YOU SURE?!!?" } %> +
      +<% end %> + +<% end %> +
    +
    diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 38f4d9169..6418b5895 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,26 +1,50 @@ -

    List of Tasks

    +
    + + + +<%= render partial: "priority", locals: { input_priority: 0 } %> + + + + +
    +
    +
      + <%= render partial: "priority", locals: { input_priority: 1 } %> +
    + +
    +
    -<% @tasks.each do |task| %> - - - <% if !(task.completed) %> -
  • <%= link_to(task.title, task_path(task.id)) %>
    • -
    - <%= link_to "mark complete", mark_complete_task_path(task.id), method: :patch %> - <%= link_to "edit", edit_tasks_path(task.id) %> - <%= link_to "delete", delete_task_path(task.id), method: :delete %>
    - <%else%> -
  • <%= link_to(task.title, task_path(task.id)) %>
    • -
    - <%= link_to "mark incomplete", mark_complete_task_path(task.id), method: :patch %> - <%= link_to "edit", edit_tasks_path(task.id) %> - <%= link_to "delete", delete_task_path(task.id), method: :delete, data: { confirm: "ARE YOU SURE?!!?" } %> -
    - <% end %> - -<% end %> +
    +
    +
      + <%= render partial: "priority", locals: { input_priority: 2 } %>
    + +
    +
    + +
    +
    +
      + <%= render partial: "priority", locals: { input_priority: 3 } %> +
    + +
    +
    + +
    +
    +
      + <%= render partial: "priority", locals: { input_priority: 4 } %> +
    +
    +
    From 7ebb48ba8114ce81f0507d1077392330b5d287cf Mon Sep 17 00:00:00 2001 From: murog Date: Fri, 22 Sep 2017 15:20:21 -0700 Subject: [PATCH 12/19] renders partials if tasks under that priority exist --- app/controllers/tasks_controller.rb | 6 +++++- app/views/tasks/index.html.erb | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 85e52a2c1..e8f78addc 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -16,7 +16,11 @@ class TasksController < ApplicationController def index # @tasks = TASKS @tasks = Task.order(:completed) - # @priority_one = Task.find_by + @priority_zero = Task.find_by(priority: 0) + @priority_one = Task.find_by(priority: 1) + @priority_two = Task.find_by(priority: 2) + @priority_three = Task.find_by(priority: 3) + @priority_four = Task.find_by(priority: 4) end def show diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 6418b5895..7a74cd392 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,18 +1,14 @@ -
    - - <%= render partial: "priority", locals: { input_priority: 0 } %> - -
    +<% end %> +<% if @priority_one %>
      @@ -21,7 +17,8 @@
    - +<% end %> +<% if @priority_two %>
      @@ -30,7 +27,9 @@
    +<% end %> +<% if @priority_three %>
      @@ -39,7 +38,8 @@
    - +<% end %> +<% if @priority_four %>
      @@ -48,3 +48,4 @@
    +<% end %> From 655ca32ac02633d6ee527f37cc2b059e64c4b865 Mon Sep 17 00:00:00 2001 From: murog Date: Sat, 23 Sep 2017 22:36:55 -0700 Subject: [PATCH 13/19] added column for task category --- Gemfile | 2 +- Gemfile.lock | 5 ++ app/assets/stylesheets/application.css | 21 ++++++-- app/controllers/tasks_controller.rb | 13 +++-- app/views/tasks/_form.html.erb | 4 ++ app/views/tasks/_priority.erb | 6 +-- app/views/tasks/index.html.erb | 48 ++----------------- .../20170924052242_add_task_category.rb | 5 ++ db/schema.rb | 3 +- 9 files changed, 49 insertions(+), 58 deletions(-) create mode 100644 db/migrate/20170924052242_add_task_category.rb diff --git a/Gemfile b/Gemfile index 504af8615..d42ebd215 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end - +gem 'jquery-rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.4' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 457ab61d1..aca0cbe1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,6 +70,10 @@ GEM jbuilder (2.7.0) activesupport (>= 4.2.0) multi_json (>= 1.2) + jquery-rails (4.3.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -179,6 +183,7 @@ DEPENDENCIES capybara (~> 2.13) coffee-rails (~> 4.2) jbuilder (~> 2.5) + jquery-rails listen (>= 3.0.5, < 3.2) pg (~> 0.18) puma (~> 3.7) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d5e3a5d31..e59da7333 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -77,9 +77,10 @@ a { display: inline-block; padding-left: 10px; /*max-width: 300px;*/ - width: 70%; + width: 35%; - min-height: 500px; + min-height: 200px; + max-height: 300px; line-height: 2em; background-color: yellow; border-bottom-right-radius: 10%; @@ -87,11 +88,20 @@ a { overflow-y: scroll; } +.form { + width: 70%; +} + .content li { font-size: 2em; line-height: 1.25em; } +.priority1 { + margin-left: 5%; + background-color: rgba(255, 0, 177, 0.5); +} + .completed { text-decoration: line-through; font-style: italic; @@ -109,7 +119,7 @@ a { text-shadow: blue 5px 5px 30px; } -@media (max-width: 500px) { +@media (max-width: 800px) { .fixed { float: none; height: 5em; @@ -141,6 +151,11 @@ a { .content { margin-top: 1em; width: 95%; + clear: both; + } + + .priority1 { + margin-left: 0em; } } diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index e8f78addc..5e330f76d 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -16,11 +16,14 @@ class TasksController < ApplicationController def index # @tasks = TASKS @tasks = Task.order(:completed) - @priority_zero = Task.find_by(priority: 0) - @priority_one = Task.find_by(priority: 1) - @priority_two = Task.find_by(priority: 2) - @priority_three = Task.find_by(priority: 3) - @priority_four = Task.find_by(priority: 4) + # @priority_zero = Task.find_by(priority: 0) + # @priority_one = Task.find_by(priority: 1) + # @priority_two = Task.find_by(priority: 2) + # @priority_three = Task.find_by(priority: 3) + # @priority_four = Task.find_by(priority: 4) + + @tasks = Task.order(:completed).group_by{|task| task.priority} + end def show diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 23fb14e0e..986677e11 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,3 +1,5 @@ +
    + <%= form_for @task do |f| %> <%= f.label :owner %> <%= f.text_field :owner %> @@ -16,3 +18,5 @@ <%= f.submit action_name %> <% end %> + +
    diff --git a/app/views/tasks/_priority.erb b/app/views/tasks/_priority.erb index fe1ec5a57..12d951250 100644 --- a/app/views/tasks/_priority.erb +++ b/app/views/tasks/_priority.erb @@ -19,17 +19,17 @@
      -<%= @tasks.each do |task| %> +<% tasks.each do |task| %> -<% if !(task.completed) && task.priority == input_priority %> +<% if !(task.completed) %>
    1. <%= link_to(task.title, task_path(task.id)) %>
      2. <%= link_to "mark complete", mark_complete_task_path(task.id), method: :patch %> <%= link_to "edit", edit_tasks_path(task.id) %> <%= link_to "delete", delete_task_path(task.id), method: :delete %>
      -<%elsif task.priority == input_priority%> +<%else%>
    2. <%= link_to(task.title, task_path(task.id)) %>
      3. <%= link_to "mark incomplete", mark_complete_task_path(task.id), method: :patch %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 7a74cd392..eaaec865a 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,51 +1,9 @@ -<% if @priority_zero %> -
      +<% @tasks.each do |priority, array| %> +
      +<%= render partial: "priority", locals: { input_priority: priority, tasks: array } %> -<%= render partial: "priority", locals: { input_priority: 0 } %> - -
      -<% end %> -<% if @priority_one %> -
      -
      -
        - <%= render partial: "priority", locals: { input_priority: 1 } %> -
      - -
      -
      -<% end %> -<% if @priority_two %> -
      -
      -
        - <%= render partial: "priority", locals: { input_priority: 2 } %> -
      - -
      -
      -<% end %> - -<% if @priority_three %> -
      -
      -
        - <%= render partial: "priority", locals: { input_priority: 3 } %> -
      - -
      -
      -<% end %> -<% if @priority_four %> -
      -
      -
        - <%= render partial: "priority", locals: { input_priority: 4 } %> -
      - -
      <% end %> diff --git a/db/migrate/20170924052242_add_task_category.rb b/db/migrate/20170924052242_add_task_category.rb new file mode 100644 index 000000000..88519c313 --- /dev/null +++ b/db/migrate/20170924052242_add_task_category.rb @@ -0,0 +1,5 @@ +class AddTaskCategory < ActiveRecord::Migration[5.1] + def change + add_column(:tasks, :category, :string, :default => "Unsorted") + end +end diff --git a/db/schema.rb b/db/schema.rb index 60836739f..a5a1fd2e5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170922203753) do +ActiveRecord::Schema.define(version: 20170924052242) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,6 +24,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "priority", default: 0 + t.string "category", default: "Unsorted" end end From 3829a23ad7f8b0447299f6c4d54661adca374ebc Mon Sep 17 00:00:00 2001 From: murog Date: Sat, 23 Sep 2017 22:49:16 -0700 Subject: [PATCH 14/19] updated forms and controller to take in category in params --- app/controllers/tasks_controller.rb | 4 +++- app/views/tasks/_form.html.erb | 9 +++++---- app/views/tasks/edit.html.erb | 18 +++--------------- app/views/tasks/new.html.erb | 4 ++++ 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 5e330f76d..2defdae3d 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -47,6 +47,8 @@ def update @task.title = params[:task][:title] @task.description = params[:task][:description] @task.deadline = Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i) + @task.priority = params[:task][:priority].to_i + @task.category = params[:task][:category] if @task.save redirect_to '/tasks' else @@ -70,7 +72,7 @@ def new end def create - task = Task.new(owner: params[:task][:owner], title: params[:task][:title], description: params[:task][:description], deadline: Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i), completed: false, priority: params[:task][:priority].to_i) + task = Task.new(owner: params[:task][:owner], title: params[:task][:title], description: params[:task][:description], deadline: Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i), completed: false, priority: params[:task][:priority].to_i, category: params[:task][:category]) if task.save flash[:notice] = "#{task.title} by #{task.owner} was successfully created" redirect_to '/tasks' diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 986677e11..3bc634174 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,4 +1,3 @@ -
      <%= form_for @task do |f| %> <%= f.label :owner %> @@ -6,17 +5,19 @@ <%= f.label :title %> <%= f.text_field :title %> - +
      <%= f.label :description %> <%= f.text_field :description %>
      + <%= select_date Date.today, prefix: :start_date %>
      <%= f.label :priority %> <%= f.text_field :priority %> +
      + <%= f.label :category %> + <%= f.text_field :category %> <%= f.submit action_name %> <% end %> - -
      diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index a7656687c..522d93328 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,18 +1,6 @@ +
      +

      Tasks#edit

      <%= render partial: "form", locals: { action_name: "Edit! The! Task!" } %> - +
      diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index f1e1fec1f..a7645332e 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,5 +1,9 @@ +
      +

      Tasks#new

      <%= render partial: "form", locals: { action_name: "Save! The! Task!" } %>

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

      + +
      From ab9e6237d89c84be4192b1d892f94dd13484cf85 Mon Sep 17 00:00:00 2001 From: murog Date: Sun, 24 Sep 2017 00:51:11 -0700 Subject: [PATCH 15/19] removed commented lines --- app/controllers/tasks_controller.rb | 34 ++--------------------------- app/views/tasks/_priority.erb | 19 ++++------------ app/views/tasks/index.html.erb | 6 ++--- 3 files changed, 9 insertions(+), 50 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 2defdae3d..b00f2ba03 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,40 +1,10 @@ class TasksController < ApplicationController -# TASKS = [ -# {id: 1, -# title:"pay car insurance", -# completed: false, -# }, -# {id: 2, -# title:"laundry", -# completed: false}, -# {id: 3, -# title:"buy groceries", -# completed: true, -# description:"spinach, maybe new bread"} -# ] - def index - # @tasks = TASKS - @tasks = Task.order(:completed) - # @priority_zero = Task.find_by(priority: 0) - # @priority_one = Task.find_by(priority: 1) - # @priority_two = Task.find_by(priority: 2) - # @priority_three = Task.find_by(priority: 3) - # @priority_four = Task.find_by(priority: 4) - - @tasks = Task.order(:completed).group_by{|task| task.priority} - + @tasks = Task.order(:completed).group_by{|task| task.category} end def show @task = Task.find(params[:id].to_i) - # id params[:id].to_i - # @task = nil - # TASKS.each do |task| - # if task[:id] == id - # @task = task - # end - # end end def edit @@ -91,7 +61,7 @@ def destroy completed ? (flash[:notice] = "#{title} was successfully deleted, great job #{owner}!") : (flash[:notice] = "#{title} was successfully deleted, better luck next time #{owner}!") redirect_to '/tasks' else - render :new + render :index end end end diff --git a/app/views/tasks/_priority.erb b/app/views/tasks/_priority.erb index 12d951250..7b32f97b2 100644 --- a/app/views/tasks/_priority.erb +++ b/app/views/tasks/_priority.erb @@ -1,18 +1,7 @@ -<% if input_priority == 0 - tag = "Unsorted" - elsif input_priority == 1 - tag = "Do right away!!!!" - elsif input_priority == 2 - tag = "Plan to do ASAP" - elsif input_priority == 3 - tag = "Delegate later" - elsif input_priority == 4 - tag = "Just for fun (-:" - end%> - - -

      <%="Priority Level #{input_priority}" %>

      -

      <%="#{tag}" %>

      + + +

      <%="category: #{input_category}" %>

      +
      diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index eaaec865a..d5e705a3e 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,8 +1,8 @@ -<% @tasks.each do |priority, array| %> +<% @tasks.each do |category, array| %> -
      -<%= render partial: "priority", locals: { input_priority: priority, tasks: array } %> +
      +<%= render partial: "priority", locals: { input_category: category, tasks: array } %>
      From 70d834ea3f455236b6f34626f2b0ea721bb42c07 Mon Sep 17 00:00:00 2001 From: murog Date: Sun, 24 Sep 2017 13:32:58 -0700 Subject: [PATCH 16/19] sort form --- app/controllers/tasks_controller.rb | 13 ++++++++++++- app/views/layouts/application.html.erb | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index b00f2ba03..5a5527e94 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,6 +1,6 @@ class TasksController < ApplicationController def index - @tasks = Task.order(:completed).group_by{|task| task.category} + @tasks = Task.order(:completed).group_by {|task| sort_variable(params[:sort], task)} end def show @@ -65,3 +65,14 @@ def destroy end end end + +private + def sort_variable(input_sort, input_task) + if input_sort == "owner" + input_task.owner + elsif input_sort == "priority" + input_task.priority + else + input_task.category + end + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1b106642f..2e26a50f4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,15 +18,26 @@ <%= link_to "new task", new_task_path %>
      - <%= link_to "all tasks", tasks_path %> + <%= link_to "all tasks", tasks_path(params[:sort])%>
      + Sort by +<%= form_tag(tasks_path, method: "get") do %> + <% ["owner", "category", "priority", "none" ].each do |i| %> + <%= label_tag(:sort, "#{i}") %> + <%= radio_button_tag(:sort, i)%> + <% end %> + <%= submit_tag "sort tasks" %> + <%end %> + +
      <% if flash[:notice] %>
      <%= flash[:notice] %>
      <% end %> - <%= yield %> + <%= yield %>
      +<%=params%> From 72c29715ac4d126cedc3afa02e5d5fa10f75561c Mon Sep 17 00:00:00 2001 From: murog Date: Sun, 24 Sep 2017 14:23:38 -0700 Subject: [PATCH 17/19] updated styling --- app/assets/stylesheets/application.css | 25 +++++++++-------------- app/controllers/tasks_controller.rb | 28 +++++++++++++++++--------- app/views/layouts/application.html.erb | 3 +-- app/views/tasks/_priority.erb | 7 +++++-- app/views/tasks/index.html.erb | 7 +++++-- 5 files changed, 40 insertions(+), 30 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index e59da7333..749ff78b2 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -26,14 +26,6 @@ header { top: -1em; } -/*.nav_box { - background-color: #EEE; - height: 100%; - width: 150px; - position: absolute; - top: 0px; - z-index: -100; -}*/ .fixed { float: left; @@ -76,9 +68,7 @@ a { margin-top: 5em; display: inline-block; padding-left: 10px; - /*max-width: 300px;*/ width: 35%; - min-height: 200px; max-height: 300px; line-height: 2em; @@ -86,6 +76,16 @@ a { border-bottom-right-radius: 10%; box-shadow: #AAA 0px 15px 20px; overflow-y: scroll; + vertical-align: top; +} + +.all_tasks { + max-height: 700px; + width: 70% +} + +.filler { + max-height: 700px; } .form { @@ -97,10 +97,6 @@ a { line-height: 1.25em; } -.priority1 { - margin-left: 5%; - background-color: rgba(255, 0, 177, 0.5); -} .completed { text-decoration: line-through; @@ -125,7 +121,6 @@ a { height: 5em; background-color: #EEE; max-width: none; - /*display: flex;*/ width: 100%; margin-left: 0; box-shadow: #AAA 0px 1px 5px; diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 5a5527e94..bd5455eef 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,6 +1,7 @@ class TasksController < ApplicationController def index - @tasks = Task.order(:completed).group_by {|task| sort_variable(params[:sort], task)} + @tasks = Task.order(:completed).group_by {|task| sort_variable(params[:sort], task)} + @sorter = params[:sort] end def show @@ -67,12 +68,21 @@ def destroy end private - def sort_variable(input_sort, input_task) - if input_sort == "owner" - input_task.owner - elsif input_sort == "priority" - input_task.priority - else - input_task.category - end +# def unsorted(input_sort) +# if !(["owner", "priority", "category"].include? input_sort) +# return true +# else +# return false +# end +# end + +def sort_variable(input_sort, input_task) + if input_sort == "owner" + input_task.owner + elsif input_sort == "priority" + input_task.priority + elsif input_sort == "category" + input_task.category + else end +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2e26a50f4..67d88027d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,9 +20,8 @@
      <%= link_to "all tasks", tasks_path(params[:sort])%>
      - Sort by <%= form_tag(tasks_path, method: "get") do %> - <% ["owner", "category", "priority", "none" ].each do |i| %> + <% ["owner", "category", "priority"].each do |i| %> <%= label_tag(:sort, "#{i}") %> <%= radio_button_tag(:sort, i)%> <% end %> diff --git a/app/views/tasks/_priority.erb b/app/views/tasks/_priority.erb index 7b32f97b2..b31b3e9c5 100644 --- a/app/views/tasks/_priority.erb +++ b/app/views/tasks/_priority.erb @@ -1,7 +1,10 @@ +<% if !(input_category) %> +

      <%="All Tasks" %>

      +<% else %> -

      <%="category: #{input_category}" %>

      - +

      <%="#{sorter}: #{input_category}" %>

      +<% end %>
      diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index d5e705a3e..fa499e89a 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,8 +1,11 @@ + + <% @tasks.each do |category, array| %> -
      -<%= render partial: "priority", locals: { input_category: category, tasks: array } %> + +
      <%= "filler" if @tasks.count < 3 %>"> +<%= render partial: "priority", locals: { input_category: category, tasks: array, sorter: @sorter} %>
      From 88917c368ef8ea690542fd3e422e70c88fd34681 Mon Sep 17 00:00:00 2001 From: murog Date: Sun, 24 Sep 2017 14:33:14 -0700 Subject: [PATCH 18/19] updated sorting --- app/assets/stylesheets/application.css | 4 ++++ app/views/layouts/application.html.erb | 17 +++++++++++------ app/views/tasks/_priority.erb | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 749ff78b2..49a99b440 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -55,6 +55,10 @@ line-height: 12em; } +.sort { + font-size: 0.8em; +} + .button a:hover { text-shadow: yellow 0px 5px 20px; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 67d88027d..eb790e098 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,19 +14,24 @@
      diff --git a/app/views/tasks/_priority.erb b/app/views/tasks/_priority.erb index b31b3e9c5..d24196d4f 100644 --- a/app/views/tasks/_priority.erb +++ b/app/views/tasks/_priority.erb @@ -20,7 +20,7 @@
      <%= link_to "mark complete", mark_complete_task_path(task.id), method: :patch %> <%= link_to "edit", edit_tasks_path(task.id) %> -<%= link_to "delete", delete_task_path(task.id), method: :delete %>
      +<%= link_to "delete", delete_task_path(task.id), method: :delete, data: { confirm: "ARE YOU SURE?!!?" } %>
      <%else%>
    3. <%= link_to(task.title, task_path(task.id)) %>
      4. From cfb32ac6d8333ac409d65f413db071c06bd78012 Mon Sep 17 00:00:00 2001 From: murog Date: Mon, 2 Oct 2017 07:46:30 -0700 Subject: [PATCH 19/19] updated css --- .DS_Store | Bin 0 -> 8196 bytes app/.DS_Store | Bin 0 -> 6148 bytes app/assets/.DS_Store | Bin 0 -> 6148 bytes app/assets/images/.DS_Store | Bin 0 -> 6148 bytes app/assets/stylesheets/application.css | 31 +++++++++++++++++++++++++ app/views/layouts/application.html.erb | 2 ++ app/views/tasks/_form.html.erb | 31 +++++++++++++------------ app/views/tasks/_priority.erb | 2 +- app/views/tasks/show.html.erb | 6 +++++ 9 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 .DS_Store create mode 100644 app/.DS_Store create mode 100644 app/assets/.DS_Store create mode 100644 app/assets/images/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fc6ccf809f3cc5bb94b0b3c31a0e09dd6ee75c70 GIT binary patch literal 8196 zcmeHMO-~a+7=EW)%a(GeQ6h<#9x*`!28hQ}LF0jhPy;cdxZAFt>sTqMk!e^4K1D4zh+JG%$FOF=C}0#Y3K#{90!D#n=jUom%fq?a(Zb>)`gd+G42RXPwtfA^(#ray z?(pU7H*ep)|M2nCXK}y8)T@TB$m`Sg3wlb8elre(DBQycM_c5QPobvdH_Xf)i-I0e ziCPpWNB4QF9JU%yl0PwlIW)*Kb- zDie=L7Bz+EU+Un%vxmJNP{L!B--C!wmRAC=2Mzg7S{jzeC5yFb6Fv^HI*QyPTA@{1hdnDkS%!^0%cv&6$GSEmLRox~Qs5Ix^ERTum?_g literal 0 HcmV?d00001 diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..696137c994a8bd96c4bc1460d36c79e6f2de56fc GIT binary patch literal 6148 zcmeHKO^ee&7=EYiwrO*Ts3>^JafKCH*%gnqy9yqJVr3U`wI-Wjvt%=+Nn4gu=-Hp) z_wNur2>t-Q`vW|BtIvF_Y}0yNQJFWq^Sm>8-ZzXEB0)LwV;@d5gM=7q57QbJyDBOXs!`Xa}HplhH zX3I6`XMOTyhK zjr=H%vSX`Sty9ZcI1aNn>*p@y+Xv>D2jTSy!%Z-MaU%KYjk<<*V0k z-oAVPLC%^O);DSAHJ-pn1Pl6&I)fzU$uo?L9E%R92YnM-rBX$!H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0
      +
      <%=params%> +
      diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 3bc634174..b4df2c1ab 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,23 +1,24 @@ <%= form_for @task do |f| %> - <%= f.label :owner %> - <%= f.text_field :owner %> +<%= f.label :owner %> +<%= f.text_field :owner %> - <%= f.label :title %> - <%= f.text_field :title %> -
      +<%= f.label :title %> +<%= f.text_field :title %> +
      +
      <%= f.label :description %> <%= f.text_field :description %> +
      +
      -
      +<%= select_date Date.today, prefix: :start_date %> +
      +<%= f.label :priority %> +<%= f.text_field :priority %> +
      +<%= f.label :category %> +<%= f.text_field :category %> - <%= select_date Date.today, prefix: :start_date %> -
      - <%= f.label :priority %> - <%= f.text_field :priority %> -
      - <%= f.label :category %> - <%= f.text_field :category %> - - <%= f.submit action_name %> +<%= f.submit action_name %> <% end %> diff --git a/app/views/tasks/_priority.erb b/app/views/tasks/_priority.erb index d24196d4f..4f946f3f3 100644 --- a/app/views/tasks/_priority.erb +++ b/app/views/tasks/_priority.erb @@ -19,7 +19,7 @@
    4. <%= link_to(task.title, task_path(task.id)) %>
      5. <%= link_to "mark complete", mark_complete_task_path(task.id), method: :patch %> -<%= link_to "edit", edit_tasks_path(task.id) %> +<%= link_to "edit", edit_tasks_path(:id => task.id, :sort => sorter) %> <%= link_to "delete", delete_task_path(task.id), method: :delete, data: { confirm: "ARE YOU SURE?!!?" } %>
      <%else%>
    5. <%= link_to(task.title, task_path(task.id)) %>
      6. diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 668399d05..d844ce31b 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,8 +1,12 @@ +
      + + <% if !(@task) %>

      Task does not exist

      <% else %>

      <%= @task[:title] %>

      owner: <%= @task[:owner] %>

      +

      category: <%=@task[:category]%>

      deadline: <%= (@task[:deadline]).to_s.chomp('00:00:00 UTC') %>

      @@ -11,3 +15,5 @@
      <% end %> + +