Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
c599656
first commit
Lisa-Sano Apr 19, 2016
d08f83a
home page now shows a list of all tasks
Lisa-Sano Apr 19, 2016
4db35cf
added styling to pages
Lisa-Sano Apr 19, 2016
1e085d2
added a font link for Reenie Beanie google font
Lisa-Sano Apr 19, 2016
693eac4
added background images
Lisa-Sano Apr 19, 2016
6e1db2b
small tweaks on style
Lisa-Sano Apr 20, 2016
7594480
added a footer. made link_to tags for home and add a task
Lisa-Sano Apr 20, 2016
f648ccc
added/modified styling for home and add task links
Lisa-Sano Apr 20, 2016
5153e40
added a by_task view to show a single task when the item is clicked o…
Lisa-Sano Apr 20, 2016
2a1f205
moved the add a task link from this page to the main layout
Lisa-Sano Apr 20, 2016
9e5b78c
added path to the add task link
Lisa-Sano Apr 20, 2016
02b4d1f
form for creating a new task. first commit
Lisa-Sano Apr 20, 2016
42224f5
added route for creating a new task
Lisa-Sano Apr 20, 2016
e45f922
added font awesome buttons for edit and delete
Lisa-Sano Apr 21, 2016
2452310
added route to make a new task and a form to fill out
Lisa-Sano Apr 21, 2016
6796e4c
fixed the #create method - forgot to save the new task made in the form
Lisa-Sano Apr 21, 2016
b201b2b
added the edit functionality for each task
Lisa-Sano Apr 21, 2016
3bbc655
added a link for the delete functionality
Lisa-Sano Apr 21, 2016
9db8094
used rails forms for edit and delete buttons. added home and plus fa …
Lisa-Sano Apr 21, 2016
9de25c0
got a button working that marks a task complete and populates the cur…
Lisa-Sano Apr 22, 2016
0dc439e
changed #delete to #destroy for convention and changed order of routes
Lisa-Sano Apr 22, 2016
c677e80
added search functionality to the home page
Lisa-Sano Apr 22, 2016
cb9c813
added new Person model, person_id to Tasks model. #index and #show fo…
Lisa-Sano Apr 22, 2016
e614a53
added partials for head and footer for layout pages
Lisa-Sano Apr 22, 2016
6a92c92
added column to show person assigned to a task
Lisa-Sano Apr 22, 2016
37ae4f1
added @people to allow names in drop-down menu for selecting task res…
Lisa-Sano Apr 22, 2016
00fbc9b
added person drop-down menu to form to allow task designation
Lisa-Sano Apr 22, 2016
51886f2
updated drop-down menu to show current selection when editing
Lisa-Sano Apr 22, 2016
8694ec1
show completed as well as incomplete tasks in the show page for each …
Lisa-Sano Apr 22, 2016
64024a7
added an incomplete task count, and link to a page that shows count o…
Lisa-Sano Apr 24, 2016
26abc48
add a route to show lists of a persons complete and incomplete tasks
Lisa-Sano Apr 24, 2016
df8ace4
all times now in pacific time instead of UTC
Lisa-Sano Apr 24, 2016
0492d41
added new class method to get all completed tasks, and updated #incom…
Lisa-Sano Apr 24, 2016
fc5388e
added a request for a page that shows all the tasks a person has, com…
Lisa-Sano Apr 24, 2016
217abfb
all pages now have an icon link to both the list and people pages (to…
Lisa-Sano Apr 24, 2016
330e139
updated stylesheet includes #show_tasks styling for people
Lisa-Sano Apr 24, 2016
404ca87
root path '/' goes to tasks#index
Lisa-Sano Apr 24, 2016
4fe5ef1
moved if else from search function to index
Lisa-Sano Apr 24, 2016
050bc9f
added pg and rails_12factor to production and sqlite to development
Lisa-Sano Apr 25, 2016
b3defb3
moved all rails files to the TaskListRails folder from an inner folde…
Lisa-Sano Apr 25, 2016
85809d3
added configs to get css on page
Lisa-Sano Apr 25, 2016
8120a83
oops didnt change the ones that were in there already
Lisa-Sano Apr 25, 2016
98d9ccd
order by DESC completed_at date so that incomplete tasks appear befor…
Lisa-Sano Apr 25, 2016
e280fb5
added more names to seed file
Lisa-Sano Apr 26, 2016
56c519a
added secondary order
Lisa-Sano Apr 26, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
58 changes: 58 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
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

gem "font-awesome-rails"

gem 'chronic'

# 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 "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
180 changes: 180 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
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)
chronic (0.10.2)
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)
font-awesome-rails (4.6.1.0)
railties (>= 3.2, < 5.1)
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)
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)
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)
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
chronic
coffee-rails (~> 4.1.0)
font-awesome-rails
jbuilder (~> 2.0)
jquery-rails
pg
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
28 changes: 28 additions & 0 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
== README

This README would normally document whatever steps are necessary to get the
application up and running.

Things you may want to cover:

* Ruby version

* System dependencies

* Configuration

* Database creation

* Database initialization

* How to run the test suite

* Services (job queues, cache servers, search engines, etc.)

* Deployment instructions

* ...


Please feel free to use a different markup language if you do not plan to run
<tt>rake doc:app</tt>.
6 changes: 6 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -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
Empty file added app/assets/images/.keep
Empty file.
Binary file added app/assets/images/pen-paper-light.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pen-paper.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -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 .
3 changes: 3 additions & 0 deletions app/assets/javascripts/people.coffee
Original file line number Diff line number Diff line change
@@ -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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/tasks.coffee
Original file line number Diff line number Diff line change
@@ -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/
Loading