From abb97043609b2263ab51d75d5436ef97b536df4c Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 28 Sep 2016 13:49:57 -0700 Subject: [PATCH 01/47] created rails app --- .gitignore | 46 ++--- Gemfile | 47 +++++ Gemfile.lock | 163 ++++++++++++++++++ README.rdoc | 28 +++ Rakefile | 6 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/stylesheets/application.css | 15 ++ app/controllers/application_controller.rb | 5 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/mailers/.keep | 0 app/models/.keep | 0 app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 29 ++++ bin/spring | 15 ++ config.ru | 4 + config/application.rb | 26 +++ config/boot.rb | 3 + config/database.yml | 25 +++ config/environment.rb | 5 + config/environments/development.rb | 41 +++++ config/environments/production.rb | 79 +++++++++ config/environments/test.rb | 42 +++++ config/initializers/assets.rb | 11 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 3 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/routes.rb | 56 ++++++ config/secrets.yml | 22 +++ 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/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 10 ++ vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 57 files changed, 985 insertions(+), 32 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 README.rdoc create mode 100644 Rakefile create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/mailers/.keep create mode 100644 app/models/.keep create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.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 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb 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/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/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/routes.rb create mode 100644 config/secrets.yml 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/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep 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/Gemfile b/Gemfile new file mode 100644 index 000000000..e87fad5fc --- /dev/null +++ b/Gemfile @@ -0,0 +1,47 @@ +source 'https://rubygems.org' + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.7' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# 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' +end + +group :development do + # 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 + diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..187046034 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,163 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) + 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.7) + activesupport (= 4.2.7) + 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.7) + activesupport (= 4.2.7) + globalid (>= 0.3.0) + activemodel (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) + arel (~> 6.0) + activesupport (4.2.7) + 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) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + byebug (9.0.5) + 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.2) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.7.0) + globalid (0.3.7) + activesupport (>= 4.1.0) + i18n (0.7.0) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.2.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.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.1) + multi_json (1.12.1) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.7) + 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) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.3.0) + rdoc (4.2.2) + json (~> 1.4) + sass (3.4.22) + 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) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + spring (1.7.2) + sprockets (3.7.0) + 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.11) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.2) + 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 + byebug + coffee-rails (~> 4.1.0) + jbuilder (~> 2.0) + jquery-rails + rails (= 4.2.7) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +BUNDLED WITH + 1.13.1 diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 000000000..dd4e97e22 --- /dev/null +++ b/README.rdoc @@ -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 +rake doc:app. 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/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/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..f9cd5b348 --- /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 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 + */ 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/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/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/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..46eeb110b --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + TaskListRails + <%= 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/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..902432bad --- /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 TaskListRails + 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..15d065a84 --- /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: '_TaskListRails_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..3f66539d5 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,56 @@ +Rails.application.routes.draw do + # 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 'welcome#index' + + # 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..6d2fcb1fe --- /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: c55096e1452a0dc896cf1a7bc96a295fc2cecf490d60e204218177b0c23d0d811c93e27d125685ae5d66e7bba4f60d98e779cd31db50251d3f48f3b457656f47 + +test: + secret_key_base: ccd7ac321070304ba099562d545c30e20c8e9f10ca391214b7713bfd8ba82376e80b82af93e6f3f0890fb1e13fa27f30e28490acf9cbb2f08d5ea2382aec1778 + +# 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/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..4edb1e857 --- /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 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) 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/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/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/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 From f0165341319ce211f2cb90864384232a3056d664 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 28 Sep 2016 14:06:30 -0700 Subject: [PATCH 02/47] created controller for tasks --- app/assets/javascripts/tasks.coffee | 3 +++ app/assets/stylesheets/tasks.scss | 3 +++ app/controllers/tasks_controller.rb | 16 +++++++++++++ app/helpers/tasks_helper.rb | 2 ++ app/views/tasks/delete.html.erb | 2 ++ app/views/tasks/index.html.erb | 2 ++ app/views/tasks/new.html.erb | 2 ++ app/views/tasks/show.html.erb | 2 ++ app/views/tasks/update.html.erb | 2 ++ config/routes.rb | 10 ++++++++ test/controllers/tasks_controller_test.rb | 29 +++++++++++++++++++++++ 11 files changed, 73 insertions(+) create mode 100644 app/assets/javascripts/tasks.coffee create mode 100644 app/assets/stylesheets/tasks.scss create mode 100644 app/controllers/tasks_controller.rb create mode 100644 app/helpers/tasks_helper.rb create mode 100644 app/views/tasks/delete.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 100644 app/views/tasks/update.html.erb create mode 100644 test/controllers/tasks_controller_test.rb 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/tasks.scss b/app/assets/stylesheets/tasks.scss new file mode 100644 index 000000000..c5e7712d4 --- /dev/null +++ b/app/assets/stylesheets/tasks.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Tasks controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb new file mode 100644 index 000000000..9621fb185 --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,16 @@ +class TasksController < ApplicationController + def index + end + + def new + end + + def update + end + + def delete + end + + def show + end +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/views/tasks/delete.html.erb b/app/views/tasks/delete.html.erb new file mode 100644 index 000000000..ea72c29cf --- /dev/null +++ b/app/views/tasks/delete.html.erb @@ -0,0 +1,2 @@ +

Tasks#delete

+

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

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

Tasks#index

+

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

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

Tasks#new

+

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

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

Tasks#show

+

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

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

Tasks#update

+

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

diff --git a/config/routes.rb b/config/routes.rb index 3f66539d5..fd016ed21 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,14 @@ Rails.application.routes.draw do + get 'tasks/index' + + get 'tasks/new' + + get 'tasks/update' + + get 'tasks/delete' + + get 'tasks/show' + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb new file mode 100644 index 000000000..dffa5f67c --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,29 @@ +require 'test_helper' + +class TasksControllerTest < ActionController::TestCase + test "should get index" do + get :index + assert_response :success + end + + test "should get new" do + get :new + assert_response :success + end + + test "should get update" do + get :update + assert_response :success + end + + test "should get delete" do + get :delete + assert_response :success + end + + test "should get show" do + get :show + assert_response :success + end + +end From 737e405401b3faabf990fdf269d946b059c0c46e Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 28 Sep 2016 14:59:02 -0700 Subject: [PATCH 03/47] finished Wave 1, started Wave 2. forgot to commit earlier... --- app/controllers/tasks_controller.rb | 36 ++++++++++++++++++- app/views/tasks/create.html.erb | 2 ++ .../{delete.html.erb => destroy.html.erb} | 0 app/views/tasks/edit.html.erb | 2 ++ app/views/tasks/index.html.erb | 13 +++++-- app/views/tasks/show.html.erb | 18 ++++++++-- config/routes.rb | 12 +++++-- 7 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 app/views/tasks/create.html.erb rename app/views/tasks/{delete.html.erb => destroy.html.erb} (100%) create mode 100644 app/views/tasks/edit.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 9621fb185..92eaf65fb 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,16 +1,50 @@ class TasksController < ApplicationController def index + @tasks = TasksController.alltasks end def new end + def create + @params = params + @title = params[:title] + @description = params[:description] + @completion_status = params[:completion_status] + @completion_date = params[:completion_date] + end + def update end - def delete + def destroy + end + + def edit end def show + @tasks = TasksController.alltasks + @mytask = nil + + @tasks.each do |task| + number = params[:id].to_i + if number == task[:id] + @mytask = task + end + end + if @mytask == nil + render :file => 'public/404.html', + :status => :not_found, :layout => false + end + end + + def self.alltasks + [ + {id: 1, title: "Clean Bathroom", description: "wash towels, scour sink, clean bathtub", completion_status: true, completion_date:Time.now}, + {id: 2, title: "Read", description: "read for 20 minutes", completion_status: false}, + {id: 3, title: "Exercise", description: "yoga, run for 30 minutes", completion_status: true, completion_date:Time.now} + ] + end end diff --git a/app/views/tasks/create.html.erb b/app/views/tasks/create.html.erb new file mode 100644 index 000000000..e0a729bf7 --- /dev/null +++ b/app/views/tasks/create.html.erb @@ -0,0 +1,2 @@ +

Tasks#create

+

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

diff --git a/app/views/tasks/delete.html.erb b/app/views/tasks/destroy.html.erb similarity index 100% rename from app/views/tasks/delete.html.erb rename to app/views/tasks/destroy.html.erb diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb new file mode 100644 index 000000000..e0a729bf7 --- /dev/null +++ b/app/views/tasks/edit.html.erb @@ -0,0 +1,2 @@ +

Tasks#create

+

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

diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index b16c10310..d7113419d 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,2 +1,11 @@ -

Tasks#index

-

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

+

Welcome to Your Tasks

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

<%= link_to(task[:title], show_path(task[:id])) %>

+
+ +<% end %> + +

<%= link_to("Add New Task", new_path(@mytask[:id]) %>

diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 1139224db..13b315d64 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,2 +1,16 @@ -

Tasks#show

-

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

+
+

Task Name: <%= @mytask[:title]%>

+

Description: <%= @mytask[:description] %>

+

Completed? + <% if @mytask[:completion_status] == true %> + <%= "Yes" %> + <% else %> + <%= "Not yet completed" %> + <% end %> + +

Completed Time and Date: <%= @mytask[:completion_date] %>

+ <%= link_to( "Edit", edit_path(@mytask[:id]) ) %> + + <%= link_to( "Delete", delete_path(@mytask[:id]), method: :delete ) %> + +
diff --git a/config/routes.rb b/config/routes.rb index fd016ed21..bcf222b9c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,13 +1,19 @@ Rails.application.routes.draw do + root to: "posts#index" + get 'tasks/index' - get 'tasks/new' + get 'tasks/new'=> "tasks#new", as: "new" + + post 'tasks/create' => 'tasks#create' get 'tasks/update' - get 'tasks/delete' + get 'tasks/show/:id' => 'tasks#show', as: 'show' + + delete 'tasks/:id/destroy' => "tasks#destroy", as: "delete" - get 'tasks/show' + get "tasks/:id/edit" => "tasks#edit", as: "edit" # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 8516c9e09883895d654a9ba8dc08a16ef121f659 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 28 Sep 2016 15:00:56 -0700 Subject: [PATCH 04/47] created model --- app/models/task.rb | 2 ++ db/migrate/20160928220045_create_tasks.rb | 12 ++++++++++++ test/fixtures/tasks.yml | 13 +++++++++++++ test/models/task_test.rb | 7 +++++++ 4 files changed, 34 insertions(+) create mode 100644 app/models/task.rb create mode 100644 db/migrate/20160928220045_create_tasks.rb create mode 100644 test/fixtures/tasks.yml create mode 100644 test/models/task_test.rb diff --git a/app/models/task.rb b/app/models/task.rb new file mode 100644 index 000000000..935f76e12 --- /dev/null +++ b/app/models/task.rb @@ -0,0 +1,2 @@ +class Task < ActiveRecord::Base +end diff --git a/db/migrate/20160928220045_create_tasks.rb b/db/migrate/20160928220045_create_tasks.rb new file mode 100644 index 000000000..e6e5b55aa --- /dev/null +++ b/db/migrate/20160928220045_create_tasks.rb @@ -0,0 +1,12 @@ +class CreateTasks < ActiveRecord::Migration + def change + create_table :tasks do |t| + t.string :title + t.string :description + t.boolean :completion_status + t.datetime :completed_at + + t.timestamps null: false + end + end +end diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 000000000..8b1100441 --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyString + completion_status: false + completed_at: 2016-09-28 15:00:45 + +two: + title: MyString + description: MyString + completion_status: false + completed_at: 2016-09-28 15:00:45 diff --git a/test/models/task_test.rb b/test/models/task_test.rb new file mode 100644 index 000000000..3ca215970 --- /dev/null +++ b/test/models/task_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TaskTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From c77ca4dd2e35ee41128b84a596c810756dab5ce9 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 28 Sep 2016 15:06:09 -0700 Subject: [PATCH 05/47] migrated database --- db/migrate/20160928220045_create_tasks.rb | 2 +- db/schema.rb | 25 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 db/schema.rb diff --git a/db/migrate/20160928220045_create_tasks.rb b/db/migrate/20160928220045_create_tasks.rb index e6e5b55aa..36b7bee37 100644 --- a/db/migrate/20160928220045_create_tasks.rb +++ b/db/migrate/20160928220045_create_tasks.rb @@ -5,7 +5,7 @@ def change t.string :description t.boolean :completion_status t.datetime :completed_at - + t.timestamps null: false end end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..1c912097b --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,25 @@ +# 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: 20160928220045) do + + create_table "tasks", force: :cascade do |t| + t.string "title" + t.string "description" + t.boolean "completion_status" + t.datetime "completed_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From b671c9b70ddc862d14d0089cc0b2d0fcebb8e68b Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 28 Sep 2016 15:19:26 -0700 Subject: [PATCH 06/47] added three tasks to database --- app/controllers/tasks_controller.rb | 6 +++--- app/views/tasks/index.html.erb | 2 -- app/views/tasks/show.html.erb | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 92eaf65fb..5dc4e6497 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -11,7 +11,7 @@ def create @title = params[:title] @description = params[:description] @completion_status = params[:completion_status] - @completion_date = params[:completion_date] + @completion_date = params[:completed_at] end def update @@ -41,9 +41,9 @@ def show def self.alltasks [ - {id: 1, title: "Clean Bathroom", description: "wash towels, scour sink, clean bathtub", completion_status: true, completion_date:Time.now}, + {id: 1, title: "Clean Bathroom", description: "wash towels, scour sink, clean bathtub", completion_status: true, completed_at:Time.now}, {id: 2, title: "Read", description: "read for 20 minutes", completion_status: false}, - {id: 3, title: "Exercise", description: "yoga, run for 30 minutes", completion_status: true, completion_date:Time.now} + {id: 3, title: "Exercise", description: "yoga, run for 30 minutes", completion_status: true, completed_at:Time.now} ] end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index d7113419d..55cdce454 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -7,5 +7,3 @@ <% end %> - -

<%= link_to("Add New Task", new_path(@mytask[:id]) %>

diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 13b315d64..cfec37ab0 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -8,7 +8,7 @@ <%= "Not yet completed" %> <% end %> -

Completed Time and Date: <%= @mytask[:completion_date] %>

+

Completed Time and Date: <%= @mytask[:completed_at] %>

<%= link_to( "Edit", edit_path(@mytask[:id]) ) %> <%= link_to( "Delete", delete_path(@mytask[:id]), method: :delete ) %> From d1a67250a5d70b710ec2a6e0d2c3d1f39fd1328b Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 28 Sep 2016 15:57:05 -0700 Subject: [PATCH 07/47] finished new.html.erb form along with routes and controllers --- app/controllers/tasks_controller.rb | 28 +++++++++++++--------------- app/views/tasks/index.html.erb | 10 ++++++++-- app/views/tasks/new.html.erb | 18 ++++++++++++++++-- config/routes.rb | 2 +- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 5dc4e6497..d0aa41ffe 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,30 +1,28 @@ class TasksController < ApplicationController def index - @tasks = TasksController.alltasks + @tasks = Task.all end def new end def create - @params = params - @title = params[:title] - @description = params[:description] - @completion_status = params[:completion_status] - @completion_date = params[:completed_at] + Task.create(title: params[:title], description: params[:description]) + redirect_to action: "index" end def update end def destroy + # Task.destroy{} end def edit end def show - @tasks = TasksController.alltasks + @tasks = Task.all @mytask = nil @tasks.each do |task| @@ -39,12 +37,12 @@ def show end end - def self.alltasks - [ - {id: 1, title: "Clean Bathroom", description: "wash towels, scour sink, clean bathtub", completion_status: true, completed_at:Time.now}, - {id: 2, title: "Read", description: "read for 20 minutes", completion_status: false}, - {id: 3, title: "Exercise", description: "yoga, run for 30 minutes", completion_status: true, completed_at:Time.now} - ] - - end + # def self.alltasks + # [ + # {id: 1, title: "Clean Bathroom", description: "wash towels, scour sink, clean bathtub", completion_status: true, completed_at:Time.now}, + # {id: 2, title: "Read", description: "read for 20 minutes", completion_status: false}, + # {id: 3, title: "Exercise", description: "yoga, run for 30 minutes", completion_status: true, completed_at:Time.now} + # ] + # + # end end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 55cdce454..0d1c4d8b4 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,9 +1,15 @@ -

Welcome to Your Tasks

+

Welcome to Your Tasks

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

<%= link_to(task[:title], show_path(task[:id])) %>

+
    +
  • +

    <%= link_to(task[:title], show_path(task[:id])) %>

    +
    • +
<% end %> + + diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 2484008a3..674c25b37 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,2 +1,16 @@ -

Tasks#new

-

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

+

Create a New Task

+ +
+ + + + + + +
+ + <%= tag(:input, :type => "hidden", + :name => request_forgery_protection_token.to_s, + :value => form_authenticity_token) %> + + diff --git a/config/routes.rb b/config/routes.rb index bcf222b9c..05eaee484 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do root to: "posts#index" - get 'tasks/index' + get 'tasks/index', as: 'index' get 'tasks/new'=> "tasks#new", as: "new" From 221527b9b17e4d3bb1e0f941453d4241be36aa51 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 28 Sep 2016 16:15:01 -0700 Subject: [PATCH 08/47] added delete function from wave2 --- app/controllers/tasks_controller.rb | 22 ++++++++++------------ app/views/tasks/index.html.erb | 4 ++++ app/views/tasks/show.html.erb | 12 ++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index d0aa41ffe..fed0a9c6b 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -15,26 +15,24 @@ def update end def destroy - # Task.destroy{} + @task = Task.find(params[:id]) + @task.destroy + + redirect_to action: "index" + end def edit + @task = Task.find(params[:id]) end def show - @tasks = Task.all - @mytask = nil + @task = Task.find(params[:id]) - @tasks.each do |task| - number = params[:id].to_i - if number == task[:id] - @mytask = task - end + if @task == nil + render :file => 'public/404.html', + :status => :not_found, :layout => false end - if @mytask == nil - render :file => 'public/404.html', - :status => :not_found, :layout => false - end end # def self.alltasks diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 0d1c4d8b4..3a4020692 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -6,6 +6,10 @@

  • <%= link_to(task[:title], show_path(task[:id])) %>

    +
    <%= link_to 'Edit', edit_path(task) %>
    +
    <%= link_to 'Delete', delete_path(task), + method: :delete, + data: { confirm: 'Are you sure?' } %>
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index cfec37ab0..f17d783c0 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,16 +1,16 @@
-

Task Name: <%= @mytask[:title]%>

-

Description: <%= @mytask[:description] %>

+

Task Name: <%= @task[:title]%>

+

Description: <%= @task[:description] %>

Completed? - <% if @mytask[:completion_status] == true %> + <% if @task[:completion_status] == true %> <%= "Yes" %> <% else %> <%= "Not yet completed" %> <% end %> -

Completed Time and Date: <%= @mytask[:completed_at] %>

- <%= link_to( "Edit", edit_path(@mytask[:id]) ) %> +

Completed Time and Date: <%= @task[:completed_at] %>

+ <%= link_to( "Edit", edit_path(@task[:id]) ) %> - <%= link_to( "Delete", delete_path(@mytask[:id]), method: :delete ) %> + <%= link_to( "Delete", delete_path(@task[:id]), method: :delete, data: { confirm: 'Are you sure?' } ) %>
From d7ce1157f439570ecef649b7c256c2f0307c07a1 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 28 Sep 2016 16:30:54 -0700 Subject: [PATCH 09/47] finished edit and delete functions --- app/controllers/tasks_controller.rb | 7 +++++++ app/views/tasks/edit.html.erb | 20 ++++++++++++++++++-- app/views/tasks/index.html.erb | 6 +++--- app/views/tasks/new.html.erb | 1 + config/routes.rb | 2 ++ 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index fed0a9c6b..499677a5a 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -12,6 +12,13 @@ def create end def update + @task = Task.find(params[:id]) + + if @task.update(title: params[:title], description: params[:description]) + redirect_to action: "show" + else + render 'edit' + end end def destroy diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index e0a729bf7..4fa558eab 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,2 +1,18 @@ -

Tasks#create

-

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

+

Edit Task

+ + + + + + + + + +
+ + <%= tag(:input, :type => "hidden", + :name => request_forgery_protection_token.to_s, + :value => form_authenticity_token) %> + + + diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 3a4020692..721af4992 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -6,10 +6,10 @@

  • <%= link_to(task[:title], show_path(task[:id])) %>

    -
    <%= link_to 'Edit', edit_path(task) %>
    -
    <%= link_to 'Delete', delete_path(task), +

    <%= link_to 'Edit', edit_path(task) %> + <%= link_to 'Delete', delete_path(task), method: :delete, - data: { confirm: 'Are you sure?' } %>

    + data: { confirm: 'Are you sure?' } %>

diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 674c25b37..19aed76da 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -14,3 +14,4 @@ :value => form_authenticity_token) %> + diff --git a/config/routes.rb b/config/routes.rb index 05eaee484..3f4645021 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,6 +9,8 @@ get 'tasks/update' + put "tasks/:id/update" => "tasks#update" + get 'tasks/show/:id' => 'tasks#show', as: 'show' delete 'tasks/:id/destroy' => "tasks#destroy", as: "delete" From d2859f7445dd7ac0c4eb979805530dfcd3e7168d Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 29 Sep 2016 13:52:52 -0700 Subject: [PATCH 10/47] working on complete checkbox function --- app/controllers/tasks_controller.rb | 12 ++++++++++++ app/views/tasks/completion_status.html.erb | 2 ++ app/views/tasks/index.html.erb | 17 +++++++++++------ app/views/tasks/show.html.erb | 9 ++++++--- config/routes.rb | 6 +++++- 5 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 app/views/tasks/completion_status.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 499677a5a..f2f9687c6 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -42,6 +42,18 @@ def show end end + def completion_status + @task = Task.find(params[:id]) + + if @task.completion_status == true + @task.completion_date = Time.now + else + redirect_to action: "index" + end + + end + + # used this before creating model # def self.alltasks # [ # {id: 1, title: "Clean Bathroom", description: "wash towels, scour sink, clean bathtub", completion_status: true, completed_at:Time.now}, diff --git a/app/views/tasks/completion_status.html.erb b/app/views/tasks/completion_status.html.erb new file mode 100644 index 000000000..d8edfc6ec --- /dev/null +++ b/app/views/tasks/completion_status.html.erb @@ -0,0 +1,2 @@ +

Tasks#completion_status

+

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

diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 721af4992..dd27668c1 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,16 +1,21 @@ -

Welcome to Your Tasks

+

Daily Task List

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

    <%= link_to(task[:title], show_path(task[:id])) %>

    -

    <%= link_to 'Edit', edit_path(task) %> - <%= link_to 'Delete', delete_path(task), - method: :delete, - data: { confirm: 'Are you sure?' } %>

    + <%= check_box_tag(task[:completion_status]) %> + <%= label_tag(task[:completion_status], link_to(task[:title], show_path(task[:id])) + ) %>
    • + +
      +
    • <%= button_to 'Edit', edit_path(task) %>
      • +
    • <%= button_to 'Delete', delete_path(task), + method: :delete, + data: { confirm: 'Are you sure?' } %>
      • +
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index f17d783c0..ab344bf5c 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -9,8 +9,11 @@ <% end %>

Completed Time and Date: <%= @task[:completed_at] %>

- <%= link_to( "Edit", edit_path(@task[:id]) ) %> - - <%= link_to( "Delete", delete_path(@task[:id]), method: :delete, data: { confirm: 'Are you sure?' } ) %> +
    +
  • <%= button_to 'Edit', edit_path(@task) %>
    • +
  • <%= button_to 'Delete', delete_path(@task), + method: :delete, + data: { confirm: 'Are you sure?' } %>
    • +
diff --git a/config/routes.rb b/config/routes.rb index 3f4645021..fd862019f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,7 +15,11 @@ delete 'tasks/:id/destroy' => "tasks#destroy", as: "delete" - get "tasks/:id/edit" => "tasks#edit", as: "edit" + post "tasks/:id/edit" => "tasks#edit", as: "edit" + + patch 'tasks/:id/completion_status' => 'tasks#completion_status', as: "complete" + + # post 'tasks/:id/completion_status' => 'tasks#completion_status', as: "completed" # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From bcb207c75f64ef874c5cbce0b77f66c40c678700 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 29 Sep 2016 14:05:13 -0700 Subject: [PATCH 11/47] added gemfile for awesome_print --- Gemfile | 3 +-- Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e87fad5fc..d7371e6c2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' - +gem 'awesome_print' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.7' # Use sqlite3 as the database for Active Record @@ -44,4 +44,3 @@ group :development do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' end - diff --git a/Gemfile.lock b/Gemfile.lock index 187046034..b6d552c2c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,6 +37,7 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.3) + awesome_print (1.7.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) @@ -146,6 +147,7 @@ PLATFORMS ruby DEPENDENCIES + awesome_print byebug coffee-rails (~> 4.1.0) jbuilder (~> 2.0) From a4653744aa6ebf6f43bf0fad4980a9140365208a Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 29 Sep 2016 14:45:20 -0700 Subject: [PATCH 12/47] changed new.html.erb to Ruby form --- app/assets/stylesheets/normalize.css | 419 +++++++++++++++++++++++++++ app/assets/stylesheets/style.css | 188 ++++++++++++ app/controllers/tasks_controller.rb | 9 +- app/views/tasks/create.html.erb | 10 +- app/views/tasks/new.html.erb | 21 +- config/routes.rb | 4 +- 6 files changed, 644 insertions(+), 7 deletions(-) create mode 100644 app/assets/stylesheets/normalize.css create mode 100644 app/assets/stylesheets/style.css diff --git a/app/assets/stylesheets/normalize.css b/app/assets/stylesheets/normalize.css new file mode 100644 index 000000000..18ddf7fed --- /dev/null +++ b/app/assets/stylesheets/normalize.css @@ -0,0 +1,419 @@ +/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */ + +/** + * 1. Change the default font family in all browsers (opinionated). + * 2. Prevent adjustments of font size after orientation changes in IE and iOS. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + * 2. Add the correct display in IE. + */ + +article, +aside, +details, /* 1 */ +figcaption, +figure, +footer, +header, +main, /* 2 */ +menu, +nav, +section, +summary { /* 1 */ + display: block; +} + +/** + * Add the correct display in IE 9-. + */ + +audio, +canvas, +progress, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Add the correct display in IE 10-. + * 1. Add the correct display in IE. + */ + +template, /* 1 */ +[hidden] { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + +a { + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ +} + +/** + * Remove the outline on focused links when they are also active or hovered + * in all browsers (opinionated). + */ + +a:active, +a:hover { + outline-width: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ + +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * Add the correct font style in Android 4.3-. + */ + +dfn { + font-style: italic; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Add the correct background and color in IE 9-. + */ + +mark { + background-color: #ff0; + color: #000; +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10-. + */ + +img { + border-style: none; +} + +/** + * Hide the overflow in IE. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 40px; +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change font properties to `inherit` in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +select, +textarea { + font: inherit; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Restore the font weight unset by the previous rule. + */ + +optgroup { + font-weight: bold; +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ + +button, +html [type="button"], /* 1 */ +[type="reset"], +[type="submit"] { + -webkit-appearance: button; /* 2 */ +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Change the border, margin, and padding in all browsers (opinionated). + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Remove the default vertical scrollbar in IE. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on OS X. + */ + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Correct the text style of placeholders in Chrome, Edge, and Safari. + */ + +::-webkit-input-placeholder { + color: inherit; + opacity: 0.54; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css new file mode 100644 index 000000000..6124d1041 --- /dev/null +++ b/app/assets/stylesheets/style.css @@ -0,0 +1,188 @@ +@import 'https://fonts.googleapis.com/css?family=Amatic+SC|Josefin+Sans'; + +html { +font: normal normal 14px/1 "Josefin Sans"; +/*, Helvetica, Arial, sans-serif;*/ +} +/************************************/ +/* NAVIGATION BAR AND HEADER SECTION */ +/************************************/ + +.social-media-container { + width: 100%; + text-align: center; + margin: 0 auto; +} + +.social-media-container li { + list-style-type: none; + display: inline; + padding: 0; +} + +.social-media-container ul { + padding: 0; + margin: 0; +} + +/*header section { + background-color: #b24569; +}*/ + +.navigation-container { + width: 100%; + height: 10%; + text-align:center; + /*position: fixed;*/ + /*background-color: #fff796;*/ +} + +.navigation-container li { + list-style-type: none; + padding: 0 2% 0 2%; + display: inline-block; +} + +.navigation-container ul { + padding: 0 0 2% 0; + margin: 0; +} + + +/************************************/ +/* FORMS and BUTTONS */ +/************************************/ + +button { + display: block; + background-color: #4fb1cc; /* Green */ + border: none; + color: white; + padding: 10px 20px; + text-align: center; + text-decoration: none; + font-size: 16px; +} + + +/************************************/ +/* LINKS */ +/************************************/ +.navigation-container li a { + color: #000000; + font-size: 30px; + font-family: 'Amatic SC'; + text-decoration: none; + text-align: center; +} + +.navigation-container img { + padding-left: 1.75%; +} + +.social-media-container a { + padding: 0 5px 0 5px; +} + +.navigation-container li a:hover { + /*color: #ff7ca7;*/ + color: #b24569; +} + +a:hover { + /*color: #c98f8f;*/ + color: #4fb1cc; +} + +/*a:visited { + color: #000000 +}*/ + +a:link { + color: #000000; + text-decoration: none; +} + + + +/************************************/ +/* MAIN BODY SECTION - INDEX.HTML */ +/************************************/ +body { + margin-left: .5%; + margin-right: .5%; +} + +h2 { + font-family: 'Amatic SC'; + font-size: 2em; + text-align: left; + /*width: 30%;*/ + margin: 5px 2px 5px 2px; +} + +.blog-images { + padding: 5%; + height: 175px; +} + +.format-about-me { + height: 300px; + width: 100%; +} + +.format-about-me img { + border-radius: 50%; + float: left; + width: 25%; + padding-left: 5%; +} + +.format-about-me p { + float: right; + width: 60%; + padding: 0 5% 0 5%; +} + +section article { + display: inline-block; + width: 29%; + vertical-align: top; +} + +.article-format { + text-align: center; +} + +.article-format p, h3, h4 { + text-align: left; + margin: 0 4% 0 4%; +} + + +/************************************/ +/* FOOTER */ +/************************************/ +footer { + clear: both; + width: 100%; + margin: 0 auto; + margin-top: 1%; + height: 3%; + bottom:0; +} + +footer section { + float: right; + width: 10%; + margin: 0; +} + +footer section a { + padding: 0 1% .5% 1%; +} + +footer p { + float: left; + /*width: 90%;*/ +} diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index f2f9687c6..47eaa28ab 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -4,11 +4,18 @@ def index end def new + @mytask = Task.new end def create - Task.create(title: params[:title], description: params[:description]) + @params = params + @mytask = Task.new + @mytask.title = params[:task][:title] + @mytask.description = params[:task][:description] + @mytask.save redirect_to action: "index" + + # Task.create(title: params[:title], description: params[:description]) end def update diff --git a/app/views/tasks/create.html.erb b/app/views/tasks/create.html.erb index e0a729bf7..f73eb32d0 100644 --- a/app/views/tasks/create.html.erb +++ b/app/views/tasks/create.html.erb @@ -1,2 +1,8 @@ -

Tasks#create

-

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

+
+

+

<%= @params%>

+
<%= @mytask.title %>
+

<%= @mytask.description %>

+

+ +
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 19aed76da..043a1453d 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,6 +1,23 @@

Create a New Task

-
+<%= form_for @mytask, + url: create_path do |f| %> + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :description %> + <%= f.text_field :description %> + + <%= f.submit %> + + <%= tag(:input, :type => "hidden", + :name => request_forgery_protection_token.to_s, + :value => form_authenticity_token) %> + + <% end %> + + + diff --git a/config/routes.rb b/config/routes.rb index fd862019f..2d87f8374 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,11 +5,11 @@ get 'tasks/new'=> "tasks#new", as: "new" - post 'tasks/create' => 'tasks#create' + post 'tasks/create' => 'tasks#create', as: "create" get 'tasks/update' - put "tasks/:id/update" => "tasks#update" + put "tasks/:id/update" => "tasks#update", as: "update" get 'tasks/show/:id' => 'tasks#show', as: 'show' From 450f1feda578d621a72ae30ea0f8b34b5ddb860e Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 29 Sep 2016 16:13:02 -0700 Subject: [PATCH 13/47] added css styling and layout --- app/assets/stylesheets/style.css | 110 +++++++------------------ app/controllers/tasks_controller.rb | 8 +- app/views/layouts/application.html.erb | 17 ++++ app/views/tasks/edit.html.erb | 8 +- app/views/tasks/index.html.erb | 11 +-- app/views/tasks/new.html.erb | 4 +- app/views/tasks/show.html.erb | 12 +-- 7 files changed, 67 insertions(+), 103 deletions(-) diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css index 6124d1041..e233bb6bb 100644 --- a/app/assets/stylesheets/style.css +++ b/app/assets/stylesheets/style.css @@ -1,5 +1,6 @@ @import 'https://fonts.googleapis.com/css?family=Amatic+SC|Josefin+Sans'; + html { font: normal normal 14px/1 "Josefin Sans"; /*, Helvetica, Arial, sans-serif;*/ @@ -8,33 +9,12 @@ font: normal normal 14px/1 "Josefin Sans"; /* NAVIGATION BAR AND HEADER SECTION */ /************************************/ -.social-media-container { - width: 100%; - text-align: center; - margin: 0 auto; -} - -.social-media-container li { - list-style-type: none; - display: inline; - padding: 0; -} - -.social-media-container ul { - padding: 0; - margin: 0; -} - -/*header section { - background-color: #b24569; -}*/ - .navigation-container { width: 100%; height: 10%; - text-align:center; + text-align:right; /*position: fixed;*/ - /*background-color: #fff796;*/ + background-color: #fff796; } .navigation-container li { @@ -44,26 +24,40 @@ font: normal normal 14px/1 "Josefin Sans"; } .navigation-container ul { - padding: 0 0 2% 0; + padding: 1% 0 0 0; margin: 0; } - /************************************/ /* FORMS and BUTTONS */ /************************************/ -button { +.button { display: block; - background-color: #4fb1cc; /* Green */ + background-color: #4fb1cc; border: none; - color: white; - padding: 10px 20px; + color: #fff796; + padding: 5px 10px; text-align: center; text-decoration: none; font-size: 16px; } +ul li { + list-style-type: none; + padding: 1% 0 0 0; +} + +label{ + display: block; + width: 200px; + padding: 10px 0 10px 0; + +} +input { + display: block; + +} /************************************/ /* LINKS */ @@ -76,14 +70,6 @@ button { text-align: center; } -.navigation-container img { - padding-left: 1.75%; -} - -.social-media-container a { - padding: 0 5px 0 5px; -} - .navigation-container li a:hover { /*color: #ff7ca7;*/ color: #b24569; @@ -94,17 +80,11 @@ a:hover { color: #4fb1cc; } -/*a:visited { - color: #000000 -}*/ - a:link { color: #000000; text-decoration: none; } - - /************************************/ /* MAIN BODY SECTION - INDEX.HTML */ /************************************/ @@ -113,53 +93,19 @@ body { margin-right: .5%; } -h2 { +h3 { font-family: 'Amatic SC'; - font-size: 2em; + font-size: 2.5em; text-align: left; + padding-top: 10px; /*width: 30%;*/ margin: 5px 2px 5px 2px; } -.blog-images { - padding: 5%; - height: 175px; -} - -.format-about-me { - height: 300px; - width: 100%; -} - -.format-about-me img { - border-radius: 50%; - float: left; - width: 25%; - padding-left: 5%; -} - -.format-about-me p { - float: right; - width: 60%; - padding: 0 5% 0 5%; -} - -section article { - display: inline-block; - width: 29%; - vertical-align: top; -} - -.article-format { - text-align: center; -} - -.article-format p, h3, h4 { - text-align: left; - margin: 0 4% 0 4%; +.font-style { + font-size: 2em; } - /************************************/ /* FOOTER */ /************************************/ diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 47eaa28ab..7de8c1aa7 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -52,11 +52,9 @@ def show def completion_status @task = Task.find(params[:id]) - if @task.completion_status == true - @task.completion_date = Time.now - else - redirect_to action: "index" - end + @task.update_attribute(:completed_at, Time.now) + + redirect_to action: 'index', notice: "task item completed" end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 46eeb110b..d25645149 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,8 +7,25 @@ <%= csrf_meta_tags %> +
+ + +
+ <%= yield %> +
+

+ Copyright 2016, Rachel Pavilanis +

+ +
+ diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 4fa558eab..f4dc29ec0 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -7,12 +7,14 @@ - -
+ <%= tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, :value => form_authenticity_token) %> - + + diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index dd27668c1..6a23abbc1 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -4,15 +4,16 @@
    -
  • - <%= check_box_tag(task[:completion_status]) %> - <%= label_tag(task[:completion_status], link_to(task[:title], show_path(task[:id])) +
  • + + <%= label_tag(task.completion_status, link_to(task.title, show_path(task.id)) ) %>
      • -
    • <%= button_to 'Edit', edit_path(task) %>
      • -
    • <%= button_to 'Delete', delete_path(task), +
    • <%= button_to 'Complete', complete_path(task), :class => 'button' %>
      • +
    • <%= button_to 'Edit', edit_path(task), :class => 'button' %>
      • +
    • <%= button_to 'Delete', delete_path(task), :class => 'button', method: :delete, data: { confirm: 'Are you sure?' } %>
    diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 043a1453d..226646937 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -6,9 +6,9 @@ <%= f.text_field :title %> <%= f.label :description %> - <%= f.text_field :description %> + <%= f.text_area :description %> - <%= f.submit %> + <%= f.submit :class=>"button" %> <%= tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index ab344bf5c..a39b9626a 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,17 +1,17 @@
    -

    Task Name: <%= @task[:title]%>

    -

    Description: <%= @task[:description] %>

    +

    Task Name: <%= @task.title%>

    +

    Description: <%= @task.description %>

    Completed? - <% if @task[:completion_status] == true %> + <% if @task.completion_status == true %> <%= "Yes" %> <% else %> <%= "Not yet completed" %> <% end %> -

    Completed Time and Date: <%= @task[:completed_at] %>

    +

    Completed Time and Date: <%= @task.completed_at %>

      -
    • <%= button_to 'Edit', edit_path(@task) %>
      • -
    • <%= button_to 'Delete', delete_path(@task), +
    • <%= button_to 'Edit', edit_path(@task), :class => 'button' %>
      • +
    • <%= button_to 'Delete', delete_path(@task), :class => 'button', method: :delete, data: { confirm: 'Are you sure?' } %>
    From 1b33b3ce5b4c1485da849823f4f0351342dc43b6 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 29 Sep 2016 16:14:55 -0700 Subject: [PATCH 14/47] moved buttons into a line --- app/assets/stylesheets/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css index e233bb6bb..9aea31b85 100644 --- a/app/assets/stylesheets/style.css +++ b/app/assets/stylesheets/style.css @@ -45,7 +45,8 @@ font: normal normal 14px/1 "Josefin Sans"; ul li { list-style-type: none; - padding: 1% 0 0 0; + padding: 0 1% 0 1%; + display: inline-block; } label{ From d82691ad1e03c277c4be203fb6830763633ab24b Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 29 Sep 2016 16:26:31 -0700 Subject: [PATCH 15/47] complete method now working --- app/controllers/tasks_controller.rb | 4 +++- app/views/tasks/index.html.erb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 7de8c1aa7..7aef807f3 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -53,8 +53,10 @@ def completion_status @task = Task.find(params[:id]) @task.update_attribute(:completed_at, Time.now) + @task.update_attribute(:completion_status, true) - redirect_to action: 'index', notice: "task item completed" + + redirect_to action: 'index' end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 6a23abbc1..1abdfc13c 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -11,7 +11,7 @@
      -
    • <%= button_to 'Complete', complete_path(task), :class => 'button' %>
      • +
    • <%= button_to 'Complete', complete_path(task), :class => 'button', method: :patch, data: { flash: "Task has been updated"} %>
    • <%= button_to 'Edit', edit_path(task), :class => 'button' %>
    • <%= button_to 'Delete', delete_path(task), :class => 'button', method: :delete, From 445b4ccb2c3a235a327fee0e956ab5df00bd8a8b Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 29 Sep 2016 16:48:45 -0700 Subject: [PATCH 16/47] added strikethrough on completed tasks --- app/assets/stylesheets/style.css | 20 -------------------- app/controllers/tasks_controller.rb | 3 ++- app/views/layouts/application.html.erb | 1 + app/views/tasks/index.html.erb | 12 ++++++++---- app/views/tasks/new.html.erb | 17 ----------------- config/routes.rb | 3 --- 6 files changed, 11 insertions(+), 45 deletions(-) diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css index 9aea31b85..69bc10ba8 100644 --- a/app/assets/stylesheets/style.css +++ b/app/assets/stylesheets/style.css @@ -99,7 +99,6 @@ h3 { font-size: 2.5em; text-align: left; padding-top: 10px; - /*width: 30%;*/ margin: 5px 2px 5px 2px; } @@ -110,26 +109,7 @@ h3 { /************************************/ /* FOOTER */ /************************************/ -footer { - clear: both; - width: 100%; - margin: 0 auto; - margin-top: 1%; - height: 3%; - bottom:0; -} - -footer section { - float: right; - width: 10%; - margin: 0; -} - -footer section a { - padding: 0 1% .5% 1%; -} footer p { float: left; - /*width: 90%;*/ } diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 7aef807f3..02f70bd21 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -24,6 +24,7 @@ def update if @task.update(title: params[:title], description: params[:description]) redirect_to action: "show" else + # another way to redirect render 'edit' end end @@ -55,9 +56,9 @@ def completion_status @task.update_attribute(:completed_at, Time.now) @task.update_attribute(:completion_status, true) - redirect_to action: 'index' + end # used this before creating model diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d25645149..2cf6bdb58 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -15,6 +15,7 @@

    • <%= link_to("Add New Task", new_path()) %>

    + diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 1abdfc13c..4c8545502 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -5,13 +5,17 @@
    • - - <%= label_tag(task.completion_status, link_to(task.title, show_path(task.id)) - ) %> + <% if task.completion_status == true %> + <%= label_tag(task.completion_status, link_to(task.title, show_path(task.id)) + ) %> + <% else %> + <%= label_tag(task.completion_status, link_to(task.title, show_path(task.id)) + ) %> + <% end %>
        • -
      • <%= button_to 'Complete', complete_path(task), :class => 'button', method: :patch, data: { flash: "Task has been updated"} %>
        • +
      • <%= button_to 'Complete', complete_path(task), :class => 'button', method: :patch %>
      • <%= button_to 'Edit', edit_path(task), :class => 'button' %>
      • <%= button_to 'Delete', delete_path(task), :class => 'button', method: :delete, diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 226646937..75cda1d7a 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -15,20 +15,3 @@ :value => form_authenticity_token) %> <% end %> - - - diff --git a/config/routes.rb b/config/routes.rb index 2d87f8374..a86f348a8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,7 +8,6 @@ post 'tasks/create' => 'tasks#create', as: "create" get 'tasks/update' - put "tasks/:id/update" => "tasks#update", as: "update" get 'tasks/show/:id' => 'tasks#show', as: 'show' @@ -19,8 +18,6 @@ patch 'tasks/:id/completion_status' => 'tasks#completion_status', as: "complete" - # post 'tasks/:id/completion_status' => 'tasks#completion_status', as: "completed" - # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 9c1dffae0ef4a0c96e2da358b12040f100d3c919 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 29 Sep 2016 16:49:04 -0700 Subject: [PATCH 17/47] hadn't saved controller --- app/controllers/tasks_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 02f70bd21..fe8546da6 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -58,7 +58,6 @@ def completion_status redirect_to action: 'index' - end # used this before creating model From 6d1f6a51ff54d9612e40b35c6ec35a7db1d56a7e Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 29 Sep 2016 20:30:34 -0700 Subject: [PATCH 18/47] added logo to task list home page --- .ruby-gemset | 1 - .ruby-version | 1 - app/assets/images/.DS_Store | Bin 0 -> 6148 bytes app/assets/stylesheets/style.css | 6 ++++++ app/controllers/tasks_controller.rb | 2 +- app/views/layouts/application.html.erb | 13 ++++++++----- public/Logo.png | Bin 0 -> 9148 bytes 7 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 .ruby-gemset delete mode 100644 .ruby-version create mode 100644 app/assets/images/.DS_Store create mode 100644 public/Logo.png 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/app/assets/images/.DS_Store b/app/assets/images/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0
        -
        diff --git a/public/Logo.png b/public/Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..481ae20decd09af51c8fd55ae54293c98156aff7 GIT binary patch literal 9148 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 Date: Thu, 29 Sep 2016 20:37:28 -0700 Subject: [PATCH 19/47] added hover feature on buttons --- app/assets/stylesheets/style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css index c61677c2a..55473bb11 100644 --- a/app/assets/stylesheets/style.css +++ b/app/assets/stylesheets/style.css @@ -49,6 +49,11 @@ font: normal normal 14px/1 "Josefin Sans"; font-size: 16px; } +.button:hover { + background-color: #fff796; + color: #b24569; +} + ul li { list-style-type: none; padding: 0 1% 0 1%; From e00ef8a5b8caab922b7586411316a181717c0797 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 30 Sep 2016 10:00:07 -0700 Subject: [PATCH 20/47] created a people controller and a person model --- app/assets/javascripts/people.coffee | 3 ++ app/assets/stylesheets/people.scss | 3 ++ app/assets/stylesheets/style.css | 18 ++++++---- app/controllers/people_controller.rb | 22 ++++++++++++ app/helpers/people_helper.rb | 2 ++ app/models/person.rb | 2 ++ app/views/people/create.html.erb | 2 ++ app/views/people/destroy.html.erb | 2 ++ app/views/people/edit.html.erb | 2 ++ app/views/people/index.html.erb | 2 ++ app/views/people/new.html.erb | 2 ++ app/views/people/show.html.erb | 2 ++ app/views/people/update.html.erb | 2 ++ config/routes.rb | 16 ++++++++- db/migrate/20160930165830_create_people.rb | 9 +++++ db/schema.rb | 8 ++++- public/Logo.png | Bin 9148 -> 8736 bytes test/controllers/people_controller_test.rb | 39 +++++++++++++++++++++ test/fixtures/people.yml | 7 ++++ test/models/person_test.rb | 7 ++++ 20 files changed, 141 insertions(+), 9 deletions(-) create mode 100644 app/assets/javascripts/people.coffee create mode 100644 app/assets/stylesheets/people.scss create mode 100644 app/controllers/people_controller.rb create mode 100644 app/helpers/people_helper.rb create mode 100644 app/models/person.rb create mode 100644 app/views/people/create.html.erb create mode 100644 app/views/people/destroy.html.erb create mode 100644 app/views/people/edit.html.erb create mode 100644 app/views/people/index.html.erb create mode 100644 app/views/people/new.html.erb create mode 100644 app/views/people/show.html.erb create mode 100644 app/views/people/update.html.erb create mode 100644 db/migrate/20160930165830_create_people.rb create mode 100644 test/controllers/people_controller_test.rb create mode 100644 test/fixtures/people.yml create mode 100644 test/models/person_test.rb 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/stylesheets/people.scss b/app/assets/stylesheets/people.scss new file mode 100644 index 000000000..521746256 --- /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/style.css b/app/assets/stylesheets/style.css index 55473bb11..e69783f57 100644 --- a/app/assets/stylesheets/style.css +++ b/app/assets/stylesheets/style.css @@ -51,7 +51,7 @@ font: normal normal 14px/1 "Josefin Sans"; .button:hover { background-color: #fff796; - color: #b24569; + color: #FF7CA7; } ul li { @@ -84,12 +84,7 @@ input { .navigation-container li a:hover { /*color: #ff7ca7;*/ - color: #b24569; -} - -a:hover { - /*color: #c98f8f;*/ - color: #4fb1cc; + color: #FF7CA7; } a:link { @@ -100,6 +95,7 @@ a:link { /************************************/ /* MAIN BODY SECTION - INDEX.HTML */ /************************************/ + body { margin-left: .5%; margin-right: .5%; @@ -117,6 +113,14 @@ h3 { font-size: 2em; } +.font-style a:link { + color: #FF7CA7; +} + +.font-style a:hover { + color: #4fb1cc;; +} + /************************************/ /* FOOTER */ /************************************/ diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb new file mode 100644 index 000000000..24de03a6e --- /dev/null +++ b/app/controllers/people_controller.rb @@ -0,0 +1,22 @@ +class PeopleController < ApplicationController + def index + end + + def show + end + + def edit + end + + def create + end + + def new + end + + def update + end + + def destroy + end +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/models/person.rb b/app/models/person.rb new file mode 100644 index 000000000..2f2e286c0 --- /dev/null +++ b/app/models/person.rb @@ -0,0 +1,2 @@ +class Person < ActiveRecord::Base +end diff --git a/app/views/people/create.html.erb b/app/views/people/create.html.erb new file mode 100644 index 000000000..eaa521a99 --- /dev/null +++ b/app/views/people/create.html.erb @@ -0,0 +1,2 @@ +

        People#create

        +

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

        diff --git a/app/views/people/destroy.html.erb b/app/views/people/destroy.html.erb new file mode 100644 index 000000000..42a6ded2c --- /dev/null +++ b/app/views/people/destroy.html.erb @@ -0,0 +1,2 @@ +

        People#destroy

        +

        Find me in app/views/people/destroy.html.erb

        diff --git a/app/views/people/edit.html.erb b/app/views/people/edit.html.erb new file mode 100644 index 000000000..b80753264 --- /dev/null +++ b/app/views/people/edit.html.erb @@ -0,0 +1,2 @@ +

        People#edit

        +

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

        diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb new file mode 100644 index 000000000..72f624e4c --- /dev/null +++ b/app/views/people/index.html.erb @@ -0,0 +1,2 @@ +

        People#index

        +

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

        diff --git a/app/views/people/new.html.erb b/app/views/people/new.html.erb new file mode 100644 index 000000000..783270e08 --- /dev/null +++ b/app/views/people/new.html.erb @@ -0,0 +1,2 @@ +

        People#new

        +

        Find me in app/views/people/new.html.erb

        diff --git a/app/views/people/show.html.erb b/app/views/people/show.html.erb new file mode 100644 index 000000000..0de309092 --- /dev/null +++ b/app/views/people/show.html.erb @@ -0,0 +1,2 @@ +

        People#show

        +

        Find me in app/views/people/show.html.erb

        diff --git a/app/views/people/update.html.erb b/app/views/people/update.html.erb new file mode 100644 index 000000000..79a6b9f23 --- /dev/null +++ b/app/views/people/update.html.erb @@ -0,0 +1,2 @@ +

        People#update

        +

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

        diff --git a/config/routes.rb b/config/routes.rb index a86f348a8..f21f83df4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,19 @@ Rails.application.routes.draw do - root to: "posts#index" + root to: "tasks#index" + + get 'people/index' + + get 'people/show' + + get 'people/edit' + + get 'people/create' + + get 'people/new' + + get 'people/update' + + get 'people/destroy' get 'tasks/index', as: 'index' diff --git a/db/migrate/20160930165830_create_people.rb b/db/migrate/20160930165830_create_people.rb new file mode 100644 index 000000000..727e50381 --- /dev/null +++ b/db/migrate/20160930165830_create_people.rb @@ -0,0 +1,9 @@ +class CreatePeople < ActiveRecord::Migration + def change + create_table :people do |t| + t.string :name + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 1c912097b..c62457c12 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,13 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160928220045) do +ActiveRecord::Schema.define(version: 20160930165830) do + + create_table "people", force: :cascade do |t| + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end create_table "tasks", force: :cascade do |t| t.string "title" diff --git a/public/Logo.png b/public/Logo.png index 481ae20decd09af51c8fd55ae54293c98156aff7..a125638207d323e2d5ff3f5aa194985ffe6d6e05 100644 GIT binary patch literal 8736 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 E0FK3SHUIzs literal 9148 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 Date: Fri, 30 Sep 2016 10:16:02 -0700 Subject: [PATCH 21/47] created belongs_to association - a task belongs to a person --- Gemfile | 2 ++ Gemfile.lock | 7 +++++++ db/migrate/20160930171540_add_person_to_task.rb | 5 +++++ 3 files changed, 14 insertions(+) create mode 100644 db/migrate/20160930171540_add_person_to_task.rb diff --git a/Gemfile b/Gemfile index d7371e6c2..b8edd684d 100644 --- a/Gemfile +++ b/Gemfile @@ -40,6 +40,8 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> in views gem 'web-console', '~> 2.0' + gem "better_errors" + gem "binding_of_caller" # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' diff --git a/Gemfile.lock b/Gemfile.lock index b6d552c2c..86a8d23f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,15 @@ GEM tzinfo (~> 1.1) arel (6.0.3) awesome_print (1.7.0) + 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 (9.0.5) + coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -148,6 +153,8 @@ PLATFORMS DEPENDENCIES awesome_print + better_errors + binding_of_caller byebug coffee-rails (~> 4.1.0) jbuilder (~> 2.0) diff --git a/db/migrate/20160930171540_add_person_to_task.rb b/db/migrate/20160930171540_add_person_to_task.rb new file mode 100644 index 000000000..9f031134b --- /dev/null +++ b/db/migrate/20160930171540_add_person_to_task.rb @@ -0,0 +1,5 @@ +class AddPersonToTask < ActiveRecord::Migration + def change + add_reference :tasks, :person, index: true, foreign_key: true + end +end From a3cba947f63aa9accb547baa9e912e8739931095 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 30 Sep 2016 10:18:56 -0700 Subject: [PATCH 22/47] migrated --- app/models/person.rb | 1 + app/models/task.rb | 1 + db/schema.rb | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/person.rb b/app/models/person.rb index 2f2e286c0..4ed22ba8b 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -1,2 +1,3 @@ class Person < ActiveRecord::Base + has_many :tasks end diff --git a/app/models/task.rb b/app/models/task.rb index 935f76e12..c3c534741 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,2 +1,3 @@ class Task < ActiveRecord::Base + belongs_to :person end diff --git a/db/schema.rb b/db/schema.rb index c62457c12..301fefd80 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160930165830) do +ActiveRecord::Schema.define(version: 20160930171540) do create_table "people", force: :cascade do |t| t.string "name" @@ -26,6 +26,9 @@ t.datetime "completed_at" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "person_id" end + add_index "tasks", ["person_id"], name: "index_tasks_on_person_id" + end From 9c04fbad8de3a629c9a4bccdb7a3956031da6c81 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 30 Sep 2016 11:36:44 -0700 Subject: [PATCH 23/47] got individualized index pages working for different people --- app/controllers/people_controller.rb | 9 +++++++++ app/controllers/tasks_controller.rb | 4 ++-- app/views/tasks/index.html.erb | 1 + app/views/tasks/show.html.erb | 3 ++- config/routes.rb | 28 ++++++++++++++-------------- 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 24de03a6e..bf64a2b12 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -1,17 +1,26 @@ class PeopleController < ApplicationController def index + @people = Person.all end def show + @person = Person.find(params[:id]) + + if @person == nil + render :file => 'public/404.html', + :status => :not_found, :layout => false + end end def edit end def create + @person = Person.new end def new + @person = Person.new end def update diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 952ea5ff0..e12f68da3 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,6 +1,6 @@ class TasksController < ApplicationController def index - @tasks = Task.all + @tasks = Task.where(person_id: params[:id]) end def new @@ -52,7 +52,7 @@ def show def completion_status @task = Task.find(params[:id]) - + @task.update_attribute(:completed_at, Time.now) @task.update_attribute(:completion_status, true) diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 4c8545502..3e18b0d1a 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,3 +1,4 @@ +

        Daily Task List

        <% @tasks.each do |task| %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index a39b9626a..92b64eacb 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,5 +1,6 @@
        -

        Task Name: <%= @task.title%>

        + +

        Task Name: <%= @task.title%>

        Description: <%= @task.description %>

        Completed? <% if @task.completion_status == true %> diff --git a/config/routes.rb b/config/routes.rb index f21f83df4..05ee89aaf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,21 +1,21 @@ Rails.application.routes.draw do root to: "tasks#index" - - get 'people/index' - get 'people/show' - - get 'people/edit' - - get 'people/create' - - get 'people/new' - - get 'people/update' - - get 'people/destroy' + # get 'people/index', as: 'people-index' + # + # get 'people/show/:id', 'people#show', as: 'people-show' + # + # get 'people/edit' + # + # get 'people/create' + # + # get 'people/new' + # + # get 'people/update' + # + # get 'people/destroy' - get 'tasks/index', as: 'index' + get 'tasks/:id/index' => "tasks#index", as: 'index' get 'tasks/new'=> "tasks#new", as: "new" From f3c9395cb13e4b9615cea43497f2da447121b231 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 30 Sep 2016 13:55:30 -0700 Subject: [PATCH 24/47] has working individualized name on tasks index page. --- app/controllers/people_controller.rb | 9 +++++++++ app/controllers/tasks_controller.rb | 5 ++++- app/views/layouts/application.html.erb | 2 +- app/views/people/index.html.erb | 17 +++++++++++++++-- app/views/tasks/index.html.erb | 2 +- app/views/tasks/show.html.erb | 1 - config/routes.rb | 6 +++--- 7 files changed, 33 insertions(+), 9 deletions(-) diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index bf64a2b12..5c4a727ae 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -1,6 +1,10 @@ class PeopleController < ApplicationController def index @people = Person.all + + @tasks = Task.where(person_id: params[:person_id]) + @incomplete_tasks = 0 + end def show @@ -17,6 +21,11 @@ def edit def create @person = Person.new + @params = params + @person.name = params[:person][:name] + + @person.save + redirect_to action: "people-index" end def new diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index e12f68da3..10ebd9a23 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,6 +1,8 @@ class TasksController < ApplicationController def index - @tasks = Task.where(person_id: params[:id]) + + @person = Person.find( params[:person_id].to_i) + @tasks = @person.tasks end def new @@ -42,6 +44,7 @@ def edit end def show + @task = Task.find(params[:id]) if @task == nil diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a98d7f3e0..495bd07a1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,7 +13,7 @@
          -

        • <%= link_to("Home", index_path()) %>

          • +

        • <%= link_to("Home", index_path(:id)) %>

        • <%= link_to("Add New Task", new_path()) %>

        diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb index 72f624e4c..98d4adad6 100644 --- a/app/views/people/index.html.erb +++ b/app/views/people/index.html.erb @@ -1,2 +1,15 @@ -

        People#index

        -

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

        +

        List of Current Users

        + +<% @people.each do |person| %> + + <% @tasks.each do |task| %> + <% if task.completion_status == false %> + <% @incomplete_tasks += 1 %> + <% end %> + <% end %> + +
          +
        • <%= person.name %>: <%= @incomplete_tasks %>
          • +
        + +<% end %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 3e18b0d1a..422fd263e 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,4 +1,4 @@ - +

        Hello, <%= @person.name %>!

        Daily Task List

        <% @tasks.each do |task| %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 92b64eacb..4c4d68104 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,5 +1,4 @@
        -

        Task Name: <%= @task.title%>

        Description: <%= @task.description %>

        Completed? diff --git a/config/routes.rb b/config/routes.rb index 05ee89aaf..5bd13296c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do root to: "tasks#index" - # get 'people/index', as: 'people-index' + get 'people/index', as: 'people-index' # # get 'people/show/:id', 'people#show', as: 'people-show' # @@ -15,7 +15,7 @@ # # get 'people/destroy' - get 'tasks/:id/index' => "tasks#index", as: 'index' + get 'tasks/:person_id/index' => "tasks#index", as: 'index' get 'tasks/new'=> "tasks#new", as: "new" @@ -24,7 +24,7 @@ get 'tasks/update' put "tasks/:id/update" => "tasks#update", as: "update" - get 'tasks/show/:id' => 'tasks#show', as: 'show' + get 'tasks/show/:id/' => 'tasks#show', as: 'show' delete 'tasks/:id/destroy' => "tasks#destroy", as: "delete" From d2e62f7d068419c03a8a27fe762803dce3d50839 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 30 Sep 2016 14:58:29 -0700 Subject: [PATCH 25/47] changed main homepage to be list of current users and linked to individual task lists. created new layout so that current user list page has a link to add a new person. --- app/controllers/people_controller.rb | 9 ++++++- app/controllers/tasks_controller.rb | 2 ++ app/views/layouts/application.html.erb | 2 +- app/views/layouts/people.html.erb | 35 ++++++++++++++++++++++++++ app/views/people/index.html.erb | 2 +- app/views/people/new.html.erb | 16 ++++++++++-- app/views/tasks/new.html.erb | 2 ++ config/routes.rb | 12 ++++----- 8 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 app/views/layouts/people.html.erb diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 5c4a727ae..f4147ea52 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -1,4 +1,5 @@ class PeopleController < ApplicationController + def index @people = Person.all @@ -25,7 +26,7 @@ def create @person.name = params[:person][:name] @person.save - redirect_to action: "people-index" + redirect_to action: "index" end def new @@ -37,4 +38,10 @@ def update def destroy end + + private + def action + render :layout => 'people' + end + end diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 10ebd9a23..9391bf814 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -7,6 +7,7 @@ def index def new @mytask = Task.new + @people = Person.all end def create @@ -14,6 +15,7 @@ def create @mytask = Task.new @mytask.title = params[:task][:title] @mytask.description = params[:task][:description] + @mytask.person_id = params[:task][:person_id] @mytask.save redirect_to action: "index" diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 495bd07a1..1fc6966bc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,7 +13,7 @@
          -

        • <%= link_to("Home", index_path(:id)) %>

          • +

        • <%= link_to("Home", root_path) %>

        • <%= link_to("Add New Task", new_path()) %>

        diff --git a/app/views/layouts/people.html.erb b/app/views/layouts/people.html.erb new file mode 100644 index 000000000..84d88e833 --- /dev/null +++ b/app/views/layouts/people.html.erb @@ -0,0 +1,35 @@ + + + + TaskListRails + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + +
        + + + +
        + + +<%= yield %> + +
        +

        + Copyright 2016, Rachel Pavilanis +

        + +
        + + + diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb index 98d4adad6..005832e6c 100644 --- a/app/views/people/index.html.erb +++ b/app/views/people/index.html.erb @@ -9,7 +9,7 @@ <% end %>
          -
        • <%= person.name %>: <%= @incomplete_tasks %>
          • +
        • <%= link_to(person.name, index_path(person.id)) %>: <%= @incomplete_tasks %>
        <% end %> diff --git a/app/views/people/new.html.erb b/app/views/people/new.html.erb index 783270e08..bdcd97247 100644 --- a/app/views/people/new.html.erb +++ b/app/views/people/new.html.erb @@ -1,2 +1,14 @@ -

        People#new

        -

        Find me in app/views/people/new.html.erb

        +

        Create a New Person

        + +<%= form_for @person, + url: createperson_path do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.submit :class=>"button" %> + + <%= tag(:input, :type => "hidden", + :name => request_forgery_protection_token.to_s, + :value => form_authenticity_token) %> + + <% end %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 75cda1d7a..a53d48277 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -8,6 +8,8 @@ <%= f.label :description %> <%= f.text_area :description %> + <%= select("person", "person_id", @people.collect {|p| [ p.name, p.id ] }, { :include_blank => true }) %> + <%= f.submit :class=>"button" %> <%= tag(:input, :type => "hidden", diff --git a/config/routes.rb b/config/routes.rb index 5bd13296c..3a959c09f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - root to: "tasks#index" + root to: "people#index" get 'people/index', as: 'people-index' # @@ -7,9 +7,9 @@ # # get 'people/edit' # - # get 'people/create' - # - # get 'people/new' + post 'people/create' => 'people#create', as: "createperson" + + get 'people/new' => "people#new", as: "newperson" # # get 'people/update' # @@ -17,9 +17,9 @@ get 'tasks/:person_id/index' => "tasks#index", as: 'index' - get 'tasks/new'=> "tasks#new", as: "new" + get 'tasks/new/'=> "tasks#new", as: "new" - post 'tasks/create' => 'tasks#create', as: "create" + post 'tasks/create/' => 'tasks#create', as: "create" get 'tasks/update' put "tasks/:id/update" => "tasks#update", as: "update" From 89424d0503f074c52804ea294acae65241d18a2a Mon Sep 17 00:00:00 2001 From: Rachel Pavilanis Date: Mon, 3 Oct 2016 09:26:14 -0700 Subject: [PATCH 26/47] Update README.md --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 2b96daf9c..9731b2c7e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,21 @@ +## What went well? +I really liked this assignment, because it aligns with some of my personal interests and capstone ideas. I am loving Ruby on Rails. Even though we are just beginning to learn about the functionality of Rails, it already feels so much more powerful and complete than anything we have done before. I love combining many of the concepts we have learned thus far into a single project. I think this project also made me feel more confident and secure in some of the previously covered concepts like CSS and Ruby. + +Since I finished my project early, I was really excited about adding User functionality. I decided to let my curiousity lead me down the path of trying to add some of those features, and I am really glad I did. I was able to get individualized task lists working for various users, and also created a different layout page for the user home screen and the task home screen. Normally I am too nervous to experiment because I don't want to break anything. Although I did end up breaking several things (I can no longer add a new task or mark a task as complete, because these features are not linked to a specific user), I also learned a lot. I'm excited to learn more about adding users and user relationships in lectures this week, and I am hoping to go back in to make everything work again. + +## What are you still working on understanding better? + +I am definitely looking forward to learning more about how to actually create different user views. + +I also feel like CSS is an area where I kind of stumble around blindly until I get something that looks good to me. I have used similar headers and navigation bars in my projects, because I found something that works and I am nervous to change that too much. In my next project, I want to push myself to do something totally different (maybe a side navigation) so that I can continue building my skills in this area. + +## What did your chair pair do differently? + +My chair pair had the details of each of here tasks displayed on the main page - I liked this because all of the detail is right there. In my project, it felt like an additional unneeded step for users to have to click on a task before seeing the description. + +## + + # Task List Rails ✅ We are going to build a Task List in Rails. This web application will enable us to keep track of list of tasks with the functionality to add, edit and remove tasks from a list. From f3232453bed64d1c41da5cd7262c3b3ba2ebbe84 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 4 Oct 2016 21:25:09 -0700 Subject: [PATCH 27/47] fixed some things and broke other things - my show method is working, as is my ability to mark things as complete. I am able to delete tasks, however, my redirect_to: index isn't working in my destroy controller method, or really anywhere. I am able to go into edit something, but then the edit form is blank and even if I change nothing and hit edit, the form then becomes blank. I really want to get this working with having the different layouts and people with their various tasks, so I will probably keep working on this. --- app/controllers/tasks_controller.rb | 46 ++++++++++++++++---------- app/views/layouts/application.html.erb | 4 +-- app/views/layouts/people.html.erb | 2 +- app/views/people/index.html.erb | 12 ++++--- app/views/tasks/_form.html.erb | 15 +++++++++ app/views/tasks/edit.html.erb | 19 +---------- app/views/tasks/index.html.erb | 6 ++-- app/views/tasks/new.html.erb | 18 +--------- app/views/tasks/show.html.erb | 8 ++--- config/routes.rb | 14 ++++---- 10 files changed, 71 insertions(+), 73 deletions(-) create mode 100644 app/views/tasks/_form.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 9391bf814..897298472 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -6,31 +6,21 @@ def index end def new - @mytask = Task.new + @task = Task.new @people = Person.all end def create @params = params - @mytask = Task.new - @mytask.title = params[:task][:title] - @mytask.description = params[:task][:description] - @mytask.person_id = params[:task][:person_id] - @mytask.save - redirect_to action: "index" - # Task.create(title: params[:title], description: params[:description]) - end + @task = Task.new + @task.title = params[:task][:title] + @task.description = params[:task][:description] + @task.person_id = params[:person_id].to_i + @task.save - def update - @task = Task.find(params[:id]) + redirect_to index_path(@task.id, params[:person_id]) - if @task.update(title: params[:title], description: params[:description]) - redirect_to action: "show" - else - # another way to redirect - render 'edit' - end end def destroy @@ -43,8 +33,30 @@ def destroy def edit @task = Task.find(params[:id]) + + if @task == nil + render :file => 'public/404.html', + :status => :not_found + end + end + + def update + @task = Task.find(params[:id]) + + if @task == nil + render :file => 'public/404.html', + :status => :not_found + end + + if @task.update(title: params[:title], description: params[:description]) + redirect_to action: "show" + else + # another way to redirect + render 'edit' + end end + def show @task = Task.find(params[:id]) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1fc6966bc..64040a836 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,8 +13,8 @@
          -

        • <%= link_to("Home", root_path) %>

          • -

        • <%= link_to("Add New Task", new_path()) %>

          • +

        • <%= link_to("Users", root_path) %>

          • +

        • <%= link_to("Add New Task", new_path) %>

        diff --git a/app/views/layouts/people.html.erb b/app/views/layouts/people.html.erb index 84d88e833..45a81449e 100644 --- a/app/views/layouts/people.html.erb +++ b/app/views/layouts/people.html.erb @@ -13,7 +13,7 @@
          -

        • <%= link_to("Home", root_path) %>

          • +

        • <%= link_to("Users", root_path) %>

        • <%= link_to("Add New Person", newperson_path()) %>

        diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb index 005832e6c..90121a277 100644 --- a/app/views/people/index.html.erb +++ b/app/views/people/index.html.erb @@ -2,14 +2,18 @@ <% @people.each do |person| %> - <% @tasks.each do |task| %> + +
          -
        • <%= link_to(person.name, index_path(person.id)) %>: <%= @incomplete_tasks %>
          • +
        • <%= link_to(person.name, index_path(person.id)) %>
          • + +
        <% end %> diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..ee86c41da --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,15 @@ +<%= form_for @task, + url: action_name do |f| %> + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :description %> + <%= f.text_area :description %> + + <%= f.submit :class=>"button" %> + + <%= tag(:input, :type => "hidden", + :name => request_forgery_protection_token.to_s, + :value => form_authenticity_token) %> + + <% end %> diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index f4dc29ec0..333ff723e 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,20 +1,3 @@

        Edit Task

        -
        - - - - - - - - - <%= tag(:input, :type => "hidden", - :name => request_forgery_protection_token.to_s, - :value => form_authenticity_token) %> - - - -
        +<%= render partial: "form", locals: {action_name: "update", params: {id: @task.id, person_id: params[:person_id]}} %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 422fd263e..0735eae00 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -16,9 +16,9 @@

          • -
        • <%= button_to 'Complete', complete_path(task), :class => 'button', method: :patch %>
          • -
        • <%= button_to 'Edit', edit_path(task), :class => 'button' %>
          • -
        • <%= button_to 'Delete', delete_path(task), :class => 'button', +
        • <%= button_to 'Complete', complete_path(task, params[:person_id]), :class => 'button', method: :patch %>
          • +
        • <%= button_to 'Edit', edit_path(task, params[:person_id]), :class => 'button', method: :get %>
          • +
        • <%= button_to 'Delete', delete_path(task, params[:person_id]), :class => 'button', method: :delete, data: { confirm: 'Are you sure?' } %>
        diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index a53d48277..873bba31f 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,19 +1,3 @@

        Create a New Task

        -<%= form_for @mytask, - url: create_path do |f| %> - <%= f.label :title %> - <%= f.text_field :title %> - - <%= f.label :description %> - <%= f.text_area :description %> - - <%= select("person", "person_id", @people.collect {|p| [ p.name, p.id ] }, { :include_blank => true }) %> - - <%= f.submit :class=>"button" %> - - <%= tag(:input, :type => "hidden", - :name => request_forgery_protection_token.to_s, - :value => form_authenticity_token) %> - - <% end %> +<%= render partial: "form", locals: {action_name: "create", params: {id: @task.id, person_id: params[:person_id]}}%> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 4c4d68104..0d9b7b59a 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -10,10 +10,10 @@

        Completed Time and Date: <%= @task.completed_at %>

          -
        • <%= button_to 'Edit', edit_path(@task), :class => 'button' %>
          • -
        • <%= button_to 'Delete', delete_path(@task), :class => 'button', - method: :delete, - data: { confirm: 'Are you sure?' } %>
          • +
        • <%= button_to 'Edit', edit_path(@task.id, params[:person_id]), :class => 'button', method: :get %>
          • +
        • <%= button_to 'Delete', delete_path(@task.id, params[:person_id]), :class => 'button', + method: :delete, + data: { confirm: 'Are you sure?' } %>
    diff --git a/config/routes.rb b/config/routes.rb index 3a959c09f..864b6d7b9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,22 +15,22 @@ # # get 'people/destroy' - get 'tasks/:person_id/index' => "tasks#index", as: 'index' + get 'tasks/:person_id/index' => "tasks#index", as: "index" get 'tasks/new/'=> "tasks#new", as: "new" - post 'tasks/create/' => 'tasks#create', as: "create" + post 'tasks/:id/create/:person_id' => 'tasks#create', as: "create" - get 'tasks/update' - put "tasks/:id/update" => "tasks#update", as: "update" + # get 'tasks/update' + get "tasks/:id/edit" => "tasks#edit", as: "edit" + + patch "tasks/:id/update/" => "tasks#update", as: "update" get 'tasks/show/:id/' => 'tasks#show', as: 'show' delete 'tasks/:id/destroy' => "tasks#destroy", as: "delete" - post "tasks/:id/edit" => "tasks#edit", as: "edit" - - patch 'tasks/:id/completion_status' => 'tasks#completion_status', as: "complete" + patch 'tasks/:id/completion_status/:person_id' => 'tasks#completion_status', as: "complete" # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 2e70b41654c5dfb8fc3c357b9348286369f95618 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 5 Oct 2016 08:59:25 -0700 Subject: [PATCH 28/47] edit feature is working with users now --- app/controllers/tasks_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 897298472..7056e08e1 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -48,7 +48,7 @@ def update :status => :not_found end - if @task.update(title: params[:title], description: params[:description]) + if @task.update(title: params[:task][:title], description: params[:task][:description]) redirect_to action: "show" else # another way to redirect From 04c58646836346ef8f4e379254d1f2e6f189c6d7 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 5 Oct 2016 21:48:52 -0700 Subject: [PATCH 29/47] tried a few things with new/create to get it working again - still not working for new task now that I have users. --- app/controllers/tasks_controller.rb | 7 +++---- app/views/tasks/new.html.erb | 2 +- config/routes.rb | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 7056e08e1..31f2351fc 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -16,10 +16,10 @@ def create @task = Task.new @task.title = params[:task][:title] @task.description = params[:task][:description] - @task.person_id = params[:person_id].to_i + # @task.person_id = params[:person_id].to_i @task.save - redirect_to index_path(@task.id, params[:person_id]) + redirect_to index_path( params[:person_id]) end @@ -27,8 +27,7 @@ def destroy @task = Task.find(params[:id]) @task.destroy - redirect_to action: "index" - + redirect_to root_path end def edit diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 873bba31f..e3def880d 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,3 +1,3 @@

    Create a New Task

    -<%= render partial: "form", locals: {action_name: "create", params: {id: @task.id, person_id: params[:person_id]}}%> +<%= render partial: "form", locals: {action_name: "create", params: {person_id: params[:person_id]}}%> diff --git a/config/routes.rb b/config/routes.rb index 864b6d7b9..cb13c6204 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,7 +19,7 @@ get 'tasks/new/'=> "tasks#new", as: "new" - post 'tasks/:id/create/:person_id' => 'tasks#create', as: "create" + post 'tasks/create/' => 'tasks#create', as: "create" # get 'tasks/update' get "tasks/:id/edit" => "tasks#edit", as: "edit" From 53dbfa55df6bdba675a5ab913ef9638a25199d34 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 5 Oct 2016 22:46:29 -0700 Subject: [PATCH 30/47] I'm seriously cheering right now - I FINALLY got the new/create features to work by adding a parameter in when I created a new task and adjusting my routes file to accept a person_id when creating a new task. Feeling SO proud of myself right now. LOL. --- app/controllers/tasks_controller.rb | 10 ++++++---- app/views/tasks/new.html.erb | 2 +- config/routes.rb | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 31f2351fc..59fea6ccf 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -6,8 +6,8 @@ def index end def new - @task = Task.new - @people = Person.all + @task = Task.new(:person_id => params[:person_id].to_i) + # @people = Person.all end def create @@ -16,10 +16,12 @@ def create @task = Task.new @task.title = params[:task][:title] @task.description = params[:task][:description] - # @task.person_id = params[:person_id].to_i + @task.person_id = params[:person_id].to_i @task.save - redirect_to index_path( params[:person_id]) + + + redirect_to index_path( @task.person_id) end diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index e3def880d..8ca0a6eab 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,3 +1,3 @@

    Create a New Task

    -<%= render partial: "form", locals: {action_name: "create", params: {person_id: params[:person_id]}}%> +<%= render partial: "form", locals: {action_name: "create", params: {person_id: @task.person_id }}%> diff --git a/config/routes.rb b/config/routes.rb index cb13c6204..55f0207f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,9 +17,9 @@ get 'tasks/:person_id/index' => "tasks#index", as: "index" - get 'tasks/new/'=> "tasks#new", as: "new" + get 'tasks/:person_id/new/'=> "tasks#new", as: "new" - post 'tasks/create/' => 'tasks#create', as: "create" + post 'tasks/:person_id/create' => 'tasks#create', as: "create" # get 'tasks/update' get "tasks/:id/edit" => "tasks#edit", as: "edit" From 6e436093d701cf6ae8cc5aee07e056b8a8ca5d62 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 5 Oct 2016 22:53:29 -0700 Subject: [PATCH 31/47] okay, there have seriously been some ups and downs in the last five minutes. But I got it working - a link just broke in my layout for tasks because I changed new to accept a parameter. It all seems to be working now, this will be my final submission for this, I think. --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 64040a836..bb069c6e9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,7 +14,7 @@

    • <%= link_to("Users", root_path) %>

      • -

    • <%= link_to("Add New Task", new_path) %>

      • +

    • <%= link_to("Add New Task", new_path((params[:person_id].to_i))) %>

    From 4e9c315cd9910b7895f14d75478e40b8188fbcb7 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 7 Oct 2016 09:36:30 -0700 Subject: [PATCH 32/47] added gemfiles for deployment --- Gemfile | 4 +++- Gemfile.lock | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b8edd684d..5b21eacb3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'awesome_print' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.7' # Use sqlite3 as the database for Active Record -gem 'sqlite3' +gem 'sqlite3', group: [:development, :test] # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -31,6 +31,8 @@ gem 'sdoc', '~> 0.4.0', group: :doc # Use Capistrano for deployment # gem 'capistrano-rails', group: :development +gem 'pg', group: :production +gem 'rails_12factor', group: :production group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 86a8d23f6..8b3bbd2cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,6 +82,7 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) + pg (0.19.0) pkg-config (1.1.7) rack (1.6.4) rack-test (0.6.3) @@ -105,6 +106,11 @@ GEM 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.7) actionpack (= 4.2.7) activesupport (= 4.2.7) @@ -159,7 +165,9 @@ DEPENDENCIES coffee-rails (~> 4.1.0) jbuilder (~> 2.0) jquery-rails + pg rails (= 4.2.7) + rails_12factor sass-rails (~> 5.0) sdoc (~> 0.4.0) spring From e2fb0c834667bf2f15a1d7d455f4f70ca186e4a2 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 7 Oct 2016 09:55:32 -0700 Subject: [PATCH 33/47] gemfile --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5b21eacb3..928e96390 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'awesome_print' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.7' # Use sqlite3 as the database for Active Record -gem 'sqlite3', group: [:development, :test] + # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -37,6 +37,7 @@ gem 'rails_12factor', group: :production group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' + gem 'sqlite3' end group :development do From d37dc0eac6fdf3d58e577a8ab4cd688daaf4bec1 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 7 Oct 2016 10:10:30 -0700 Subject: [PATCH 34/47] tried again to update Gemfile for Heroku --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 928e96390..bb5fca1bf 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,6 @@ source 'https://rubygems.org' gem 'awesome_print' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.7' -# Use sqlite3 as the database for Active Record - # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -37,7 +35,7 @@ gem 'rails_12factor', group: :production group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' - gem 'sqlite3' + end group :development do @@ -45,6 +43,8 @@ group :development do gem 'web-console', '~> 2.0' gem "better_errors" gem "binding_of_caller" + # Use sqlite3 as the database for Active Record + gem 'sqlite3' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' From 8ffa39a9bdf56a389230dea4b7f483a7974f4b0c Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 18 Oct 2016 10:00:32 -0700 Subject: [PATCH 35/47] added session controller and user model, started to modify files for use with a user. --- .gitignore | 6 ++++ Gemfile | 5 +++ Gemfile.lock | 28 +++++++++++++++++ app/assets/javascripts/homepages.coffee | 3 ++ app/assets/javascripts/sessionscreate.coffee | 3 ++ app/assets/stylesheets/homepages.scss | 3 ++ app/assets/stylesheets/sessionscreate.scss | 3 ++ app/assets/stylesheets/style.css | 6 +++- app/controllers/homepages_controller.rb | 11 +++++++ app/controllers/sessions_controller.rb | 31 +++++++++++++++++++ app/helpers/homepages_helper.rb | 2 ++ app/helpers/sessionscreate_helper.rb | 2 ++ app/models/person.rb | 2 +- app/models/task.rb | 2 +- app/models/user.rb | 16 ++++++++++ app/views/homepages/index.html.erb | 9 ++++++ app/views/layouts/application.html.erb | 5 +-- app/views/sessions/create.html.erb | 0 app/views/sessions/destroy.html.erb | 2 ++ app/views/tasks/_form.html.erb | 1 + app/views/tasks/index.html.erb | 8 ++--- config/initializers/omniauth.rb | 3 ++ config/routes.rb | 14 ++++++--- db/migrate/20161017195142_create_users.rb | 13 ++++++++ .../20161017195704_add_provider_to_user.rb | 5 +++ db/schema.rb | 13 +++++++- test/controllers/homepages_controller_test.rb | 9 ++++++ .../sessionscreate_controller_test.rb | 9 ++++++ test/fixtures/users.yml | 15 +++++++++ test/models/user_test.rb | 7 +++++ 30 files changed, 222 insertions(+), 14 deletions(-) create mode 100644 app/assets/javascripts/homepages.coffee create mode 100644 app/assets/javascripts/sessionscreate.coffee create mode 100644 app/assets/stylesheets/homepages.scss create mode 100644 app/assets/stylesheets/sessionscreate.scss create mode 100644 app/controllers/homepages_controller.rb create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/helpers/homepages_helper.rb create mode 100644 app/helpers/sessionscreate_helper.rb create mode 100644 app/models/user.rb create mode 100644 app/views/homepages/index.html.erb create mode 100644 app/views/sessions/create.html.erb create mode 100644 app/views/sessions/destroy.html.erb create mode 100644 config/initializers/omniauth.rb create mode 100644 db/migrate/20161017195142_create_users.rb create mode 100644 db/migrate/20161017195704_add_provider_to_user.rb create mode 100644 test/controllers/homepages_controller_test.rb create mode 100644 test/controllers/sessionscreate_controller_test.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/.gitignore b/.gitignore index 050c9d95c..73bd75532 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ # Ignore bundler config. /.bundle +# Ignore the .env file (it's full of secrets!) +/.env + # Ignore the default SQLite database. /db/*.sqlite3 /db/*.sqlite3-journal @@ -15,3 +18,6 @@ /log/* !/log/.keep /tmp + +# ignore this annoying MACOS file +.DS_Store diff --git a/Gemfile b/Gemfile index bb5fca1bf..3efb14bcf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,9 @@ source 'https://rubygems.org' +# for oAuth github Authentication +gem "omniauth" +gem "omniauth-github" +# helps with console gem 'awesome_print' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.7' @@ -35,6 +39,7 @@ gem 'rails_12factor', group: :production group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' + gem 'dotenv-rails' end diff --git a/Gemfile.lock b/Gemfile.lock index 8b3bbd2cc..76dd07d83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,10 +56,17 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) debug_inspector (0.0.2) + dotenv (2.1.1) + dotenv-rails (2.1.1) + dotenv (= 2.1.1) + railties (>= 4.0, < 5.1) erubis (2.7.0) execjs (2.7.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) globalid (0.3.7) activesupport (>= 4.1.0) + hashie (3.4.6) i18n (0.7.0) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) @@ -69,6 +76,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) + jwt (1.5.6) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) @@ -79,9 +87,26 @@ GEM mini_portile2 (2.1.0) minitest (5.9.1) multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (2.0.0) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) + oauth2 (1.2.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) + omniauth (~> 1.2) pg (0.19.0) pkg-config (1.1.7) rack (1.6.4) @@ -163,8 +188,11 @@ DEPENDENCIES binding_of_caller byebug coffee-rails (~> 4.1.0) + dotenv-rails jbuilder (~> 2.0) jquery-rails + omniauth + omniauth-github pg rails (= 4.2.7) rails_12factor diff --git a/app/assets/javascripts/homepages.coffee b/app/assets/javascripts/homepages.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/homepages.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/sessionscreate.coffee b/app/assets/javascripts/sessionscreate.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/sessionscreate.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/homepages.scss b/app/assets/stylesheets/homepages.scss new file mode 100644 index 000000000..e42583ae8 --- /dev/null +++ b/app/assets/stylesheets/homepages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the homepages 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/sessionscreate.scss b/app/assets/stylesheets/sessionscreate.scss new file mode 100644 index 000000000..9bab607a9 --- /dev/null +++ b/app/assets/stylesheets/sessionscreate.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the sessionscreate 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/style.css b/app/assets/stylesheets/style.css index e69783f57..7c9fe2ef8 100644 --- a/app/assets/stylesheets/style.css +++ b/app/assets/stylesheets/style.css @@ -56,7 +56,7 @@ font: normal normal 14px/1 "Josefin Sans"; ul li { list-style-type: none; - padding: 0 1% 0 1%; + padding: 0 1% 1% 1%; display: inline-block; } @@ -121,6 +121,10 @@ h3 { color: #4fb1cc;; } +.flash-notice { + color: red; +} + /************************************/ /* FOOTER */ /************************************/ diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb new file mode 100644 index 000000000..2ef8d6bab --- /dev/null +++ b/app/controllers/homepages_controller.rb @@ -0,0 +1,11 @@ +class HomepagesController < ApplicationController + def index + get_current_user + + end + + private + def get_current_user + @user = User.find_by(id: session[:user_id]) + end +end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 000000000..cbd88cc3a --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,31 @@ +class SessionsController < ApplicationController + def create + # gets auth hash from github (because we have logged into github) + auth_hash = request.env['omniauth.auth'] + # by default login failed - if tried to go to address without going to github first + flash[:notice] = "Login Failed!" + return redirect_to root_path unless auth_hash['uid'] + # try to find person in database - with same user_id and same provider. + @user = User.find_by(user_id: auth_hash[:uid], provider: 'github') + if @user.nil? + # User doesn't match anything in the DB. + # Attempt to create a new user. + #If couldn't find user - means they are new to website, and that means that they need to be built from github (method is in model) + @user = User.build_from_github(auth_hash) + # assuming unable to save, means could login but not save user + flash[:notice] = "Unable to Save the User" + return redirect_to root_path unless @user.save + end + + # Save the user ID in the session + # session is a type of cookie that lasts the current browser session + session[:user_id] = @user.id + # If they are this far, we know they successfully logged in + flash[:notice] = "Successfully Logged In!" + redirect_to root_path + end + + def destroy + session[:user_id] = nil + end +end diff --git a/app/helpers/homepages_helper.rb b/app/helpers/homepages_helper.rb new file mode 100644 index 000000000..4bd8098f3 --- /dev/null +++ b/app/helpers/homepages_helper.rb @@ -0,0 +1,2 @@ +module HomepagesHelper +end diff --git a/app/helpers/sessionscreate_helper.rb b/app/helpers/sessionscreate_helper.rb new file mode 100644 index 000000000..f3b92e103 --- /dev/null +++ b/app/helpers/sessionscreate_helper.rb @@ -0,0 +1,2 @@ +module SessionscreateHelper +end diff --git a/app/models/person.rb b/app/models/person.rb index 4ed22ba8b..c2e188db2 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -1,3 +1,3 @@ class Person < ActiveRecord::Base - has_many :tasks + end diff --git a/app/models/task.rb b/app/models/task.rb index c3c534741..5c58542c4 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,3 +1,3 @@ class Task < ActiveRecord::Base - belongs_to :person + belongs_to :user end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 000000000..aba5a407a --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,16 @@ +class User < ActiveRecord::Base + has_many :tasks + validates :email, :name, :user_id, :provider, presence: true + + def self.build_from_github(auth_hash) + user = User.new + user.user_id = auth_hash[:uid] + user.provider = 'github' + user.name = auth_hash['info']['name'] + user.email = auth_hash['info']['email'] + user.avatar = auth_hash["extra"]["raw_info"]['avatar_url'] + user.follower_count = auth_hash["extra"]["raw_info"]["followers"].to_i + + return user + end +end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb new file mode 100644 index 000000000..020cf31a9 --- /dev/null +++ b/app/views/homepages/index.html.erb @@ -0,0 +1,9 @@ +<% if @user %> +

    Welcome <%= @user.name %>

    +<%= image_tag(@user.avatar, alt:"image of user") %> +<% else %> +

    Please login.

    +<% end %> +<% if flash[:notice] %> +

    <%= flash[:notice] %>

    +<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bb069c6e9..950aa1f53 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,8 +13,9 @@
      -

    • <%= link_to("Users", root_path) %>

      • -

    • <%= link_to("Add New Task", new_path((params[:person_id].to_i))) %>

      • +

    • <%= link_to("Login via Github", "/auth/github") %>

      • +

    • <%= link_to("Logout", 'destroy-sessions', :controller => "sessions", :action => :destroy) %>

      • +
    diff --git a/app/views/sessions/create.html.erb b/app/views/sessions/create.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/sessions/destroy.html.erb b/app/views/sessions/destroy.html.erb new file mode 100644 index 000000000..333a7de14 --- /dev/null +++ b/app/views/sessions/destroy.html.erb @@ -0,0 +1,2 @@ +

    Sessionscreate#destroy

    +

    Find me in app/views/sessionscreate/destroy.html.erb

    diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index ee86c41da..3a1bbda73 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -6,6 +6,7 @@ <%= f.label :description %> <%= f.text_area :description %> + <%= f.submit :class=>"button" %> <%= tag(:input, :type => "hidden", diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 0735eae00..47a89bf28 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,4 +1,4 @@ -

    Hello, <%= @person.name %>!

    +

    Hello, <%= @user.name %>!

    Daily Task List

    <% @tasks.each do |task| %> @@ -16,9 +16,9 @@
      -
    • <%= button_to 'Complete', complete_path(task, params[:person_id]), :class => 'button', method: :patch %>
      • -
    • <%= button_to 'Edit', edit_path(task, params[:person_id]), :class => 'button', method: :get %>
      • -
    • <%= button_to 'Delete', delete_path(task, params[:person_id]), :class => 'button', +
    • <%= button_to 'Complete', complete_path(task, params[:user_id]), :class => 'button', method: :patch %>
      • +
    • <%= button_to 'Edit', edit_path(task, params[:user_id]), :class => 'button', method: :get %>
      • +
    • <%= button_to 'Delete', delete_path(task, params[:user_id]), :class => 'button', method: :delete, data: { confirm: 'Are you sure?' } %>
    diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 000000000..fd4416122 --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,3 @@ +Rails.application.config.middleware.use OmniAuth::Builder do + provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email" +end diff --git a/config/routes.rb b/config/routes.rb index 55f0207f5..70c60df03 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,15 +1,17 @@ Rails.application.routes.draw do - root to: "people#index" + root to: "homepages#index" - get 'people/index', as: 'people-index' + delete 'sessions/destroy', 'sessions#destroy', as: 'destroy-sessions' + + # get 'people/index', as: 'people-index' # # get 'people/show/:id', 'people#show', as: 'people-show' # # get 'people/edit' # - post 'people/create' => 'people#create', as: "createperson" + # post 'people/create' => 'people#create', as: "createperson" - get 'people/new' => "people#new", as: "newperson" + # get 'people/new' => "people#new", as: "newperson" # # get 'people/update' # @@ -32,6 +34,10 @@ patch 'tasks/:id/completion_status/:person_id' => 'tasks#completion_status', as: "complete" + get "/auth/:provider/callback" => "sessions#create" + + + get 'sessions/create' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20161017195142_create_users.rb b/db/migrate/20161017195142_create_users.rb new file mode 100644 index 000000000..90af6efa6 --- /dev/null +++ b/db/migrate/20161017195142_create_users.rb @@ -0,0 +1,13 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :user_id + t.string :name + t.string :email + t.string :avatar + t.integer :follower_count + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161017195704_add_provider_to_user.rb b/db/migrate/20161017195704_add_provider_to_user.rb new file mode 100644 index 000000000..901d24422 --- /dev/null +++ b/db/migrate/20161017195704_add_provider_to_user.rb @@ -0,0 +1,5 @@ +class AddProviderToUser < ActiveRecord::Migration + def change + add_column :users, :provider, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 301fefd80..bb786e026 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160930171540) do +ActiveRecord::Schema.define(version: 20161017195704) do create_table "people", force: :cascade do |t| t.string "name" @@ -31,4 +31,15 @@ add_index "tasks", ["person_id"], name: "index_tasks_on_person_id" + create_table "users", force: :cascade do |t| + t.string "user_id" + t.string "name" + t.string "email" + t.string "avatar" + t.integer "follower_count" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "provider" + end + end diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb new file mode 100644 index 000000000..46828ab12 --- /dev/null +++ b/test/controllers/homepages_controller_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class HomepagesControllerTest < ActionController::TestCase + test "should get index" do + get :index + assert_response :success + end + +end diff --git a/test/controllers/sessionscreate_controller_test.rb b/test/controllers/sessionscreate_controller_test.rb new file mode 100644 index 000000000..4b1f4373e --- /dev/null +++ b/test/controllers/sessionscreate_controller_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class SessionscreateControllerTest < ActionController::TestCase + test "should get destroy" do + get :destroy + assert_response :success + end + +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 000000000..df6d87751 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + user_id: MyString + name: MyString + email: MyString + avatar: MyString + follower_count: 1 + +two: + user_id: MyString + name: MyString + email: MyString + avatar: MyString + follower_count: 1 diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 000000000..82f61e010 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 5863b110adea5df26ee3793ba7376bda63b640d6 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 18 Oct 2016 10:56:45 -0700 Subject: [PATCH 36/47] added basic testing through lecture with Chris. --- Gemfile | 1 + Gemfile.lock | 8 +++ app/views/layouts/application.html.erb | 5 ++ config/routes.rb | 1 - test/controllers/sessions_controller_test.rb | 31 +++++++++++ .../sessionscreate_controller_test.rb | 9 ---- test/controllers/tasks_controller_test.rb | 52 +++++++++++++------ test/fixtures/tasks.yml | 17 +++--- test/fixtures/users.yml | 25 ++++----- test/test_helper.rb | 6 +++ 10 files changed, 108 insertions(+), 47 deletions(-) create mode 100644 test/controllers/sessions_controller_test.rb delete mode 100644 test/controllers/sessionscreate_controller_test.rb diff --git a/Gemfile b/Gemfile index 3efb14bcf..ba63dc8ad 100644 --- a/Gemfile +++ b/Gemfile @@ -40,6 +40,7 @@ group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' gem 'dotenv-rails' + gem 'minitest-reporters' end diff --git a/Gemfile.lock b/Gemfile.lock index 76dd07d83..4b8b2a396 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,6 +36,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + ansi (1.5.0) arel (6.0.3) awesome_print (1.7.0) better_errors (2.1.1) @@ -86,6 +87,11 @@ GEM mime-types-data (3.2016.0521) mini_portile2 (2.1.0) minitest (5.9.1) + minitest-reporters (1.1.11) + ansi + builder + minitest (>= 5.0) + ruby-progressbar multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) @@ -144,6 +150,7 @@ GEM rake (11.3.0) rdoc (4.2.2) json (~> 1.4) + ruby-progressbar (1.8.1) sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -191,6 +198,7 @@ DEPENDENCIES dotenv-rails jbuilder (~> 2.0) jquery-rails + minitest-reporters omniauth omniauth-github pg diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 950aa1f53..86c3ca1fc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,6 +13,11 @@
      + <% if current_user %> + <%= link_to "Logout", :controller => 'sessions', :action => 'destroy' %> + <% else %> + <%= link_to "Login", :controller => 'sessions', :action => 'new' %> + <% end %>

    • <%= link_to("Login via Github", "/auth/github") %>

    • <%= link_to("Logout", 'destroy-sessions', :controller => "sessions", :action => :destroy) %>

      • diff --git a/config/routes.rb b/config/routes.rb index 70c60df03..6f34c1c03 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -36,7 +36,6 @@ get "/auth/:provider/callback" => "sessions#create" - get 'sessions/create' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 000000000..1e5c67683 --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,31 @@ +require 'test_helper' + +class SessionsControllerTest < ActionController::TestCase + test "should get destroy" do + get :destroy + assert_response :success + end + + def login_a_user + request.env['omniauth.auth'] = OmniAUth.config.mock_auth[:github] + get :create, {provider: "github"} + end + + test “can create a user” do + assert_difference("User.count", 1) do + login_a_user + assert_response :redirect + assert_redirected_to root_path + assert_equal session[:user_id], User.find_by(user_id: OmniAuth.config.mock_auth[:github][:uid], provider: "github").id + end + end + + # test "if a user logs in twice it doesn't create a 2nd user" do + # assert_difference('User.count', 1) do + # login_a_user + # end + # # add more here + # end + + +end diff --git a/test/controllers/sessionscreate_controller_test.rb b/test/controllers/sessionscreate_controller_test.rb deleted file mode 100644 index 4b1f4373e..000000000 --- a/test/controllers/sessionscreate_controller_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'test_helper' - -class SessionscreateControllerTest < ActionController::TestCase - test "should get destroy" do - get :destroy - assert_response :success - end - -end diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb index dffa5f67c..2f0c76ba1 100644 --- a/test/controllers/tasks_controller_test.rb +++ b/test/controllers/tasks_controller_test.rb @@ -1,29 +1,47 @@ require 'test_helper' class TasksControllerTest < ActionController::TestCase - test "should get index" do - get :index - assert_response :success - end - test "should get new" do - get :new - assert_response :success - end + test "Make sure a user can see their tasks." do + session[:user_id] = users(:ada).id + get :show, id: tasks(:adas_task).id - test "should get update" do - get :update assert_response :success - end - test "should get delete" do - get :delete - assert_response :success end - test "should get show" do - get :show - assert_response :success + test "Make sure a user cannot see another user's tasks." do + session[:user_id] = users(:babbage).id + get :show, id: tasks(:adas_task).id + + assert_response :redirect + assert_equal flash[:notice], "You do not have access to that task" end + # + # test "should get index" do + # get :index + # assert_response :success + # end + # + # test "should get new" do + # get :new + # assert_response :success + # end + # + # test "should get update" do + # get :update + # assert_response :success + # end + # + # test "should get delete" do + # get :delete + # assert_response :success + # end + # + # test "should get show" do + # get :show + # assert_response :success + # end + end diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml index 8b1100441..8cfe8a675 100644 --- a/test/fixtures/tasks.yml +++ b/test/fixtures/tasks.yml @@ -1,13 +1,14 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - description: MyString - completion_status: false +adas_task: + title: "Write the 1st Code" + description: "Be awesome!" + user: :ada + completion_status: true completed_at: 2016-09-28 15:00:45 -two: - title: MyString - description: MyString +lisas_task: + title: "Run 3.12 miles" + description: "around neighborhood" + user: :lisa completion_status: false - completed_at: 2016-09-28 15:00:45 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index df6d87751..958952b4f 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,15 +1,16 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - user_id: MyString - name: MyString - email: MyString - avatar: MyString - follower_count: 1 +ada: + id: 1 + user_id: 12322 + name: "Ada" + email: "ada@adadevelopersacademy.org" + provider: github -two: - user_id: MyString - name: MyString - email: MyString - avatar: MyString - follower_count: 1 + +lisa: + id: 2 + user_id: 12555 + name: "Lisa" + email: "lisa@adadevelopersacademy.org" + provider: github diff --git a/test/test_helper.rb b/test/test_helper.rb index 92e39b2d7..027bbd20b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -6,5 +6,11 @@ class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all + def setup + OmniAuth.config.test_mode = true + + OmniAuth.config.mock_auth[:github] OmniAuth::AuthHash.new({provider: 'github', user_id: '123545', info: { email: "a@b.com", name: "Ada"} + }) + end # Add more helper methods to be used by all tests here... end From 53652edee6ea138c39b83fb3cab3bf9e1af7822d Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 20 Oct 2016 18:21:03 -0700 Subject: [PATCH 37/47] got rails server working again. --- config/routes.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 6f34c1c03..e532d4459 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do root to: "homepages#index" - - delete 'sessions/destroy', 'sessions#destroy', as: 'destroy-sessions' + # + # delete 'sessions/destroy', 'sessions#destroy', as: 'destroy-sessions' # get 'people/index', as: 'people-index' # @@ -36,7 +36,7 @@ get "/auth/:provider/callback" => "sessions#create" - get 'sessions/create' + # get 'sessions/create' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 72a377e2dbc1d7b8c282bd4c45fbd1e0a74c2df8 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 20 Oct 2016 19:05:14 -0700 Subject: [PATCH 38/47] finished logout button for homepage --- app/assets/stylesheets/style.css | 4 ++-- app/controllers/application_controller.rb | 11 +++++++++++ app/views/layouts/application.html.erb | 9 ++++----- config/routes.rb | 3 ++- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css index 7c9fe2ef8..1a8b86527 100644 --- a/app/assets/stylesheets/style.css +++ b/app/assets/stylesheets/style.css @@ -19,12 +19,12 @@ font: normal normal 14px/1 "Josefin Sans"; .navigation-container li { list-style-type: none; - padding: 0 2% 0 2%; + padding: 0 1% 0 1%; display: inline-block; } .navigation-container ul { - padding: 1% 0 0 0; + padding: 4% 0 0 0; margin: 0; } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e1b..216fcea8f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,15 @@ 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 + + private + # Finds the User with the ID stored in the session with the key + # :current_user_id This is a common way to handle user login in + # a Rails application; logging in sets the session value and + # logging out removes it. + def current_user + @current_user ||= User.find(session[:user_id]) if session[:user_id] + end + + helper_method :current_user end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 86c3ca1fc..2ec80c62a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,13 +14,12 @@
        <% if current_user %> - <%= link_to "Logout", :controller => 'sessions', :action => 'destroy' %> +
      • Logged in as <%= current_user.email %>
        • +
      • <%= link_to "Log Out", session_path("current"), method: "delete" %>
        • +
      • <%= link_to("Add New Task", new_path((params[:user_id].to_i))) %>
        • <% else %> - <%= link_to "Login", :controller => 'sessions', :action => 'new' %> +
      • <%= link_to("Login", "/auth/github") %>
        • <% end %> -

      • <%= link_to("Login via Github", "/auth/github") %>

        • -

      • <%= link_to("Logout", 'destroy-sessions', :controller => "sessions", :action => :destroy) %>

        • -
      diff --git a/config/routes.rb b/config/routes.rb index e532d4459..7b55dc188 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do root to: "homepages#index" + + resources :sessions # # delete 'sessions/destroy', 'sessions#destroy', as: 'destroy-sessions' @@ -36,7 +38,6 @@ get "/auth/:provider/callback" => "sessions#create" - # get 'sessions/create' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 33d62d109a26e4f5757fc61d9bff832d7328bcfc Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 20 Oct 2016 19:27:43 -0700 Subject: [PATCH 39/47] added user_id to tasks --- app/assets/stylesheets/style.css | 6 ++++ app/controllers/tasks_controller.rb | 11 +++---- app/views/homepages/index.html.erb | 29 +++++++++++++------ app/views/layouts/application.html.erb | 7 ----- config/routes.rb | 8 ++--- .../20161021022630_add_user_id_to_tasks.rb | 5 ++++ db/schema.rb | 3 +- 7 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 db/migrate/20161021022630_add_user_id_to_tasks.rb diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css index 1a8b86527..862703976 100644 --- a/app/assets/stylesheets/style.css +++ b/app/assets/stylesheets/style.css @@ -125,6 +125,12 @@ h3 { color: red; } +.style_image { + width: 8%; + height: 8%; + border: 5px solid #4fb1cc; +} + /************************************/ /* FOOTER */ /************************************/ diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 59fea6ccf..d841231c9 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,13 +1,12 @@ class TasksController < ApplicationController def index - @person = Person.find( params[:person_id].to_i) - @tasks = @person.tasks + @user = User.find( params[:user_id].to_i) + @tasks = @user.tasks end def new - @task = Task.new(:person_id => params[:person_id].to_i) - # @people = Person.all + @task = Task.new(:user_id => params[:user_id].to_i) end def create @@ -19,9 +18,7 @@ def create @task.person_id = params[:person_id].to_i @task.save - - - redirect_to index_path( @task.person_id) + redirect_to index_path( @task.user_id) end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 020cf31a9..f435ee430 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,9 +1,20 @@ -<% if @user %> -

      Welcome <%= @user.name %>

      -<%= image_tag(@user.avatar, alt:"image of user") %> -<% else %> -

      Please login.

      -<% end %> -<% if flash[:notice] %> -

      <%= flash[:notice] %>

      -<% end %> +
      + <% if @user %> +

      Welcome <%= @user.name %>

      + <%= image_tag(@user.avatar, alt:"image of user", :class => "style_image") %> + <% else %> +

      Please login to begin tracking your habits with the Personal Habit Tracker.

      + <% end %> + <% if flash[:notice] %> +

      <%= flash[:notice] %>

      + <% end %> +
      +
      + <% if @user %> +

      Manage Your Tasks

      +
        +
      • <%= link_to "See Current Tasks", index_path(@user.id), controller: 'tasks' %>
        • +
      • <%= "Add a New Task" %>
        • +
      + <% end %> +
      diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2ec80c62a..0144ba0b1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -29,12 +29,5 @@ <%= yield %> -
      -

      - Copyright 2016, Rachel Pavilanis -

      - -
      - diff --git a/config/routes.rb b/config/routes.rb index 7b55dc188..370dfb3f3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,11 +19,11 @@ # # get 'people/destroy' - get 'tasks/:person_id/index' => "tasks#index", as: "index" + get 'tasks/:user_id/index' => "tasks#index", as: "index" - get 'tasks/:person_id/new/'=> "tasks#new", as: "new" + get 'tasks/:user_id/new/'=> "tasks#new", as: "new" - post 'tasks/:person_id/create' => 'tasks#create', as: "create" + post 'tasks/:user_id/create' => 'tasks#create', as: "create" # get 'tasks/update' get "tasks/:id/edit" => "tasks#edit", as: "edit" @@ -34,7 +34,7 @@ delete 'tasks/:id/destroy' => "tasks#destroy", as: "delete" - patch 'tasks/:id/completion_status/:person_id' => 'tasks#completion_status', as: "complete" + patch 'tasks/:id/completion_status/:user_id' => 'tasks#completion_status', as: "complete" get "/auth/:provider/callback" => "sessions#create" diff --git a/db/migrate/20161021022630_add_user_id_to_tasks.rb b/db/migrate/20161021022630_add_user_id_to_tasks.rb new file mode 100644 index 000000000..1c20af801 --- /dev/null +++ b/db/migrate/20161021022630_add_user_id_to_tasks.rb @@ -0,0 +1,5 @@ +class AddUserIdToTasks < ActiveRecord::Migration + def change + add_column :tasks, :user_id, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index bb786e026..f3f81ab6e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20161017195704) do +ActiveRecord::Schema.define(version: 20161021022630) do create_table "people", force: :cascade do |t| t.string "name" @@ -27,6 +27,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "person_id" + t.string "user_id" end add_index "tasks", ["person_id"], name: "index_tasks_on_person_id" From 53a13a25c46786c4d600b13f19532cbce5738727 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 20 Oct 2016 20:34:50 -0700 Subject: [PATCH 40/47] added foundation and did some more styling on main page and Tasks index page. --- app/assets/javascripts/people.coffee | 3 - app/assets/stylesheets/foundation.css | 4194 ++++++++++++++++++++ app/assets/stylesheets/normalize.css | 419 -- app/assets/stylesheets/people.scss | 3 - app/assets/stylesheets/style.css | 52 +- app/controllers/people_controller.rb | 47 - app/controllers/tasks_controller.rb | 12 +- app/helpers/people_helper.rb | 2 - app/models/person.rb | 3 - app/views/homepages/index.html.erb | 43 +- app/views/layouts/application.html.erb | 3 +- app/views/people/create.html.erb | 2 - app/views/people/destroy.html.erb | 2 - app/views/people/edit.html.erb | 2 - app/views/people/index.html.erb | 19 - app/views/people/new.html.erb | 14 - app/views/people/show.html.erb | 2 - app/views/people/update.html.erb | 2 - app/views/tasks/index.html.erb | 8 +- config/routes.rb | 17 - db/migrate/20160930165830_create_people.rb | 9 - test/controllers/people_controller_test.rb | 39 - test/fixtures/people.yml | 7 - test/models/person_test.rb | 7 - 24 files changed, 4250 insertions(+), 661 deletions(-) delete mode 100644 app/assets/javascripts/people.coffee create mode 100644 app/assets/stylesheets/foundation.css delete mode 100644 app/assets/stylesheets/normalize.css delete mode 100644 app/assets/stylesheets/people.scss delete mode 100644 app/controllers/people_controller.rb delete mode 100644 app/helpers/people_helper.rb delete mode 100644 app/models/person.rb delete mode 100644 app/views/people/create.html.erb delete mode 100644 app/views/people/destroy.html.erb delete mode 100644 app/views/people/edit.html.erb delete mode 100644 app/views/people/index.html.erb delete mode 100644 app/views/people/new.html.erb delete mode 100644 app/views/people/show.html.erb delete mode 100644 app/views/people/update.html.erb delete mode 100644 db/migrate/20160930165830_create_people.rb delete mode 100644 test/controllers/people_controller_test.rb delete mode 100644 test/fixtures/people.yml delete mode 100644 test/models/person_test.rb diff --git a/app/assets/javascripts/people.coffee b/app/assets/javascripts/people.coffee deleted file mode 100644 index 24f83d18b..000000000 --- a/app/assets/javascripts/people.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# 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/foundation.css b/app/assets/stylesheets/foundation.css new file mode 100644 index 000000000..66aca962d --- /dev/null +++ b/app/assets/stylesheets/foundation.css @@ -0,0 +1,4194 @@ +@charset "UTF-8"; +/** + * Foundation for Sites by ZURB + * Version 6.2.3 + * foundation.zurb.com + * Licensed under MIT Open Source + */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS and IE text size adjust after device orientation change, + * without disabling user zoom. + */ +html { + font-family: sans-serif; + /* 1 */ + -ms-text-size-adjust: 100%; + /* 2 */ + -webkit-text-size-adjust: 100%; + /* 2 */ } + +/** + * Remove default margin. + */ +body { + margin: 0; } + +/* HTML5 display definitions + ========================================================================== */ +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; } + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ +audio, +canvas, +progress, +video { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. + */ +[hidden], +template { + display: none; } + +/* Links + ========================================================================== */ +/** + * Remove the gray background color from active links in IE 10. + */ +a { + background-color: transparent; } + +/** + * Improve readability of focused elements when they are also in an + * active/hover state. + */ +a:active, +a:hover { + outline: 0; } + +/* Text-level semantics + ========================================================================== */ +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ +abbr[title] { + border-bottom: 1px dotted; } + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ +b, +strong { + font-weight: bold; } + +/** + * Address styling not present in Safari and Chrome. + */ +dfn { + font-style: italic; } + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ +h1 { + font-size: 2em; + margin: 0.67em 0; } + +/** + * Address styling not present in IE 8/9. + */ +mark { + background: #ff0; + color: #000; } + +/** + * Address inconsistent and variable font size in all browsers. + */ +small { + font-size: 80%; } + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } + +sup { + top: -0.5em; } + +sub { + bottom: -0.25em; } + +/* Embedded content + ========================================================================== */ +/** + * Remove border when inside `a` element in IE 8/9/10. + */ +img { + border: 0; } + +/** + * Correct overflow not hidden in IE 9/10/11. + */ +svg:not(:root) { + overflow: hidden; } + +/* Grouping content + ========================================================================== */ +/** + * Address margin not present in IE 8/9 and Safari. + */ +figure { + margin: 1em 40px; } + +/** + * Address differences between Firefox and other browsers. + */ +hr { + box-sizing: content-box; + height: 0; } + +/** + * Contain overflow in all browsers. + */ +pre { + overflow: auto; } + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } + +/* Forms + ========================================================================== */ +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ +button, +input, +optgroup, +select, +textarea { + color: inherit; + /* 1 */ + font: inherit; + /* 2 */ + margin: 0; + /* 3 */ } + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ +button { + overflow: visible; } + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ +button, +select { + text-transform: none; } + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + /* 2 */ + cursor: pointer; + /* 3 */ } + +/** + * Re-set default cursor for disabled elements. + */ +button[disabled], +html input[disabled] { + cursor: not-allowed; } + +/** + * Remove inner padding and border in Firefox 4+. + */ +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; } + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ +input { + line-height: normal; } + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + /* 1 */ + padding: 0; + /* 2 */ } + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; } + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. + */ +input[type="search"] { + -webkit-appearance: textfield; + /* 1 */ + box-sizing: content-box; + /* 2 */ } + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } + +/** + * Define consistent border, margin, and padding. + * [NOTE] We don't enable this ruleset in Foundation, because we want the
      element to have plain styling. + */ +/* fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; + } */ +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ +legend { + border: 0; + /* 1 */ + padding: 0; + /* 2 */ } + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ +textarea { + overflow: auto; } + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ +optgroup { + font-weight: bold; } + +/* Tables + ========================================================================== */ +/** + * Remove most spacing between table cells. + */ +table { + border-collapse: collapse; + border-spacing: 0; } + +td, +th { + padding: 0; } + +.foundation-mq { + font-family: "small=0em&medium=40em&large=64em&xlarge=75em&xxlarge=90em"; } + +html { + font-size: 100%; + box-sizing: border-box; } + +*, +*::before, +*::after { + box-sizing: inherit; } + +body { + padding: 0; + margin: 0; + font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; + font-weight: normal; + line-height: 1.5; + color: #0a0a0a; + background: #fefefe; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } + +img { + max-width: 100%; + height: auto; + -ms-interpolation-mode: bicubic; + display: inline-block; + vertical-align: middle; } + +textarea { + height: auto; + min-height: 50px; + border-radius: 0; } + +select { + width: 100%; + border-radius: 0; } + +#map_canvas img, +#map_canvas embed, +#map_canvas object, +.map_canvas img, +.map_canvas embed, +.map_canvas object, +.mqa-display img, +.mqa-display embed, +.mqa-display object { + max-width: none !important; } + +button { + -webkit-appearance: none; + -moz-appearance: none; + background: transparent; + padding: 0; + border: 0; + border-radius: 0; + line-height: 1; } + [data-whatinput='mouse'] button { + outline: 0; } + +.is-visible { + display: block !important; } + +.is-hidden { + display: none !important; } + +.row { + max-width: 75rem; + margin-left: auto; + margin-right: auto; } + .row::before, .row::after { + content: ' '; + display: table; } + .row::after { + clear: both; } + .row.collapse > .column, .row.collapse > .columns { + padding-left: 0; + padding-right: 0; } + .row .row { + max-width: none; + margin-left: -0.625rem; + margin-right: -0.625rem; } + @media screen and (min-width: 40em) { + .row .row { + margin-left: -0.9375rem; + margin-right: -0.9375rem; } } + .row .row.collapse { + margin-left: 0; + margin-right: 0; } + .row.expanded { + max-width: none; } + .row.expanded .row { + margin-left: auto; + margin-right: auto; } + +.column, .columns { + width: 100%; + float: left; + padding-left: 0.625rem; + padding-right: 0.625rem; } + @media screen and (min-width: 40em) { + .column, .columns { + padding-left: 0.9375rem; + padding-right: 0.9375rem; } } + .column:last-child:not(:first-child), .columns:last-child:not(:first-child) { + float: right; } + .column.end:last-child:last-child, .end.columns:last-child:last-child { + float: left; } + +.column.row.row, .row.row.columns { + float: none; } + .row .column.row.row, .row .row.row.columns { + padding-left: 0; + padding-right: 0; + margin-left: 0; + margin-right: 0; } + +.small-1 { + width: 8.33333%; } + +.small-push-1 { + position: relative; + left: 8.33333%; } + +.small-pull-1 { + position: relative; + left: -8.33333%; } + +.small-offset-0 { + margin-left: 0%; } + +.small-2 { + width: 16.66667%; } + +.small-push-2 { + position: relative; + left: 16.66667%; } + +.small-pull-2 { + position: relative; + left: -16.66667%; } + +.small-offset-1 { + margin-left: 8.33333%; } + +.small-3 { + width: 25%; } + +.small-push-3 { + position: relative; + left: 25%; } + +.small-pull-3 { + position: relative; + left: -25%; } + +.small-offset-2 { + margin-left: 16.66667%; } + +.small-4 { + width: 33.33333%; } + +.small-push-4 { + position: relative; + left: 33.33333%; } + +.small-pull-4 { + position: relative; + left: -33.33333%; } + +.small-offset-3 { + margin-left: 25%; } + +.small-5 { + width: 41.66667%; } + +.small-push-5 { + position: relative; + left: 41.66667%; } + +.small-pull-5 { + position: relative; + left: -41.66667%; } + +.small-offset-4 { + margin-left: 33.33333%; } + +.small-6 { + width: 50%; } + +.small-push-6 { + position: relative; + left: 50%; } + +.small-pull-6 { + position: relative; + left: -50%; } + +.small-offset-5 { + margin-left: 41.66667%; } + +.small-7 { + width: 58.33333%; } + +.small-push-7 { + position: relative; + left: 58.33333%; } + +.small-pull-7 { + position: relative; + left: -58.33333%; } + +.small-offset-6 { + margin-left: 50%; } + +.small-8 { + width: 66.66667%; } + +.small-push-8 { + position: relative; + left: 66.66667%; } + +.small-pull-8 { + position: relative; + left: -66.66667%; } + +.small-offset-7 { + margin-left: 58.33333%; } + +.small-9 { + width: 75%; } + +.small-push-9 { + position: relative; + left: 75%; } + +.small-pull-9 { + position: relative; + left: -75%; } + +.small-offset-8 { + margin-left: 66.66667%; } + +.small-10 { + width: 83.33333%; } + +.small-push-10 { + position: relative; + left: 83.33333%; } + +.small-pull-10 { + position: relative; + left: -83.33333%; } + +.small-offset-9 { + margin-left: 75%; } + +.small-11 { + width: 91.66667%; } + +.small-push-11 { + position: relative; + left: 91.66667%; } + +.small-pull-11 { + position: relative; + left: -91.66667%; } + +.small-offset-10 { + margin-left: 83.33333%; } + +.small-12 { + width: 100%; } + +.small-offset-11 { + margin-left: 91.66667%; } + +.small-up-1 > .column, .small-up-1 > .columns { + width: 100%; + float: left; } + .small-up-1 > .column:nth-of-type(1n), .small-up-1 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-1 > .column:nth-of-type(1n+1), .small-up-1 > .columns:nth-of-type(1n+1) { + clear: both; } + .small-up-1 > .column:last-child, .small-up-1 > .columns:last-child { + float: left; } + +.small-up-2 > .column, .small-up-2 > .columns { + width: 50%; + float: left; } + .small-up-2 > .column:nth-of-type(1n), .small-up-2 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-2 > .column:nth-of-type(2n+1), .small-up-2 > .columns:nth-of-type(2n+1) { + clear: both; } + .small-up-2 > .column:last-child, .small-up-2 > .columns:last-child { + float: left; } + +.small-up-3 > .column, .small-up-3 > .columns { + width: 33.33333%; + float: left; } + .small-up-3 > .column:nth-of-type(1n), .small-up-3 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-3 > .column:nth-of-type(3n+1), .small-up-3 > .columns:nth-of-type(3n+1) { + clear: both; } + .small-up-3 > .column:last-child, .small-up-3 > .columns:last-child { + float: left; } + +.small-up-4 > .column, .small-up-4 > .columns { + width: 25%; + float: left; } + .small-up-4 > .column:nth-of-type(1n), .small-up-4 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-4 > .column:nth-of-type(4n+1), .small-up-4 > .columns:nth-of-type(4n+1) { + clear: both; } + .small-up-4 > .column:last-child, .small-up-4 > .columns:last-child { + float: left; } + +.small-up-5 > .column, .small-up-5 > .columns { + width: 20%; + float: left; } + .small-up-5 > .column:nth-of-type(1n), .small-up-5 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-5 > .column:nth-of-type(5n+1), .small-up-5 > .columns:nth-of-type(5n+1) { + clear: both; } + .small-up-5 > .column:last-child, .small-up-5 > .columns:last-child { + float: left; } + +.small-up-6 > .column, .small-up-6 > .columns { + width: 16.66667%; + float: left; } + .small-up-6 > .column:nth-of-type(1n), .small-up-6 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-6 > .column:nth-of-type(6n+1), .small-up-6 > .columns:nth-of-type(6n+1) { + clear: both; } + .small-up-6 > .column:last-child, .small-up-6 > .columns:last-child { + float: left; } + +.small-up-7 > .column, .small-up-7 > .columns { + width: 14.28571%; + float: left; } + .small-up-7 > .column:nth-of-type(1n), .small-up-7 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-7 > .column:nth-of-type(7n+1), .small-up-7 > .columns:nth-of-type(7n+1) { + clear: both; } + .small-up-7 > .column:last-child, .small-up-7 > .columns:last-child { + float: left; } + +.small-up-8 > .column, .small-up-8 > .columns { + width: 12.5%; + float: left; } + .small-up-8 > .column:nth-of-type(1n), .small-up-8 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-8 > .column:nth-of-type(8n+1), .small-up-8 > .columns:nth-of-type(8n+1) { + clear: both; } + .small-up-8 > .column:last-child, .small-up-8 > .columns:last-child { + float: left; } + +.small-collapse > .column, .small-collapse > .columns { + padding-left: 0; + padding-right: 0; } + +.small-collapse .row, +.expanded.row .small-collapse.row { + margin-left: 0; + margin-right: 0; } + +.small-uncollapse > .column, .small-uncollapse > .columns { + padding-left: 0.625rem; + padding-right: 0.625rem; } + +.small-centered { + float: none; + margin-left: auto; + margin-right: auto; } + +.small-uncentered, +.small-push-0, +.small-pull-0 { + position: static; + margin-left: 0; + margin-right: 0; + float: left; } + +@media screen and (min-width: 40em) { + .medium-1 { + width: 8.33333%; } + .medium-push-1 { + position: relative; + left: 8.33333%; } + .medium-pull-1 { + position: relative; + left: -8.33333%; } + .medium-offset-0 { + margin-left: 0%; } + .medium-2 { + width: 16.66667%; } + .medium-push-2 { + position: relative; + left: 16.66667%; } + .medium-pull-2 { + position: relative; + left: -16.66667%; } + .medium-offset-1 { + margin-left: 8.33333%; } + .medium-3 { + width: 25%; } + .medium-push-3 { + position: relative; + left: 25%; } + .medium-pull-3 { + position: relative; + left: -25%; } + .medium-offset-2 { + margin-left: 16.66667%; } + .medium-4 { + width: 33.33333%; } + .medium-push-4 { + position: relative; + left: 33.33333%; } + .medium-pull-4 { + position: relative; + left: -33.33333%; } + .medium-offset-3 { + margin-left: 25%; } + .medium-5 { + width: 41.66667%; } + .medium-push-5 { + position: relative; + left: 41.66667%; } + .medium-pull-5 { + position: relative; + left: -41.66667%; } + .medium-offset-4 { + margin-left: 33.33333%; } + .medium-6 { + width: 50%; } + .medium-push-6 { + position: relative; + left: 50%; } + .medium-pull-6 { + position: relative; + left: -50%; } + .medium-offset-5 { + margin-left: 41.66667%; } + .medium-7 { + width: 58.33333%; } + .medium-push-7 { + position: relative; + left: 58.33333%; } + .medium-pull-7 { + position: relative; + left: -58.33333%; } + .medium-offset-6 { + margin-left: 50%; } + .medium-8 { + width: 66.66667%; } + .medium-push-8 { + position: relative; + left: 66.66667%; } + .medium-pull-8 { + position: relative; + left: -66.66667%; } + .medium-offset-7 { + margin-left: 58.33333%; } + .medium-9 { + width: 75%; } + .medium-push-9 { + position: relative; + left: 75%; } + .medium-pull-9 { + position: relative; + left: -75%; } + .medium-offset-8 { + margin-left: 66.66667%; } + .medium-10 { + width: 83.33333%; } + .medium-push-10 { + position: relative; + left: 83.33333%; } + .medium-pull-10 { + position: relative; + left: -83.33333%; } + .medium-offset-9 { + margin-left: 75%; } + .medium-11 { + width: 91.66667%; } + .medium-push-11 { + position: relative; + left: 91.66667%; } + .medium-pull-11 { + position: relative; + left: -91.66667%; } + .medium-offset-10 { + margin-left: 83.33333%; } + .medium-12 { + width: 100%; } + .medium-offset-11 { + margin-left: 91.66667%; } + .medium-up-1 > .column, .medium-up-1 > .columns { + width: 100%; + float: left; } + .medium-up-1 > .column:nth-of-type(1n), .medium-up-1 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-1 > .column:nth-of-type(1n+1), .medium-up-1 > .columns:nth-of-type(1n+1) { + clear: both; } + .medium-up-1 > .column:last-child, .medium-up-1 > .columns:last-child { + float: left; } + .medium-up-2 > .column, .medium-up-2 > .columns { + width: 50%; + float: left; } + .medium-up-2 > .column:nth-of-type(1n), .medium-up-2 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-2 > .column:nth-of-type(2n+1), .medium-up-2 > .columns:nth-of-type(2n+1) { + clear: both; } + .medium-up-2 > .column:last-child, .medium-up-2 > .columns:last-child { + float: left; } + .medium-up-3 > .column, .medium-up-3 > .columns { + width: 33.33333%; + float: left; } + .medium-up-3 > .column:nth-of-type(1n), .medium-up-3 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-3 > .column:nth-of-type(3n+1), .medium-up-3 > .columns:nth-of-type(3n+1) { + clear: both; } + .medium-up-3 > .column:last-child, .medium-up-3 > .columns:last-child { + float: left; } + .medium-up-4 > .column, .medium-up-4 > .columns { + width: 25%; + float: left; } + .medium-up-4 > .column:nth-of-type(1n), .medium-up-4 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-4 > .column:nth-of-type(4n+1), .medium-up-4 > .columns:nth-of-type(4n+1) { + clear: both; } + .medium-up-4 > .column:last-child, .medium-up-4 > .columns:last-child { + float: left; } + .medium-up-5 > .column, .medium-up-5 > .columns { + width: 20%; + float: left; } + .medium-up-5 > .column:nth-of-type(1n), .medium-up-5 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-5 > .column:nth-of-type(5n+1), .medium-up-5 > .columns:nth-of-type(5n+1) { + clear: both; } + .medium-up-5 > .column:last-child, .medium-up-5 > .columns:last-child { + float: left; } + .medium-up-6 > .column, .medium-up-6 > .columns { + width: 16.66667%; + float: left; } + .medium-up-6 > .column:nth-of-type(1n), .medium-up-6 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-6 > .column:nth-of-type(6n+1), .medium-up-6 > .columns:nth-of-type(6n+1) { + clear: both; } + .medium-up-6 > .column:last-child, .medium-up-6 > .columns:last-child { + float: left; } + .medium-up-7 > .column, .medium-up-7 > .columns { + width: 14.28571%; + float: left; } + .medium-up-7 > .column:nth-of-type(1n), .medium-up-7 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-7 > .column:nth-of-type(7n+1), .medium-up-7 > .columns:nth-of-type(7n+1) { + clear: both; } + .medium-up-7 > .column:last-child, .medium-up-7 > .columns:last-child { + float: left; } + .medium-up-8 > .column, .medium-up-8 > .columns { + width: 12.5%; + float: left; } + .medium-up-8 > .column:nth-of-type(1n), .medium-up-8 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-8 > .column:nth-of-type(8n+1), .medium-up-8 > .columns:nth-of-type(8n+1) { + clear: both; } + .medium-up-8 > .column:last-child, .medium-up-8 > .columns:last-child { + float: left; } + .medium-collapse > .column, .medium-collapse > .columns { + padding-left: 0; + padding-right: 0; } + .medium-collapse .row, + .expanded.row .medium-collapse.row { + margin-left: 0; + margin-right: 0; } + .medium-uncollapse > .column, .medium-uncollapse > .columns { + padding-left: 0.9375rem; + padding-right: 0.9375rem; } + .medium-centered { + float: none; + margin-left: auto; + margin-right: auto; } + .medium-uncentered, + .medium-push-0, + .medium-pull-0 { + position: static; + margin-left: 0; + margin-right: 0; + float: left; } } + +@media screen and (min-width: 64em) { + .large-1 { + width: 8.33333%; } + .large-push-1 { + position: relative; + left: 8.33333%; } + .large-pull-1 { + position: relative; + left: -8.33333%; } + .large-offset-0 { + margin-left: 0%; } + .large-2 { + width: 16.66667%; } + .large-push-2 { + position: relative; + left: 16.66667%; } + .large-pull-2 { + position: relative; + left: -16.66667%; } + .large-offset-1 { + margin-left: 8.33333%; } + .large-3 { + width: 25%; } + .large-push-3 { + position: relative; + left: 25%; } + .large-pull-3 { + position: relative; + left: -25%; } + .large-offset-2 { + margin-left: 16.66667%; } + .large-4 { + width: 33.33333%; } + .large-push-4 { + position: relative; + left: 33.33333%; } + .large-pull-4 { + position: relative; + left: -33.33333%; } + .large-offset-3 { + margin-left: 25%; } + .large-5 { + width: 41.66667%; } + .large-push-5 { + position: relative; + left: 41.66667%; } + .large-pull-5 { + position: relative; + left: -41.66667%; } + .large-offset-4 { + margin-left: 33.33333%; } + .large-6 { + width: 50%; } + .large-push-6 { + position: relative; + left: 50%; } + .large-pull-6 { + position: relative; + left: -50%; } + .large-offset-5 { + margin-left: 41.66667%; } + .large-7 { + width: 58.33333%; } + .large-push-7 { + position: relative; + left: 58.33333%; } + .large-pull-7 { + position: relative; + left: -58.33333%; } + .large-offset-6 { + margin-left: 50%; } + .large-8 { + width: 66.66667%; } + .large-push-8 { + position: relative; + left: 66.66667%; } + .large-pull-8 { + position: relative; + left: -66.66667%; } + .large-offset-7 { + margin-left: 58.33333%; } + .large-9 { + width: 75%; } + .large-push-9 { + position: relative; + left: 75%; } + .large-pull-9 { + position: relative; + left: -75%; } + .large-offset-8 { + margin-left: 66.66667%; } + .large-10 { + width: 83.33333%; } + .large-push-10 { + position: relative; + left: 83.33333%; } + .large-pull-10 { + position: relative; + left: -83.33333%; } + .large-offset-9 { + margin-left: 75%; } + .large-11 { + width: 91.66667%; } + .large-push-11 { + position: relative; + left: 91.66667%; } + .large-pull-11 { + position: relative; + left: -91.66667%; } + .large-offset-10 { + margin-left: 83.33333%; } + .large-12 { + width: 100%; } + .large-offset-11 { + margin-left: 91.66667%; } + .large-up-1 > .column, .large-up-1 > .columns { + width: 100%; + float: left; } + .large-up-1 > .column:nth-of-type(1n), .large-up-1 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-1 > .column:nth-of-type(1n+1), .large-up-1 > .columns:nth-of-type(1n+1) { + clear: both; } + .large-up-1 > .column:last-child, .large-up-1 > .columns:last-child { + float: left; } + .large-up-2 > .column, .large-up-2 > .columns { + width: 50%; + float: left; } + .large-up-2 > .column:nth-of-type(1n), .large-up-2 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-2 > .column:nth-of-type(2n+1), .large-up-2 > .columns:nth-of-type(2n+1) { + clear: both; } + .large-up-2 > .column:last-child, .large-up-2 > .columns:last-child { + float: left; } + .large-up-3 > .column, .large-up-3 > .columns { + width: 33.33333%; + float: left; } + .large-up-3 > .column:nth-of-type(1n), .large-up-3 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-3 > .column:nth-of-type(3n+1), .large-up-3 > .columns:nth-of-type(3n+1) { + clear: both; } + .large-up-3 > .column:last-child, .large-up-3 > .columns:last-child { + float: left; } + .large-up-4 > .column, .large-up-4 > .columns { + width: 25%; + float: left; } + .large-up-4 > .column:nth-of-type(1n), .large-up-4 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-4 > .column:nth-of-type(4n+1), .large-up-4 > .columns:nth-of-type(4n+1) { + clear: both; } + .large-up-4 > .column:last-child, .large-up-4 > .columns:last-child { + float: left; } + .large-up-5 > .column, .large-up-5 > .columns { + width: 20%; + float: left; } + .large-up-5 > .column:nth-of-type(1n), .large-up-5 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-5 > .column:nth-of-type(5n+1), .large-up-5 > .columns:nth-of-type(5n+1) { + clear: both; } + .large-up-5 > .column:last-child, .large-up-5 > .columns:last-child { + float: left; } + .large-up-6 > .column, .large-up-6 > .columns { + width: 16.66667%; + float: left; } + .large-up-6 > .column:nth-of-type(1n), .large-up-6 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-6 > .column:nth-of-type(6n+1), .large-up-6 > .columns:nth-of-type(6n+1) { + clear: both; } + .large-up-6 > .column:last-child, .large-up-6 > .columns:last-child { + float: left; } + .large-up-7 > .column, .large-up-7 > .columns { + width: 14.28571%; + float: left; } + .large-up-7 > .column:nth-of-type(1n), .large-up-7 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-7 > .column:nth-of-type(7n+1), .large-up-7 > .columns:nth-of-type(7n+1) { + clear: both; } + .large-up-7 > .column:last-child, .large-up-7 > .columns:last-child { + float: left; } + .large-up-8 > .column, .large-up-8 > .columns { + width: 12.5%; + float: left; } + .large-up-8 > .column:nth-of-type(1n), .large-up-8 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-8 > .column:nth-of-type(8n+1), .large-up-8 > .columns:nth-of-type(8n+1) { + clear: both; } + .large-up-8 > .column:last-child, .large-up-8 > .columns:last-child { + float: left; } + .large-collapse > .column, .large-collapse > .columns { + padding-left: 0; + padding-right: 0; } + .large-collapse .row, + .expanded.row .large-collapse.row { + margin-left: 0; + margin-right: 0; } + .large-uncollapse > .column, .large-uncollapse > .columns { + padding-left: 0.9375rem; + padding-right: 0.9375rem; } + .large-centered { + float: none; + margin-left: auto; + margin-right: auto; } + .large-uncentered, + .large-push-0, + .large-pull-0 { + position: static; + margin-left: 0; + margin-right: 0; + float: left; } } + +div, +dl, +dt, +dd, +ul, +ol, +li, +h1, +h2, +h3, +h4, +h5, +h6, +pre, +form, +p, +blockquote, +th, +td { + margin: 0; + padding: 0; } + +p { + font-size: inherit; + line-height: 1.6; + margin-bottom: 1rem; + text-rendering: optimizeLegibility; } + +em, +i { + font-style: italic; + line-height: inherit; } + +strong, +b { + font-weight: bold; + line-height: inherit; } + +small { + font-size: 80%; + line-height: inherit; } + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; + font-weight: normal; + font-style: normal; + color: inherit; + text-rendering: optimizeLegibility; + margin-top: 0; + margin-bottom: 0.5rem; + line-height: 1.4; } + h1 small, + h2 small, + h3 small, + h4 small, + h5 small, + h6 small { + color: #cacaca; + line-height: 0; } + +h1 { + font-size: 1.5rem; } + +h2 { + font-size: 1.25rem; } + +h3 { + font-size: 1.1875rem; } + +h4 { + font-size: 1.125rem; } + +h5 { + font-size: 1.0625rem; } + +h6 { + font-size: 1rem; } + +@media screen and (min-width: 40em) { + h1 { + font-size: 3rem; } + h2 { + font-size: 2.5rem; } + h3 { + font-size: 1.9375rem; } + h4 { + font-size: 1.5625rem; } + h5 { + font-size: 1.25rem; } + h6 { + font-size: 1rem; } } + +a { + color: #2199e8; + text-decoration: none; + line-height: inherit; + cursor: pointer; } + a:hover, a:focus { + color: #1585cf; } + a img { + border: 0; } + +hr { + max-width: 75rem; + height: 0; + border-right: 0; + border-top: 0; + border-bottom: 1px solid #cacaca; + border-left: 0; + margin: 1.25rem auto; + clear: both; } + +ul, +ol, +dl { + line-height: 1.6; + margin-bottom: 1rem; + list-style-position: outside; } + +li { + font-size: inherit; } + +ul { + list-style-type: disc; + margin-left: 1.25rem; } + +ol { + margin-left: 1.25rem; } + +ul ul, ol ul, ul ol, ol ol { + margin-left: 1.25rem; + margin-bottom: 0; } + +dl { + margin-bottom: 1rem; } + dl dt { + margin-bottom: 0.3rem; + font-weight: bold; } + +blockquote { + margin: 0 0 1rem; + padding: 0.5625rem 1.25rem 0 1.1875rem; + border-left: 1px solid #cacaca; } + blockquote, blockquote p { + line-height: 1.6; + color: #8a8a8a; } + +cite { + display: block; + font-size: 0.8125rem; + color: #8a8a8a; } + cite:before { + content: '\2014 \0020'; } + +abbr { + color: #0a0a0a; + cursor: help; + border-bottom: 1px dotted #0a0a0a; } + +code { + font-family: Consolas, "Liberation Mono", Courier, monospace; + font-weight: normal; + color: #0a0a0a; + background-color: #e6e6e6; + border: 1px solid #cacaca; + padding: 0.125rem 0.3125rem 0.0625rem; } + +kbd { + padding: 0.125rem 0.25rem 0; + margin: 0; + background-color: #e6e6e6; + color: #0a0a0a; + font-family: Consolas, "Liberation Mono", Courier, monospace; } + +.subheader { + margin-top: 0.2rem; + margin-bottom: 0.5rem; + font-weight: normal; + line-height: 1.4; + color: #8a8a8a; } + +.lead { + font-size: 125%; + line-height: 1.6; } + +.stat { + font-size: 2.5rem; + line-height: 1; } + p + .stat { + margin-top: -1rem; } + +.no-bullet { + margin-left: 0; + list-style: none; } + +.text-left { + text-align: left; } + +.text-right { + text-align: right; } + +.text-center { + text-align: center; } + +.text-justify { + text-align: justify; } + +@media screen and (min-width: 40em) { + .medium-text-left { + text-align: left; } + .medium-text-right { + text-align: right; } + .medium-text-center { + text-align: center; } + .medium-text-justify { + text-align: justify; } } + +@media screen and (min-width: 64em) { + .large-text-left { + text-align: left; } + .large-text-right { + text-align: right; } + .large-text-center { + text-align: center; } + .large-text-justify { + text-align: justify; } } + +.show-for-print { + display: none !important; } + +@media print { + * { + background: transparent !important; + color: black !important; + box-shadow: none !important; + text-shadow: none !important; } + .show-for-print { + display: block !important; } + .hide-for-print { + display: none !important; } + table.show-for-print { + display: table !important; } + thead.show-for-print { + display: table-header-group !important; } + tbody.show-for-print { + display: table-row-group !important; } + tr.show-for-print { + display: table-row !important; } + td.show-for-print { + display: table-cell !important; } + th.show-for-print { + display: table-cell !important; } + a, + a:visited { + text-decoration: underline; } + a[href]:after { + content: " (" attr(href) ")"; } + .ir a:after, + a[href^='javascript:']:after, + a[href^='#']:after { + content: ''; } + abbr[title]:after { + content: " (" attr(title) ")"; } + pre, + blockquote { + border: 1px solid #8a8a8a; + page-break-inside: avoid; } + thead { + display: table-header-group; } + tr, + img { + page-break-inside: avoid; } + img { + max-width: 100% !important; } + @page { + margin: 0.5cm; } + p, + h2, + h3 { + orphans: 3; + widows: 3; } + h2, + h3 { + page-break-after: avoid; } } + +.button { + display: inline-block; + text-align: center; + line-height: 1; + cursor: pointer; + -webkit-appearance: none; + transition: background-color 0.25s ease-out, color 0.25s ease-out; + vertical-align: middle; + border: 1px solid transparent; + border-radius: 0; + padding: 0.85em 1em; + margin: 0 0 1rem 0; + font-size: 0.9rem; + background-color: #2199e8; + color: #fefefe; } + [data-whatinput='mouse'] .button { + outline: 0; } + .button:hover, .button:focus { + background-color: #1583cc; + color: #fefefe; } + .button.tiny { + font-size: 0.6rem; } + .button.small { + font-size: 0.75rem; } + .button.large { + font-size: 1.25rem; } + .button.expanded { + display: block; + width: 100%; + margin-left: 0; + margin-right: 0; } + .button.primary { + background-color: #2199e8; + color: #fefefe; } + .button.primary:hover, .button.primary:focus { + background-color: #147cc0; + color: #fefefe; } + .button.secondary { + background-color: #777; + color: #fefefe; } + .button.secondary:hover, .button.secondary:focus { + background-color: #5f5f5f; + color: #fefefe; } + .button.success { + background-color: #3adb76; + color: #fefefe; } + .button.success:hover, .button.success:focus { + background-color: #22bb5b; + color: #fefefe; } + .button.warning { + background-color: #ffae00; + color: #fefefe; } + .button.warning:hover, .button.warning:focus { + background-color: #cc8b00; + color: #fefefe; } + .button.alert { + background-color: #ec5840; + color: #fefefe; } + .button.alert:hover, .button.alert:focus { + background-color: #da3116; + color: #fefefe; } + .button.hollow { + border: 1px solid #2199e8; + color: #2199e8; } + .button.hollow, .button.hollow:hover, .button.hollow:focus { + background-color: transparent; } + .button.hollow:hover, .button.hollow:focus { + border-color: #0c4d78; + color: #0c4d78; } + .button.hollow.primary { + border: 1px solid #2199e8; + color: #2199e8; } + .button.hollow.primary:hover, .button.hollow.primary:focus { + border-color: #0c4d78; + color: #0c4d78; } + .button.hollow.secondary { + border: 1px solid #777; + color: #777; } + .button.hollow.secondary:hover, .button.hollow.secondary:focus { + border-color: #3c3c3c; + color: #3c3c3c; } + .button.hollow.success { + border: 1px solid #3adb76; + color: #3adb76; } + .button.hollow.success:hover, .button.hollow.success:focus { + border-color: #157539; + color: #157539; } + .button.hollow.warning { + border: 1px solid #ffae00; + color: #ffae00; } + .button.hollow.warning:hover, .button.hollow.warning:focus { + border-color: #805700; + color: #805700; } + .button.hollow.alert { + border: 1px solid #ec5840; + color: #ec5840; } + .button.hollow.alert:hover, .button.hollow.alert:focus { + border-color: #881f0e; + color: #881f0e; } + .button.disabled, .button[disabled] { + opacity: 0.25; + cursor: not-allowed; } + .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus { + background-color: #2199e8; + color: #fefefe; } + .button.dropdown::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 0.4em; + border-color: #fefefe transparent transparent; + border-top-style: solid; + border-bottom-width: 0; + position: relative; + top: 0.4em; + float: right; + margin-left: 1em; + display: inline-block; } + .button.arrow-only::after { + margin-left: 0; + float: none; + top: -0.1em; } + +[type='text'], [type='password'], [type='date'], [type='datetime'], [type='datetime-local'], [type='month'], [type='week'], [type='email'], [type='number'], [type='search'], [type='tel'], [type='time'], [type='url'], [type='color'], +textarea { + display: block; + box-sizing: border-box; + width: 100%; + height: 2.4375rem; + padding: 0.5rem; + border: 1px solid #cacaca; + margin: 0 0 1rem; + font-family: inherit; + font-size: 1rem; + color: #0a0a0a; + background-color: #fefefe; + box-shadow: inset 0 1px 2px rgba(10, 10, 10, 0.1); + border-radius: 0; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out; + -webkit-appearance: none; + -moz-appearance: none; } + [type='text']:focus, [type='password']:focus, [type='date']:focus, [type='datetime']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='week']:focus, [type='email']:focus, [type='number']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='url']:focus, [type='color']:focus, + textarea:focus { + border: 1px solid #8a8a8a; + background-color: #fefefe; + outline: none; + box-shadow: 0 0 5px #cacaca; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out; } + +textarea { + max-width: 100%; } + textarea[rows] { + height: auto; } + +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #cacaca; } + +input::-moz-placeholder, +textarea::-moz-placeholder { + color: #cacaca; } + +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #cacaca; } + +input::placeholder, +textarea::placeholder { + color: #cacaca; } + +input:disabled, input[readonly], +textarea:disabled, +textarea[readonly] { + background-color: #e6e6e6; + cursor: not-allowed; } + +[type='submit'], +[type='button'] { + border-radius: 0; + -webkit-appearance: none; + -moz-appearance: none; } + +input[type='search'] { + box-sizing: border-box; } + +[type='file'], +[type='checkbox'], +[type='radio'] { + margin: 0 0 1rem; } + +[type='checkbox'] + label, +[type='radio'] + label { + display: inline-block; + margin-left: 0.5rem; + margin-right: 1rem; + margin-bottom: 0; + vertical-align: baseline; } + [type='checkbox'] + label[for], + [type='radio'] + label[for] { + cursor: pointer; } + +label > [type='checkbox'], +label > [type='radio'] { + margin-right: 0.5rem; } + +[type='file'] { + width: 100%; } + +label { + display: block; + margin: 0; + font-size: 0.875rem; + font-weight: normal; + line-height: 1.8; + color: #0a0a0a; } + label.middle { + margin: 0 0 1rem; + padding: 0.5625rem 0; } + +.help-text { + margin-top: -0.5rem; + font-size: 0.8125rem; + font-style: italic; + color: #0a0a0a; } + +.input-group { + display: table; + width: 100%; + margin-bottom: 1rem; } + .input-group > :first-child { + border-radius: 0 0 0 0; } + .input-group > :last-child > * { + border-radius: 0 0 0 0; } + +.input-group-label, .input-group-field, .input-group-button { + margin: 0; + white-space: nowrap; + display: table-cell; + vertical-align: middle; } + +.input-group-label { + text-align: center; + padding: 0 1rem; + background: #e6e6e6; + color: #0a0a0a; + border: 1px solid #cacaca; + white-space: nowrap; + width: 1%; + height: 100%; } + .input-group-label:first-child { + border-right: 0; } + .input-group-label:last-child { + border-left: 0; } + +.input-group-field { + border-radius: 0; + height: 2.5rem; } + +.input-group-button { + padding-top: 0; + padding-bottom: 0; + text-align: center; + height: 100%; + width: 1%; } + .input-group-button a, + .input-group-button input, + .input-group-button button { + margin: 0; } + +.input-group .input-group-button { + display: table-cell; } + +fieldset { + border: 0; + padding: 0; + margin: 0; } + +legend { + margin-bottom: 0.5rem; + max-width: 100%; } + +.fieldset { + border: 1px solid #cacaca; + padding: 1.25rem; + margin: 1.125rem 0; } + .fieldset legend { + background: #fefefe; + padding: 0 0.1875rem; + margin: 0; + margin-left: -0.1875rem; } + +select { + height: 2.4375rem; + padding: 0.5rem; + border: 1px solid #cacaca; + margin: 0 0 1rem; + font-size: 1rem; + font-family: inherit; + line-height: normal; + color: #0a0a0a; + background-color: #fefefe; + border-radius: 0; + -webkit-appearance: none; + -moz-appearance: none; + background-image: url("data:image/svg+xml;utf8,"); + background-size: 9px 6px; + background-position: right -1rem center; + background-origin: content-box; + background-repeat: no-repeat; + padding-right: 1.5rem; } + @media screen and (min-width: 0\0) { + select { + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAYCAYAAACbU/80AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAIpJREFUeNrEkckNgDAMBBfRkEt0ObRBBdsGXUDgmQfK4XhH2m8czQAAy27R3tsw4Qfe2x8uOO6oYLb6GlOor3GF+swURAOmUJ+RwtEJs9WvTGEYxBXqI1MQAZhCfUQKRzDMVj+TwrAIV6jvSUEkYAr1LSkcyTBb/V+KYfX7xAeusq3sLDtGH3kEGACPWIflNZfhRQAAAABJRU5ErkJggg=="); } } + select:disabled { + background-color: #e6e6e6; + cursor: not-allowed; } + select::-ms-expand { + display: none; } + select[multiple] { + height: auto; + background-image: none; } + +.is-invalid-input:not(:focus) { + background-color: rgba(236, 88, 64, 0.1); + border-color: #ec5840; } + +.is-invalid-label { + color: #ec5840; } + +.form-error { + display: none; + margin-top: -0.5rem; + margin-bottom: 1rem; + font-size: 0.75rem; + font-weight: bold; + color: #ec5840; } + .form-error.is-visible { + display: block; } + +.accordion { + list-style-type: none; + background: #fefefe; + margin-left: 0; } + +.accordion-item:first-child > :first-child { + border-radius: 0 0 0 0; } + +.accordion-item:last-child > :last-child { + border-radius: 0 0 0 0; } + +.accordion-title { + display: block; + padding: 1.25rem 1rem; + line-height: 1; + font-size: 0.75rem; + color: #2199e8; + position: relative; + border: 1px solid #e6e6e6; + border-bottom: 0; } + :last-child:not(.is-active) > .accordion-title { + border-radius: 0 0 0 0; + border-bottom: 1px solid #e6e6e6; } + .accordion-title:hover, .accordion-title:focus { + background-color: #e6e6e6; } + .accordion-title::before { + content: '+'; + position: absolute; + right: 1rem; + top: 50%; + margin-top: -0.5rem; } + .is-active > .accordion-title::before { + content: '–'; } + +.accordion-content { + padding: 1rem; + display: none; + border: 1px solid #e6e6e6; + border-bottom: 0; + background-color: #fefefe; + color: #0a0a0a; } + :last-child > .accordion-content:last-child { + border-bottom: 1px solid #e6e6e6; } + +.is-accordion-submenu-parent > a { + position: relative; } + .is-accordion-submenu-parent > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 6px; + border-color: #2199e8 transparent transparent; + border-top-style: solid; + border-bottom-width: 0; + position: absolute; + top: 50%; + margin-top: -4px; + right: 1rem; } + +.is-accordion-submenu-parent[aria-expanded='true'] > a::after { + -webkit-transform-origin: 50% 50%; + -ms-transform-origin: 50% 50%; + transform-origin: 50% 50%; + -webkit-transform: scaleY(-1); + -ms-transform: scaleY(-1); + transform: scaleY(-1); } + +.badge { + display: inline-block; + padding: 0.3em; + min-width: 2.1em; + font-size: 0.6rem; + text-align: center; + border-radius: 50%; + background: #2199e8; + color: #fefefe; } + .badge.secondary { + background: #777; + color: #fefefe; } + .badge.success { + background: #3adb76; + color: #fefefe; } + .badge.warning { + background: #ffae00; + color: #fefefe; } + .badge.alert { + background: #ec5840; + color: #fefefe; } + +.breadcrumbs { + list-style: none; + margin: 0 0 1rem 0; } + .breadcrumbs::before, .breadcrumbs::after { + content: ' '; + display: table; } + .breadcrumbs::after { + clear: both; } + .breadcrumbs li { + float: left; + color: #0a0a0a; + font-size: 0.6875rem; + cursor: default; + text-transform: uppercase; } + .breadcrumbs li:not(:last-child)::after { + color: #cacaca; + content: "/"; + margin: 0 0.75rem; + position: relative; + top: 1px; + opacity: 1; } + .breadcrumbs a { + color: #2199e8; } + .breadcrumbs a:hover { + text-decoration: underline; } + .breadcrumbs .disabled { + color: #cacaca; + cursor: not-allowed; } + +.button-group { + margin-bottom: 1rem; + font-size: 0; } + .button-group::before, .button-group::after { + content: ' '; + display: table; } + .button-group::after { + clear: both; } + .button-group .button { + margin: 0; + margin-right: 1px; + margin-bottom: 1px; + font-size: 0.9rem; } + .button-group .button:last-child { + margin-right: 0; } + .button-group.tiny .button { + font-size: 0.6rem; } + .button-group.small .button { + font-size: 0.75rem; } + .button-group.large .button { + font-size: 1.25rem; } + .button-group.expanded { + margin-right: -1px; } + .button-group.expanded::before, .button-group.expanded::after { + display: none; } + .button-group.expanded .button:first-child:nth-last-child(2), .button-group.expanded .button:first-child:nth-last-child(2):first-child:nth-last-child(2) ~ .button { + display: inline-block; + width: calc(50% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(2):last-child, .button-group.expanded .button:first-child:nth-last-child(2):first-child:nth-last-child(2) ~ .button:last-child { + margin-right: -6px; } + .button-group.expanded .button:first-child:nth-last-child(3), .button-group.expanded .button:first-child:nth-last-child(3):first-child:nth-last-child(3) ~ .button { + display: inline-block; + width: calc(33.33333% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(3):last-child, .button-group.expanded .button:first-child:nth-last-child(3):first-child:nth-last-child(3) ~ .button:last-child { + margin-right: -6px; } + .button-group.expanded .button:first-child:nth-last-child(4), .button-group.expanded .button:first-child:nth-last-child(4):first-child:nth-last-child(4) ~ .button { + display: inline-block; + width: calc(25% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(4):last-child, .button-group.expanded .button:first-child:nth-last-child(4):first-child:nth-last-child(4) ~ .button:last-child { + margin-right: -6px; } + .button-group.expanded .button:first-child:nth-last-child(5), .button-group.expanded .button:first-child:nth-last-child(5):first-child:nth-last-child(5) ~ .button { + display: inline-block; + width: calc(20% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(5):last-child, .button-group.expanded .button:first-child:nth-last-child(5):first-child:nth-last-child(5) ~ .button:last-child { + margin-right: -6px; } + .button-group.expanded .button:first-child:nth-last-child(6), .button-group.expanded .button:first-child:nth-last-child(6):first-child:nth-last-child(6) ~ .button { + display: inline-block; + width: calc(16.66667% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(6):last-child, .button-group.expanded .button:first-child:nth-last-child(6):first-child:nth-last-child(6) ~ .button:last-child { + margin-right: -6px; } + .button-group.primary .button { + background-color: #2199e8; + color: #fefefe; } + .button-group.primary .button:hover, .button-group.primary .button:focus { + background-color: #147cc0; + color: #fefefe; } + .button-group.secondary .button { + background-color: #777; + color: #fefefe; } + .button-group.secondary .button:hover, .button-group.secondary .button:focus { + background-color: #5f5f5f; + color: #fefefe; } + .button-group.success .button { + background-color: #3adb76; + color: #fefefe; } + .button-group.success .button:hover, .button-group.success .button:focus { + background-color: #22bb5b; + color: #fefefe; } + .button-group.warning .button { + background-color: #ffae00; + color: #fefefe; } + .button-group.warning .button:hover, .button-group.warning .button:focus { + background-color: #cc8b00; + color: #fefefe; } + .button-group.alert .button { + background-color: #ec5840; + color: #fefefe; } + .button-group.alert .button:hover, .button-group.alert .button:focus { + background-color: #da3116; + color: #fefefe; } + .button-group.stacked .button, .button-group.stacked-for-small .button, .button-group.stacked-for-medium .button { + width: 100%; } + .button-group.stacked .button:last-child, .button-group.stacked-for-small .button:last-child, .button-group.stacked-for-medium .button:last-child { + margin-bottom: 0; } + @media screen and (min-width: 40em) { + .button-group.stacked-for-small .button { + width: auto; + margin-bottom: 0; } } + @media screen and (min-width: 64em) { + .button-group.stacked-for-medium .button { + width: auto; + margin-bottom: 0; } } + @media screen and (max-width: 39.9375em) { + .button-group.stacked-for-small.expanded { + display: block; } + .button-group.stacked-for-small.expanded .button { + display: block; + margin-right: 0; } } + +.callout { + margin: 0 0 1rem 0; + padding: 1rem; + border: 1px solid rgba(10, 10, 10, 0.25); + border-radius: 0; + position: relative; + color: #0a0a0a; + background-color: white; } + .callout > :first-child { + margin-top: 0; } + .callout > :last-child { + margin-bottom: 0; } + .callout.primary { + background-color: #def0fc; } + .callout.secondary { + background-color: #ebebeb; } + .callout.success { + background-color: #e1faea; } + .callout.warning { + background-color: #fff3d9; } + .callout.alert { + background-color: #fce6e2; } + .callout.small { + padding-top: 0.5rem; + padding-right: 0.5rem; + padding-bottom: 0.5rem; + padding-left: 0.5rem; } + .callout.large { + padding-top: 3rem; + padding-right: 3rem; + padding-bottom: 3rem; + padding-left: 3rem; } + +.close-button { + position: absolute; + color: #8a8a8a; + right: 1rem; + top: 0.5rem; + font-size: 2em; + line-height: 1; + cursor: pointer; } + [data-whatinput='mouse'] .close-button { + outline: 0; } + .close-button:hover, .close-button:focus { + color: #0a0a0a; } + +.menu { + margin: 0; + list-style-type: none; } + .menu > li { + display: table-cell; + vertical-align: middle; } + [data-whatinput='mouse'] .menu > li { + outline: 0; } + .menu > li > a { + display: block; + padding: 0.7rem 1rem; + line-height: 1; } + .menu input, + .menu a, + .menu button { + margin-bottom: 0; } + .menu > li > a img, + .menu > li > a i, + .menu > li > a svg { + vertical-align: middle; } + .menu > li > a img + span, + .menu > li > a i + span, + .menu > li > a svg + span { + vertical-align: middle; } + .menu > li > a img, + .menu > li > a i, + .menu > li > a svg { + margin-right: 0.25rem; + display: inline-block; } + .menu > li { + display: table-cell; } + .menu.vertical > li { + display: block; } + @media screen and (min-width: 40em) { + .menu.medium-horizontal > li { + display: table-cell; } + .menu.medium-vertical > li { + display: block; } } + @media screen and (min-width: 64em) { + .menu.large-horizontal > li { + display: table-cell; } + .menu.large-vertical > li { + display: block; } } + .menu.simple li { + line-height: 1; + display: inline-block; + margin-right: 1rem; } + .menu.simple a { + padding: 0; } + .menu.align-right::before, .menu.align-right::after { + content: ' '; + display: table; } + .menu.align-right::after { + clear: both; } + .menu.align-right > li { + float: right; } + .menu.expanded { + width: 100%; + display: table; + table-layout: fixed; } + .menu.expanded > li:first-child:last-child { + width: 100%; } + .menu.icon-top > li > a { + text-align: center; } + .menu.icon-top > li > a img, + .menu.icon-top > li > a i, + .menu.icon-top > li > a svg { + display: block; + margin: 0 auto 0.25rem; } + .menu.nested { + margin-left: 1rem; } + .menu .active > a { + color: #fefefe; + background: #2199e8; } + +.menu-text { + font-weight: bold; + color: inherit; + line-height: 1; + padding-top: 0; + padding-bottom: 0; + padding: 0.7rem 1rem; } + +.menu-centered { + text-align: center; } + .menu-centered > .menu { + display: inline-block; } + +.no-js [data-responsive-menu] ul { + display: none; } + +.menu-icon { + position: relative; + display: inline-block; + vertical-align: middle; + cursor: pointer; + width: 20px; + height: 16px; } + .menu-icon::after { + content: ''; + position: absolute; + display: block; + width: 100%; + height: 2px; + background: #fefefe; + top: 0; + left: 0; + box-shadow: 0 7px 0 #fefefe, 0 14px 0 #fefefe; } + .menu-icon:hover::after { + background: #cacaca; + box-shadow: 0 7px 0 #cacaca, 0 14px 0 #cacaca; } + +.menu-icon.dark { + position: relative; + display: inline-block; + vertical-align: middle; + cursor: pointer; + width: 20px; + height: 16px; } + .menu-icon.dark::after { + content: ''; + position: absolute; + display: block; + width: 100%; + height: 2px; + background: #0a0a0a; + top: 0; + left: 0; + box-shadow: 0 7px 0 #0a0a0a, 0 14px 0 #0a0a0a; } + .menu-icon.dark:hover::after { + background: #8a8a8a; + box-shadow: 0 7px 0 #8a8a8a, 0 14px 0 #8a8a8a; } + +.is-drilldown { + position: relative; + overflow: hidden; } + .is-drilldown li { + display: block !important; } + +.is-drilldown-submenu { + position: absolute; + top: 0; + left: 100%; + z-index: -1; + height: 100%; + width: 100%; + background: #fefefe; + transition: -webkit-transform 0.15s linear; + transition: transform 0.15s linear; } + .is-drilldown-submenu.is-active { + z-index: 1; + display: block; + -webkit-transform: translateX(-100%); + -ms-transform: translateX(-100%); + transform: translateX(-100%); } + .is-drilldown-submenu.is-closing { + -webkit-transform: translateX(100%); + -ms-transform: translateX(100%); + transform: translateX(100%); } + +.is-drilldown-submenu-parent > a { + position: relative; } + .is-drilldown-submenu-parent > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 6px; + border-color: transparent transparent transparent #2199e8; + border-left-style: solid; + border-right-width: 0; + position: absolute; + top: 50%; + margin-top: -6px; + right: 1rem; } + +.js-drilldown-back > a::before { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 6px; + border-color: transparent #2199e8 transparent transparent; + border-right-style: solid; + border-left-width: 0; + border-left-width: 0; + display: inline-block; + vertical-align: middle; + margin-right: 0.75rem; } + +.dropdown-pane { + background-color: #fefefe; + border: 1px solid #cacaca; + border-radius: 0; + display: block; + font-size: 1rem; + padding: 1rem; + position: absolute; + visibility: hidden; + width: 300px; + z-index: 10; } + .dropdown-pane.is-open { + visibility: visible; } + +.dropdown-pane.tiny { + width: 100px; } + +.dropdown-pane.small { + width: 200px; } + +.dropdown-pane.large { + width: 400px; } + +.dropdown.menu > li.opens-left > .is-dropdown-submenu { + left: auto; + right: 0; + top: 100%; } + +.dropdown.menu > li.opens-right > .is-dropdown-submenu { + right: auto; + left: 0; + top: 100%; } + +.dropdown.menu > li.is-dropdown-submenu-parent > a { + padding-right: 1.5rem; + position: relative; } + +.dropdown.menu > li.is-dropdown-submenu-parent > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: #2199e8 transparent transparent; + border-top-style: solid; + border-bottom-width: 0; + right: 5px; + margin-top: -2px; } + +[data-whatinput='mouse'] .dropdown.menu a { + outline: 0; } + +.no-js .dropdown.menu ul { + display: none; } + +.dropdown.menu.vertical > li .is-dropdown-submenu { + top: 0; } + +.dropdown.menu.vertical > li.opens-left > .is-dropdown-submenu { + left: auto; + right: 100%; } + +.dropdown.menu.vertical > li.opens-right > .is-dropdown-submenu { + right: auto; + left: 100%; } + +.dropdown.menu.vertical > li > a::after { + right: 14px; + margin-top: -3px; } + +.dropdown.menu.vertical > li.opens-left > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: transparent #2199e8 transparent transparent; + border-right-style: solid; + border-left-width: 0; } + +.dropdown.menu.vertical > li.opens-right > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: transparent transparent transparent #2199e8; + border-left-style: solid; + border-right-width: 0; } + +@media screen and (min-width: 40em) { + .dropdown.menu.medium-horizontal > li.opens-left > .is-dropdown-submenu { + left: auto; + right: 0; + top: 100%; } + .dropdown.menu.medium-horizontal > li.opens-right > .is-dropdown-submenu { + right: auto; + left: 0; + top: 100%; } + .dropdown.menu.medium-horizontal > li.is-dropdown-submenu-parent > a { + padding-right: 1.5rem; + position: relative; } + .dropdown.menu.medium-horizontal > li.is-dropdown-submenu-parent > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: #2199e8 transparent transparent; + border-top-style: solid; + border-bottom-width: 0; + right: 5px; + margin-top: -2px; } + .dropdown.menu.medium-vertical > li .is-dropdown-submenu { + top: 0; } + .dropdown.menu.medium-vertical > li.opens-left > .is-dropdown-submenu { + left: auto; + right: 100%; } + .dropdown.menu.medium-vertical > li.opens-right > .is-dropdown-submenu { + right: auto; + left: 100%; } + .dropdown.menu.medium-vertical > li > a::after { + right: 14px; + margin-top: -3px; } + .dropdown.menu.medium-vertical > li.opens-left > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: transparent #2199e8 transparent transparent; + border-right-style: solid; + border-left-width: 0; } + .dropdown.menu.medium-vertical > li.opens-right > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: transparent transparent transparent #2199e8; + border-left-style: solid; + border-right-width: 0; } } + +@media screen and (min-width: 64em) { + .dropdown.menu.large-horizontal > li.opens-left > .is-dropdown-submenu { + left: auto; + right: 0; + top: 100%; } + .dropdown.menu.large-horizontal > li.opens-right > .is-dropdown-submenu { + right: auto; + left: 0; + top: 100%; } + .dropdown.menu.large-horizontal > li.is-dropdown-submenu-parent > a { + padding-right: 1.5rem; + position: relative; } + .dropdown.menu.large-horizontal > li.is-dropdown-submenu-parent > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: #2199e8 transparent transparent; + border-top-style: solid; + border-bottom-width: 0; + right: 5px; + margin-top: -2px; } + .dropdown.menu.large-vertical > li .is-dropdown-submenu { + top: 0; } + .dropdown.menu.large-vertical > li.opens-left > .is-dropdown-submenu { + left: auto; + right: 100%; } + .dropdown.menu.large-vertical > li.opens-right > .is-dropdown-submenu { + right: auto; + left: 100%; } + .dropdown.menu.large-vertical > li > a::after { + right: 14px; + margin-top: -3px; } + .dropdown.menu.large-vertical > li.opens-left > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: transparent #2199e8 transparent transparent; + border-right-style: solid; + border-left-width: 0; } + .dropdown.menu.large-vertical > li.opens-right > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: transparent transparent transparent #2199e8; + border-left-style: solid; + border-right-width: 0; } } + +.dropdown.menu.align-right .is-dropdown-submenu.first-sub { + top: 100%; + left: auto; + right: 0; } + +.is-dropdown-menu.vertical { + width: 100px; } + .is-dropdown-menu.vertical.align-right { + float: right; } + +.is-dropdown-submenu-parent { + position: relative; } + .is-dropdown-submenu-parent a::after { + position: absolute; + top: 50%; + right: 5px; + margin-top: -2px; } + .is-dropdown-submenu-parent.opens-inner > .is-dropdown-submenu { + top: 100%; + left: auto; } + .is-dropdown-submenu-parent.opens-left > .is-dropdown-submenu { + left: auto; + right: 100%; } + .is-dropdown-submenu-parent.opens-right > .is-dropdown-submenu { + right: auto; + left: 100%; } + +.is-dropdown-submenu { + display: none; + position: absolute; + top: 0; + left: 100%; + min-width: 200px; + z-index: 1; + background: #fefefe; + border: 1px solid #cacaca; } + .is-dropdown-submenu .is-dropdown-submenu-parent > a::after { + right: 14px; + margin-top: -3px; } + .is-dropdown-submenu .is-dropdown-submenu-parent.opens-left > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: transparent #2199e8 transparent transparent; + border-right-style: solid; + border-left-width: 0; } + .is-dropdown-submenu .is-dropdown-submenu-parent.opens-right > a::after { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 5px; + border-color: transparent transparent transparent #2199e8; + border-left-style: solid; + border-right-width: 0; } + .is-dropdown-submenu .is-dropdown-submenu { + margin-top: -1px; } + .is-dropdown-submenu > li { + width: 100%; } + .is-dropdown-submenu.js-dropdown-active { + display: block; } + +.flex-video { + position: relative; + height: 0; + padding-bottom: 75%; + margin-bottom: 1rem; + overflow: hidden; } + .flex-video iframe, + .flex-video object, + .flex-video embed, + .flex-video video { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } + .flex-video.widescreen { + padding-bottom: 56.25%; } + .flex-video.vimeo { + padding-top: 0; } + +.label { + display: inline-block; + padding: 0.33333rem 0.5rem; + font-size: 0.8rem; + line-height: 1; + white-space: nowrap; + cursor: default; + border-radius: 0; + background: #2199e8; + color: #fefefe; } + .label.secondary { + background: #777; + color: #fefefe; } + .label.success { + background: #3adb76; + color: #fefefe; } + .label.warning { + background: #ffae00; + color: #fefefe; } + .label.alert { + background: #ec5840; + color: #fefefe; } + +.media-object { + margin-bottom: 1rem; + display: block; } + .media-object img { + max-width: none; } + @media screen and (max-width: 39.9375em) { + .media-object.stack-for-small .media-object-section { + padding: 0; + padding-bottom: 1rem; + display: block; } + .media-object.stack-for-small .media-object-section img { + width: 100%; } } + +.media-object-section { + display: table-cell; + vertical-align: top; } + .media-object-section:first-child { + padding-right: 1rem; } + .media-object-section:last-child:not(:nth-child(2)) { + padding-left: 1rem; } + .media-object-section > :last-child { + margin-bottom: 0; } + .media-object-section.middle { + vertical-align: middle; } + .media-object-section.bottom { + vertical-align: bottom; } + +html, +body { + height: 100%; } + +.off-canvas-wrapper { + width: 100%; + overflow-x: hidden; + position: relative; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + -webkit-overflow-scrolling: auto; } + +.off-canvas-wrapper-inner { + position: relative; + width: 100%; + transition: -webkit-transform 0.5s ease; + transition: transform 0.5s ease; } + .off-canvas-wrapper-inner::before, .off-canvas-wrapper-inner::after { + content: ' '; + display: table; } + .off-canvas-wrapper-inner::after { + clear: both; } + +.off-canvas-content, +.off-canvas-content { + min-height: 100%; + background: #fefefe; + transition: -webkit-transform 0.5s ease; + transition: transform 0.5s ease; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + z-index: 1; + padding-bottom: 0.1px; + box-shadow: 0 0 10px rgba(10, 10, 10, 0.5); } + +.js-off-canvas-exit { + display: none; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: rgba(254, 254, 254, 0.25); + cursor: pointer; + transition: background 0.5s ease; } + +.off-canvas { + position: absolute; + background: #e6e6e6; + z-index: -1; + max-height: 100%; + overflow-y: auto; + -webkit-transform: translateX(0); + -ms-transform: translateX(0); + transform: translateX(0); } + [data-whatinput='mouse'] .off-canvas { + outline: 0; } + .off-canvas.position-left { + left: -250px; + top: 0; + width: 250px; } + .is-open-left { + -webkit-transform: translateX(250px); + -ms-transform: translateX(250px); + transform: translateX(250px); } + .off-canvas.position-right { + right: -250px; + top: 0; + width: 250px; } + .is-open-right { + -webkit-transform: translateX(-250px); + -ms-transform: translateX(-250px); + transform: translateX(-250px); } + +@media screen and (min-width: 40em) { + .position-left.reveal-for-medium { + left: 0; + z-index: auto; + position: fixed; } + .position-left.reveal-for-medium ~ .off-canvas-content { + margin-left: 250px; } + .position-right.reveal-for-medium { + right: 0; + z-index: auto; + position: fixed; } + .position-right.reveal-for-medium ~ .off-canvas-content { + margin-right: 250px; } } + +@media screen and (min-width: 64em) { + .position-left.reveal-for-large { + left: 0; + z-index: auto; + position: fixed; } + .position-left.reveal-for-large ~ .off-canvas-content { + margin-left: 250px; } + .position-right.reveal-for-large { + right: 0; + z-index: auto; + position: fixed; } + .position-right.reveal-for-large ~ .off-canvas-content { + margin-right: 250px; } } + +.orbit { + position: relative; } + +.orbit-container { + position: relative; + margin: 0; + overflow: hidden; + list-style: none; } + +.orbit-slide { + width: 100%; + max-height: 100%; } + .orbit-slide.no-motionui.is-active { + top: 0; + left: 0; } + +.orbit-figure { + margin: 0; } + +.orbit-image { + margin: 0; + width: 100%; + max-width: 100%; } + +.orbit-caption { + position: absolute; + bottom: 0; + width: 100%; + padding: 1rem; + margin-bottom: 0; + color: #fefefe; + background-color: rgba(10, 10, 10, 0.5); } + +.orbit-previous, .orbit-next { + position: absolute; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); + z-index: 10; + padding: 1rem; + color: #fefefe; } + [data-whatinput='mouse'] .orbit-previous, [data-whatinput='mouse'] .orbit-next { + outline: 0; } + .orbit-previous:hover, .orbit-next:hover, .orbit-previous:active, .orbit-next:active, .orbit-previous:focus, .orbit-next:focus { + background-color: rgba(10, 10, 10, 0.5); } + +.orbit-previous { + left: 0; } + +.orbit-next { + left: auto; + right: 0; } + +.orbit-bullets { + position: relative; + margin-top: 0.8rem; + margin-bottom: 0.8rem; + text-align: center; } + [data-whatinput='mouse'] .orbit-bullets { + outline: 0; } + .orbit-bullets button { + width: 1.2rem; + height: 1.2rem; + margin: 0.1rem; + background-color: #cacaca; + border-radius: 50%; } + .orbit-bullets button:hover { + background-color: #8a8a8a; } + .orbit-bullets button.is-active { + background-color: #8a8a8a; } + +.pagination { + margin-left: 0; + margin-bottom: 1rem; } + .pagination::before, .pagination::after { + content: ' '; + display: table; } + .pagination::after { + clear: both; } + .pagination li { + font-size: 0.875rem; + margin-right: 0.0625rem; + border-radius: 0; + display: none; } + .pagination li:last-child, .pagination li:first-child { + display: inline-block; } + @media screen and (min-width: 40em) { + .pagination li { + display: inline-block; } } + .pagination a, + .pagination button { + color: #0a0a0a; + display: block; + padding: 0.1875rem 0.625rem; + border-radius: 0; } + .pagination a:hover, + .pagination button:hover { + background: #e6e6e6; } + .pagination .current { + padding: 0.1875rem 0.625rem; + background: #2199e8; + color: #fefefe; + cursor: default; } + .pagination .disabled { + padding: 0.1875rem 0.625rem; + color: #cacaca; + cursor: not-allowed; } + .pagination .disabled:hover { + background: transparent; } + .pagination .ellipsis::after { + content: '\2026'; + padding: 0.1875rem 0.625rem; + color: #0a0a0a; } + +.pagination-previous a::before, +.pagination-previous.disabled::before { + content: '\00ab'; + display: inline-block; + margin-right: 0.5rem; } + +.pagination-next a::after, +.pagination-next.disabled::after { + content: '\00bb'; + display: inline-block; + margin-left: 0.5rem; } + +.progress { + background-color: #cacaca; + height: 1rem; + margin-bottom: 1rem; + border-radius: 0; } + .progress.primary .progress-meter { + background-color: #2199e8; } + .progress.secondary .progress-meter { + background-color: #777; } + .progress.success .progress-meter { + background-color: #3adb76; } + .progress.warning .progress-meter { + background-color: #ffae00; } + .progress.alert .progress-meter { + background-color: #ec5840; } + +.progress-meter { + position: relative; + display: block; + width: 0%; + height: 100%; + background-color: #2199e8; } + +.progress-meter-text { + position: absolute; + top: 50%; + left: 50%; + -webkit-transform: translate(-50%, -50%); + -ms-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + position: absolute; + margin: 0; + font-size: 0.75rem; + font-weight: bold; + color: #fefefe; + white-space: nowrap; } + +body.is-reveal-open { + overflow: hidden; } + +html.is-reveal-open, +html.is-reveal-open body { + height: 100%; + overflow: hidden; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +.reveal-overlay { + display: none; + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 1005; + background-color: rgba(10, 10, 10, 0.45); + overflow-y: scroll; } + +.reveal { + display: none; + z-index: 1006; + padding: 1rem; + border: 1px solid #cacaca; + background-color: #fefefe; + border-radius: 0; + position: relative; + top: 100px; + margin-left: auto; + margin-right: auto; + overflow-y: auto; } + [data-whatinput='mouse'] .reveal { + outline: 0; } + @media screen and (min-width: 40em) { + .reveal { + min-height: 0; } } + .reveal .column, .reveal .columns, + .reveal .columns { + min-width: 0; } + .reveal > :last-child { + margin-bottom: 0; } + @media screen and (min-width: 40em) { + .reveal { + width: 600px; + max-width: 75rem; } } + @media screen and (min-width: 40em) { + .reveal .reveal { + left: auto; + right: auto; + margin: 0 auto; } } + .reveal.collapse { + padding: 0; } + @media screen and (min-width: 40em) { + .reveal.tiny { + width: 30%; + max-width: 75rem; } } + @media screen and (min-width: 40em) { + .reveal.small { + width: 50%; + max-width: 75rem; } } + @media screen and (min-width: 40em) { + .reveal.large { + width: 90%; + max-width: 75rem; } } + .reveal.full { + top: 0; + left: 0; + width: 100%; + height: 100%; + height: 100vh; + min-height: 100vh; + max-width: none; + margin-left: 0; + border: 0; + border-radius: 0; } + @media screen and (max-width: 39.9375em) { + .reveal { + top: 0; + left: 0; + width: 100%; + height: 100%; + height: 100vh; + min-height: 100vh; + max-width: none; + margin-left: 0; + border: 0; + border-radius: 0; } } + .reveal.without-overlay { + position: fixed; } + +.slider { + position: relative; + height: 0.5rem; + margin-top: 1.25rem; + margin-bottom: 2.25rem; + background-color: #e6e6e6; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + -ms-touch-action: none; + touch-action: none; } + +.slider-fill { + position: absolute; + top: 0; + left: 0; + display: inline-block; + max-width: 100%; + height: 0.5rem; + background-color: #cacaca; + transition: all 0.2s ease-in-out; } + .slider-fill.is-dragging { + transition: all 0s linear; } + +.slider-handle { + position: absolute; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); + position: absolute; + left: 0; + z-index: 1; + display: inline-block; + width: 1.4rem; + height: 1.4rem; + background-color: #2199e8; + transition: all 0.2s ease-in-out; + -ms-touch-action: manipulation; + touch-action: manipulation; + border-radius: 0; } + [data-whatinput='mouse'] .slider-handle { + outline: 0; } + .slider-handle:hover { + background-color: #1583cc; } + .slider-handle.is-dragging { + transition: all 0s linear; } + +.slider.disabled, +.slider[disabled] { + opacity: 0.25; + cursor: not-allowed; } + +.slider.vertical { + display: inline-block; + width: 0.5rem; + height: 12.5rem; + margin: 0 1.25rem; + -webkit-transform: scale(1, -1); + -ms-transform: scale(1, -1); + transform: scale(1, -1); } + .slider.vertical .slider-fill { + top: 0; + width: 0.5rem; + max-height: 100%; } + .slider.vertical .slider-handle { + position: absolute; + top: 0; + left: 50%; + width: 1.4rem; + height: 1.4rem; + -webkit-transform: translateX(-50%); + -ms-transform: translateX(-50%); + transform: translateX(-50%); } + +.sticky-container { + position: relative; } + +.sticky { + position: absolute; + z-index: 0; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } + +.sticky.is-stuck { + position: fixed; + z-index: 5; } + .sticky.is-stuck.is-at-top { + top: 0; } + .sticky.is-stuck.is-at-bottom { + bottom: 0; } + +.sticky.is-anchored { + position: absolute; + left: auto; + right: auto; } + .sticky.is-anchored.is-at-bottom { + bottom: 0; } + +.switch { + margin-bottom: 1rem; + outline: 0; + position: relative; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + color: #fefefe; + font-weight: bold; + font-size: 0.875rem; } + +.switch-input { + opacity: 0; + position: absolute; } + +.switch-paddle { + background: #cacaca; + cursor: pointer; + display: block; + position: relative; + width: 4rem; + height: 2rem; + transition: all 0.25s ease-out; + border-radius: 0; + color: inherit; + font-weight: inherit; } + input + .switch-paddle { + margin: 0; } + .switch-paddle::after { + background: #fefefe; + content: ''; + display: block; + position: absolute; + height: 1.5rem; + left: 0.25rem; + top: 0.25rem; + width: 1.5rem; + transition: all 0.25s ease-out; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + border-radius: 0; } + input:checked ~ .switch-paddle { + background: #2199e8; } + input:checked ~ .switch-paddle::after { + left: 2.25rem; } + [data-whatinput='mouse'] input:focus ~ .switch-paddle { + outline: 0; } + +.switch-active, .switch-inactive { + position: absolute; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); } + +.switch-active { + left: 8%; + display: none; } + input:checked + label > .switch-active { + display: block; } + +.switch-inactive { + right: 15%; } + input:checked + label > .switch-inactive { + display: none; } + +.switch.tiny .switch-paddle { + width: 3rem; + height: 1.5rem; + font-size: 0.625rem; } + +.switch.tiny .switch-paddle::after { + width: 1rem; + height: 1rem; } + +.switch.tiny input:checked ~ .switch-paddle::after { + left: 1.75rem; } + +.switch.small .switch-paddle { + width: 3.5rem; + height: 1.75rem; + font-size: 0.75rem; } + +.switch.small .switch-paddle::after { + width: 1.25rem; + height: 1.25rem; } + +.switch.small input:checked ~ .switch-paddle::after { + left: 2rem; } + +.switch.large .switch-paddle { + width: 5rem; + height: 2.5rem; + font-size: 1rem; } + +.switch.large .switch-paddle::after { + width: 2rem; + height: 2rem; } + +.switch.large input:checked ~ .switch-paddle::after { + left: 2.75rem; } + +table { + width: 100%; + margin-bottom: 1rem; + border-radius: 0; } + table thead, + table tbody, + table tfoot { + border: 1px solid #f1f1f1; + background-color: #fefefe; } + table caption { + font-weight: bold; + padding: 0.5rem 0.625rem 0.625rem; } + table thead, + table tfoot { + background: #f8f8f8; + color: #0a0a0a; } + table thead tr, + table tfoot tr { + background: transparent; } + table thead th, + table thead td, + table tfoot th, + table tfoot td { + padding: 0.5rem 0.625rem 0.625rem; + font-weight: bold; + text-align: left; } + table tbody tr:nth-child(even) { + background-color: #f1f1f1; } + table tbody th, + table tbody td { + padding: 0.5rem 0.625rem 0.625rem; } + +@media screen and (max-width: 63.9375em) { + table.stack thead { + display: none; } + table.stack tfoot { + display: none; } + table.stack tr, + table.stack th, + table.stack td { + display: block; } + table.stack td { + border-top: 0; } } + +table.scroll { + display: block; + width: 100%; + overflow-x: auto; } + +table.hover tr:hover { + background-color: #f9f9f9; } + +table.hover tr:nth-of-type(even):hover { + background-color: #ececec; } + +.table-scroll { + overflow-x: auto; } + .table-scroll table { + width: auto; } + +.tabs { + margin: 0; + list-style-type: none; + background: #fefefe; + border: 1px solid #e6e6e6; } + .tabs::before, .tabs::after { + content: ' '; + display: table; } + .tabs::after { + clear: both; } + +.tabs.vertical > li { + width: auto; + float: none; + display: block; } + +.tabs.simple > li > a { + padding: 0; } + .tabs.simple > li > a:hover { + background: transparent; } + +.tabs.primary { + background: #2199e8; } + .tabs.primary > li > a { + color: #fefefe; } + .tabs.primary > li > a:hover, .tabs.primary > li > a:focus { + background: #1893e4; } + +.tabs-title { + float: left; } + .tabs-title > a { + display: block; + padding: 1.25rem 1.5rem; + line-height: 1; + font-size: 0.75rem; } + .tabs-title > a:hover { + background: #fefefe; } + .tabs-title > a:focus, .tabs-title > a[aria-selected='true'] { + background: #e6e6e6; } + +.tabs-content { + background: #fefefe; + transition: all 0.5s ease; + border: 1px solid #e6e6e6; + border-top: 0; } + +.tabs-content.vertical { + border: 1px solid #e6e6e6; + border-left: 0; } + +.tabs-panel { + display: none; + padding: 1rem; } + .tabs-panel.is-active { + display: block; } + +.thumbnail { + border: solid 4px #fefefe; + box-shadow: 0 0 0 1px rgba(10, 10, 10, 0.2); + display: inline-block; + line-height: 0; + max-width: 100%; + transition: box-shadow 200ms ease-out; + border-radius: 0; + margin-bottom: 1rem; } + .thumbnail:hover, .thumbnail:focus { + box-shadow: 0 0 6px 1px rgba(33, 153, 232, 0.5); } + +.title-bar { + background: #0a0a0a; + color: #fefefe; + padding: 0.5rem; } + .title-bar::before, .title-bar::after { + content: ' '; + display: table; } + .title-bar::after { + clear: both; } + .title-bar .menu-icon { + margin-left: 0.25rem; + margin-right: 0.25rem; } + +.title-bar-left { + float: left; } + +.title-bar-right { + float: right; + text-align: right; } + +.title-bar-title { + font-weight: bold; + vertical-align: middle; + display: inline-block; } + +.menu-icon.dark { + position: relative; + display: inline-block; + vertical-align: middle; + cursor: pointer; + width: 20px; + height: 16px; } + .menu-icon.dark::after { + content: ''; + position: absolute; + display: block; + width: 100%; + height: 2px; + background: #0a0a0a; + top: 0; + left: 0; + box-shadow: 0 7px 0 #0a0a0a, 0 14px 0 #0a0a0a; } + .menu-icon.dark:hover::after { + background: #8a8a8a; + box-shadow: 0 7px 0 #8a8a8a, 0 14px 0 #8a8a8a; } + +.has-tip { + border-bottom: dotted 1px #8a8a8a; + font-weight: bold; + position: relative; + display: inline-block; + cursor: help; } + +.tooltip { + background-color: #0a0a0a; + color: #fefefe; + font-size: 80%; + padding: 0.75rem; + position: absolute; + z-index: 10; + top: calc(100% + 0.6495rem); + max-width: 10rem !important; + border-radius: 0; } + .tooltip::before { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 0.75rem; + border-color: transparent transparent #0a0a0a; + border-bottom-style: solid; + border-top-width: 0; + bottom: 100%; + position: absolute; + left: 50%; + -webkit-transform: translateX(-50%); + -ms-transform: translateX(-50%); + transform: translateX(-50%); } + .tooltip.top::before { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 0.75rem; + border-color: #0a0a0a transparent transparent; + border-top-style: solid; + border-bottom-width: 0; + top: 100%; + bottom: auto; } + .tooltip.left::before { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 0.75rem; + border-color: transparent transparent transparent #0a0a0a; + border-left-style: solid; + border-right-width: 0; + bottom: auto; + left: 100%; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); } + .tooltip.right::before { + content: ''; + display: block; + width: 0; + height: 0; + border: inset 0.75rem; + border-color: transparent #0a0a0a transparent transparent; + border-right-style: solid; + border-left-width: 0; + bottom: auto; + left: auto; + right: 100%; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); } + +.top-bar { + padding: 0.5rem; } + .top-bar::before, .top-bar::after { + content: ' '; + display: table; } + .top-bar::after { + clear: both; } + .top-bar, + .top-bar ul { + background-color: #e6e6e6; } + .top-bar input { + max-width: 200px; + margin-right: 1rem; } + .top-bar .input-group-field { + width: 100%; + margin-right: 0; } + .top-bar input.button { + width: auto; } + .top-bar .top-bar-left, + .top-bar .top-bar-right { + width: 100%; } + @media screen and (min-width: 40em) { + .top-bar .top-bar-left, + .top-bar .top-bar-right { + width: auto; } } + @media screen and (max-width: 63.9375em) { + .top-bar.stacked-for-medium .top-bar-left, + .top-bar.stacked-for-medium .top-bar-right { + width: 100%; } } + @media screen and (max-width: 74.9375em) { + .top-bar.stacked-for-large .top-bar-left, + .top-bar.stacked-for-large .top-bar-right { + width: 100%; } } + +.top-bar-title { + float: left; + margin-right: 1rem; } + +.top-bar-left { + float: left; } + +.top-bar-right { + float: right; } + +.hide { + display: none !important; } + +.invisible { + visibility: hidden; } + +@media screen and (max-width: 39.9375em) { + .hide-for-small-only { + display: none !important; } } + +@media screen and (max-width: 0em), screen and (min-width: 40em) { + .show-for-small-only { + display: none !important; } } + +@media screen and (min-width: 40em) { + .hide-for-medium { + display: none !important; } } + +@media screen and (max-width: 39.9375em) { + .show-for-medium { + display: none !important; } } + +@media screen and (min-width: 40em) and (max-width: 63.9375em) { + .hide-for-medium-only { + display: none !important; } } + +@media screen and (max-width: 39.9375em), screen and (min-width: 64em) { + .show-for-medium-only { + display: none !important; } } + +@media screen and (min-width: 64em) { + .hide-for-large { + display: none !important; } } + +@media screen and (max-width: 63.9375em) { + .show-for-large { + display: none !important; } } + +@media screen and (min-width: 64em) and (max-width: 74.9375em) { + .hide-for-large-only { + display: none !important; } } + +@media screen and (max-width: 63.9375em), screen and (min-width: 75em) { + .show-for-large-only { + display: none !important; } } + +.show-for-sr, +.show-on-focus { + position: absolute !important; + width: 1px; + height: 1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); } + +.show-on-focus:active, .show-on-focus:focus { + position: static !important; + height: auto; + width: auto; + overflow: visible; + clip: auto; } + +.show-for-landscape, +.hide-for-portrait { + display: block !important; } + @media screen and (orientation: landscape) { + .show-for-landscape, + .hide-for-portrait { + display: block !important; } } + @media screen and (orientation: portrait) { + .show-for-landscape, + .hide-for-portrait { + display: none !important; } } + +.hide-for-landscape, +.show-for-portrait { + display: none !important; } + @media screen and (orientation: landscape) { + .hide-for-landscape, + .show-for-portrait { + display: none !important; } } + @media screen and (orientation: portrait) { + .hide-for-landscape, + .show-for-portrait { + display: block !important; } } + +.float-left { + float: left !important; } + +.float-right { + float: right !important; } + +.float-center { + display: block; + margin-left: auto; + margin-right: auto; } + +.clearfix::before, .clearfix::after { + content: ' '; + display: table; } + +.clearfix::after { + clear: both; } + +.slide-in-down.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: translateY(-100%); + -ms-transform: translateY(-100%); + transform: translateY(-100%); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; } + +.slide-in-down.mui-enter.mui-enter-active { + -webkit-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); } + +.slide-in-left.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: translateX(-100%); + -ms-transform: translateX(-100%); + transform: translateX(-100%); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; } + +.slide-in-left.mui-enter.mui-enter-active { + -webkit-transform: translateX(0); + -ms-transform: translateX(0); + transform: translateX(0); } + +.slide-in-up.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: translateY(100%); + -ms-transform: translateY(100%); + transform: translateY(100%); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; } + +.slide-in-up.mui-enter.mui-enter-active { + -webkit-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); } + +.slide-in-right.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: translateX(100%); + -ms-transform: translateX(100%); + transform: translateX(100%); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; } + +.slide-in-right.mui-enter.mui-enter-active { + -webkit-transform: translateX(0); + -ms-transform: translateX(0); + transform: translateX(0); } + +.slide-out-down.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; } + +.slide-out-down.mui-leave.mui-leave-active { + -webkit-transform: translateY(100%); + -ms-transform: translateY(100%); + transform: translateY(100%); } + +.slide-out-right.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: translateX(0); + -ms-transform: translateX(0); + transform: translateX(0); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; } + +.slide-out-right.mui-leave.mui-leave-active { + -webkit-transform: translateX(100%); + -ms-transform: translateX(100%); + transform: translateX(100%); } + +.slide-out-up.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; } + +.slide-out-up.mui-leave.mui-leave-active { + -webkit-transform: translateY(-100%); + -ms-transform: translateY(-100%); + transform: translateY(-100%); } + +.slide-out-left.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: translateX(0); + -ms-transform: translateX(0); + transform: translateX(0); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; } + +.slide-out-left.mui-leave.mui-leave-active { + -webkit-transform: translateX(-100%); + -ms-transform: translateX(-100%); + transform: translateX(-100%); } + +.fade-in.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + opacity: 0; + transition-property: opacity; } + +.fade-in.mui-enter.mui-enter-active { + opacity: 1; } + +.fade-out.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + opacity: 1; + transition-property: opacity; } + +.fade-out.mui-leave.mui-leave-active { + opacity: 0; } + +.hinge-in-from-top.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotateX(-90deg); + transform: perspective(2000px) rotateX(-90deg); + -webkit-transform-origin: top; + -ms-transform-origin: top; + transform-origin: top; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.hinge-in-from-top.mui-enter.mui-enter-active { + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + opacity: 1; } + +.hinge-in-from-right.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotateY(-90deg); + transform: perspective(2000px) rotateY(-90deg); + -webkit-transform-origin: right; + -ms-transform-origin: right; + transform-origin: right; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.hinge-in-from-right.mui-enter.mui-enter-active { + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + opacity: 1; } + +.hinge-in-from-bottom.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotateX(90deg); + transform: perspective(2000px) rotateX(90deg); + -webkit-transform-origin: bottom; + -ms-transform-origin: bottom; + transform-origin: bottom; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.hinge-in-from-bottom.mui-enter.mui-enter-active { + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + opacity: 1; } + +.hinge-in-from-left.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotateY(90deg); + transform: perspective(2000px) rotateY(90deg); + -webkit-transform-origin: left; + -ms-transform-origin: left; + transform-origin: left; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.hinge-in-from-left.mui-enter.mui-enter-active { + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + opacity: 1; } + +.hinge-in-from-middle-x.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotateX(-90deg); + transform: perspective(2000px) rotateX(-90deg); + -webkit-transform-origin: center; + -ms-transform-origin: center; + transform-origin: center; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.hinge-in-from-middle-x.mui-enter.mui-enter-active { + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + opacity: 1; } + +.hinge-in-from-middle-y.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotateY(-90deg); + transform: perspective(2000px) rotateY(-90deg); + -webkit-transform-origin: center; + -ms-transform-origin: center; + transform-origin: center; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.hinge-in-from-middle-y.mui-enter.mui-enter-active { + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + opacity: 1; } + +.hinge-out-from-top.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + -webkit-transform-origin: top; + -ms-transform-origin: top; + transform-origin: top; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.hinge-out-from-top.mui-leave.mui-leave-active { + -webkit-transform: perspective(2000px) rotateX(-90deg); + transform: perspective(2000px) rotateX(-90deg); + opacity: 0; } + +.hinge-out-from-right.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + -webkit-transform-origin: right; + -ms-transform-origin: right; + transform-origin: right; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.hinge-out-from-right.mui-leave.mui-leave-active { + -webkit-transform: perspective(2000px) rotateY(-90deg); + transform: perspective(2000px) rotateY(-90deg); + opacity: 0; } + +.hinge-out-from-bottom.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + -webkit-transform-origin: bottom; + -ms-transform-origin: bottom; + transform-origin: bottom; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.hinge-out-from-bottom.mui-leave.mui-leave-active { + -webkit-transform: perspective(2000px) rotateX(90deg); + transform: perspective(2000px) rotateX(90deg); + opacity: 0; } + +.hinge-out-from-left.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + -webkit-transform-origin: left; + -ms-transform-origin: left; + transform-origin: left; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.hinge-out-from-left.mui-leave.mui-leave-active { + -webkit-transform: perspective(2000px) rotateY(90deg); + transform: perspective(2000px) rotateY(90deg); + opacity: 0; } + +.hinge-out-from-middle-x.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + -webkit-transform-origin: center; + -ms-transform-origin: center; + transform-origin: center; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.hinge-out-from-middle-x.mui-leave.mui-leave-active { + -webkit-transform: perspective(2000px) rotateX(-90deg); + transform: perspective(2000px) rotateX(-90deg); + opacity: 0; } + +.hinge-out-from-middle-y.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: perspective(2000px) rotate(0deg); + transform: perspective(2000px) rotate(0deg); + -webkit-transform-origin: center; + -ms-transform-origin: center; + transform-origin: center; + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.hinge-out-from-middle-y.mui-leave.mui-leave-active { + -webkit-transform: perspective(2000px) rotateY(-90deg); + transform: perspective(2000px) rotateY(-90deg); + opacity: 0; } + +.scale-in-up.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: scale(0.5); + -ms-transform: scale(0.5); + transform: scale(0.5); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.scale-in-up.mui-enter.mui-enter-active { + -webkit-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); + opacity: 1; } + +.scale-in-down.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: scale(1.5); + -ms-transform: scale(1.5); + transform: scale(1.5); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.scale-in-down.mui-enter.mui-enter-active { + -webkit-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); + opacity: 1; } + +.scale-out-up.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.scale-out-up.mui-leave.mui-leave-active { + -webkit-transform: scale(1.5); + -ms-transform: scale(1.5); + transform: scale(1.5); + opacity: 0; } + +.scale-out-down.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.scale-out-down.mui-leave.mui-leave-active { + -webkit-transform: scale(0.5); + -ms-transform: scale(0.5); + transform: scale(0.5); + opacity: 0; } + +.spin-in.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: rotate(-0.75turn); + -ms-transform: rotate(-0.75turn); + transform: rotate(-0.75turn); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.spin-in.mui-enter.mui-enter-active { + -webkit-transform: rotate(0); + -ms-transform: rotate(0); + transform: rotate(0); + opacity: 1; } + +.spin-out.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: rotate(0); + -ms-transform: rotate(0); + transform: rotate(0); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.spin-out.mui-leave.mui-leave-active { + -webkit-transform: rotate(0.75turn); + -ms-transform: rotate(0.75turn); + transform: rotate(0.75turn); + opacity: 0; } + +.spin-in-ccw.mui-enter { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: rotate(0.75turn); + -ms-transform: rotate(0.75turn); + transform: rotate(0.75turn); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 0; } + +.spin-in-ccw.mui-enter.mui-enter-active { + -webkit-transform: rotate(0); + -ms-transform: rotate(0); + transform: rotate(0); + opacity: 1; } + +.spin-out-ccw.mui-leave { + transition-duration: 500ms; + transition-timing-function: linear; + -webkit-transform: rotate(0); + -ms-transform: rotate(0); + transform: rotate(0); + transition-property: -webkit-transform, opacity; + transition-property: transform, opacity; + opacity: 1; } + +.spin-out-ccw.mui-leave.mui-leave-active { + -webkit-transform: rotate(-0.75turn); + -ms-transform: rotate(-0.75turn); + transform: rotate(-0.75turn); + opacity: 0; } + +.slow { + transition-duration: 750ms !important; } + +.fast { + transition-duration: 250ms !important; } + +.linear { + transition-timing-function: linear !important; } + +.ease { + transition-timing-function: ease !important; } + +.ease-in { + transition-timing-function: ease-in !important; } + +.ease-out { + transition-timing-function: ease-out !important; } + +.ease-in-out { + transition-timing-function: ease-in-out !important; } + +.bounce-in { + transition-timing-function: cubic-bezier(0.485, 0.155, 0.24, 1.245) !important; } + +.bounce-out { + transition-timing-function: cubic-bezier(0.485, 0.155, 0.515, 0.845) !important; } + +.bounce-in-out { + transition-timing-function: cubic-bezier(0.76, -0.245, 0.24, 1.245) !important; } + +.short-delay { + transition-delay: 300ms !important; } + +.long-delay { + transition-delay: 700ms !important; } + +.shake { + -webkit-animation-name: shake-7; + animation-name: shake-7; } + +@-webkit-keyframes shake-7 { + 0%, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90% { + -webkit-transform: translateX(7%); + transform: translateX(7%); } + 5%, 15%, 25%, 35%, 45%, 55%, 65%, 75%, 85%, 95% { + -webkit-transform: translateX(-7%); + transform: translateX(-7%); } } + +@keyframes shake-7 { + 0%, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90% { + -webkit-transform: translateX(7%); + transform: translateX(7%); } + 5%, 15%, 25%, 35%, 45%, 55%, 65%, 75%, 85%, 95% { + -webkit-transform: translateX(-7%); + transform: translateX(-7%); } } + +.spin-cw { + -webkit-animation-name: spin-cw-1turn; + animation-name: spin-cw-1turn; } + +@-webkit-keyframes spin-cw-1turn { + 0% { + -webkit-transform: rotate(-1turn); + transform: rotate(-1turn); } + 100% { + -webkit-transform: rotate(0); + transform: rotate(0); } } + +@keyframes spin-cw-1turn { + 0% { + -webkit-transform: rotate(-1turn); + transform: rotate(-1turn); } + 100% { + -webkit-transform: rotate(0); + transform: rotate(0); } } + +.spin-ccw { + -webkit-animation-name: spin-cw-1turn; + animation-name: spin-cw-1turn; } + +@keyframes spin-cw-1turn { + 0% { + -webkit-transform: rotate(0); + transform: rotate(0); } + 100% { + -webkit-transform: rotate(1turn); + transform: rotate(1turn); } } + +.wiggle { + -webkit-animation-name: wiggle-7deg; + animation-name: wiggle-7deg; } + +@-webkit-keyframes wiggle-7deg { + 40%, 50%, 60% { + -webkit-transform: rotate(7deg); + transform: rotate(7deg); } + 35%, 45%, 55%, 65% { + -webkit-transform: rotate(-7deg); + transform: rotate(-7deg); } + 0%, 30%, 70%, 100% { + -webkit-transform: rotate(0); + transform: rotate(0); } } + +@keyframes wiggle-7deg { + 40%, 50%, 60% { + -webkit-transform: rotate(7deg); + transform: rotate(7deg); } + 35%, 45%, 55%, 65% { + -webkit-transform: rotate(-7deg); + transform: rotate(-7deg); } + 0%, 30%, 70%, 100% { + -webkit-transform: rotate(0); + transform: rotate(0); } } + +.shake, +.spin-cw, +.spin-ccw, +.wiggle { + -webkit-animation-duration: 500ms; + animation-duration: 500ms; } + +.infinite { + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; } + +.slow { + -webkit-animation-duration: 750ms !important; + animation-duration: 750ms !important; } + +.fast { + -webkit-animation-duration: 250ms !important; + animation-duration: 250ms !important; } + +.linear { + -webkit-animation-timing-function: linear !important; + animation-timing-function: linear !important; } + +.ease { + -webkit-animation-timing-function: ease !important; + animation-timing-function: ease !important; } + +.ease-in { + -webkit-animation-timing-function: ease-in !important; + animation-timing-function: ease-in !important; } + +.ease-out { + -webkit-animation-timing-function: ease-out !important; + animation-timing-function: ease-out !important; } + +.ease-in-out { + -webkit-animation-timing-function: ease-in-out !important; + animation-timing-function: ease-in-out !important; } + +.bounce-in { + -webkit-animation-timing-function: cubic-bezier(0.485, 0.155, 0.24, 1.245) !important; + animation-timing-function: cubic-bezier(0.485, 0.155, 0.24, 1.245) !important; } + +.bounce-out { + -webkit-animation-timing-function: cubic-bezier(0.485, 0.155, 0.515, 0.845) !important; + animation-timing-function: cubic-bezier(0.485, 0.155, 0.515, 0.845) !important; } + +.bounce-in-out { + -webkit-animation-timing-function: cubic-bezier(0.76, -0.245, 0.24, 1.245) !important; + animation-timing-function: cubic-bezier(0.76, -0.245, 0.24, 1.245) !important; } + +.short-delay { + -webkit-animation-delay: 300ms !important; + animation-delay: 300ms !important; } + +.long-delay { + -webkit-animation-delay: 700ms !important; + animation-delay: 700ms !important; } diff --git a/app/assets/stylesheets/normalize.css b/app/assets/stylesheets/normalize.css deleted file mode 100644 index 18ddf7fed..000000000 --- a/app/assets/stylesheets/normalize.css +++ /dev/null @@ -1,419 +0,0 @@ -/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */ - -/** - * 1. Change the default font family in all browsers (opinionated). - * 2. Prevent adjustments of font size after orientation changes in IE and iOS. - */ - -html { - font-family: sans-serif; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ -} - -/** - * Remove the margin in all browsers (opinionated). - */ - -body { - margin: 0; -} - -/* HTML5 display definitions - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. - * 2. Add the correct display in IE. - */ - -article, -aside, -details, /* 1 */ -figcaption, -figure, -footer, -header, -main, /* 2 */ -menu, -nav, -section, -summary { /* 1 */ - display: block; -} - -/** - * Add the correct display in IE 9-. - */ - -audio, -canvas, -progress, -video { - display: inline-block; -} - -/** - * Add the correct display in iOS 4-7. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ - -progress { - vertical-align: baseline; -} - -/** - * Add the correct display in IE 10-. - * 1. Add the correct display in IE. - */ - -template, /* 1 */ -[hidden] { - display: none; -} - -/* Links - ========================================================================== */ - -/** - * 1. Remove the gray background on active links in IE 10. - * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. - */ - -a { - background-color: transparent; /* 1 */ - -webkit-text-decoration-skip: objects; /* 2 */ -} - -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ - -a:active, -a:hover { - outline-width: 0; -} - -/* Text-level semantics - ========================================================================== */ - -/** - * 1. Remove the bottom border in Firefox 39-. - * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ - -abbr[title] { - border-bottom: none; /* 1 */ - text-decoration: underline; /* 2 */ - text-decoration: underline dotted; /* 2 */ -} - -/** - * Prevent the duplicate application of `bolder` by the next rule in Safari 6. - */ - -b, -strong { - font-weight: inherit; -} - -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ - -b, -strong { - font-weight: bolder; -} - -/** - * Add the correct font style in Android 4.3-. - */ - -dfn { - font-style: italic; -} - -/** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -/** - * Add the correct background and color in IE 9-. - */ - -mark { - background-color: #ff0; - color: #000; -} - -/** - * Add the correct font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` elements from affecting the line height in - * all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* Embedded content - ========================================================================== */ - -/** - * Remove the border on images inside links in IE 10-. - */ - -img { - border-style: none; -} - -/** - * Hide the overflow in IE. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Grouping content - ========================================================================== */ - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -code, -kbd, -pre, -samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/** - * Add the correct margin in IE 8. - */ - -figure { - margin: 1em 40px; -} - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ -} - -/* Forms - ========================================================================== */ - -/** - * 1. Change font properties to `inherit` in all browsers (opinionated). - * 2. Remove the margin in Firefox and Safari. - */ - -button, -input, -select, -textarea { - font: inherit; /* 1 */ - margin: 0; /* 2 */ -} - -/** - * Restore the font weight unset by the previous rule. - */ - -optgroup { - font-weight: bold; -} - -/** - * Show the overflow in IE. - * 1. Show the overflow in Edge. - */ - -button, -input { /* 1 */ - overflow: visible; -} - -/** - * Remove the inheritance of text transform in Edge, Firefox, and IE. - * 1. Remove the inheritance of text transform in Firefox. - */ - -button, -select { /* 1 */ - text-transform: none; -} - -/** - * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` - * controls in Android 4. - * 2. Correct the inability to style clickable types in iOS and Safari. - */ - -button, -html [type="button"], /* 1 */ -[type="reset"], -[type="submit"] { - -webkit-appearance: button; /* 2 */ -} - -/** - * Remove the inner border and padding in Firefox. - */ - -button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; -} - -/** - * Restore the focus styles unset by the previous rule. - */ - -button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; -} - -/** - * Change the border, margin, and padding in all browsers (opinionated). - */ - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -/** - * 1. Correct the text wrapping in Edge and IE. - * 2. Correct the color inheritance from `fieldset` elements in IE. - * 3. Remove the padding so developers are not caught out when they zero out - * `fieldset` elements in all browsers. - */ - -legend { - box-sizing: border-box; /* 1 */ - color: inherit; /* 2 */ - display: table; /* 1 */ - max-width: 100%; /* 1 */ - padding: 0; /* 3 */ - white-space: normal; /* 1 */ -} - -/** - * Remove the default vertical scrollbar in IE. - */ - -textarea { - overflow: auto; -} - -/** - * 1. Add the correct box sizing in IE 10-. - * 2. Remove the padding in IE 10-. - */ - -[type="checkbox"], -[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Correct the cursor style of increment and decrement buttons in Chrome. - */ - -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Correct the odd appearance in Chrome and Safari. - * 2. Correct the outline style in Safari. - */ - -[type="search"] { - -webkit-appearance: textfield; /* 1 */ - outline-offset: -2px; /* 2 */ -} - -/** - * Remove the inner padding and cancel buttons in Chrome and Safari on OS X. - */ - -[type="search"]::-webkit-search-cancel-button, -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * Correct the text style of placeholders in Chrome, Edge, and Safari. - */ - -::-webkit-input-placeholder { - color: inherit; - opacity: 0.54; -} - -/** - * 1. Correct the inability to style clickable types in iOS and Safari. - * 2. Change font properties to `inherit` in Safari. - */ - -::-webkit-file-upload-button { - -webkit-appearance: button; /* 1 */ - font: inherit; /* 2 */ -} diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss deleted file mode 100644 index 521746256..000000000 --- a/app/assets/stylesheets/people.scss +++ /dev/null @@ -1,3 +0,0 @@ -// 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/style.css b/app/assets/stylesheets/style.css index 862703976..e2b3e4551 100644 --- a/app/assets/stylesheets/style.css +++ b/app/assets/stylesheets/style.css @@ -1,10 +1,6 @@ +@import url('foundation.css'); @import 'https://fonts.googleapis.com/css?family=Amatic+SC|Josefin+Sans'; - -html { -font: normal normal 14px/1 "Josefin Sans"; -/*, Helvetica, Arial, sans-serif;*/ -} /************************************/ /* NAVIGATION BAR AND HEADER SECTION */ /************************************/ @@ -87,11 +83,9 @@ input { color: #FF7CA7; } -a:link { - color: #000000; - text-decoration: none; +a:hover { + color: #4fb1cc; } - /************************************/ /* MAIN BODY SECTION - INDEX.HTML */ /************************************/ @@ -99,6 +93,11 @@ a:link { body { margin-left: .5%; margin-right: .5%; + font-family: 'Josefin Sans'; +} + +h1, h2, h4, h5 { + font-family: 'Josefin Sans'; } h3 { @@ -111,30 +110,35 @@ h3 { .font-style { font-size: 2em; + color: #FF7CA7; } -.font-style a:link { - color: #FF7CA7; +.flash-notice { + color: red; } -.font-style a:hover { - color: #4fb1cc;; +.style-image { + width: 40%; + height: 40%; + border: 7px solid #4fb1cc; } -.flash-notice { - color: red; +.style-index { + padding-top: 10%; } -.style_image { - width: 8%; - height: 8%; - border: 5px solid #4fb1cc; +.font-index { + color: #FF7CA7; } -/************************************/ -/* FOOTER */ -/************************************/ +.first-half { + padding-left: 10%; +} -footer p { - float: left; +.second-half { + padding-top: 5%; +} + +.second-half ul li { + display: block; } diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb deleted file mode 100644 index f4147ea52..000000000 --- a/app/controllers/people_controller.rb +++ /dev/null @@ -1,47 +0,0 @@ -class PeopleController < ApplicationController - - def index - @people = Person.all - - @tasks = Task.where(person_id: params[:person_id]) - @incomplete_tasks = 0 - - end - - def show - @person = Person.find(params[:id]) - - if @person == nil - render :file => 'public/404.html', - :status => :not_found, :layout => false - end - end - - def edit - end - - def create - @person = Person.new - @params = params - @person.name = params[:person][:name] - - @person.save - redirect_to action: "index" - end - - def new - @person = Person.new - end - - def update - end - - def destroy - end - - private - def action - render :layout => 'people' - end - -end diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index d841231c9..a124c6944 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -15,7 +15,7 @@ def create @task = Task.new @task.title = params[:task][:title] @task.description = params[:task][:description] - @task.person_id = params[:person_id].to_i + @task.user_id = params[:user_id].to_i @task.save redirect_to index_path( @task.user_id) @@ -74,14 +74,4 @@ def completion_status redirect_to action: 'index' end - - # used this before creating model - # def self.alltasks - # [ - # {id: 1, title: "Clean Bathroom", description: "wash towels, scour sink, clean bathtub", completion_status: true, completed_at:Time.now}, - # {id: 2, title: "Read", description: "read for 20 minutes", completion_status: false}, - # {id: 3, title: "Exercise", description: "yoga, run for 30 minutes", completion_status: true, completed_at:Time.now} - # ] - # - # end end diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb deleted file mode 100644 index b682fbf12..000000000 --- a/app/helpers/people_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module PeopleHelper -end diff --git a/app/models/person.rb b/app/models/person.rb deleted file mode 100644 index c2e188db2..000000000 --- a/app/models/person.rb +++ /dev/null @@ -1,3 +0,0 @@ -class Person < ActiveRecord::Base - -end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index f435ee430..9d81b3e60 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,20 +1,23 @@ -
      - <% if @user %> -

      Welcome <%= @user.name %>

      - <%= image_tag(@user.avatar, alt:"image of user", :class => "style_image") %> - <% else %> -

      Please login to begin tracking your habits with the Personal Habit Tracker.

      - <% end %> - <% if flash[:notice] %> -

      <%= flash[:notice] %>

      - <% end %> -
      -
      - <% if @user %> -

      Manage Your Tasks

      -
        -
      • <%= link_to "See Current Tasks", index_path(@user.id), controller: 'tasks' %>
        • -
      • <%= "Add a New Task" %>
        • -
      - <% end %> -
      +
      +
      + <% if @user %> +

      Welcome <%= @user.name %>

      + <%= image_tag(@user.avatar, alt:"image of user", :class => "style-image") %> + <% else %> +

      Please login to begin tracking your habits with the Personal Habit Tracker.

      + <% end %> + <% if flash[:notice] %> +

      <%= flash[:notice] %>

      + <% end %> +
      + +
      + <% if @user %> +
        +

      • Manage Your Tasks

        • +

      • <%= link_to "See Current Tasks", index_path(@user.id), controller: 'tasks', class: 'font-index' %>

        • +

      • <%= link_to "Add a New Task", new_path(@user.id), controller: 'tasks', class: 'font-index' %>

        • +
      + <% end %> +
      +
      diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0144ba0b1..d70a4a3c3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,13 +10,12 @@