From cf1b0e6fb0129ced04a838d35d20a3e989c24c57 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Wed, 20 Sep 2017 23:16:58 -0700 Subject: [PATCH 01/11] create index.html.erb new.html.erb --- .gitignore | 48 ++--- Gemfile | 54 +++++ Gemfile.lock | 196 ++++++++++++++++++ README.md | 74 ++----- 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 | 4 + app/helpers/application_helper.rb | 2 + app/helpers/tasks_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + app/views/tasks/index.html.erb | 2 + app/views/tasks/new.html.erb | 2 + bin/bundle | 3 + bin/rails | 4 + bin/rake | 4 + bin/setup | 38 ++++ bin/update | 29 +++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 18 ++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 25 +++ 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 | 14 ++ config/secrets.yml | 32 +++ config/spring.rb | 6 + 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 | 9 + test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 9 + tmp/.keep | 0 vendor/.keep | 0 82 files changed, 1190 insertions(+), 91 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/index.html.erb create mode 100644 app/views/tasks/new.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/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/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..dcc5b36f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,23 @@ -*.gem -*.rbc -/.config -/coverage/ -/InstalledFiles -/pkg/ -/spec/reports/ -/test/tmp/ -/test/version_tmp/ -/tmp/ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' -## Specific to RubyMotion: -.dat* -.repl_history -build/ +# Ignore bundler config. +/.bundle -## Documentation cache and generated files: -/.yardoc/ -/_yardoc/ -/doc/ -/rdoc/ +# Ignore the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal -## Environment normalisation: -/.bundle/ -/vendor/bundle -/lib/bundler/man/ +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep -# 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 +/node_modules +/yarn-error.log -# 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..13ab51252 --- /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 sqlite3 as the database for Active Record +gem 'sqlite3' +# 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..a4162209f --- /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.3.0) + minitest (5.10.3) + multi_json (1.12.2) + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.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) + sqlite3 (1.3.13) + 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) + puma (~> 3.7) + rails (~> 5.1.4) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + sqlite3 + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.15.4 diff --git a/README.md b/README.md index 3f64582e4..7db80e4ca 100644 --- a/README.md +++ b/README.md @@ -1,72 +1,24 @@ -# Task List -Let's build a Task List in Rails! We will solve the problem of tracking tasks in a web application. This project will enable us to keep track of and persist, add, edit and remove tasks. This is an individual Stage 1 project. +# README -## Learning Goals -Practice all aspects of Rails development. -- Create a new Rails application -- Explore each aspect of the Rails Request Cycle: Model, View, Controller -- Implement RESTful routes using Rails standards -- Complete all CRUD actions in a Rails application +This README would normally document whatever steps are necessary to get the +application up and running. -## Baseline -In this baseline, you'll create a new Rails application and get started with two of the major components: route, controller and view. +Things you may want to cover: -- Fork and clone this repository to your computer -- Create a new Rails application using `rails new .` - - create a `Tasks` controller - - create a route to view the task `index` page - - create a controller action for the task `index` page which contains an array of hard-coded tasks - - create an ERB view to display the tasks from the controller action +* Ruby version -## Wave 1 -This wave is where we introduce ActiveRecord to create a model. We use the model to persist our data. +* System dependencies -1. create a migration which will create a new `Task` model - - create the database schema and tables by running the `rails db:migrate` command - - the `Task` model should include _at least_ a name, a description and a completion date - - create at least 2 `Task` model instances using the `rails console` -1. update the controller's `index` action you created to retrieve and show `all` Task objects from the database - - you may need to update the view as well to use the model fields rather than the hard-coded data +* Configuration - - -### Optional Design -The focus of this project is to familiarize yourself with rails. Design of this application is optional and secondary to learning goals this project. If you do find you have time to style the design of your application, you can use or own design or the wireframes below. - -![Homepage Wireframe](/imgs/tasklist_homepage.jpg "Homepage Wireframe") +* ... 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..d180841e6 --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,4 @@ +class TasksController < ApplicationController + def index + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/helpers/tasks_helper.rb b/app/helpers/tasks_helper.rb new file mode 100644 index 000000000..ce894d00c --- /dev/null +++ b/app/helpers/tasks_helper.rb @@ -0,0 +1,2 @@ +module TasksHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..be7a9f069 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + TaskList + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 000000000..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/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..073966023 --- /dev/null +++ b/bin/rails @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +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..17240489f --- /dev/null +++ b/bin/rake @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +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/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..0d02f2498 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + timeout: 5000 + +development: + <<: *default + database: db/development.sqlite3 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: db/test.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..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..f987b6890 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,14 @@ +Rails.application.routes.draw do + get 'tasks/new' + + get 'tasks/index' + + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get "/tasks/new", to: "tasks#new", as: "new_task" + post "/tasks", to: "tasks#create", as: "tasks" + get '/tasks/:id/edit', to: 'tasks#edit', as: "edit_task" + get "/tasks/:id", to: "tasks#show", as: "task" + patch '/tasks/:id', to: 'tasks#update' + get "/tasks", to: "tasks#index" + delete "/tasks/:id", to: "tasks#destroy" +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..b86a2c9ab --- /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: 005a89a3434542dea751a735dabdd21f4adf00425a65936323c65544817e9c71c0bcfe600d33c2d8989f9e967992157c9ce69b5b58a3dfa4dadb3f18f37c5264 + +test: + secret_key_base: fa687ca0a465235b6e7e89beefd73d3b873c34c799bf07f44fad93617b1894ccae7bd2f07a7321f6758725faa1fa1700c7a32324eb8635b73d29cab31188a51d + +# 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/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..67683c951 --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class TasksControllerTest < ActionDispatch::IntegrationTest + test "should get index" do + get tasks_index_url + assert_response :success + end + +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/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 cc4722bb2aa80af94f9d438b75a0356e0f392f21 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Thu, 21 Sep 2017 19:24:32 -0700 Subject: [PATCH 02/11] add actions to controller and views --- app/controllers/tasks_controller.rb | 17 ++++++++++++- app/views/tasks/create.html.erb | 2 ++ app/views/tasks/destroy.html.erb | 2 ++ app/views/tasks/edit.html.erb | 2 ++ app/views/tasks/show.html.erb | 2 ++ app/views/tasks/update.html.erb | 2 ++ config/routes.rb | 10 ++++++++ test/controllers/tasks_controller_test.rb | 29 +++++++++++++++++++++-- 8 files changed, 63 insertions(+), 3 deletions(-) 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/show.html.erb create mode 100644 app/views/tasks/update.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index d180841e6..645f0d613 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,4 +1,19 @@ class TasksController < ApplicationController - def index + def show + end + + def edit + end + + def update + end + + def new + end + + def create + end + + def destroy end end 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/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/config/routes.rb b/config/routes.rb index f987b6890..0ae297127 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,14 @@ Rails.application.routes.draw do + get 'tasks/show' + + get 'tasks/edit' + + get 'tasks/update' + + get 'tasks/create' + + get 'tasks/destroy' + get 'tasks/new' get 'tasks/index' diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb index 67683c951..473a1fa82 100644 --- a/test/controllers/tasks_controller_test.rb +++ b/test/controllers/tasks_controller_test.rb @@ -1,8 +1,33 @@ require 'test_helper' class TasksControllerTest < ActionDispatch::IntegrationTest - test "should get index" do - get tasks_index_url + 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 From cf5c23d6caceac478cb88de6b6e48dc899f4f07b Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Thu, 21 Sep 2017 20:43:46 -0700 Subject: [PATCH 03/11] add methods to controller --- app/controllers/tasks_controller.rb | 37 +++++++++++++++++++++-- app/models/task.rb | 2 ++ app/views/tasks/index.html.erb | 24 +++++++++++++-- app/views/tasks/update.html.erb | 2 -- config/routes.rb | 25 +++++---------- db/migrate/20170922023117_create_tasks.rb | 12 ++++++++ db/schema.rb | 24 +++++++++++++++ test/fixtures/tasks.yml | 13 ++++++++ test/models/task_test.rb | 7 +++++ 9 files changed, 121 insertions(+), 25 deletions(-) create mode 100644 app/models/task.rb delete mode 100644 app/views/tasks/update.html.erb create mode 100644 db/migrate/20170922023117_create_tasks.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/tasks.yml create mode 100644 test/models/task_test.rb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 645f0d613..495f5d929 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,19 +1,50 @@ class TasksController < ApplicationController + + def index + @tasks = Task.all.order(:status) + end + + def new + @task = Task.new + end + + def create + task = Task.new(task: params[:task][:task], description: params[:task][:description], due_date: params[:task][:due], status: false) + task.save + redirect_to('/tasks') + end + def show + @task = Task.find(params[:id]) end def edit + @task = Task.find(params[:id]) end def update - end + task_updates = params[:task] + @task = Task.find( params[:id] ) - def new + @task.title = task_updates[:title] + @task.description = task_updates[:description] + @task.due_date = task_updates[:due_date] + + @task.save + redirect_to task_path(@task) end - def create + def complete? + if @task.status == false + return false + end + @task.save + redirect_to '/tasks' end def destroy + task = Task.find(params[:id]) + task.destroy + redirect_to("/tasks") end end diff --git a/app/models/task.rb b/app/models/task.rb new file mode 100644 index 000000000..3c2342421 --- /dev/null +++ b/app/models/task.rb @@ -0,0 +1,2 @@ +class Task < ApplicationRecord +end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index b16c10310..db974b003 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,2 +1,22 @@ -

Tasks#index

-

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

+
+

Your Tasks

+
    + <% @tasks.each_with_index do |task, i| %> +
  • "> +

    + <%= task.status ? "✓ #{task[:task]}" : (link_to "#{i + 1}. #{task[:task]}", task) %> +


    + +
    • + <% end %> +
+
diff --git a/app/views/tasks/update.html.erb b/app/views/tasks/update.html.erb deleted file mode 100644 index fdb1ea609..000000000 --- a/app/views/tasks/update.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Tasks#update

-

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

diff --git a/config/routes.rb b/config/routes.rb index 0ae297127..6bf782c13 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,24 +1,13 @@ Rails.application.routes.draw do - get 'tasks/show' - - get 'tasks/edit' - - get 'tasks/update' - - get 'tasks/create' - - get 'tasks/destroy' - - get 'tasks/new' - - get 'tasks/index' - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get "/tasks", to: "tasks#index", as: "tasks" get "/tasks/new", to: "tasks#new", as: "new_task" - post "/tasks", to: "tasks#create", as: "tasks" - get '/tasks/:id/edit', to: 'tasks#edit', as: "edit_task" + post "/tasks", to: "tasks#create" get "/tasks/:id", to: "tasks#show", as: "task" - patch '/tasks/:id', to: 'tasks#update' - get "/tasks", to: "tasks#index" + get "/tasks/:id/edit", to: "tasks#edit", as: "edit_task" + patch "/tasks/:id", to: "tasks#update" delete "/tasks/:id", to: "tasks#destroy" + + patch "/tasks/:id/mark_as_complete", to: "tasks#mark_as_complete", as: "mark_as_complete" + patch "/tasks/:id/mark_as_incomplete", to: "tasks#mark_as_incomplete", as: "mark_as_incomplete" end diff --git a/db/migrate/20170922023117_create_tasks.rb b/db/migrate/20170922023117_create_tasks.rb new file mode 100644 index 000000000..5265b09dd --- /dev/null +++ b/db/migrate/20170922023117_create_tasks.rb @@ -0,0 +1,12 @@ +class CreateTasks < ActiveRecord::Migration[5.1] + def change + create_table :tasks do |t| + t.string :task + t.string :description + t.date :due + t.boolean :status + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2d45f1c8c --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,24 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20170922023117) do + + create_table "tasks", force: :cascade do |t| + t.string "task" + t.string "description" + t.date "due" + t.boolean "status" + 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..bbec58fd0 --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + task: MyString + description: MyString + due: 2017-09-21 + status: false + +two: + task: MyString + description: MyString + due: 2017-09-21 + 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 5bd49c14bc8fc90140b79fb5fdd7b5612819ff4e Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Thu, 21 Sep 2017 21:17:59 -0700 Subject: [PATCH 04/11] basic html for index new edit --- app/controllers/tasks_controller.rb | 8 ++++---- app/views/tasks/create.html.erb | 2 -- app/views/tasks/destroy.html.erb | 2 -- app/views/tasks/edit.html.erb | 16 ++++++++++++++-- app/views/tasks/index.html.erb | 4 ++-- app/views/tasks/new.html.erb | 15 +++++++++++++-- app/views/tasks/show.html.erb | 9 +++++++-- 7 files changed, 40 insertions(+), 16 deletions(-) delete mode 100644 app/views/tasks/create.html.erb delete mode 100644 app/views/tasks/destroy.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 495f5d929..ca8f452a4 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -9,7 +9,7 @@ def new end def create - task = Task.new(task: params[:task][:task], description: params[:task][:description], due_date: params[:task][:due], status: false) + task = Task.new(task: params[:task][:task], description: params[:task][:description], due: params[:task][:due], status: false) task.save redirect_to('/tasks') end @@ -24,11 +24,11 @@ def edit def update task_updates = params[:task] - @task = Task.find( params[:id] ) + @task = Task.find(params[:id]) - @task.title = task_updates[:title] + @task.task = task_updates[:task] @task.description = task_updates[:description] - @task.due_date = task_updates[:due_date] + @task.due = task_updates[:due] @task.save redirect_to task_path(@task) diff --git a/app/views/tasks/create.html.erb b/app/views/tasks/create.html.erb deleted file mode 100644 index fcad439c4..000000000 --- a/app/views/tasks/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Tasks#create

-

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

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

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 index 374190308..11325fb54 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,2 +1,14 @@ -

Tasks#edit

-

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

+

edit

+ +<%= form_for @task do |f| %> + <%= f.label :task %> + <%= f.text_field :task %> + + <%= f.label :description %> + <%= f.text_field :description %> + + <%= f.label :due %> + <%= f.text_field :due, placeholder: "e.g., 2017-9-21" %> + + <%= f.submit "Save changes" %> + <% end %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index db974b003..00e3218dc 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,10 +1,10 @@

Your Tasks

-
    +
      <% @tasks.each_with_index do |task, i| %>
    1. ">

      - <%= task.status ? "✓ #{task[:task]}" : (link_to "#{i + 1}. #{task[:task]}", task) %> + <%= task.status ? "✓ #{task[:task]}" : (link_to "#{task[:task]}", task) %>


+ + + +
+ <%= link_to 'Add', new_task_path %> | + <%= link_to "List all tasks", tasks_path %> +
diff --git a/config/routes.rb b/config/routes.rb index 6bf782c13..f1c7fb339 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,4 @@ patch "/tasks/:id", to: "tasks#update" delete "/tasks/:id", to: "tasks#destroy" - patch "/tasks/:id/mark_as_complete", to: "tasks#mark_as_complete", as: "mark_as_complete" - patch "/tasks/:id/mark_as_incomplete", to: "tasks#mark_as_incomplete", as: "mark_as_incomplete" end From f49aa0f2cd390540e634ae5574795c9a80a8660e Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Fri, 22 Sep 2017 15:53:26 -0700 Subject: [PATCH 06/11] view all, add due date with date field --- app/controllers/tasks_controller.rb | 17 ++++++++--------- app/views/tasks/all.html.erb | 21 +++++++++++++++++++++ app/views/tasks/edit.html.erb | 18 ++++++++++-------- app/views/tasks/index.html.erb | 10 +++++----- app/views/tasks/new.html.erb | 9 +++++---- app/views/tasks/show.html.erb | 6 ++++-- config/routes.rb | 21 ++++++++++++++------- 7 files changed, 67 insertions(+), 35 deletions(-) create mode 100644 app/views/tasks/all.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 07a50f8aa..237a3301d 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -22,16 +22,15 @@ def edit @task = Task.find(params[:id]) end - def update - task_updates = params[:task] - @task = Task.find(params[:id]) - - @task.title = task_updates[:title] - @task.description = task_updates[:description] - @task.due_date = task_updates[:due_date] + def all + @tasks = Task.all.order(:status) + end - @task.save - redirect_to task_path(@task) + def update + task = Task.find(params[:id]) + task.update(task: params[:task][:task], description: params[:task][:description], due: params[:task][:due]) + + redirect_to('/tasks') end def status diff --git a/app/views/tasks/all.html.erb b/app/views/tasks/all.html.erb new file mode 100644 index 000000000..2ed409acc --- /dev/null +++ b/app/views/tasks/all.html.erb @@ -0,0 +1,21 @@ +
+

Your Tasks

+
    + <% @tasks.each do |task| %> +
  1. +

    + + <%= link_to task.task, task_path(task.id) %> + +

    + +
    2. +

    + Details: <%= task.description %> +

    +

    + <%= task.due %> +

    + <% end %> +
+
diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 11325fb54..d4dc15d3e 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,14 +1,16 @@

edit

<%= form_for @task do |f| %> - <%= f.label :task %> - <%= f.text_field :task %> + <%= f.label :task %> + <%= f.text_field :task %> - <%= f.label :description %> - <%= f.text_field :description %> + <%= f.label :description %> + <%= f.text_field :description %> - <%= f.label :due %> - <%= f.text_field :due, placeholder: "e.g., 2017-9-21" %> + <%= f.label :due %> + <%= f.date_select :due %> - <%= f.submit "Save changes" %> - <% end %> + <%= f.submit 'Save' %> +<% end %> + +<%= link_to 'Home', tasks_path %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 024373671..5af656519 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,11 +1,11 @@ -
-

Your Tasks

+
+

Tasks

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

  1. - <%= link_to '#{task[:task]}', task %> + <%= link_to task.task, task_path(task.id) %>

    <%= link_to 'Edit', edit_task_path(task) %> | @@ -15,7 +15,7 @@
-
+
<%= link_to 'Add', new_task_path %> | - <%= link_to "List all tasks", tasks_path %> + <%= link_to 'All tasks', all_tasks_path %>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 858e72b07..d8782313f 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -2,12 +2,13 @@ <%= form_for @task do |f| %> <%= f.label :task %> - <%= f.text_field :task, placeholder: "e.g., Food needs" %> + <%= f.text_field :task, placeholder: "task name here" %> <%= f.label :description %> - <%= f.text_field :description, placeholder: "e.g., carrots, ginger" %> + <%= f.text_field :description, placeholder: "description here" %> <%= f.label :due %> - <%= f.text_field :due, placeholder: "e.g., 2017-9-21" %> - <%= f.submit "Make a new task!"%> + <%= f.date_field :due %> + + <%= f.submit "Create"%> <% end %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 06532b191..a554b5ccc 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,7 +1,9 @@ -

<%= @task.task %>

+

+ <%= @task.task %> +

Details: <%= @task.description %>

- Try to do by: <%= @task.due %> + Due: <%= @task.due %>

diff --git a/config/routes.rb b/config/routes.rb index f1c7fb339..17cd38e0b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,11 +1,18 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get "/tasks", to: "tasks#index", as: "tasks" - get "/tasks/new", to: "tasks#new", as: "new_task" - post "/tasks", to: "tasks#create" - get "/tasks/:id", to: "tasks#show", as: "task" - get "/tasks/:id/edit", to: "tasks#edit", as: "edit_task" - patch "/tasks/:id", to: "tasks#update" - delete "/tasks/:id", to: "tasks#destroy" + get '/tasks', to: 'tasks#index', as: 'tasks' + get '/tasks/new', to: 'tasks#new', as: 'new_task' + post '/tasks', to: 'tasks#create' + + get '/tasks/all', to: 'tasks#all', as: 'all_tasks' + + get '/tasks/:id', to: 'tasks#show', as: 'task' + get '/tasks/:id/edit', to: 'tasks#edit', as: 'edit_task' + + + patch '/tasks/:id', to: 'tasks#update' + delete '/tasks/:id', to: 'tasks#destroy' + + end From eff28a7584a4b9a454dcd25c50481e3a59b2988e Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 2 Oct 2017 00:02:13 -0700 Subject: [PATCH 07/11] add nav links to all pages --- app/views/tasks/all.html.erb | 6 ++++++ app/views/tasks/edit.html.erb | 6 +++++- app/views/tasks/index.html.erb | 5 +++-- app/views/tasks/new.html.erb | 6 ++++++ app/views/tasks/show.html.erb | 6 ++++++ 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/views/tasks/all.html.erb b/app/views/tasks/all.html.erb index 2ed409acc..cec35509b 100644 --- a/app/views/tasks/all.html.erb +++ b/app/views/tasks/all.html.erb @@ -19,3 +19,9 @@ <% end %>
+ + diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index d4dc15d3e..6b10d26af 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -13,4 +13,8 @@ <%= f.submit 'Save' %> <% end %> -<%= link_to 'Home', tasks_path %> + diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 5af656519..9207d6345 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -15,7 +15,8 @@
-
+
+ diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index d8782313f..ca2eabc33 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -12,3 +12,9 @@ <%= f.submit "Create"%> <% end %> + + diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index a554b5ccc..719fff3d4 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -7,3 +7,9 @@

Due: <%= @task.due %>

+ + From 2ed22cb1aba0ff5a5e60a0c307e077f8cd2186af Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 2 Oct 2017 01:26:27 -0700 Subject: [PATCH 08/11] created partial views for form and nav --- app/controllers/tasks_controller.rb | 21 ++++++++++++++- app/views/tasks/_form.html.erb | 12 +++++++++ app/views/tasks/_nav.html.erb | 5 ++++ app/views/tasks/all.html.erb | 27 +++++++++---------- app/views/tasks/completed.html.erb | 24 +++++++++++++++++ app/views/tasks/edit.html.erb | 22 +++------------ app/views/tasks/index.html.erb | 26 ++++++++---------- app/views/tasks/new.html.erb | 22 +++------------ app/views/tasks/show.html.erb | 6 +---- .../20171002074312_add_date_completed.rb | 4 +++ ...71002074737_add_date_completed_to_tasks.rb | 5 ++++ db/schema.rb | 3 ++- 12 files changed, 103 insertions(+), 74 deletions(-) create mode 100644 app/views/tasks/_form.html.erb create mode 100644 app/views/tasks/_nav.html.erb create mode 100644 app/views/tasks/completed.html.erb create mode 100644 db/migrate/20171002074312_add_date_completed.rb create mode 100644 db/migrate/20171002074737_add_date_completed_to_tasks.rb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 237a3301d..d119c7c22 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -29,7 +29,7 @@ def all def update task = Task.find(params[:id]) task.update(task: params[:task][:task], description: params[:task][:description], due: params[:task][:due]) - + redirect_to('/tasks') end @@ -42,4 +42,23 @@ def destroy task.destroy redirect_to("/tasks") end + + def mark_as_complete + @task = Task.find(params[:id]) + @task.status = true + + @task.date_completed = Date.today + @task.save + + redirect_to("/tasks") + end + + def mark_as_incomplete + @task = Task.find(params[:id]) + @task.status = false + @task.date_completed = "" + @task.save + + redirect_to("/tasks") + end end diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..fe50fbbfe --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,12 @@ +<%= form_for @task do |f| %> + <%= f.label :task %> + <%= f.text_field :task, placeholder: "Wash the dog" %> + + <%= f.label :description %> + <%= f.text_field :description, placeholder: "Sugarcreek smells" %> + + <%= f.label :due %> + <%= f.date_field :due %> + + <%= f.submit %> +<% end %> diff --git a/app/views/tasks/_nav.html.erb b/app/views/tasks/_nav.html.erb new file mode 100644 index 000000000..2d3c962bb --- /dev/null +++ b/app/views/tasks/_nav.html.erb @@ -0,0 +1,5 @@ + diff --git a/app/views/tasks/all.html.erb b/app/views/tasks/all.html.erb index cec35509b..9d04fa26b 100644 --- a/app/views/tasks/all.html.erb +++ b/app/views/tasks/all.html.erb @@ -1,14 +1,13 @@

Your Tasks

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

    - - <%= link_to task.task, task_path(task.id) %> - -

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

      + + <%= link_to task.task, task_path(task.id) %> + +

      2. Details: <%= task.description %> @@ -16,12 +15,12 @@

      <%= task.due %>

      +

      + <%= link_to 'Edit', edit_task_path(task) %> | + <%= link_to 'Delete', task_path(task), method: :delete %> +

      <% end %>
- +<%= render partial: 'nav' %> diff --git a/app/views/tasks/completed.html.erb b/app/views/tasks/completed.html.erb new file mode 100644 index 000000000..b144528f3 --- /dev/null +++ b/app/views/tasks/completed.html.erb @@ -0,0 +1,24 @@ +
+

Completed Tasks

+
    + <% @tasks.each do |task| %> +
  1. + <% if task.status == true %> +

    + + <%= link_to task.task, task_path(task.id) %> + +

    + <% end %> +
    2. +

    + Details: <%= task.description %> +

    +

    + <%= task.due %> +

    + <% end %> +
+
+ +<%= render partial: 'nav' %> diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 6b10d26af..0e0c29f60 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,20 +1,4 @@ -

edit

+

Edit Task

-<%= form_for @task do |f| %> - <%= f.label :task %> - <%= f.text_field :task %> - - <%= f.label :description %> - <%= f.text_field :description %> - - <%= f.label :due %> - <%= f.date_select :due %> - - <%= f.submit 'Save' %> -<% end %> - - +<%= render partial: 'form', locals: { button_text: "Update" }%> +<%= render partial: 'nav' %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 9207d6345..811702d34 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,22 +1,18 @@

Tasks

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

    - - <%= link_to task.task, task_path(task.id) %> - -

    - <%= link_to 'Edit', edit_task_path(task) %> | - <%= link_to 'Delete', task_path(task), method: :delete %> +
      + <% @tasks.each do |task| %> +
    1. +

      + + <%= link_to task.task, task_path(task.id) %> + +

      + <%= link_to 'Edit', edit_task_path(task) %> | + <%= link_to 'Delete', task_path(task), method: :delete %>
      2. <% end %>
- +<%= render partial: 'nav' %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index ca2eabc33..6294e15b4 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,20 +1,4 @@ -

new task

+

Create New Task

-<%= form_for @task do |f| %> - <%= f.label :task %> - <%= f.text_field :task, placeholder: "task name here" %> - - <%= f.label :description %> - <%= f.text_field :description, placeholder: "description here" %> - - <%= f.label :due %> - <%= f.date_field :due %> - - <%= f.submit "Create"%> -<% end %> - - +<%= render partial: 'form', locals: { button_text: "Add Task" }%> +<%= render partial: 'nav' %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 719fff3d4..cd71e44ee 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -8,8 +8,4 @@ Due: <%= @task.due %>

- +<%= render partial: 'nav' %> diff --git a/db/migrate/20171002074312_add_date_completed.rb b/db/migrate/20171002074312_add_date_completed.rb new file mode 100644 index 000000000..9ffcab35c --- /dev/null +++ b/db/migrate/20171002074312_add_date_completed.rb @@ -0,0 +1,4 @@ +class AddDateCompleted < ActiveRecord::Migration[5.1] + def change + end +end diff --git a/db/migrate/20171002074737_add_date_completed_to_tasks.rb b/db/migrate/20171002074737_add_date_completed_to_tasks.rb new file mode 100644 index 000000000..477beaa31 --- /dev/null +++ b/db/migrate/20171002074737_add_date_completed_to_tasks.rb @@ -0,0 +1,5 @@ +class AddDateCompletedToTasks < ActiveRecord::Migration[5.1] + def change + add_column :tasks, :date_completed, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 2d45f1c8c..d0352fd88 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: 20170922023117) do +ActiveRecord::Schema.define(version: 20171002074737) do create_table "tasks", force: :cascade do |t| t.string "task" @@ -19,6 +19,7 @@ t.boolean "status" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.date "date_completed" end end From eb27d2db45f3236853764ace5a462a7cc9e4728c Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 2 Oct 2017 01:51:23 -0700 Subject: [PATCH 09/11] trying to create a view for completed tasks --- app/controllers/tasks_controller.rb | 4 ++-- app/views/tasks/_nav.html.erb | 3 ++- app/views/tasks/completed.html.erb | 2 +- app/views/tasks/index.html.erb | 3 ++- config/routes.rb | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index d119c7c22..9db3c3295 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -43,7 +43,7 @@ def destroy redirect_to("/tasks") end - def mark_as_complete + def complete @task = Task.find(params[:id]) @task.status = true @@ -53,7 +53,7 @@ def mark_as_complete redirect_to("/tasks") end - def mark_as_incomplete + def incomplete @task = Task.find(params[:id]) @task.status = false @task.date_completed = "" diff --git a/app/views/tasks/_nav.html.erb b/app/views/tasks/_nav.html.erb index 2d3c962bb..3b7a7f480 100644 --- a/app/views/tasks/_nav.html.erb +++ b/app/views/tasks/_nav.html.erb @@ -1,5 +1,6 @@ diff --git a/app/views/tasks/completed.html.erb b/app/views/tasks/completed.html.erb index b144528f3..73f284606 100644 --- a/app/views/tasks/completed.html.erb +++ b/app/views/tasks/completed.html.erb @@ -1,7 +1,7 @@

Completed Tasks

    - <% @tasks.each do |task| %> + <% tasks.each do |task| %>
  1. <% if task.status == true %>

    diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 811702d34..8c96c7b4b 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -8,8 +8,9 @@ <%= link_to task.task, task_path(task.id) %>

    + <%= link_to "Mark Completed", completed_path(task.id), method: :patch %> | <%= link_to 'Edit', edit_task_path(task) %> | - <%= link_to 'Delete', task_path(task), method: :delete %> + <%= link_to 'Delete', task_path(task), method: :delete, data: { confirm: "This cannot be reversed. Are you sure you want to delete?" } %>
    2. <% end %>
diff --git a/config/routes.rb b/config/routes.rb index 17cd38e0b..24f5302ea 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,10 +9,10 @@ get '/tasks/:id', to: 'tasks#show', as: 'task' get '/tasks/:id/edit', to: 'tasks#edit', as: 'edit_task' - patch '/tasks/:id', to: 'tasks#update' delete '/tasks/:id', to: 'tasks#destroy' - - + get '/tasks/completed', to: 'tasks#completed', as: 'all_completed' + patch '/tasks/:id/completed', to: 'tasks#completed', as: 'completed' + patch '/tasks/:id/incompleted', to: 'tasks#incompleted' end From cd1e293dfef62eb819297d7a33b1d5e66972df31 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 2 Oct 2017 02:09:25 -0700 Subject: [PATCH 10/11] internet is down --- app/controllers/tasks_controller.rb | 11 +---------- app/views/tasks/_nav.html.erb | 1 - app/views/tasks/all_completed.html.erb | 15 +++++++++++++++ app/views/tasks/completed.html.erb | 24 ------------------------ config/routes.rb | 4 ++-- 5 files changed, 18 insertions(+), 37 deletions(-) create mode 100644 app/views/tasks/all_completed.html.erb delete mode 100644 app/views/tasks/completed.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 9db3c3295..1163981a1 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -43,7 +43,7 @@ def destroy redirect_to("/tasks") end - def complete + def completed @task = Task.find(params[:id]) @task.status = true @@ -52,13 +52,4 @@ def complete redirect_to("/tasks") end - - def incomplete - @task = Task.find(params[:id]) - @task.status = false - @task.date_completed = "" - @task.save - - redirect_to("/tasks") - end end diff --git a/app/views/tasks/_nav.html.erb b/app/views/tasks/_nav.html.erb index 3b7a7f480..5767f5a1f 100644 --- a/app/views/tasks/_nav.html.erb +++ b/app/views/tasks/_nav.html.erb @@ -2,5 +2,4 @@ <%= link_to 'Home', tasks_path %> | <%= link_to 'Add', new_task_path %> | <%= link_to 'All Tasks', all_tasks_path %> - <%= link_to 'Completed Tasks', all_completed_path %> diff --git a/app/views/tasks/all_completed.html.erb b/app/views/tasks/all_completed.html.erb new file mode 100644 index 000000000..770cd3044 --- /dev/null +++ b/app/views/tasks/all_completed.html.erb @@ -0,0 +1,15 @@ + diff --git a/app/views/tasks/completed.html.erb b/app/views/tasks/completed.html.erb deleted file mode 100644 index 73f284606..000000000 --- a/app/views/tasks/completed.html.erb +++ /dev/null @@ -1,24 +0,0 @@ -
-

Completed Tasks

-
    - <% tasks.each do |task| %> -
  1. - <% if task.status == true %> -

    - - <%= link_to task.task, task_path(task.id) %> - -

    - <% end %> -
    2. -

    - Details: <%= task.description %> -

    -

    - <%= task.due %> -

    - <% end %> -
-
- -<%= render partial: 'nav' %> diff --git a/config/routes.rb b/config/routes.rb index 24f5302ea..f9e64c6e3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,7 +12,7 @@ patch '/tasks/:id', to: 'tasks#update' delete '/tasks/:id', to: 'tasks#destroy' - get '/tasks/completed', to: 'tasks#completed', as: 'all_completed' + get '/tasks/completed_tasks', to: 'tasks#completed_tasks', as: 'completed_tasks' patch '/tasks/:id/completed', to: 'tasks#completed', as: 'completed' - patch '/tasks/:id/incompleted', to: 'tasks#incompleted' + # patch '/tasks/:id/incompleted', to: 'tasks#incompleted' end From 62a9e12c3ed17cd5d31c271d075559c0bc92da61 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 2 Oct 2017 08:30:07 -0700 Subject: [PATCH 11/11] unable to figure out how to mark completed --- app/controllers/tasks_controller.rb | 18 +++++++++--------- app/views/tasks/_nav.html.erb | 2 +- app/views/tasks/all_completed.html.erb | 15 --------------- app/views/tasks/index.html.erb | 1 - config/routes.rb | 8 ++++---- 5 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 app/views/tasks/all_completed.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 1163981a1..68c40eeea 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -43,13 +43,13 @@ def destroy redirect_to("/tasks") end - def completed - @task = Task.find(params[:id]) - @task.status = true - - @task.date_completed = Date.today - @task.save - - redirect_to("/tasks") - end + # def mark_completed + # @task = Task.find(params[:id]) + # @task.status = true + # + # @task.date_completed = Date.today + # @task.save + # + # redirect_to("/tasks") + # end end diff --git a/app/views/tasks/_nav.html.erb b/app/views/tasks/_nav.html.erb index 5767f5a1f..700936bab 100644 --- a/app/views/tasks/_nav.html.erb +++ b/app/views/tasks/_nav.html.erb @@ -1,5 +1,5 @@ diff --git a/app/views/tasks/all_completed.html.erb b/app/views/tasks/all_completed.html.erb deleted file mode 100644 index 770cd3044..000000000 --- a/app/views/tasks/all_completed.html.erb +++ /dev/null @@ -1,15 +0,0 @@ - diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 8c96c7b4b..454039386 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -8,7 +8,6 @@ <%= link_to task.task, task_path(task.id) %>

- <%= link_to "Mark Completed", completed_path(task.id), method: :patch %> | <%= link_to 'Edit', edit_task_path(task) %> | <%= link_to 'Delete', task_path(task), method: :delete, data: { confirm: "This cannot be reversed. Are you sure you want to delete?" } %> diff --git a/config/routes.rb b/config/routes.rb index f9e64c6e3..21737f1f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,8 +11,8 @@ patch '/tasks/:id', to: 'tasks#update' delete '/tasks/:id', to: 'tasks#destroy' - - get '/tasks/completed_tasks', to: 'tasks#completed_tasks', as: 'completed_tasks' - patch '/tasks/:id/completed', to: 'tasks#completed', as: 'completed' - # patch '/tasks/:id/incompleted', to: 'tasks#incompleted' + # + # get '/tasks/completed', to: 'tasks#completed' + # get '/tasks/:id/completed', to: 'tasks#completed' + # patch '/tasks/:id/completed', to: 'tasks#completed' end