From 7b01057252a6d7a7ff5bf6f700f9f50b97e6a68a Mon Sep 17 00:00:00 2001 From: Gale Harrington Date: Tue, 19 Sep 2017 15:23:06 -0700 Subject: [PATCH 1/9] Cloned from github again --- .gitignore | 46 ++-- Gemfile | 54 +++++ Gemfile.lock | 196 ++++++++++++++++++ README.md | 76 ++----- 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 | 47 +++++ app/assets/stylesheets/tasks.scss | 11 + 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 | 16 ++ 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 | 23 ++ app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + app/views/tasks/add.html.erb | 2 + app/views/tasks/edit.html.erb | 2 + app/views/tasks/index.html.erb | 10 + app/views/tasks/remove.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 | 11 + 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 | 24 +++ 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 86 files changed, 1377 insertions(+), 94 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/add.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/remove.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..c66a5e41d --- /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) + 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.15.4 diff --git a/README.md b/README.md index cd701a5c0..7db80e4ca 100644 --- a/README.md +++ b/README.md @@ -1,74 +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. -## Wave 0 -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 - +* 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..dbb36e0ae --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,47 @@ +/* + * 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 + */ + + + #Tasklist { + position: fixed; + left: 5vw; + top: 0; + } + + #add_button, #all_button { + border: solid; + display: block; + padding: 2vw; + position: fixed; + top: 5vw; + left: 5vw; + } + + #all_button { + top: 15vw; + } + + footer p { + position: fixed; + bottom: 0px; + left: 0px; + width: 100%; + height: 4vw; + text-align: center; + border: dotted; + display: inline; + padding-top: 4vw; + } diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss new file mode 100644 index 000000000..f63c5b593 --- /dev/null +++ b/app/assets/stylesheets/tasks.scss @@ -0,0 +1,11 @@ +// 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/ +.to_do_list { + position: relative; + left: 19vw; + top: 6vw; + border: solid; + padding: 2vw; + width: 20vw; +} 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..af582f36d --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,16 @@ +class TasksController < ApplicationController + TASKS = [{task: "Call Mom"}, {task: "Laundry"}, {task: "Groceries"}] + + def index + @tasks = TASKS + end + + def add + end + + def remove + end + + def edit + 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..18ebeaa2a --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,23 @@ + + + + TaskList + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + +
+

Tasklist

+
+ + <%= yield %> +

<%= link_to("Add Task", add_task_path)%>

+

<%= link_to("All Tasks", tasks_path) %>

+ + + 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/add.html.erb b/app/views/tasks/add.html.erb new file mode 100644 index 000000000..fd9ee695c --- /dev/null +++ b/app/views/tasks/add.html.erb @@ -0,0 +1,2 @@ +

Tasks#add

+

Find me in app/views/tasks/add.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..d97f8786c --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,10 @@ + +

To Do:

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

Tasks#remove

+

Find me in app/views/tasks/remove.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..eb738cb2e --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,11 @@ +Rails.application.routes.draw do + get 'tasks', to: 'tasks#index', as: 'tasks' + + get 'tasks/add', to:'tasks#add', as: 'add_task' + + get 'tasks/remove' + + get 'tasks/edit' + + # 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..e41ca6855 --- /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: 53be76e6020a33b168b7a27646e4a7c6ac7e337556509984afc86d3bc967886ff6ad3b5b0d76967fbb6a14d4c2bcc3f1fbb227b550dc42f9eb7a0d3500fdd2c4 + +test: + secret_key_base: 5f6531bfd45a52db212303380a900787734e2b00702dfdb4a3b07c43f52b7b3e668b5bb6e26fa8cd1d7355351d5260aa0b9907de71e4310c20be882e41ef88f9 + +# 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..622c1441b --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,24 @@ +require 'test_helper' + +class TasksControllerTest < ActionDispatch::IntegrationTest + test "should get index" do + get tasks_index_url + assert_response :success + end + + test "should get add" do + get tasks_add_url + assert_response :success + end + + test "should get remove" do + get tasks_remove_url + assert_response :success + end + + test "should get edit" do + get tasks_edit_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 4cd75db65fe2a913e7451cf898756694eb9f4e71 Mon Sep 17 00:00:00 2001 From: Gale Harrington Date: Fri, 22 Sep 2017 10:43:57 -0700 Subject: [PATCH 2/9] Commit for the first time - oops --- app/assets/images/island.jpeg | Bin 0 -> 8467 bytes app/assets/stylesheets/application.css | 41 ++++++++++++------- app/assets/stylesheets/tasks.scss | 44 +++++++++++++++++++-- app/controllers/tasks_controller.rb | 46 ++++++++++++++++++++-- app/models/task.rb | 2 + app/views/layouts/application.html.erb | 44 +++++++++++---------- app/views/tasks/add.html.erb | 22 ++++++++++- app/views/tasks/create.html.erb | 5 +++ app/views/tasks/edit.html.erb | 22 ++++++++++- app/views/tasks/index.html.erb | 23 ++++++----- app/views/tasks/show.html.erb | 25 ++++++++++++ app/views/tasks/update.html.erb | 3 ++ config/routes.rb | 12 +++++- db/migrate/20170919222950_create_tasks.rb | 11 ++++++ db/schema.rb | 10 ++++- test/fixtures/tasks.yml | 11 ++++++ test/models/task_test.rb | 7 ++++ 17 files changed, 270 insertions(+), 58 deletions(-) create mode 100644 app/assets/images/island.jpeg create mode 100644 app/models/task.rb create mode 100644 app/views/tasks/create.html.erb create mode 100644 app/views/tasks/show.html.erb create mode 100644 app/views/tasks/update.html.erb create mode 100644 db/migrate/20170919222950_create_tasks.rb create mode 100644 test/fixtures/tasks.yml create mode 100644 test/models/task_test.rb diff --git a/app/assets/images/island.jpeg b/app/assets/images/island.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..0f5a26e65061125dd861316c33f2cb3ef640044c GIT binary patch literal 8467 zcmZX22T)T{w{9rXr3j(-CJ<^U(mMf^UP7;-gsMOQK@q7!2%%#H=~aplnlzD~015=8 zT96{rl_E&L{CD1c_szU@X75>ZzBPNT^R3z6p0ls#uYUmO??VhB03sp)favA{Tz>(? z11QPJ>F?YD($Uk?)6vt>-HiY7fIwzuAOjG{$}Pgn$}YqK1oFx735kLvB_&ySWEEw_ z?}G#0PR8Kc{Rpe5lxL1OX~BQ@ zCFIjjlUc9K>?Q%J`)2Bh&fAqgg=&HyqpLHg^h!$J<{UT@M*mU|nVj@{Mc(zwsT-aX z`NY}T$SwcI87;`5v;lk~bl`fG`ocSS&S>m(U_D=TUR-AGRc54U6^{3b&}P<5@UQz- z1ZD?xo!GwtE~dpbXxV(;!SSz0Al-VyUa7&f2-J}%$Xkb7cw>Y8cKJ%?@%sp8l^@Fn zo3i7%>OQQ8J|7~Hp86t6)(?Sa`0cTYM7PLY0rcN$J7pTfpp@ zn+=q^1wp3HHf_2qYpF7Y58OM^qsrh-^Y^^rFSN#WkDc?BtcMm3yWf(^ z=d(GkM|2=w32d_93eAu17YJ|d{diR9WfW|h;d$?_cj2povij$~-n5mJnGBzwE51e! zrPyLqhEkLvMlH6~Ae6O%_14Ygw4FFAO4QWTK7uY6_0&-sMBp?Fl;cGchrS62ll6gd zMrM-O^p;!kA^>(}CPoM_Lnghhw#t{r_07lbMux-+go^P{qUInfhaDy{ig&5@Tz6V! zmoc5s!q1gk`^k@+(3S1w?XN;;7ApTS$ZCVR<4K=C_ef4+wV=TId&G($7j)yGO#x|4 zvi2+YjcRmSs=*eXKQbD3>XEsq7et**M;{|(<;GfBYrXaxJLt){zbfv;CAI(Y`mB#o z<9-&6pW8+)z}IG|)AXxUf92OivR(t2XOs*Mf7Oji`L|Y?R71RUl@_ptt3B3ppe2uvtStYJT{}33sy-KZi@$S>XQIgzyM~n0I!>-yI)B|jrm$S zwvQp(@zI@t1yA-P*SS@ybWT0_Mc%Jp584lQWxe{^wZg1lV2pW$K?^TejL(R|aweA( zY086#9ZM|+L^{3vrm^c}AtOwzD_NY=JGCw|mI4w+EN#xpc4JdqRaudV%Ux+tQ)ab* z_DWIcnUULCJ87t_Io;@F=lQ>!$gYaX@R0|OopiCFFS6BZ1tTc>tDWA~pl8FjmPZ2{ z9a3)sRWK)oGIwiYmde$dy%sn#W@0%ArcaETJ~k;Mv3KhSfX?FySh;X$vF&ItEo#DM zztd>`SC6CKB{z4Opf?CvI{PFsWExElSNsvgS18dpU0hvnUc`I)Z1WcflYBTNmj>?q`W%yy6RkI7+}6?I#tH=nPwo)~l}gycku`?+}WD|lyPhWvm{ z;Pj!;LI3#5d(hX2!4QwTIk}NmB>D02`O<6oo(Wzyq%{WVyHe^O^b5fWcEZdLiB?<# zq`ZmRM%Mj8&CM4vBUDO7_c9$YE4i&sjHJ4mo#l-wvp4UvKZ!l3Tvr*o4AKOwJkPF5jvBt-2!sQ89@`i>I38W zrR&^0j19z+h}lS?@?=^J==8`zsPrdyk7!xW9fQxiSN?*LrB%3Ci&$@`q_@dSP(Qiry271aF;;o_JheLOVWiI5;ZXpE@}V9l4;^?O5I-NVLe8`jWbkdi?6vU*?r_j zOw#ov>~wpF0_=2+k)1g0IDRm|I#Z6f7SJ~ZVk0wD0JFXYvAVaH%G9hh8TpnG34;?w zh2u()5Cb=MkZyV0>^{4I2udh}(_mBp_=RB*Rm>$Bo7_&yVzOpj`Si#m6fEJ70MZ9| zAizoBNpuFWtG`F2fHzR}&Ejs^wE7#Ld#6oZc#d!?6Kck|UN4siF zFRfnAhG%}Z(b*ADJBZ-j9~rv5RpWutjE!kT$)|%TMq=HlL@>g(ctmgK|M|FH+w@Yb zdz%d#nBcCwZPDThT=v)9EKe`q1%77QW=_pZ`;n#>;7`ey{{y?h`5C`m1 zn!+l1z&0aFBehodPbR_-B306Io;VMuSX#X=t5Ynb0+R4E5QzC$IVkjv7%2uSZw-1V zyPoigp`VO?5J}Oihvc<()C&1yM-JUyC|7fuC^f&@@%g~ksnVq3rMh^T=5HN0|IFN{ zC1-|rI-QcXyfq-^HS9I_+s7f#WN@zoM_n&aE~hoX`)?Q9BEFDVHg7-tR3+=IZ+Q8h za{z7RbDv#tH%&JBNRCg<@ttXs)Z0(5r)o-=Zdn7wVx9vw7(WIFd|5lbV`#zD3abQZ zhlwKuG!4?+CvU;+tk{eoV46gtIKCttZK43HGHcy3a#19eW_A)BKm*-3lmn;TPz=%} zD8zy^1++-?;E-6*Pzk5DL{@cvvWy24C|UXsbqhYCchP{YpCIiXn@qxFFQjMzSEiF$ zW(O}$D+P@ls(&!`nwV?)kvQe6BgOeptkFXQ*!ORuHN_4a4R=_`JXcSf^s_X#jzpsU zI)HQYbXv#ghw-PJ^WT-)Ka|#63Xcf}lj*u8NymFo#(S6(yRjl@d&3>VXTJq3)uXw= znA%9}w>k2UXbM3E9bz4lagHkWg=5e^Rr25Iof0Z`?$Ef1f*GsO%pm4q^Ay+$db2$I z97IK2O;rORf-n(Hl3SgM-v8o%*1q4H+8-<)UvH<&eAj)HKLEfF1}2k;fT=1$oM2WI zUwSW2YjP0Ai+7hs3Fwh%5sDc~;^Axxab-ioll^i`#>F+06a?u>O5Fi1?G}1Dd*C3( zr(ZGaHXz$bj<|)vh*-{uwY15#Pn*E&O+`ov6^lt;8FR2}Z&v^}sBazped@`VI?}NA zlX)EUlgH1xuGQb3p2XVNxHrSE6uBG9lo@U_FRPAbSWGtgLLAfFS)6+pKpSkT8!_X+ z%n+_0yjEHGUO2Op`p!QoABt;0d7xkj;t>z!VPv(bBxLHxw8*=S#%4b=r5)FNMti~1o~k;cq&z_k3N4$7)s&y_a!RYzSz~cDN}pG&7Pw$9btai-<`)0R zbX#tC(tA7EOi2x{@X(xbr&_{nJ5y_GJ`=McT4pM$V`;ew+zkp-k4N86pt?jwlP8Z@9FE2*5_z9k|{If0LG+AEdlr&VMVa9gQ(ohOHutVFumTfSTAW@y1#{H+`A zZ!_LZ(Bu}NbCALf&k1l0Tm%|hHttBRFLn?!B9--F46$9HqUcx4`E)F6oZR&v<6eC7o#lQYgb3>s_`xaqS>Urj^cx+ ze3J!3rZD5mCskSdMOWH5{g+Ku@Pl*1u0(<@B^ytE1FP!SUxgOzc2Nd3gFmhTUXBM( ztlBnfTUmk}m8^S7Zy#?kO2QRCRa!h99cl{)$%S%MxBb+2(p#W0SnY`v5~}zl=0{MS zwDhUk@afQRremzHe(GMY9(pwNfd8n@(sI-(n@B^vzL65ATPL@$`)E|uIQk`7(c1Xv zm@h@6%6s(gbFFU@eeYkb_WNESb0BjhK5e^*-&u&J2(NMp50O%)HW_%b6BiR>n>EEy zp0YL=!&Vw^#E&T>wPf-b0O`RI{bhP?jd+5NTTW?`Vmb zZK7iSPY-UIalj$FgurN3z1oO~Lkd z4f<6yg!4OJ92^}Dc|%~&adK}tY03PjEtF09uL1LjYrsO$Vas8t%dUIt$mpqln0#K^ zzx->!xOZ#pJ+z?5W{ORVOmBifb<%_>OkbX1Cg7nCLX3u(y!5>+b~7($zN7UXyVOMn z$}YOCMdR_uYe4ojfc1s;2Pgt$|F|Vml-ibn6cqJ?=$RFK;-Z<)sWfNwcf@QylE_w% zc%sweyNHi)@9CG=UgTQ2omPBWGOzWF>Sj6LIW9Jg^pndgW?NRRDx5<%{F^VN7JdY2HW9Xl#k*+ z8Tw;deDOLe-l@#=zo9d_5!}3ai_e)}T%S7nRPkI;p+Lhx)%A~Q+0Akzw`*_0P~4P9 z;Wvp`e5@i~bN}NOMevC8%ty8+eI@bk5r}gh|HiW6`}$pN-2R;aN>M=;(vTmpMOi>< zrD4GFm26EP)Zk{jP(N#b>Ytxvy(k~nP4k;3xjn(D!p5(6{10BAz9_q9_c7adHtI&q zBH|c_`b`sqO+JW&e@5gb&{8Tp^m0aw%Jmd6AL5qP_NcNqS_i8#gS_pCVp=6 zb}r^cpZW{C{bQ-X$%fV+FmXnXpYA&r-=d-#NVr@v4c2K`mC)AXZko_U-S4$L?!TN| zTw=0qJp^W8^0CQ>`Dxw87nj@*{C387of;UFs|a%>yw;2Rj5SVNkM4Ha*qv*K8f+(L z+jqR{Iq3b|N%e?weQP)BXKck}v^HF1eQEV?E>)3^v-(JJSp{xrmaJ-WWT3J1y+**Z zsiDg=jw4~nYr3hsU6E8pTJ2%Rw3xIhsK&3=Tc*WdK?{6d*&*{Ed_xlTkGSUN=07oS zQYs>PHB1GC$<+Ou}+^_Hhl2tvSg|Jf= zFOG+srsecJu{u96;lhSt>!?H2lY7w~znS_v$SyiccBSV1uc}oo$<{n}3&_a5^z<8=ad>#2SA>e;B@GuODPha+DH4YrAgSVF}s*p;*jr&Ldy`KpLy1$(V!%MTv< z`_xWZ<$`~U(Q7SD)ZvazWrf)~+ETdBB7 zb@h((r~C~2tv7!5D*zA8jtR!BPsu6Pl=rK@B?ckG{Fh!LoS1o!xqdv=9a(whB2Lsc zM=09#J%{ixYew)&czvEiIJhjLupey{slT+yEg8BjqOl+K6;sqF%ig&}B*4;p44$h% z(2I|8`*@BOKTw(X(Yxm#XAcBD=NI^z^V@o)BQn0TEXXuX1Uz*;EbEqP#(8lky6`Nh ze2iO;Ds;kptN5+a#3QG*>}Ki3o$C^FNpSX1?q@u(IL1Zq#f{&KVZ6vxfqgj9Iw1L> z#o~dU{C!DyrnwE!o8NdAp0*daCeuxEvgWpk>%Q7t;w#wiPer!>?T${A8i74U80`Re zqkb=^9AIwbO`*uu=HuY6?P~yy;Z`}6-IL%}v6dbZ(-nvE!d=|awx7-Ltay;+L5R>O zKbxt2(yEXaamh3$@#KuzlvCSb?YJlpsn+vs7I&$rj!5{Higdx(SQdL%F)u7_LF`As zDV#3lpo`pUZr;mUI`mHIi~E-_#xZ|0TXOxr>D|8JILQsd;vc>MzWE2oyXU&0s<)@n0 z&|5gZta7y>xEK9NTb4b=d>45h5a024n#-Zpi$|JUkZjx(J*mEImb%U|m{8=pTK@Fu z(k`l*YM)wtNPT?m5}WJx)D?|CiJngVNsby#3rFO8T2Rn+bxI`gK0og&##SGbH!r`M zWv8lBOSgsdw{LL`gV;!!X-ke>*=|8k!u4S0(j3KU&9_S0q>~-OUd%H%PL6TVYORl+ zpYZSTz;2tIG_RBjmM5CStYr_~)J0z@5Uem)n1!MZ+(~o~#6s_m*96wMn-amL^AY8} zYt+H+W&8l?cnvuEBG=Di;54WnqO*t{;ovNg(mSdOZum{^ulTffdH_{Wd@I#z< zAH7z~xjGfX5xQt?5!McsU2R_@v+0J-jX4BziR;TgZ1Su;zmmDg;2C4YnTAh=&z&z@ z>PPVFugzZaUIXa{qC*dwx`Yd{crKi3le>BEu->Bp9x%6Y)mD9ZV&rUJre z!oAcZK-_}K#&Hbxh|ftAtymzMn^-u&(HtIL13FzJv|Ezg5H45Wk`BQshV*}Tt^p5kd~9we-`2vf))QTQOlXCU+y-C)Z7II-0y@3EXh0W>%?QP5UQNX<(tS0ivPEm&a@G_BVFgYOLC z!pgR1qz{`bhyTQfQXEA*4E(|q&o`e;eOc8R&btUbsF^)wE|;V@l{jBm-q=$J8c5D- z3ICaPEa%=cPNZJJ>ZOap$0uQ*!)3b;M6t!wbX(DTvg@Hmdl}mmefW;x=%TIYHjQf2 z=m%HT*8u&3H=)AjUcNF>naI(>rKedursjXeE(27HMy>%UQyblOufIWD+7Xn^1OsTl za=gca9+Qxda|xG%0{%$UkM@m0n*d7JU!cZZ!MG0~cwblm39@;inf)~8{>_yQ+*2C) z$Lzai?0lEb8ik~EfC?V?P%X$2Vy9E_>#ac2Ht$e4cRN}jf(+DkbIBDdCu{wEK9#6t zc&k0E+r7oaAh7m@FG%+_WV90R()<@)NAvIc!`k{^?%6uy{pc?eu`-m?|5e zSGz@DKk)FC!)Uo_`c@UT3T1$23|y{fg**=?RP*d=#ZjSE(j=Cg;H?GB^>hNG6S-^a&M)W!p>BWy$JnW zMpoFCaZm$Etp?@6!X4AtB<&xvTaPKp#&phEqIWL%1H?Zx3eqC40Tf@NGp+&0G{rlQ zF{9$4mlJ6t~_ftuDsuDUe#9?-289kY0N)ME4&jMd5${EH#ihxUT~|N zS5Q`q$(HbCT~m0R{+^_6WK7uvDWSpQ8L;TZ`7g&9OnaMaIz9CofZJ?eJ=Bd_FS=Lf za%gZOBSqlMAEnA_31wZ~oV&_14L7{HIh^$~YOVo(A}>vTJ-0CG%5)wP4}O;Hi)e!m zi9;ZqTVE+QUzb;G{9@Bz=sFcq&n;$5gEY)ek6q-gXq>A>5BCT@gvQKzr`P=jQaPmg zdoWKHq>99^LBHaRsa6JeK89*f144LWIPLDs%FDsl^6t16*HYvY9*flF+seYNM zi`k2^=deHP$d>7^`4F1Lr-7|mt*S?~W4L?SY>>_WDb(T|| zNm{_-FEpT`h>O!8F%r|>l2h=fDf*U4?I`pmPk!axNdNCZ{@hJ2+0nvRpO#8f?q4mK zMrXfOM;AN_CJS7VnI%3PcS&>c_lyPYm`sR1#IgJS3t7i$@Yv+Xtg<~*R(s)ZQ$l`_ z^JWzZ=k6C5q{VIq}e~=4Gez*AR#5Ac4(d+)U|8jNtB5uS*doBVp%k5DdJ?1v? z9o0gwvZhhO6)h?M((0(AD)@8c7YZ%0-Z-54f-QWRIq!^QLb!TndnWMdpnvFZx?%rE z7P5Qrj)iWledg#m^5tRc-W{hVvOj9Pe+}M?1@45t2{mR~eE-J5L-Mth&97kcfjb18 zi$_K7m|D(QloPOCMD#H9?N(xa^048G4!VPKWB=3MvrqK1CSu5f!0E#|h0-;eW1vL4 z9iTsfl}!zR7{hVT??QamzDaz1sMB`zw-IJsPE1QuwJMZFT5;^aT%z?wr~BNrt|Qj$+mCxkI{-praTW-*^aKPI*!zf z%&;!ppK9JZ`q0%$nbskfehRzg#zyybD*q#|&52}DJpA&(iA(>PjDQ5Q^(H&t+rdjL z^0+W(qAW`H@(~>h)##Dd;*(g#c+?LTUH4R9ClfMcwoEzdT_{U1SdY0tDy$3WUoZR@ DY$>#X literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index dbb36e0ae..6f5ba2b89 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,34 +14,45 @@ *= require_self */ +body { + background-image: url("https://visitkohrong.com/wp-content/uploads/2016/03/Royal-Sands-Hotel-on-Koh-Rong-Island-in-Cambodia-Chill-Bar-and-Grill-Cocktials-2-768x432.jpg"); + background-size: cover; +} #Tasklist { - position: fixed; - left: 5vw; + position: relative; + width: 100%; + background-color: #ed104b; + left: 0; top: 0; + margin: 0; + padding: 2vw; + font-family: 'Shrikhand', cursive; + color: white; + font-size: 3em; } #add_button, #all_button { border: solid; - display: block; + background-color: white; + border-radius: 2vw; padding: 2vw; - position: fixed; - top: 5vw; - left: 5vw; + margin: 5vw; + margin-right: 3vw; } - #all_button { - top: 15vw; - } +aside { + display: inline-block; +} footer p { - position: fixed; + position: absolute; bottom: 0px; left: 0px; width: 100%; - height: 4vw; - text-align: center; - border: dotted; - display: inline; - padding-top: 4vw; + height: 2vw; + padding-top: 1vw; + padding-left: 5vw; + color: white; + z-index: 1; } diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index f63c5b593..64cb66a12 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -1,11 +1,49 @@ // 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/ -.to_do_list { +.to_do_list, .form { + background-color: white; position: relative; - left: 19vw; + left: 6vw; top: 6vw; border: solid; + border-radius: 2vw; padding: 2vw; - width: 20vw; + min-width: 20vw; + display: inline-block; +} + +.to_do_list h2, h1.view_title { + font-size: 2em; + +} + +.to_do_list li { + font-size: 1.5em; + padding-bottom: 2vw; +} + +.form p { + font-size: 1.5em; + width: 100%; +} + +input { + text-align: center; + width: 85%; + padding: 2vw; + margin-left: 2vw; + border-width: .5vw; + border-color: #ed104b; +} + +.submit_container { + width: 100%; +} + +.submit{ + width: 100%; + padding: 1vw; + font-size: 1.5em; + font-family: 'Shrikhand', cursive; } diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index af582f36d..061189c92 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,16 +1,56 @@ class TasksController < ApplicationController - TASKS = [{task: "Call Mom"}, {task: "Laundry"}, {task: "Groceries"}] - def index - @tasks = TASKS + @tasks = Task.all end def add + @task = Task.new + end + + def show + @task = Task.find( params[:id].to_i ) end def remove + Task.find_by(id: params[:id]).destroy + + redirect_to root_path end def edit + @task = Task.find_by(id: params[:id].to_i) + unless @task + redirect_to root_path + end + end + + def update + task = Task.find_by(id: params[:id].to_i) + redirect_to root_path unless task + + task.name = params[:task][:name] + task.description = params[:task][:description] + task.date = params[:task][:date] + + if task.update(name: task.name, description: task.description, date: task.date) + redirect_to task_path + else + render :edit + end + end + + def create + @task = Task.new(name: params[:task][:name], description: params[:task][:description]) + if @task.save + redirect_to root_path + else + render :add + end + end + + private + + def task_params + return params.require(task).permit(:name, :description, :date) 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/layouts/application.html.erb b/app/views/layouts/application.html.erb index 18ebeaa2a..184916626 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,23 +1,25 @@ - - TaskList - <%= csrf_meta_tags %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - -
-

Tasklist

-
- - <%= yield %> -

<%= link_to("Add Task", add_task_path)%>

-

<%= link_to("All Tasks", tasks_path) %>

- -
-

- Im a footer! -

-
- + + TaskList + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + +
+

Tasklist

+
+ + + <%= yield %> + +
+

+ Im a footer! +

+
+ diff --git a/app/views/tasks/add.html.erb b/app/views/tasks/add.html.erb index fd9ee695c..318bb5337 100644 --- a/app/views/tasks/add.html.erb +++ b/app/views/tasks/add.html.erb @@ -1,2 +1,20 @@ -

Tasks#add

-

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

+
+

Add Your Task!

+ <%= form_for @task do |task| %> +

+ <%= task.label :Task_Name %> + <%= task.text_field :name %> +

+

+ <%= task.label :Task_Description %> + <%= task.text_field :description %> +

+

+ <%= task.label :Due_Date %> + <%= task.text_field :date %> +

+
+ <%= task.submit "Save Task", :class => "submit"%> +
+ <% end %> +
diff --git a/app/views/tasks/create.html.erb b/app/views/tasks/create.html.erb new file mode 100644 index 000000000..f9952e8dc --- /dev/null +++ b/app/views/tasks/create.html.erb @@ -0,0 +1,5 @@ +

Tasks#Create

+ +

+ <%= params %> +

diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 374190308..f98380051 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,2 +1,20 @@ -

Tasks#edit

-

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

+
+

Edit Your Task!

+ <%= form_for @task do |task| %> +

+ <%= task.label :Task_Name %> + <%= task.text_field :name %> +

+

+ <%= task.label :Task_Description %> + <%= task.text_field :description %> +

+

+ <%= task.label :Due_Date %> + <%= task.text_field :date %> +

+
+ <%= task.submit "Save Updates", :class => "submit"%> +
+ <% end %> +
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index d97f8786c..786dd5f28 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,10 +1,15 @@ - -

To Do:

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

To Do:

+
    + <% @tasks.each do |task| %> +
  • + Task: <%= link_to(task.name, task_path(task.id)) %> + +
    • + <%end%> +
+
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb new file mode 100644 index 000000000..7a73c1287 --- /dev/null +++ b/app/views/tasks/show.html.erb @@ -0,0 +1,25 @@ +

Tasks#show

+

+ Params are <%= params %> +

+ +

+ Task is <%= @task %> +

+ + <% if @task %> +

+ Task: <%= @task.name %> +

+

+ Description: <%= @task.description %> +

+

+ Oh look, there is also a date for reasons! + It is <%=@task.date%> +

+

Task ID number: <%= @task.id %>

+ + <%= link_to("Edit", edit_task_path(@task.id.to_i)) %> + <%= link_to("Delete", remove_task_path(@task.id.to_i)) %> + <%end%> diff --git a/app/views/tasks/update.html.erb b/app/views/tasks/update.html.erb new file mode 100644 index 000000000..66d74ae8d --- /dev/null +++ b/app/views/tasks/update.html.erb @@ -0,0 +1,3 @@ +

Task#Update

+ +

Params are <%= params %>

diff --git a/config/routes.rb b/config/routes.rb index eb738cb2e..bd3d2fbb8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,11 +1,19 @@ Rails.application.routes.draw do + root to: 'tasks#index' + get 'tasks', to: 'tasks#index', as: 'tasks' get 'tasks/add', to:'tasks#add', as: 'add_task' - get 'tasks/remove' + get 'tasks/:id/edit', to: 'tasks#edit', as: 'edit_task' + + patch 'tasks/:id', to: 'tasks#update', as: 'update_task' + + get 'tasks/:id', to: 'tasks#show', as: 'task' + + get 'tasks/:id/remove', to: 'tasks#remove', as: 'remove_task' - get 'tasks/edit' + post 'tasks/', to: 'tasks#create', as: 'create_task' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20170919222950_create_tasks.rb b/db/migrate/20170919222950_create_tasks.rb new file mode 100644 index 000000000..f019f1257 --- /dev/null +++ b/db/migrate/20170919222950_create_tasks.rb @@ -0,0 +1,11 @@ +class CreateTasks < ActiveRecord::Migration[5.1] + def change + create_table :tasks do |t| + t.string :name + t.string :description + t.string :date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..713d74275 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,17 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20170919222950) 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 "name" + t.string "description" + t.string "date" + 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..9da8ca483 --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + description: MyString + date: MyString + +two: + name: MyString + description: MyString + date: MyString 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 434a95c5ee1a5e45869974dcb5f4ebf95ddd11b4 Mon Sep 17 00:00:00 2001 From: Gale Harrington Date: Fri, 22 Sep 2017 11:10:32 -0700 Subject: [PATCH 3/9] Add delete function --- app/controllers/tasks_controller.rb | 35 ++++++++++++++++--------- app/views/layouts/application.html.erb | 4 +-- app/views/tasks/confirm_remove.html.erb | 0 app/views/tasks/remove.html.erb | 3 ++- config/routes.rb | 2 ++ 5 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 app/views/tasks/confirm_remove.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 061189c92..25e539837 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -7,14 +7,17 @@ def add @task = Task.new end - def show - @task = Task.find( params[:id].to_i ) + def create + @task = Task.new(name: params[:task][:name], description: params[:task][:description]) + if @task.save + redirect_to root_path + else + render :add + end end - def remove - Task.find_by(id: params[:id]).destroy - - redirect_to root_path + def show + @task = Task.find( params[:id].to_i ) end def edit @@ -39,15 +42,21 @@ def update end end - def create - @task = Task.new(name: params[:task][:name], description: params[:task][:description]) - if @task.save - redirect_to root_path - else - render :add - end + def mark_complete + + end + + def remove + @task = Task.find_by(id: params[:id]) + end + + def confirm_remove + Task.find_by(id: params[:id]).destroy + + redirect_to root_path end + private def task_params diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 184916626..8d4434911 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,9 +17,9 @@ <%= yield %> -