diff --git a/.gitignore b/.gitignore index 28f484983..050c9d95c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,17 @@ -*.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/ - -# 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 all logfiles and tempfiles. +/log/* +!/log/.keep +/tmp diff --git a/.ruby-gemset b/.ruby-gemset deleted file mode 100644 index 5d2410e51..000000000 --- a/.ruby-gemset +++ /dev/null @@ -1 +0,0 @@ -TaskListRails diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 276cbf9e2..000000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.3.0 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..69a905f4d --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +source 'https://rubygems.org' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.6' + +# 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.1.0' +# 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 following links in your web application faster. Read more: https://github.com/rails/turbolinks +gem 'turbolinks' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.0' +# bundle exec rake doc:rails generates the API under doc/api. +gem 'sdoc', '~> 0.4.0', group: :doc + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Unicorn as the app server +# gem 'unicorn' + +# 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' + # Use sqlite3 as the database for Active Record + gem 'sqlite3' +end + +group :development do + gem 'pry-rails' + gem 'better_errors' + gem 'binding_of_caller' + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' +end + +group :production do + gem 'pg' + gem 'rails_12factor' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..950e29768 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,184 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.6) + activesupport (= 4.2.6) + globalid (>= 0.3.0) + activemodel (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) + arel (~> 6.0) + activesupport (4.2.6) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + arel (6.0.3) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + byebug (8.2.4) + coderay (1.1.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.1) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.6.0) + globalid (0.3.6) + activesupport (>= 4.1.0) + i18n (0.7.0) + jbuilder (2.4.1) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + json (1.8.3) + 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.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) + mini_portile2 (2.0.0) + minitest (5.8.4) + multi_json (1.11.2) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + pg (0.18.4) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.6) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + rails_12factor (0.0.3) + rails_serve_static_assets + rails_stdout_logging + rails_serve_static_assets (0.0.5) + rails_stdout_logging (0.0.5) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.1.2) + rdoc (4.2.2) + json (~> 1.4) + sass (3.4.22) + sass-rails (5.0.4) + railties (>= 4.0.0, < 5.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + slop (3.6.0) + spring (1.7.1) + sprockets (3.6.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.0.4) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.11) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.2) + turbolinks (2.5.3) + coffee-rails + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + coffee-rails (~> 4.1.0) + jbuilder (~> 2.0) + jquery-rails + pg + pry-rails + rails (= 4.2.6) + rails_12factor + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +BUNDLED WITH + 1.11.2 diff --git a/README.md b/README.md deleted file mode 100644 index 5d73b6980..000000000 --- a/README.md +++ /dev/null @@ -1,75 +0,0 @@ -# Task List Rails -Let's build our Task List in Rails. Solving the same problem--tracking tasks in a web app--will let us focus on following Rails conventions and learning how data flows through a Rails application. This project will enable us to keep track of and persist, add, edit and remove tasks. - -## Baseline -Once you've achieved this baseline, take a walk around the room and see if you can answer questions or help other folks. - -This project... - -- Will have our standard Github setup (fork this repo and clone to your machine) -- requires you to create a Rails 4.2.6 application - - create a controller for your `Tasks` - - create a `Task` model a migration. - - create the database schema and tables with `rake db:migrate` - - the `Task` model should include _at least_ a name, a description and a completion indicator - - conform to Rails conventions on naming and inflection - -Tinker with your Model in the `rails console` in order to ensure you have created your model and can interact with it as expected. - -## Wave 1 -This wave is where we will introduce the view layer to interact with our application via the browser. - -- Use the provided seed data to pre-populate your database with a given set of tasks. - - Hint: research `rake db:seed` -- Set up necessary controller(s) and route(s) that you will need in order to show a task from the database -- Create a root route for your application that directs users to the list of tasks - - Each task name in the list should link to a `show` action that will render a new view for the user. - - The `show` view should include the complete information about the task: name, description, completion status, and completion date. -- All markup in all views should have semantic relevance. -- Add some basic styles to your task list. - -## Wave 2 -In this wave we will add the first set of user interactivity and persistence. - -- Be able to create a new task: - - The home page should contain a link to Add a new task. This will give the user a form to fill out with the appropriate task fields. - - After the new task is added, the site should take the user back to the home page which displays the full list of tasks. The new task that was just added should be included in the full list of tasks. -- Be able to delete an existing task: - - Add a route and controller action whose responsibility is deleting a task (RESTful routes) - - On the home page, add a button or link for each task that will, once clicked... - 1. Ask the user to confirm that they definitely want to delete the task. - 1. Delete the task from the database and redirect the user back to the list of remaining tasks - -## Wave 3 -In this wave we will extend the interactivity with users, allowing them to edit existing tasks in a couple of different ways. As always, follow _RESTful_ conventions when implementing these features. - -- Add the ability for the user to mark a task complete - - Add a button to the list of tasks on the home page that, when clicked, will mark a task complete. - - Update the database with the task's completed date -- Add the ability for the user to edit a task's details. - - Add an `edit` action that renders a form allowing the user to update all the fields of a task. - - Submitting the form from the `edit` action should _update_ the existing task; not create a new one. - - Research: ActiveRecord's `update` method. - - Link to the `edit` action from the task's `show` page. - - DRY up your code by reusing the view code from the `new` functionality - - Hint: Rendering _partials_ in Rails. - -## Final Wave! -In this wave, we explore creating ActiveRecord associations by creating `belongs_to` and `has_many` relationships. - -- Create a model & migration for a new Person object. - - at a minimum, a Person should have a name -- Create seed data to add at least three Person records to the database. -- Each Task in your database can be assigned to a Person, indicating that Person is responsible for completing the Task. - - Express the relationship between Person and Task using `belongs_to` and `has_many` - - Update your Task `index` and `show` actions to include displaying the Person's name to which the Task belongs. - - Update your Task's `new` and `edit` actions to allow for selecting an _existing_ Person to which the Task should be associated. -- Add a new people (the plural of Person) controller with the following routes and actions - - `index` action: Show a list of all people in the database. - - Link each Person's name to their `show` action. - - The index should include a count of how many _uncompleted_ tasks are assigned to each Person. - - `show` action: show all of the Person's information -- Create a custom route and action for showing a complete list of a Person's tasks, both complete and incomplete. - - The url of this page should look something like `http://localhost:5000/people/1/tasks`. - - Link to this action from a Person's `show` view. -- Deploy your completed app to Heroku. diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 000000000..c3c4fbc06 --- /dev/null +++ b/README.rdoc @@ -0,0 +1,3 @@ +== README + +http://task-list-melissa.herokuapp.com/ diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..ba6b733dd --- /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 File.expand_path('../config/application', __FILE__) + +Rails.application.load_tasks diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/images/note.png b/app/assets/images/note.png new file mode 100644 index 000000000..08b1def1c Binary files /dev/null and b/app/assets/images/note.png differ diff --git a/app/assets/images/note2.png b/app/assets/images/note2.png new file mode 100644 index 000000000..77e187e8d Binary files /dev/null and b/app/assets/images/note2.png differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..e07c5a830 --- /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. +// +// 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/melissa.coffee b/app/assets/javascripts/melissa.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/melissa.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/javascripts/people.coffee b/app/assets/javascripts/people.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/people.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/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..907b92866 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,195 @@ +/* +* 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 styles +* defined in the other CSS/SCSS files in this directory. It is generally better to create a new +* file per style scope. +* +*= require_tree . +*= require_self +*/ + +html { + background-attachment: fixed; + background-position: center; + background-size: cover; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + font-family: 'Oswald', sans-serif; +} + +h1 { + font-weight: 400; + text-align: center; + margin-top: 15px; +} + +.main-form label { + margin: 0; + margin-right: 10px; + padding: 0; + +} +label { +font-size: 1.2rem; +} + +.both-forms { + margin: 0; + margin-top: 20px; + overflow: auto; + padding: 0; + margin-bottom: 10px; +} + +.check-form, .check-deleted { + color: #262127; + font-size: 14px; + margin: 0; + padding: 0; +} + +.check-form { + float: left; +} + +.check-deleted { + float: right; +} + +.top-bar { + color:#D76B88; + font-family: 'Oswald', sans-serif; + font-size: 16px; + margin-top: 60px; + margin-bottom: 40px; + text-align: center; + width: 100%; +} + +.top-bar ul { + list-style: none; +} + +.top-bar ul li { + display: inline; +} + +.top-bar a { + color:#D76B88; + font-size: 32px; + padding-top: 10px; + padding-right: 30px; + padding-left: 30px; + padding-bottom: 5px; + text-decoration: none; +} + +.task-container { + background-color: rgba(244,244,244,.7); + border-radius: 15px; + color:#4D434F; + display: -webkit-flex; + display: flex; + flex-wrap: wrap; + margin-top: 1%; + margin-right: 10%; + margin-left: auto; + margin-bottom: 1%; + overflow: auto; + width: 80%; + padding-top: 5rem; + padding-bottom: 5rem; + padding-left: 3rem; +} + +.task-item { + display: inline-block; + font-size: 24px; + font-weight: 300; + margin: .8rem; + text-align: left; + width: 28%; + height: 340px; + overflow: auto; + +} + +.task-item-azul { + display: inline-block; + font-size: 24px; + font-weight: 300; + margin: .8rem; + text-align: left; + width: 28%; + height: 300px; + +} + +.text{ + height: 115px; + width: 75%; + margin:2rem; + margin-top:6rem; +} + +.task-description { + padding: 6rem; + line-height: 2.2rem; +} + +.buttons{ + display: flex; + position: relative; + margin-bottom: 0; +} + +.form{ + margin-left: auto; + margin-right: auto; + +} + +select { + background-color: rgb(6,104,165); + border-radius: 5px; + color:white; + cursor:pointer; + display: inline-block; + font-family: 'Oswald', sans-serif; + font-size: 1.2rem; + float: right; + width: 50%; +} + +input[type=text] { + border-radius: 5px; + color:#3F1A08; + cursor:pointer; + display: inline-block; + font-family: 'Oswald', sans-serif; + font-size: 16px; + margin-top: 5px; + margin-left: 10px; + padding:5px 15px; + margin-bottom: 1.4rem; +} + +input[type=submit] { + background-color: rgb(6,104,165); + border-radius: 5px; + color:white; + cursor:pointer; + display: inline-block; + font-family: 'Oswald', sans-serif; + font-size: 16px; + margin-top: 5px; + margin-left: 10px; + padding:5px 15px 5px 15px; +} diff --git a/app/assets/stylesheets/melissa.scss b/app/assets/stylesheets/melissa.scss new file mode 100644 index 000000000..7c6eabd6a --- /dev/null +++ b/app/assets/stylesheets/melissa.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the melissa controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss new file mode 100644 index 000000000..e6ee13d8f --- /dev/null +++ b/app/assets/stylesheets/people.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the people controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss new file mode 100644 index 000000000..ac4131de2 --- /dev/null +++ b/app/assets/stylesheets/tasks.scss @@ -0,0 +1,13 @@ +// Place all the styles related to the tasks controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ +.task-item-azul { + background: image-url("note2.png"); + background-repeat: no-repeat; + +} + +.task-item { +background: image-url("note.png"); +background-repeat: no-repeat; +} diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..d83690e1b --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + 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..180f4e87a --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,64 @@ +class TasksController < ApplicationController + def index + @all_tasks = Task.order(completed_at: :asc)#.where(completed_at: '') +end + + def show + @task = Task.find(params[:id]) + end + + def new + @task = Task.new + end + + def create + @task = Task.new(tasks_create_params[:task]) + if @task.save + redirect_to root_path + else + render :new + end + + end + + def edit + @task = Task.find(params[:id]) + end + + def update + @task = Task.find(params[:id]) + @task.update(tasks_create_params[:task]) + redirect_to root_path + end + + def allcompleted + @all_tasks = Task.where.not(completed_at: "") + end + + def completed + @task = Task.find(params[:id]) + @task.update(completed_at: DateTime.now) + @all_tasks = Task.where.not(completed_at: "") + end + + def uncompleted + @task = Task.find(params[:id]) + @task.update(completed_at: "") + redirect_to root_path + + end + + def destroy + @task = Task.find(params[:id]) + @task.destroy + redirect_to root_path + end + + + private + + def tasks_create_params + params.permit(task: [:name, :description, :completed_at, :person_id]) + # params.permit(album: [:artist, :title]) + 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/melissa_helper.rb b/app/helpers/melissa_helper.rb new file mode 100644 index 000000000..c0c3017b3 --- /dev/null +++ b/app/helpers/melissa_helper.rb @@ -0,0 +1,2 @@ +module MelissaHelper +end diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb new file mode 100644 index 000000000..b682fbf12 --- /dev/null +++ b/app/helpers/people_helper.rb @@ -0,0 +1,2 @@ +module PeopleHelper +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/mailers/.keep b/app/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/.keep b/app/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/person.rb b/app/models/person.rb new file mode 100644 index 000000000..4a151cb51 --- /dev/null +++ b/app/models/person.rb @@ -0,0 +1,12 @@ +class Person < ActiveRecord::Base + validates :name, presence: true + has_many :tasks + + def display_name + return "" if name.nil? + return name unless name[0,1] == 'Da' + + name.gsub(/^Da\s+/, '') + ', M' + + end +end diff --git a/app/models/task.rb b/app/models/task.rb new file mode 100644 index 000000000..ec65fd640 --- /dev/null +++ b/app/models/task.rb @@ -0,0 +1,9 @@ +class Task < ActiveRecord::Base + validates :name, presence: true + belongs_to :person + + #this is how I wanna to show in the view + #WHY THIS METHOD IS HERE + #it is about model data + #I can test it when it is in model +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..5fd37ecd0 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,39 @@ + + + + Tasklistapp + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + + + + + + + + + + + +
+ +
+
+
+ <%= yield %> +
+
+ + + + + diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..6bd2ef1f8 --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,26 @@ +
+ +

HI!! Let's <%= @title %> task!

+
+<%= form_for @task, class: "main-form" do |f| %> + +<%= f.label :name, value="New Task" %> +<%= f.text_field :name, :require => true %> +
+<%= f.label :description %> +<%= f.text_field :description %> +
+ +<%= f.label :completed_at, value="Completed?" %> +<%= f.text_field :completed_at %> +
+ +<%= f.collection_select :person_id, Person.all, :id, :name, :require => true, class: "drop" %> +
+ +
+ +<%= f.submit %> +<% end %> +
+
diff --git a/app/views/tasks/allcompleted.html.erb b/app/views/tasks/allcompleted.html.erb new file mode 100644 index 000000000..fe27f90b3 --- /dev/null +++ b/app/views/tasks/allcompleted.html.erb @@ -0,0 +1,18 @@ +

Here are all the completed tasks!!!!

+
+ + <%@all_tasks.each do |task| %> +
+

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

+ +
+ <%= button_to "Opps um!!", uncompleted_path(task.id), method: :patch %> + <%= button_to "Remove That", destroy_path(task.id), method: :delete, data: { confirm: "Are you sure?" } %> +
+
+ + <%end%> +
diff --git a/app/views/tasks/completed.html.erb b/app/views/tasks/completed.html.erb new file mode 100644 index 000000000..fe27f90b3 --- /dev/null +++ b/app/views/tasks/completed.html.erb @@ -0,0 +1,18 @@ +

Here are all the completed tasks!!!!

+
+ + <%@all_tasks.each do |task| %> +
+

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

+ +
+ <%= button_to "Opps um!!", uncompleted_path(task.id), method: :patch %> + <%= button_to "Remove That", destroy_path(task.id), method: :delete, data: { confirm: "Are you sure?" } %> +
+
+ + <%end%> +
diff --git a/app/views/tasks/delete.html.erb b/app/views/tasks/delete.html.erb new file mode 100644 index 000000000..df667b5e2 --- /dev/null +++ b/app/views/tasks/delete.html.erb @@ -0,0 +1 @@ +

<%= @task.name %> is gone for ever

diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb new file mode 100644 index 000000000..12f84f864 --- /dev/null +++ b/app/views/tasks/edit.html.erb @@ -0,0 +1,27 @@ +
+ +

HI!! Let's <%= @title %> task!

+
+<%= form_for @task, class: "main-form" do |f| %> + +<%= f.label :name, value="New Task" %> +<%= f.text_field :name, :require => true %> +
+<%= f.label :description %> +<%= f.text_field :description %> +
+ +<%= f.label :completed_at, value="Completed?" %> +<%= f.text_field :completed_at %> +
+ +<%= f.collection_select :person_id, Person.all, :id, :name, :require => true, class: "drop" %> +
+ + +
+ +<%= f.submit %> +<% end %> +
+
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 000000000..6f326c421 --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,40 @@ +

Here is the big list of things I have to do!!!!

+
+ <%@all_tasks.each do |task| %> + <% if task.completed_at == "" %> + +
+ <% elsif task.completed_at != "" %> + +
+ <% else %> + <%= "ERROR" %> + + <% end %> + +

+ <%= link_to task.name, task_path(task.id)%> +
+ <%=task.completed_at%> +
+ <% if task.person %> + <%= task.person.name %> + <% end %> + +

+
+ + + +<%= button_to "Edit", edit_task_path(task.id), method: :get %> +<% if task.completed_at == ""%> +<%= button_to "Completed!!", completed_path(task.id), method: :patch %> + <% else %> +<%= button_to "Opps um!!", uncompleted_path(task.id), method: :patch %> +<% end %> + +<%= button_to "Remove That", destroy_path(task.id), method: :delete, data: { confirm: "Are you sure?" } %> +
+
+ <%end%> +
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb new file mode 100644 index 000000000..3e535cb92 --- /dev/null +++ b/app/views/tasks/new.html.erb @@ -0,0 +1,26 @@ +

HI!! Let's add a new task!

+
+ +
+<%= form_for @task, class: "main-form" do |f| %> + +<%= f.label :name, value="New Task" %> +<%= f.text_field :name, :require => true %> +
+<%= f.label :description %> +<%= f.text_field :description %> +
+ +<%= f.label :completed_at, value="If completed, when?" %> +<%= f.text_field :completed_at %> +
+ +<%= f.label :person_id, value="Who's doing it?" %> +<%= f.collection_select :person_id, Person.all, :id, :name, :require => true, class: "drop" %> +
+
+
+<%= f.submit %> +<% end %> +
+
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb new file mode 100644 index 000000000..514a0d211 --- /dev/null +++ b/app/views/tasks/show.html.erb @@ -0,0 +1,24 @@ +

All about this task!!!!

+
+
+

+ <%=@task.name %> +
+ <%= @task.description%> +
+ <%= @task.completed_at %> +

+
+ <%= button_to "Edit", edit_task_path(@task.id), method: :get %> + + <% if @task.completed_at == ""%> + <%= button_to "Completed!!", completed_path(@task.id), method: :patch %> + <% else %> + <%= button_to "Opps um!!", uncompleted_path(@task.id), method: :patch %> + <% end %> + <%= button_to "Remove That", destroy_path(@task.id), method: :delete, data: { confirm: "Are you sure?" } %> +
+ + +
+
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..0138d79b7 --- /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', __FILE__) +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..acdb2c138 --- /dev/null +++ b/bin/setup @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +Dir.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 || bundle install" + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # system "cp config/database.yml.sample config/database.yml" + # end + + puts "\n== Preparing database ==" + system "bin/rake db:setup" + + puts "\n== Removing old logs and tempfiles ==" + system "rm -f log/*" + system "rm -rf tmp/cache" + + puts "\n== Restarting application server ==" + system "touch tmp/restart.txt" +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..7fe232c3a --- /dev/null +++ b/bin/spring @@ -0,0 +1,15 @@ +#!/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' + + if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)) + Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) } + gem 'spring', match[1] + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..bd83b2541 --- /dev/null +++ b/config.ru @@ -0,0 +1,4 @@ +# This file is used by Rack-based servers to start the application. + +require ::File.expand_path('../config/environment', __FILE__) +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..8befa2cf2 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +require File.expand_path('../boot', __FILE__) + +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 Tasklistapp + 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. + + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' + + # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + # config.i18n.default_locale = :de + + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..6b750f00b --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. 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..ee8d90dc6 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require File.expand_path('../application', __FILE__) + +# 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..b55e2144b --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,41 @@ +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 and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # Adds additional error checking when serving assets at runtime. + # Checks for improperly declared sprockets dependencies. + # Raises helpful error messages. + config.assets.raise_runtime_errors = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5c1b32e48 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,79 @@ +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 + + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like + # NGINX, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.serve_static_files = 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # 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 + + # 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 = [ :subdomain, :uuid ] + + # Use a different logger for distributed setups. + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # 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 + + # 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..1c19f08b2 --- /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 static file server for tests with Cache-Control for performance. + config.serve_static_files = true + config.static_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 + + # 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 + + # Randomize the order test cases are executed. + config.active_support.test_order = :random + + # 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/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..7f70458de --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +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/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 000000000..dc6912855 --- /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: '_tasklistapp_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..33725e95f --- /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] if respond_to?(:wrap_parameters) +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/routes.rb b/config/routes.rb new file mode 100644 index 000000000..fa2ad8773 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,82 @@ +Rails.application.routes.draw do + get 'melissa/jimison' + + get 'melissa/quintero' + + # The priority is based upon order of creation: first created -> highest priority. + # See how all your routes lay out with "rake routes". + + # You can have the root of your site routed with "root" + root 'tasks#index' + get '/tasks' => 'tasks#index', as: 'tasks' + + + post '/tasks' => 'tasks#create' + get '/tasks/new' => 'tasks#new', as: 'new_task' + + get '/tasks/completed' => 'tasks#allcompleted', as: 'allcompleted' + + get '/tasks/:id/edit' => 'tasks#edit', as: 'edit_task' + patch '/tasks/:id' => 'tasks#update' + + + patch '/tasks/:id/completed' => 'tasks#completed', as: 'completed' + + patch '/tasks/:id/uncompleted' => 'tasks#uncompleted', as: 'uncompleted' + + # + get '/tasks/:id' => 'tasks#show', as: 'task' + delete '/tasks/:id' => 'tasks#destroy', as: 'destroy' + + # get '/people' => 'people#index', as: 'people' + + + # Example of regular route: + # get 'products/:id' => 'catalog#view' + + # Example of named route that can be invoked with purchase_url(id: product.id) + # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase + + # Example resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Example resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Example resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Example resource route with more complex sub-resources: + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', on: :collection + # end + # end + + # Example resource route with concerns: + # concern :toggleable do + # post 'toggle' + # end + # resources :posts, concerns: :toggleable + # resources :photos, concerns: :toggleable + + # Example resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..480c32547 --- /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 `rake 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: 787fb6bb77ef159dd5ebb4088134d5015dc0240f479f18825d9ff1890c1484f74f4ecdbb27f2e1e92bbf319637c8af730ccad97c884668c74c5e8c83aceb502e + +test: + secret_key_base: 5d52af6d66f95498d0e1289ad0436d76b84af3c4f7ee84fba41a3b9faadab00a83a843413e2007433857fe071920acf8d2a0fff5a3e2b86c8400fa64bc1e1854 + +# 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/db/migrate/20160419204103_create_tasks.rb b/db/migrate/20160419204103_create_tasks.rb new file mode 100644 index 000000000..d1d927c86 --- /dev/null +++ b/db/migrate/20160419204103_create_tasks.rb @@ -0,0 +1,11 @@ +class CreateTasks < ActiveRecord::Migration + def change + create_table :tasks do |t| + t.string :name, null: false + t.string :description + t.string :completed_at + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20160425231229_create_people.rb b/db/migrate/20160425231229_create_people.rb new file mode 100644 index 000000000..0de11f01f --- /dev/null +++ b/db/migrate/20160425231229_create_people.rb @@ -0,0 +1,10 @@ +class CreatePeople < ActiveRecord::Migration + def change + create_table :people do |t| + t.string :name + t.string :fav_color + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20160426002407_add_person_idto_task.rb b/db/migrate/20160426002407_add_person_idto_task.rb new file mode 100644 index 000000000..7806ad691 --- /dev/null +++ b/db/migrate/20160426002407_add_person_idto_task.rb @@ -0,0 +1,5 @@ +class AddPersonIdtoTask < ActiveRecord::Migration + def change + add_column :tasks, :person_id, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..9518dde08 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,32 @@ +# encoding: UTF-8 +# 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: 20160426002407) do + + create_table "people", force: :cascade do |t| + t.string "name" + t.string "fav_color" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "tasks", force: :cascade do |t| + t.string "name", null: false + t.string "description" + t.string "completed_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "person_id" + end + +end diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..0aa01d6e0 --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,35 @@ +# 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 rake db:seed (or created alongside the db with db:setup). +# +# Examples: +# +# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) +# Mayor.create(name: 'Emanuel', city: cities.first) + +people = [ + { name: "Melissa", fav_color: "Azul" }, + { name: "David", fav_color: "Rojo" }, + { name: "Gato", fav_color: "Negro" }, +] + +people.each do |person| + Person.create person +end + +def random_time + Time.at(rand * Time.now.to_i) +end + +tasks = [ + { name: "Go to Brunch", description: "Ask if it is hot, if it is veggetarian, and don't get French Toast", person_id: 1 }, + { name: "Go to Lunch", description: "Don't go to the Deli, dont get sandwich", completed_at: random_time, person_id: 2 }, + { name: "Go to Second Lunch", description: "Colombian Candies", person_id: 1 }, + { name: "Play the pending chess games", description: "I would lose if dont play a game for 5 days", completed_at: random_time, person_id: 2 }, + { name: "Trip to Portland", description: "Get cash, and those fun size personal products", person_id: 3 }, + { name: "Water Plants", description: "Use the sprinkler in the garden house", person_id: 3 }, + { name: "Nap", description: "20 minutes nap after second lunch", completed_at: random_time, person_id: 1 } +] + +tasks.each do |task| + Task.create task +end 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/assets/application-05661f78ba327638b8d0f0a5efa97e4ed7cb5e45ac5e9ac1a30c51e3236590be.css b/public/assets/application-05661f78ba327638b8d0f0a5efa97e4ed7cb5e45ac5e9ac1a30c51e3236590be.css new file mode 100644 index 000000000..1a4eb5a51 --- /dev/null +++ b/public/assets/application-05661f78ba327638b8d0f0a5efa97e4ed7cb5e45ac5e9ac1a30c51e3236590be.css @@ -0,0 +1,216 @@ +/* line 4, /Users/melissajimison/Documents/c5/projects/TaskListRails/app/assets/stylesheets/tasks.scss */ +.task-item-azul { + background: url(/assets/note2-08b458e9f505795126c94822c52f1b268db0e36235f06e3e6fbd4323df1f800d.png); +} + +/* line 8, /Users/melissajimison/Documents/c5/projects/TaskListRails/app/assets/stylesheets/tasks.scss */ +.task-item { + background: url(/assets/note-d60e7812f97c8797b4a3cd9bc6d8c9777778ce25362439caf990a523258b8910.png); +} +/* + * 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 styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. + * + + + */ + + + /* + * 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 styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. + * + *= require_tree . + *= require_self + */ + + html { + background-attachment: fixed; + background-position: center; + background-size: cover; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + font-family: 'Oswald', sans-serif; + } + + h1 { + font-weight: 400; + text-align: center; + margin-top: 15px; + } + + .main-form label { + margin: 0; + margin-right: 10px; + padding: 0; + } + + .both-forms { + margin: 0; + margin-top: 20px; + overflow: auto; + padding: 0; + margin-bottom: 10px; + } + + .check-form, .check-deleted { + color: #262127; + font-size: 14px; + margin: 0; + padding: 0; + } + + .check-form { + float: left; + } + + .check-deleted { + float: right; + } + + .top-bar { + color:#D76B88; + font-family: 'Oswald', sans-serif; + font-size: 16px; + margin-top: 60px; + margin-bottom: 40px; + text-align: center; + width: 100%; + } + + .top-bar ul { + list-style: none; + } + + .top-bar ul li { + display: inline; + } + + .top-bar a { + color:#D76B88; + font-size: 32px; + padding-top: 10px; + padding-right: 30px; + padding-left: 30px; + padding-bottom: 5px; + text-decoration: none; + } + + .task-container { + background-color: rgba(244,244,244,.7); + border-radius: 15px; + color:#4D434F; + display: -webkit-flex; + display: flex; + flex-wrap: wrap; + margin-top: 1%; + margin-right: 10%; + margin-left: auto; + margin-bottom: 1%; + overflow: auto; + width: 80%; + padding-top: 5rem; + padding-bottom: 5rem; + padding-left: 3rem; + + + + } + + .task-item { + display: inline-block; + font-size: 24px; + font-weight: 300; + margin: .8rem; + text-align: left; + width: 28%; + height: 340px; + overflow: auto; + + } + + .task-item-azul { + display: inline-block; + font-size: 24px; + font-weight: 300; + margin: .8rem; + text-align: left; + width: 28%; + height: 300px; + + } + + .text{ + height: 115px; + width: 75%; + margin:2rem; + margin-top:6rem; + } + + .task-description { + padding: 6rem; + line-height: 2.2rem; + } + + .buttons{ + display: flex; + position: relative; + margin-bottom: 0; + } + + .form{ + position: relative; + float: left; + margin-left: 10%; + } + .submit-button{ + color:white; + margin-top: 5px; + padding: 10px; + } + + .drop{ + border: solid red; + + } + input[type=submit] { + background-color: rgb(6,104,165); + border-radius: 5px; + color:white; + cursor:pointer; + display: inline-block; + font-family: 'Oswald', sans-serif; + font-size: 16px; + margin-top: 5px; + margin-left: 10px; + padding:5px 15px 5px 15px; + } + + input[type=text] { + border-radius: 5px; + color:#3F1A08; + cursor:pointer; + display: inline-block; + font-family: 'Oswald', sans-serif; + font-size: 16px; + margin-top: 5px; + margin-left: 10px; + padding:5px 15px; + } 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/seeds.rb b/seeds.rb deleted file mode 100644 index de6ef27a7..000000000 --- a/seeds.rb +++ /dev/null @@ -1,20 +0,0 @@ -def random_time - Time.at(rand * Time.now.to_i) -end - -tasks = [ - { name: "The First Task", description: "", completed_at: random_time }, - { name: "Go to Brunch", description: "" }, - { name: "Go to Lunch", description: "", completed_at: random_time }, - { name: "Go to Second Lunch", description: "" }, - { name: "Play Video Games", description: "", completed_at: random_time }, - { name: "High Five Somebody You Don't Know", description: "", completed_at: random_time }, - { name: "Plant Flowers", description: "", completed_at: random_time }, - { name: "Call Mom", description: "" }, - { name: "She worries, you know.", description: "" }, - { name: "Nap.", description: "", completed_at: random_time } -] - -tasks.each do |task| - Task.create task -end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/people_controller_test.rb b/test/controllers/people_controller_test.rb new file mode 100644 index 000000000..e75205679 --- /dev/null +++ b/test/controllers/people_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PeopleControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb new file mode 100644 index 000000000..ab48b116d --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TasksControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/people.yml b/test/fixtures/people.yml new file mode 100644 index 000000000..c22afc54e --- /dev/null +++ b/test/fixtures/people.yml @@ -0,0 +1,18 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +# one: {} +# # column: value +# # +# two: {} +# # column: value + +melissa: + name: Melissa +david: + name: David +gato: + name: Gato diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 000000000..eee642895 --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,5 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +go_to_brunch: + name: Go to Brunch + description: Ask if it is hot, if it is veggetarian, and don't get French Toast 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/person_test.rb b/test/models/person_test.rb new file mode 100644 index 000000000..d27e37a92 --- /dev/null +++ b/test/models/person_test.rb @@ -0,0 +1,28 @@ +require 'test_helper' +require 'pry' + + +class PersonTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end + test "person can have taks" do + assert_includes people(:melissa).tasks, tasks(:go_to_brunch) + end + + test "Swipe letter in the title" do + assert_equal "avid, M", people(:david).display_name + end + + test "negative test" do + assert_equal people(:melissa).name, people(:melissa).display_name + end + + test "display name for an artist with no name should be an empty string" do + assert_equal "", Person.new.display_name + end + + test "display anme for YY shoud be YY" do + assert_equal tasks(:testperson).name, tasks(:testperson).display_name + end +end diff --git a/test/models/task_test.rb b/test/models/task_test.rb new file mode 100644 index 000000000..f4fb47941 --- /dev/null +++ b/test/models/task_test.rb @@ -0,0 +1,16 @@ +require 'test_helper' + +class TaskTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end + + test "validations: task name can't ve blank" do + #test is a method of ActiveSupport::TestCase + #inside this block it is minitest + task = Task.new + #do and know all what Active record instance TAsk do + assert_not task.valid? + assert task.error.keys.include?(:name), "Name is not in the error hash" + 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/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