From fa34df1bb5a769e8db2d3fa0b6b6885beafbc5b2 Mon Sep 17 00:00:00 2001 From: Rana Sulaiman Date: Fri, 24 Mar 2017 15:37:38 -0700 Subject: [PATCH 1/9] Wave1,2,3 and 4 is done --- .gitignore | 48 ++--- Gemfile | 54 ++++++ Gemfile.lock | 176 ++++++++++++++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/javascripts/cable.js | 13 ++ app/assets/javascripts/channels/.keep | 0 app/assets/javascripts/tasks.coffee | 3 + app/assets/stylesheets/application.css | 15 ++ app/assets/stylesheets/tasks.scss | 56 ++++++ 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 | 78 ++++++++ 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/assignment.rb | 2 + app/models/concerns/.keep | 0 app/models/task.rb | 2 + app/views/layouts/application.html.erb | 14 ++ app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + app/views/tasks/_form.html.erb | 11 ++ app/views/tasks/edit.html.erb | 4 + app/views/tasks/index.html.erb | 41 ++++ app/views/tasks/new.html.erb | 3 + app/views/tasks/show.html.erb | 19 ++ bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 34 ++++ bin/spring | 17 ++ bin/update | 29 +++ config.ru | 5 + config/application.rb | 15 ++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 25 +++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 86 +++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 6 + config/initializers/assets.rb | 11 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/new_framework_defaults.rb | 24 +++ config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/puma.rb | 47 +++++ config/routes.rb | 26 +++ config/secrets.yml | 22 +++ config/spring.rb | 6 + .../20170321214055_create_assignments.rb | 11 ++ db/migrate/20170321235533_create_tasks.rb | 11 ++ db/schema.rb | 31 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 public/404.html | 67 +++++++ public/422.html | 67 +++++++ public/500.html | 66 +++++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/controllers/tasks_controller_test.rb | 9 + test/fixtures/.keep | 0 test/fixtures/assignments.yml | 11 ++ test/fixtures/files/.keep | 0 test/fixtures/tasks.yml | 11 ++ test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/assignment_test.rb | 7 + test/models/task_test.rb | 7 + test/test_helper.rb | 10 + tmp/.keep | 0 vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 93 files changed, 1454 insertions(+), 31 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/javascripts/tasks.coffee create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/assets/stylesheets/tasks.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/tasks_controller.rb create mode 100644 app/helpers/application_helper.rb create mode 100644 app/helpers/tasks_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/assignment.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/models/task.rb 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/_form.html.erb create mode 100644 app/views/tasks/edit.html.erb create mode 100644 app/views/tasks/index.html.erb create mode 100644 app/views/tasks/new.html.erb create mode 100644 app/views/tasks/show.html.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/new_framework_defaults.rb create mode 100644 config/initializers/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/migrate/20170321214055_create_assignments.rb create mode 100644 db/migrate/20170321235533_create_tasks.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 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/controllers/tasks_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/assignments.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/tasks.yml 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/models/assignment_test.rb create mode 100644 test/models/task_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep diff --git a/.gitignore b/.gitignore index 28f484983..bab620de0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,21 @@ -*.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 - -# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -.rvmrc +# Ignore Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..f0f71f579 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +gem "awesome_print" + +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.0.2' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.2' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..d0a32a07d --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,176 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + arel (7.1.4) + awesome_print (1.7.0) + builder (3.2.3) + byebug (9.0.6) + coffee-rails (4.2.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.2.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + globalid (0.3.7) + activesupport (>= 4.1.0) + i18n (0.8.1) + jbuilder (2.6.3) + activesupport (>= 3.0.0, < 5.2) + multi_json (~> 1.2) + jquery-rails (4.2.2) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + multi_json (1.12.1) + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + puma (3.8.2) + rack (2.0.1) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + sass (3.4.23) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.13) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.7) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.1.9) + execjs (>= 0.3.0, < 3) + web-console (3.4.0) + actionview (>= 5.0) + activemodel (>= 5.0) + debug_inspector + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + awesome_print + byebug + coffee-rails (~> 4.2) + jbuilder (~> 2.5) + jquery-rails + listen (~> 3.0.5) + puma (~> 3.0) + rails (~> 5.0.2) + sass-rails (~> 5.0) + spring + spring-watcher-listen (~> 2.0.0) + sqlite3 + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.14.6 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..b12018d09 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require jquery_ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 000000000..71ee1e66d --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the rails generate channel command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/tasks.coffee b/app/assets/javascripts/tasks.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/tasks.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..0ebd7fe82 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss new file mode 100644 index 000000000..b5a4acd84 --- /dev/null +++ b/app/assets/stylesheets/tasks.scss @@ -0,0 +1,56 @@ +// 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/ +@import url('https://fonts.googleapis.com/css?family=Baloo+Bhaina'); + +body { + background: linear-gradient(to right,#6190E8,#A7BFE8); + color: white; + margin-left: 70px; + font-family: "Baloo Bhaina" + +} + +a { + color: white; + text-decoration: none; + + +} + +h1 { + color: blue; + margin-left:70px; + +} + +table { + margin-left: 60px; + border: .2em dashed black; + +} + + +td { + padding: 20px; + text-align: center; +} + +tr { + border: .2em dashd black; + + +} + +li { + list-style: none; + line-height: 30px; + +} + +.button { + width: 50px; + color: white; + background-color: blue; + +} 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..0ecd68f8c --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,78 @@ +class TasksController < ApplicationController + def index + # @tasks = ["Buy Grocery", "Unload Dishwasher", "Call the Insurance"] + # @my_assignment = Assignment.all + @my_task = Task.all + + end + + def show + @result_task = Task.find(params[:id]) + # @my_assignment = assignment.find(params[:id]) + + end + +# Edit a Task + + def edit + @task = Task.find(params[:id]) + end + + def update + + task = Task.find(params[:id]) + if task.update(task_params) + redirect_to tasks_path + end + end + + def completed + task = Task.find(params[:id]) + if task.completion_date != nil + task.completion_date = nil + else + task.completion_date = Time.now + end + task.save + + redirect_to tasks_path + + + + end + +# Create a Form to add a new task + def new + @task = Task.new + end + + def create + # task = Task.new + # task.name = params[:name] + # task.description = params[:description] + # task.completion_date = params[:completion_date] + # + # if task.save + # redirect_to tasks_path + # end + task = Task.create task_params + + unless task.id == nil + redirect_to tasks_path + end + end + + def destroy + Task.destroy(params[:id]) + + redirect_to tasks_path + + end + + private + + def task_params + params.require(:task).permit(:name, :description, :Due_date) + 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/assignment.rb b/app/models/assignment.rb new file mode 100644 index 000000000..f4e270dca --- /dev/null +++ b/app/models/assignment.rb @@ -0,0 +1,2 @@ +class Assignment < ApplicationRecord +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb 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 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/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..ed1c07638 --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,11 @@ +<%= form_for @task, method: form_method do |f| %> +<%= f.label :name %> +<%= f.text_field :name %> + +<%= f.label :description %> +<%= f.text_area :description, size: "50x10" %> + +<%= f.label :completion_date %> +<%= f.date_field :completion_date%> +<%= f.submit action_name %> +<% end%> diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb new file mode 100644 index 000000000..8a4f11d0c --- /dev/null +++ b/app/views/tasks/edit.html.erb @@ -0,0 +1,4 @@ +

Edit a Task

+ + + <%= render partial: "form", locals: { action_name: "Edit a Task" , form_method: :put} %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 000000000..b76d5d217 --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,41 @@ +

My Tasks List

+ + + + + + + + + + <% @my_task.each do |task| %> + + + + + + + + + + + <% end%> +
+ Task Name + + Description + + Completion_date + + Status +
<%= link_to task.name, task_path(task.id) %> <%= task.description %> <%=task.completion_date %> <%if task.completion_date != nil %> + <%= link_to "👍🏻", task_completed_path(task.id), method: :patch %> + <% else %> + <%= link_to "👎", task_completed_path(task.id), method: :patch %> + + <%end%> + + <%= button_to "Delete", delete_task_path(task.id), :class => "button", :method => :delete, data: {confirm: "Are you sure you want to delete this"} %> +
+ +<%= button_to "Add New Task", { :action => "new" }, :method => :get %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb new file mode 100644 index 000000000..64e9b6ae6 --- /dev/null +++ b/app/views/tasks/new.html.erb @@ -0,0 +1,3 @@ +

Creating Task Forms

+ +<%= render partial: "form", locals: { action_name: "Create a New Task" , form_method: :post} %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb new file mode 100644 index 000000000..6a0a73c93 --- /dev/null +++ b/app/views/tasks/show.html.erb @@ -0,0 +1,19 @@ +

All about This Task

+ +

This task is : + <%= @result_task[:description]%> should be completed by, <%= @result_task[:Due_date]%> + + +

+ +

+<%= link_to "Edit this Task", edit_task_path(@result_task.id) %> +

+ +

+<%= link_to "Delete this Task", delete_task_path(@result_task.id), data: {confirm: "Are you sure you want to delete this task?" }, method: :delete %> +

+ +

+<%= link_to "Full List", tasks_path %> +

diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..25ee0e0e3 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,15 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module TaskList + class Application < Rails::Application + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..1c1a37ca8 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: 5 + timeout: 5000 + +development: + <<: *default + database: db/development.sqlite3 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: db/test.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..6f7197045 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..29a40f265 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,86 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "TaskList_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..30587ef6d --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..01ef3e663 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,11 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path +# Rails.application.config.assets.paths << Emoji.images_path + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..5a6a32d37 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..671abb69a --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,24 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Enable per-form CSRF tokens. Previous versions had false. +Rails.application.config.action_controller.per_form_csrf_tokens = true + +# Enable origin-checking CSRF mitigation. Previous versions had false. +Rails.application.config.action_controller.forgery_protection_origin_check = true + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 000000000..80e157130 --- /dev/null +++ b/config/initializers/session_store.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.session_store :cookie_store, key: '_TaskList_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum, this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..28bff977d --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,26 @@ +Rails.application.routes.draw do + + root "tasks#index" + + get "/tasks/new", to: "tasks#new", as: "new_task" + post "/tasks", to: "tasks#create" + + get '/tasks/:id/edit', to: 'tasks#edit', as: "edit_task" + put '/tasks/:id', to: 'tasks#update' + + + + get "/tasks", to: "tasks#index" + get "/tasks/:id", to: "tasks#show", as: "task" + + patch "/tasks/:id", to: "tasks#completed", as: "task_completed" + + delete "/tasks/:id", to: "tasks#destroy", as: "delete_task" + + + + + + + +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..eee755b2b --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 032cec454314c3f4306d562675e35c7d76663654ef2143ff6d8b399df07c8c94829abcdac7bd654f7afe79f4dad677bc9da25797b6d1d3a32e431865222e65f0 + +test: + secret_key_base: f0e06c524c8716aad1d2d61c227f3e72fa9d61308a897eec364b4a43d73f4a6f2a3121e2171c2bf39c55576c1818d4790dc8f3f86d6e22606802e0fd9c042180 + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/migrate/20170321214055_create_assignments.rb b/db/migrate/20170321214055_create_assignments.rb new file mode 100644 index 000000000..6839c7395 --- /dev/null +++ b/db/migrate/20170321214055_create_assignments.rb @@ -0,0 +1,11 @@ +class CreateAssignments < ActiveRecord::Migration[5.0] + def change + create_table :assignments do |t| + t.string :name + t.string :description + t.datetime :completion_date + + t.timestamps + end + end +end diff --git a/db/migrate/20170321235533_create_tasks.rb b/db/migrate/20170321235533_create_tasks.rb new file mode 100644 index 000000000..b60959267 --- /dev/null +++ b/db/migrate/20170321235533_create_tasks.rb @@ -0,0 +1,11 @@ +class CreateTasks < ActiveRecord::Migration[5.0] + def change + create_table :tasks do |t| + t.string :name + t.string :description + t.datetime :completion_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..72e7a42dc --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,31 @@ +# 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: 20170321235533) do + + create_table "assignments", force: :cascade do |t| + t.string "name" + t.string "description" + t.datetime "completion_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "tasks", force: :cascade do |t| + t.string "name" + t.string "description" + t.datetime "completion_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +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/public/404.html b/public/404.html new file mode 100644 index 000000000..b612547fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb new file mode 100644 index 000000000..67683c951 --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class TasksControllerTest < ActionDispatch::IntegrationTest + test "should get index" do + get tasks_index_url + assert_response :success + end + +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/assignments.yml b/test/fixtures/assignments.yml new file mode 100644 index 000000000..d662056f1 --- /dev/null +++ b/test/fixtures/assignments.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + description: MyString + completion_date: 2017-03-21 14:40:55 + +two: + name: MyString + description: MyString + completion_date: 2017-03-21 14:40:55 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 000000000..023d50dc9 --- /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: + description: + completion_date: 2017-03-21 16:55:33 + +two: + name: + description: + completion_date: 2017-03-21 16:55:33 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/models/assignment_test.rb b/test/models/assignment_test.rb new file mode 100644 index 000000000..350ff82ca --- /dev/null +++ b/test/models/assignment_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class AssignmentTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end 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 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..92e39b2d7 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep new file mode 100644 index 000000000..e69de29bb From df9c9d825be607a087e7e44ea11f180e1f0f04d3 Mon Sep 17 00:00:00 2001 From: Rana Sulaiman Date: Sat, 25 Mar 2017 15:24:55 -0700 Subject: [PATCH 2/9] This version is before generating migration to add a column. --- app/assets/stylesheets/tasks.scss | 53 ++++++++++++++++++++++++----- app/controllers/tasks_controller.rb | 30 +++++----------- app/views/tasks/_form.html.erb | 13 ++++--- app/views/tasks/index.html.erb | 6 ++-- app/views/tasks/new.html.erb | 2 +- app/views/tasks/show.html.erb | 9 +++-- 6 files changed, 72 insertions(+), 41 deletions(-) diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index b5a4acd84..5c9fa4709 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -8,6 +8,37 @@ body { color: white; margin-left: 70px; font-family: "Baloo Bhaina" +} + +.button { + width: 100px; + color: white; + background-color: #6217C4 +} + +.add-button { + + margin-left: 60px; + margin-top: 70px; + +} + +.name { + margin-left: 50px; +} + +input { + // background-color: #6217C4 +} + +.description { + margin-left: 9px; + +} + +.completion_date { + + margin-left: -25px; } @@ -19,7 +50,16 @@ a { } h1 { - color: blue; + color: #52F4FF; + margin-left:70px; + +} + +h2 { + margin-left:70px; + +} +p { margin-left:70px; } @@ -29,7 +69,11 @@ table { border: .2em dashed black; } +th { + color:#C317C4; + font-size: 1.1em; +} td { padding: 20px; @@ -47,10 +91,3 @@ li { line-height: 30px; } - -.button { - width: 50px; - color: white; - background-color: blue; - -} diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 0ecd68f8c..e7ac7029c 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,29 +1,21 @@ class TasksController < ApplicationController def index - # @tasks = ["Buy Grocery", "Unload Dishwasher", "Call the Insurance"] - # @my_assignment = Assignment.all @my_task = Task.all - end def show @result_task = Task.find(params[:id]) - # @my_assignment = assignment.find(params[:id]) - end -# Edit a Task - def edit - @task = Task.find(params[:id]) + @task = Task.find(params[:id]) end def update - task = Task.find(params[:id]) - if task.update(task_params) - redirect_to tasks_path - end + if task.update(task_params) + redirect_to tasks_path + end end def completed @@ -36,12 +28,8 @@ def completed task.save redirect_to tasks_path - - - end -# Create a Form to add a new task def new @task = Task.new end @@ -66,13 +54,11 @@ def destroy Task.destroy(params[:id]) redirect_to tasks_path - end - private - - def task_params - params.require(:task).permit(:name, :description, :Due_date) - end + private + def task_params + params.require(:task).permit(:name, :description, :Due_date) + end end diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index ed1c07638..90ebc5dda 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,11 +1,16 @@ <%= form_for @task, method: form_method do |f| %> +
-<%= f.text_field :name %> +<%= f.text_field :name %>
+
-<%= f.text_area :description, size: "50x10" %> +<%= f.text_area :description, size: "50x10" %>
+ +
<%= f.label :completion_date %> -<%= f.date_field :completion_date%> -<%= f.submit action_name %> +<%= f.date_field :completion_date%>
+ +
<%= f.submit action_name %>
<% end%> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index b76d5d217..e3147ed31 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,4 +1,4 @@ -

My Tasks List

+

My Task List

@@ -23,7 +23,7 @@
<%= task.description %> <%=task.completion_date %> <%if task.completion_date != nil %> - <%= link_to "👍🏻", task_completed_path(task.id), method: :patch %> + <%= link_to "👍", task_completed_path(task.id), method: :patch %> <% else %> <%= link_to "👎", task_completed_path(task.id), method: :patch %> @@ -38,4 +38,4 @@ <% end%>
-<%= button_to "Add New Task", { :action => "new" }, :method => :get %> +<%= button_to "Add New Task", { :action => "new" }, :method => :get, :class =>"add-button" %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 64e9b6ae6..116df2fd8 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,3 +1,3 @@ -

Creating Task Forms

+

Add More Tasks

<%= render partial: "form", locals: { action_name: "Create a New Task" , form_method: :post} %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 6a0a73c93..f57f50ac1 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,9 +1,12 @@

All about This Task

-

This task is : - <%= @result_task[:description]%> should be completed by, <%= @result_task[:Due_date]%> - +

+ <% if @result_task.completion_date != nil %> + <%= @result_task[:description]%> was completed on <%= @result_task[:completion_date] %> 😀 + <% else %> + <%= @result_task[:description]%> need to be completed 😡 + <% end %>

From 0e96ddefc1b22bebb4d8973f11b806207f1441d0 Mon Sep 17 00:00:00 2001 From: Rana Sulaiman Date: Sat, 25 Mar 2017 17:15:40 -0700 Subject: [PATCH 3/9] Generated AddCompletedColumn migration file that has new column of name 'complete' and type 'boolean' --- db/migrate/20170325235744_add_commpleted_column.rb | 5 +++++ db/schema.rb | 7 ++++--- false | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20170325235744_add_commpleted_column.rb create mode 100644 false diff --git a/db/migrate/20170325235744_add_commpleted_column.rb b/db/migrate/20170325235744_add_commpleted_column.rb new file mode 100644 index 000000000..cf74000d9 --- /dev/null +++ b/db/migrate/20170325235744_add_commpleted_column.rb @@ -0,0 +1,5 @@ +class AddCommpletedColumn < ActiveRecord::Migration[5.0] + def change + add_column("tasks", "completed", :boolean, :default => false) + end +end diff --git a/db/schema.rb b/db/schema.rb index 72e7a42dc..020dcbc74 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: 20170321235533) do +ActiveRecord::Schema.define(version: 20170325235744) do create_table "assignments", force: :cascade do |t| t.string "name" @@ -24,8 +24,9 @@ t.string "name" t.string "description" t.datetime "completion_date" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "completed", default: false end end diff --git a/false b/false new file mode 100644 index 000000000..61cac7f38 --- /dev/null +++ b/false @@ -0,0 +1,2 @@ + invoke active_record + create db/migrate/20170325223302_add_column.rb From 2225c5063022d55948b58f70b09f8da622b87478 Mon Sep 17 00:00:00 2001 From: Rana Sulaiman Date: Sat, 25 Mar 2017 18:01:28 -0700 Subject: [PATCH 4/9] Changed 'due_date' to 'completion_date' in the controller#privat. --- app/controllers/tasks_controller.rb | 20 ++++++++------------ app/views/tasks/_form.html.erb | 8 ++++---- app/views/tasks/index.html.erb | 7 ++++--- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index e7ac7029c..2a991cdd8 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -16,14 +16,17 @@ def update if task.update(task_params) redirect_to tasks_path end + # task.save + end def completed task = Task.find(params[:id]) - if task.completion_date != nil - task.completion_date = nil + if task.completed == false + task.completed = true else - task.completion_date = Time.now + task.completed = false + #task.completion_date = Time.now end task.save @@ -35,17 +38,10 @@ def new end def create - # task = Task.new - # task.name = params[:name] - # task.description = params[:description] - # task.completion_date = params[:completion_date] - # - # if task.save - # redirect_to tasks_path - # end task = Task.create task_params unless task.id == nil + redirect_to tasks_path end end @@ -58,7 +54,7 @@ def destroy private def task_params - params.require(:task).permit(:name, :description, :Due_date) + params.require(:task).permit(:name, :description, :completion_date) end end diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 90ebc5dda..c04935a5d 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,16 +1,16 @@ <%= form_for @task, method: form_method do |f| %> -
<%= f.label :name %> <%= f.text_field :name %>
-
<%= f.label :description %> <%= f.text_area :description, size: "50x10" %>
- <%= f.label :completion_date %> <%= f.date_field :completion_date%>
-
<%= f.submit action_name %>
+
+<%= f.submit action_name %>
<% end%> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index e3147ed31..be8ba8c12 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -12,7 +12,7 @@ Completion_date - Status + Completed @@ -21,14 +21,15 @@ <%= link_to task.name, task_path(task.id) %> <%= task.description %> - <%=task.completion_date %> - <%if task.completion_date != nil %> + <%= task.completion_date %> + <%if task.completed == true %> <%= link_to "👍", task_completed_path(task.id), method: :patch %> <% else %> <%= link_to "👎", task_completed_path(task.id), method: :patch %> <%end%> + <%= task.completed %> <%= button_to "Delete", delete_task_path(task.id), :class => "button", :method => :delete, data: {confirm: "Are you sure you want to delete this"} %> From ba2926c3290013e770db1a988577df4feb10b5f2 Mon Sep 17 00:00:00 2001 From: Rana Sulaiman Date: Sat, 25 Mar 2017 20:46:29 -0700 Subject: [PATCH 5/9] Changed Date format for completion_date and displayed the actual completion using updated_at generated in Schema --- app/controllers/tasks_controller.rb | 2 +- app/views/tasks/index.html.erb | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 2a991cdd8..9d0332652 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,6 +1,6 @@ class TasksController < ApplicationController def index - @my_task = Task.all + @my_tasks = Task.all end def show diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index be8ba8c12..8a3b4dac5 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -14,23 +14,28 @@ Completed + + Actual Completion + - <% @my_task.each do |task| %> + <% @my_tasks.each do |task| %> <%= link_to task.name, task_path(task.id) %> <%= task.description %> - <%= task.completion_date %> + <%= task.completion_date.strftime("%F") %> <%if task.completed == true %> <%= link_to "👍", task_completed_path(task.id), method: :patch %> <% else %> - <%= link_to "👎", task_completed_path(task.id), method: :patch %> - + <%= link_to "👎", task_completed_path(task.id), method: :patch %> <%end%> - <%= task.completed %> - + <%if task.completed == true %> + <%= task.updated_at.strftime("%F") %> + <% else %> + <%= "" %> + <%end%> <%= button_to "Delete", delete_task_path(task.id), :class => "button", :method => :delete, data: {confirm: "Are you sure you want to delete this"} %> From 54ab3c262d9bccf0bc56f9bcfc314af05549fbb7 Mon Sep 17 00:00:00 2001 From: Rana Sulaiman Date: Sat, 25 Mar 2017 21:50:38 -0700 Subject: [PATCH 6/9] Fixed some styling in css file --- app/assets/stylesheets/tasks.scss | 31 +++++++++++++++++++---------- app/controllers/tasks_controller.rb | 6 +----- app/views/tasks/edit.html.erb | 2 +- app/views/tasks/index.html.erb | 13 ++++++------ app/views/tasks/new.html.erb | 2 +- app/views/tasks/show.html.erb | 9 ++++----- config/routes.rb | 9 --------- 7 files changed, 35 insertions(+), 37 deletions(-) diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index 5c9fa4709..b4f98716f 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -27,9 +27,6 @@ body { margin-left: 50px; } -input { - // background-color: #6217C4 -} .description { margin-left: 9px; @@ -37,7 +34,6 @@ input { } .completion_date { - margin-left: -25px; } @@ -45,8 +41,6 @@ input { a { color: white; text-decoration: none; - - } h1 { @@ -61,33 +55,50 @@ h2 { } p { margin-left:70px; +} +.show { + font-size: 1.1em; + width: 60%; + text-align: left; + vertical-align: middle; + line-height: 80px; + height: 80px; + border: .2em dashed black; } table { margin-left: 60px; border: .2em dashed black; +} +.column { + text-align: left; } + + + + th { color:#C317C4; font-size: 1.1em; +} +#table_head2 { + text-align: left; + padding-left: 30px; } td { - padding: 20px; + padding: 30px; text-align: center; } tr { border: .2em dashd black; - - } li { list-style: none; line-height: 30px; - } diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 9d0332652..ea8d84414 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -16,8 +16,6 @@ def update if task.update(task_params) redirect_to tasks_path end - # task.save - end def completed @@ -26,7 +24,6 @@ def completed task.completed = true else task.completed = false - #task.completion_date = Time.now end task.save @@ -38,10 +35,9 @@ def new end def create - task = Task.create task_params + task = Task.create task_params unless task.id == nil - redirect_to tasks_path end end diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 8a4f11d0c..d2c4d57b6 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,4 +1,4 @@

Edit a Task

- <%= render partial: "form", locals: { action_name: "Edit a Task" , form_method: :put} %> + <%= render partial: "form", locals: { action_name: "Submit edits" , form_method: :put} %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 8a3b4dac5..7dc1ed135 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -5,25 +5,25 @@ Task Name - + Description - Completion_date + Completion Date - Completed + Status - Actual Completion + Actual <% @my_tasks.each do |task| %> - <%= link_to task.name, task_path(task.id) %> + <%= link_to task.name, task_path(task.id) %> - <%= task.description %> + <%= task.description %> <%= task.completion_date.strftime("%F") %> <%if task.completed == true %> <%= link_to "👍", task_completed_path(task.id), method: :patch %> @@ -32,6 +32,7 @@ <%end%> <%if task.completed == true %> + <%= task.updated_at.strftime("%F") %> <% else %> <%= "" %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 116df2fd8..7c25c5bd3 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,3 +1,3 @@

Add More Tasks

-<%= render partial: "form", locals: { action_name: "Create a New Task" , form_method: :post} %> +<%= render partial: "form", locals: { action_name: "Create New Task" , form_method: :post} %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index f57f50ac1..c6ce0e1ef 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,11 +1,10 @@

All about This Task

-

- - <% if @result_task.completion_date != nil %> - <%= @result_task[:description]%> was completed on <%= @result_task[:completion_date] %> 😀 +

+ <% if @result_task.completed == true %> + <%= @result_task[:description]%> task was completed on <%= @result_task[:updated_at].strftime("%F") %> 😀 <% else %> - <%= @result_task[:description]%> need to be completed 😡 + <%= @result_task[:description]%> task needs to be completed by <%= @result_task[:completion_date].strftime("%F") %> 😡 <% end %>

diff --git a/config/routes.rb b/config/routes.rb index 28bff977d..7bb6c60d8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,19 +8,10 @@ get '/tasks/:id/edit', to: 'tasks#edit', as: "edit_task" put '/tasks/:id', to: 'tasks#update' - - get "/tasks", to: "tasks#index" get "/tasks/:id", to: "tasks#show", as: "task" patch "/tasks/:id", to: "tasks#completed", as: "task_completed" delete "/tasks/:id", to: "tasks#destroy", as: "delete_task" - - - - - - - end From f908888d82228fbc063c9ce5ed4168a7a0b40e5b Mon Sep 17 00:00:00 2001 From: Rana Sulaiman Date: Sat, 25 Mar 2017 21:51:37 -0700 Subject: [PATCH 7/9] Cleaned up the code --- app/assets/stylesheets/tasks.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index b4f98716f..fcfdca0d6 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -76,9 +76,6 @@ table { text-align: left; } - - - th { color:#C317C4; font-size: 1.1em; From 3e1fb425808c69461783df40ad7fb9c5b2fd765b Mon Sep 17 00:00:00 2001 From: Rana Sulaiman Date: Wed, 5 Apr 2017 14:16:53 -0700 Subject: [PATCH 8/9] Chenged README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 399dc287c..a1057eb37 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ # Task List +# changes to test branch + + 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. ## Learning Goals From e6b1d8c3cc43fb0f1ebbae7ed221940f563f2ad0 Mon Sep 17 00:00:00 2001 From: Rana Sulaiman Date: Wed, 5 Apr 2017 14:31:52 -0700 Subject: [PATCH 9/9] second branch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a1057eb37..25149b738 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Task List # changes to test branch +# Changes 2 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.