From 1ae2dea85695281b66893ebe2130ca408919b25f Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 28 Mar 2017 14:44:50 -0700 Subject: [PATCH 01/11] initiated zoo rails app --- .gitignore | 21 +++ Gemfile | 53 ++++++ Gemfile.lock | 174 ++++++++++++++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/javascripts/cable.js | 13 ++ app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.css | 15 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 3 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 34 ++++ bin/spring | 17 ++ bin/update | 29 +++ config.ru | 5 + config/application.rb | 15 ++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 25 +++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 86 +++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 6 + config/initializers/assets.rb | 11 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/new_framework_defaults.rb | 24 +++ config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/puma.rb | 47 +++++ config/routes.rb | 3 + config/secrets.yml | 22 +++ config/spring.rb | 6 + db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 public/404.html | 67 +++++++ public/422.html | 67 +++++++ public/500.html | 66 +++++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 10 + tmp/.keep | 0 vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 74 files changed, 1113 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/new_framework_defaults.rb create mode 100644 config/initializers/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bab620d --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +# 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' + +# Ignore bundler config. +/.bundle + +# Ignore the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..b5fbf94 --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.2' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.2' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..5a256a3 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,174 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + arel (7.1.4) + builder (3.2.3) + byebug (9.0.6) + coffee-rails (4.2.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.2.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + debug_inspector (0.0.2) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + globalid (0.3.7) + activesupport (>= 4.1.0) + i18n (0.8.1) + jbuilder (2.6.3) + activesupport (>= 3.0.0, < 5.2) + multi_json (~> 1.2) + jquery-rails (4.3.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + multi_json (1.12.1) + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + puma (3.8.2) + rack (2.0.1) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + sass (3.4.23) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.13) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.7) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.3) + thread_safe (~> 0.1) + uglifier (3.1.11) + execjs (>= 0.3.0, < 3) + web-console (3.4.0) + actionview (>= 5.0) + activemodel (>= 5.0) + debug_inspector + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + coffee-rails (~> 4.2) + jbuilder (~> 2.5) + jquery-rails + listen (~> 3.0.5) + puma (~> 3.0) + rails (~> 5.0.2) + sass-rails (~> 5.0) + spring + spring-watcher-listen (~> 2.0.0) + sqlite3 + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.14.6 diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..e85f913 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000..b16e53d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000..b12018d --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require jquery_ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000..71ee1e6 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the rails generate channel command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000..0ebd7fe --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000..d672697 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000..0ff5442 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000..1c07694 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000..de6be79 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000..a009ace --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000..286b223 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000..10a4cba --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000..e795ed9 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + RailsZoo + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 0000000..cbd34d2 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 0000000..37f0bdd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000..66e9889 --- /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 0000000..5badb2f --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 0000000..d87d5f5 --- /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 0000000..e620b4d --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 0000000..fb2ec2e --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 0000000..a8e4462 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 0000000..f7ba0b5 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 0000000..43e5fb6 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,15 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module RailsZoo + class Application < Rails::Application + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000..30f5120 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000..0bbde6f --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000..1c1a37c --- /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 0000000..426333b --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 0000000..6f71970 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000..a1ba7ef --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,86 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "rails-zoo_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 0000000..30587ef --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000..51639b6 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000..01ef3e6 --- /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 0000000..59385cd --- /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 0000000..5a6a32d --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000..4a994e1 --- /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 0000000..ac033bf --- /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 0000000..dc18996 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 0000000..671abb6 --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,24 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Enable per-form CSRF tokens. Previous versions had false. +Rails.application.config.action_controller.per_form_csrf_tokens = true + +# Enable origin-checking CSRF mitigation. Previous versions had false. +Rails.application.config.action_controller.forgery_protection_origin_check = true + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 0000000..684837f --- /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: '_rails-zoo_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000..bbfc396 --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 0000000..0653957 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000..c7f311f --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum, this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000..787824f --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 0000000..dd5641d --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: c151112d16f7178717ccebd98c35ffb4965c99c8e66ffacb28e558c14987cce9bb5b78ae17cecca89fb390d0446d6b7aed062d1b4e378de38ed81b572a42e740 + +test: + secret_key_base: 3024c4b244cdb77ddb46cf8b2eedac0be7fdcd963ab5707d91541bd86cf707d2b306f1c839a28578bdf9a5b64c66e8a821a68442268499bf9d2c881c365b1aea + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000..c9119b4 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000..1beea2a --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000..e69de29 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000..e69de29 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000..e69de29 diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000..b612547 --- /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 0000000..a21f82b --- /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 0000000..061abc5 --- /dev/null +++ b/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000..e69de29 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000..e69de29 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..e69de29 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000..3c9c7c0 --- /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 0000000..e69de29 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000..92e39b2 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000..e69de29 diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep new file mode 100644 index 0000000..e69de29 diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep new file mode 100644 index 0000000..e69de29 From d432f004655e8fe1e1bb626d7a14f9a8a9289e9b Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 28 Mar 2017 15:18:29 -0700 Subject: [PATCH 02/11] have generated MVC for animals --- app/assets/javascripts/animals.coffee | 3 ++ app/assets/stylesheets/animals.scss | 3 ++ app/controllers/animals_controller.rb | 33 +++++++++++++++++++++ app/helpers/animals_helper.rb | 2 ++ app/models/animal.rb | 2 ++ app/views/animals/edit.html.erb | 0 app/views/animals/index.html.erb | 2 ++ app/views/animals/new.html.erb | 0 app/views/animals/show.html.erb | 0 config/routes.rb | 10 +++++++ db/migrate/20170328221429_create_animals.rb | 14 +++++++++ db/schema.rb | 25 ++++++++++++++++ test/controllers/animals_controller_test.rb | 9 ++++++ test/fixtures/animals.yml | 17 +++++++++++ test/models/animal_test.rb | 7 +++++ 15 files changed, 127 insertions(+) create mode 100644 app/assets/javascripts/animals.coffee create mode 100644 app/assets/stylesheets/animals.scss create mode 100644 app/controllers/animals_controller.rb create mode 100644 app/helpers/animals_helper.rb create mode 100644 app/models/animal.rb create mode 100644 app/views/animals/edit.html.erb create mode 100644 app/views/animals/index.html.erb create mode 100644 app/views/animals/new.html.erb create mode 100644 app/views/animals/show.html.erb create mode 100644 db/migrate/20170328221429_create_animals.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/animals_controller_test.rb create mode 100644 test/fixtures/animals.yml create mode 100644 test/models/animal_test.rb diff --git a/app/assets/javascripts/animals.coffee b/app/assets/javascripts/animals.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/animals.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/animals.scss b/app/assets/stylesheets/animals.scss new file mode 100644 index 0000000..f820257 --- /dev/null +++ b/app/assets/stylesheets/animals.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the animals 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/animals_controller.rb b/app/controllers/animals_controller.rb new file mode 100644 index 0000000..3b16e28 --- /dev/null +++ b/app/controllers/animals_controller.rb @@ -0,0 +1,33 @@ +class AnimalsController < ApplicationController + def index + @animals = Animal.all + end + + def new + @animal = Animal.new + end + + def create + animal.create(animal_params) + end + + def show + # id = params[:id]to_i + # @animal= Animal.find(id) + @animal = Animal.find(params[:id]) + end + + def edit + @animal = Animal.find(params[:id]) + end + + def update + animal = Animal.find(params[:id]) + animal.update_attributes(animal_params) + animal.save + end + + def destroy + Object.find(params[:id]).destroy + end +end diff --git a/app/helpers/animals_helper.rb b/app/helpers/animals_helper.rb new file mode 100644 index 0000000..84e6721 --- /dev/null +++ b/app/helpers/animals_helper.rb @@ -0,0 +1,2 @@ +module AnimalsHelper +end diff --git a/app/models/animal.rb b/app/models/animal.rb new file mode 100644 index 0000000..f4ff4d9 --- /dev/null +++ b/app/models/animal.rb @@ -0,0 +1,2 @@ +class Animal < ApplicationRecord +end diff --git a/app/views/animals/edit.html.erb b/app/views/animals/edit.html.erb new file mode 100644 index 0000000..e69de29 diff --git a/app/views/animals/index.html.erb b/app/views/animals/index.html.erb new file mode 100644 index 0000000..8321fa3 --- /dev/null +++ b/app/views/animals/index.html.erb @@ -0,0 +1,2 @@ +

Animals#index

+

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

diff --git a/app/views/animals/new.html.erb b/app/views/animals/new.html.erb new file mode 100644 index 0000000..e69de29 diff --git a/app/views/animals/show.html.erb b/app/views/animals/show.html.erb new file mode 100644 index 0000000..e69de29 diff --git a/config/routes.rb b/config/routes.rb index 787824f..3a92b4a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,13 @@ Rails.application.routes.draw do + + get 'animals', to: 'animals#index', as: 'animals' + get 'animals/new', to: 'animals#new', as: 'new_animal' + post 'animals', to: 'animals#create' + + get 'animals/:id', to: 'animals#show', as: 'animal' + get 'animals/:id.edit', to: 'animals#edit', as: 'edit_animal' + patch 'animals/:id', to: 'animals#update' + delete 'animals/:id', to: 'animals#destroy' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20170328221429_create_animals.rb b/db/migrate/20170328221429_create_animals.rb new file mode 100644 index 0000000..d706b1f --- /dev/null +++ b/db/migrate/20170328221429_create_animals.rb @@ -0,0 +1,14 @@ +class CreateAnimals < ActiveRecord::Migration[5.0] + def change + create_table :animals do |t| + t.string :name + t.string :string + t.string :species + t.string :string + t.string :age + t.string :intger + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..0083678 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,25 @@ +# 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: 20170328221429) do + + create_table "animals", force: :cascade do |t| + t.string "name" + t.string "string" + t.string "species" + t.string "age" + t.string "intger" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/animals_controller_test.rb b/test/controllers/animals_controller_test.rb new file mode 100644 index 0000000..2bd3abd --- /dev/null +++ b/test/controllers/animals_controller_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class AnimalsControllerTest < ActionDispatch::IntegrationTest + test "should get index" do + get animals_index_url + assert_response :success + end + +end diff --git a/test/fixtures/animals.yml b/test/fixtures/animals.yml new file mode 100644 index 0000000..0004de2 --- /dev/null +++ b/test/fixtures/animals.yml @@ -0,0 +1,17 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + string: MyString + species: MyString + string: MyString + age: MyString + intger: MyString + +two: + name: MyString + string: MyString + species: MyString + string: MyString + age: MyString + intger: MyString diff --git a/test/models/animal_test.rb b/test/models/animal_test.rb new file mode 100644 index 0000000..d25e750 --- /dev/null +++ b/test/models/animal_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class AnimalTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 13cca1e13e648c35a710a02164aca882802be3ec Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 28 Mar 2017 15:36:33 -0700 Subject: [PATCH 03/11] working on views - so far have index and new pages up and working --- app/controllers/animals_controller.rb | 9 ++++++++- app/views/animals/_form.html.erb | 12 ++++++++++++ app/views/animals/index.html.erb | 23 +++++++++++++++++++++-- app/views/animals/new.html.erb | 6 ++++++ app/views/animals/show.html.erb | 11 +++++++++++ 5 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 app/views/animals/_form.html.erb diff --git a/app/controllers/animals_controller.rb b/app/controllers/animals_controller.rb index 3b16e28..f1d3e17 100644 --- a/app/controllers/animals_controller.rb +++ b/app/controllers/animals_controller.rb @@ -8,7 +8,8 @@ def new end def create - animal.create(animal_params) + Animal.create(animal_params) + redirect_to animals_path end def show @@ -30,4 +31,10 @@ def update def destroy Object.find(params[:id]).destroy end + +private + + def animal_params + return params.require(:animal).permit(:name, :species, :age) + end end diff --git a/app/views/animals/_form.html.erb b/app/views/animals/_form.html.erb new file mode 100644 index 0000000..cd5d896 --- /dev/null +++ b/app/views/animals/_form.html.erb @@ -0,0 +1,12 @@ +<%= form_for @animal do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :species %> + <%= f.text_field :species %> + + <%= f.label :age %> + <%= f.text_field :age %> + + <%= f.submit %> +<% end %> diff --git a/app/views/animals/index.html.erb b/app/views/animals/index.html.erb index 8321fa3..83df2b4 100644 --- a/app/views/animals/index.html.erb +++ b/app/views/animals/index.html.erb @@ -1,2 +1,21 @@ -

Animals#index

-

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

+
+

Cyn's Zoo

+
+ +
+ + + +
+

Welcome

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
+ +
+

Our Animals:

+ <% @animals.each do |animal| %> +

<%= link_to animal[:name].capitalize, animal_path(animal.id) %>

+ <% end %> +
diff --git a/app/views/animals/new.html.erb b/app/views/animals/new.html.erb index e69de29..865d000 100644 --- a/app/views/animals/new.html.erb +++ b/app/views/animals/new.html.erb @@ -0,0 +1,6 @@ +
+

Add a New Animal

+
+
+ <%= render partial: "form", locals: { submit_text: "Add Animal"} %> +
diff --git a/app/views/animals/show.html.erb b/app/views/animals/show.html.erb index e69de29..b7638e5 100644 --- a/app/views/animals/show.html.erb +++ b/app/views/animals/show.html.erb @@ -0,0 +1,11 @@ +
+
+ +
+ +
+ +
+
From 85f0a24ed37392162da5aeed695548d90330e424 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 28 Mar 2017 15:42:07 -0700 Subject: [PATCH 04/11] working on show view - have basics done --- app/views/animals/show.html.erb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/views/animals/show.html.erb b/app/views/animals/show.html.erb index b7638e5..9c8dfb0 100644 --- a/app/views/animals/show.html.erb +++ b/app/views/animals/show.html.erb @@ -1,11 +1,23 @@
+

<%= @animal[:name] %>

- + + +
+

About

+ +
    +
  • Species: <%= @animal[:species] %>
    • +
  • Age: <%= @animal[:age] %>
    • +
+ +
+
From 118e244cb3ff7f7c17bbb94be0fa0d5827516ea8 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 28 Mar 2017 15:55:55 -0700 Subject: [PATCH 05/11] worked on drying up controller code by adding a find_animal helper method --- app/controllers/animals_controller.rb | 16 ++++++++++------ app/views/animals/show.html.erb | 4 +--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/controllers/animals_controller.rb b/app/controllers/animals_controller.rb index f1d3e17..30aa8cd 100644 --- a/app/controllers/animals_controller.rb +++ b/app/controllers/animals_controller.rb @@ -13,23 +13,23 @@ def create end def show - # id = params[:id]to_i - # @animal= Animal.find(id) - @animal = Animal.find(params[:id]) + @animal = find_animal end def edit - @animal = Animal.find(params[:id]) + # show + @animal = find_animal end def update - animal = Animal.find(params[:id]) + animal = find_animal + animal.update_attributes(animal_params) animal.save end def destroy - Object.find(params[:id]).destroy + Animal.find(params[:id]).destroy end private @@ -37,4 +37,8 @@ def destroy def animal_params return params.require(:animal).permit(:name, :species, :age) end + + def find_animal + Animal.find(params[:id]) + end end diff --git a/app/views/animals/show.html.erb b/app/views/animals/show.html.erb index 9c8dfb0..76bdb3d 100644 --- a/app/views/animals/show.html.erb +++ b/app/views/animals/show.html.erb @@ -1,10 +1,8 @@
-

<%= @animal[:name] %>

+

<%= @animal[:name] %>

- -

About

From 6fcf9b8d7dc969590856cde2029f246e908d2075 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 31 Mar 2017 10:23:55 -0700 Subject: [PATCH 06/11] added a delete option to the animals show page --- app/controllers/animals_controller.rb | 1 + app/views/animals/edit.html.erb | 1 + app/views/animals/index.html.erb | 6 ++++-- app/views/animals/show.html.erb | 3 +++ config/routes.rb | 4 ++-- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/animals_controller.rb b/app/controllers/animals_controller.rb index 30aa8cd..7d1d60d 100644 --- a/app/controllers/animals_controller.rb +++ b/app/controllers/animals_controller.rb @@ -30,6 +30,7 @@ def update def destroy Animal.find(params[:id]).destroy + redirect_to animals_path end private diff --git a/app/views/animals/edit.html.erb b/app/views/animals/edit.html.erb index e69de29..814153e 100644 --- a/app/views/animals/edit.html.erb +++ b/app/views/animals/edit.html.erb @@ -0,0 +1 @@ +

edit form

diff --git a/app/views/animals/index.html.erb b/app/views/animals/index.html.erb index 83df2b4..748e7cc 100644 --- a/app/views/animals/index.html.erb +++ b/app/views/animals/index.html.erb @@ -1,11 +1,12 @@
-

Cyn's Zoo

+

Welcome to the Zoo

@@ -19,3 +20,4 @@

<%= link_to animal[:name].capitalize, animal_path(animal.id) %>

<% end %>
+
diff --git a/app/views/animals/show.html.erb b/app/views/animals/show.html.erb index 76bdb3d..2d8ed79 100644 --- a/app/views/animals/show.html.erb +++ b/app/views/animals/show.html.erb @@ -6,6 +6,9 @@

About

+

<%= button_to "Delete Animal", animal_path, :class => "button", :method => :delete %>

+

<%= button_to "Edit Animal", edit_animal_path, :class=> "button", :method=> :get %>

+
  • Species: <%= @animal[:species] %>
  • Age: <%= @animal[:age] %>
    • diff --git a/config/routes.rb b/config/routes.rb index 3a92b4a..dd4d34e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,8 +4,8 @@ get 'animals/new', to: 'animals#new', as: 'new_animal' post 'animals', to: 'animals#create' - get 'animals/:id', to: 'animals#show', as: 'animal' - get 'animals/:id.edit', to: 'animals#edit', as: 'edit_animal' + get 'animals/:id', to: 'animals#show', as: 'animal' + get 'animals/:id/edit', to: 'animals#edit', as: 'edit_animal' patch 'animals/:id', to: 'animals#update' delete 'animals/:id', to: 'animals#destroy' From 062dc8bf7b3d48c8bb2d053e8bd3e73254911a09 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Sat, 1 Apr 2017 17:58:08 -0700 Subject: [PATCH 07/11] worked on styling and layout for the index and show pages --- app/assets/stylesheets/animals.scss | 22 ++++++++++++++++++++++ app/controllers/animals_controller.rb | 4 +++- app/views/animals/edit.html.erb | 7 ++++++- app/views/animals/index.html.erb | 21 +++++++++++---------- app/views/animals/show.html.erb | 24 +++++++++++++----------- 5 files changed, 55 insertions(+), 23 deletions(-) diff --git a/app/assets/stylesheets/animals.scss b/app/assets/stylesheets/animals.scss index f820257..eec66ef 100644 --- a/app/assets/stylesheets/animals.scss +++ b/app/assets/stylesheets/animals.scss @@ -1,3 +1,25 @@ // Place all the styles related to the animals controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +h1 { + text-align: center +} +* { + // border: solid; + +} + +nav { + display: inline-block; + vertical-align: text-top; + width: 15%; + margin-left: 3%; + +} + +div { + display: inline-block; + width: 65%; + vertical-align: text-top; +} diff --git a/app/controllers/animals_controller.rb b/app/controllers/animals_controller.rb index 7d1d60d..a7f1ed0 100644 --- a/app/controllers/animals_controller.rb +++ b/app/controllers/animals_controller.rb @@ -23,9 +23,11 @@ def edit def update animal = find_animal - animal.update_attributes(animal_params) animal.save + + redirect_to animal_path + end def destroy diff --git a/app/views/animals/edit.html.erb b/app/views/animals/edit.html.erb index 814153e..93b75d6 100644 --- a/app/views/animals/edit.html.erb +++ b/app/views/animals/edit.html.erb @@ -1 +1,6 @@ -

    edit form

    +
    +

    Edit Form

    +
    +
    + <%= render partial: "form", locals: { submit_text: "Edit Animal"} %> +
    diff --git a/app/views/animals/index.html.erb b/app/views/animals/index.html.erb index 748e7cc..29a0152 100644 --- a/app/views/animals/index.html.erb +++ b/app/views/animals/index.html.erb @@ -8,16 +8,17 @@

    <%= button_to "Add an Animal", new_animal_path, :class => "button", :method => :get %>

    +
    +
    +

    Welcome

    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    +
    -
    -

    Welcome

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    -
    -
    -

    Our Animals:

    - <% @animals.each do |animal| %> -

    <%= link_to animal[:name].capitalize, animal_path(animal.id) %>

    - <% end %> -
    +

    Our Animals:

    + <% @animals.each do |animal| %> +

    <%= link_to animal[:name].capitalize, animal_path(animal.id) %>

    + <% end %> +
    +
diff --git a/app/views/animals/show.html.erb b/app/views/animals/show.html.erb index 2d8ed79..5abf98d 100644 --- a/app/views/animals/show.html.erb +++ b/app/views/animals/show.html.erb @@ -3,22 +3,24 @@
-
-

About

- + -
    -
  • Species: <%= @animal[:species] %>
    • -
  • Age: <%= @animal[:age] %>
    • -
+
+

About

+
+
    +
  • Species: <%= @animal[:species] %>
    • +
  • Age: <%= @animal[:age] %>
    • +
+
+
-
- +
From f90f3aa444e7de2fd99cc8d256e88318b483296f Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Sat, 1 Apr 2017 18:08:43 -0700 Subject: [PATCH 08/11] edited animals table - had some unwanted columns --- db/migrate/20170402010123_remove_unwanted_columns.rb | 10 ++++++++++ db/schema.rb | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20170402010123_remove_unwanted_columns.rb diff --git a/db/migrate/20170402010123_remove_unwanted_columns.rb b/db/migrate/20170402010123_remove_unwanted_columns.rb new file mode 100644 index 0000000..580d7e5 --- /dev/null +++ b/db/migrate/20170402010123_remove_unwanted_columns.rb @@ -0,0 +1,10 @@ +class RemoveUnwantedColumns < ActiveRecord::Migration[5.0] + + def change + remove_column :animals, :string + remove_column :animals, :intger + remove_column :animals, :age + add_column :animals, :age, :integer + end + +end diff --git a/db/schema.rb b/db/schema.rb index 0083678..1bed3f7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,12 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170328221429) do +ActiveRecord::Schema.define(version: 20170402010123) do create_table "animals", force: :cascade do |t| t.string "name" - t.string "string" t.string "species" - t.string "age" - t.string "intger" + t.integer "age" t.datetime "created_at", null: false t.datetime "updated_at", null: false end From 69d09a4b03c13dbc17c5d61200c65770d3fd8304 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Sat, 1 Apr 2017 18:29:18 -0700 Subject: [PATCH 09/11] Final version ready to submit --- app/assets/stylesheets/animals.scss | 12 ++++++++---- app/views/animals/edit.html.erb | 9 +++++++-- app/views/animals/new.html.erb | 7 ++++++- app/views/animals/show.html.erb | 3 ++- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/animals.scss b/app/assets/stylesheets/animals.scss index eec66ef..c434677 100644 --- a/app/assets/stylesheets/animals.scss +++ b/app/assets/stylesheets/animals.scss @@ -5,10 +5,6 @@ h1 { text-align: center } -* { - // border: solid; - -} nav { display: inline-block; @@ -23,3 +19,11 @@ div { width: 65%; vertical-align: text-top; } + +form { + margin-left: 2%; +} + +footer { + margin: 3% 2% 2% 2%; +} diff --git a/app/views/animals/edit.html.erb b/app/views/animals/edit.html.erb index 93b75d6..b502d07 100644 --- a/app/views/animals/edit.html.erb +++ b/app/views/animals/edit.html.erb @@ -1,6 +1,11 @@
-

Edit Form

+

Edit Form

+
- <%= render partial: "form", locals: { submit_text: "Edit Animal"} %> + <%= render partial: "form", locals: { submit_text: "Edit Animal"} %>
+ +
+

<%= link_to "Home", animals_path %>

+
diff --git a/app/views/animals/new.html.erb b/app/views/animals/new.html.erb index 865d000..ea96f55 100644 --- a/app/views/animals/new.html.erb +++ b/app/views/animals/new.html.erb @@ -1,6 +1,11 @@
-

Add a New Animal

+

Add a New Animal

+
<%= render partial: "form", locals: { submit_text: "Add Animal"} %>
+ +
+

<%= link_to "Home", animals_path %>

+
diff --git a/app/views/animals/show.html.erb b/app/views/animals/show.html.erb index 5abf98d..33a9b28 100644 --- a/app/views/animals/show.html.erb +++ b/app/views/animals/show.html.erb @@ -3,6 +3,7 @@
+
-
From fa8b3105666ab5c583dd0c9dccfff5987e27a4f9 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Sat, 1 Apr 2017 18:39:54 -0700 Subject: [PATCH 10/11] added back links and rooted the home path to index --- app/views/animals/edit.html.erb | 1 + app/views/animals/new.html.erb | 1 + app/views/animals/show.html.erb | 1 + config/routes.rb | 1 + 4 files changed, 4 insertions(+) diff --git a/app/views/animals/edit.html.erb b/app/views/animals/edit.html.erb index b502d07..3a988fe 100644 --- a/app/views/animals/edit.html.erb +++ b/app/views/animals/edit.html.erb @@ -8,4 +8,5 @@

<%= link_to "Home", animals_path %>

+

<%= link_to 'Back', :back %>

diff --git a/app/views/animals/new.html.erb b/app/views/animals/new.html.erb index ea96f55..456becd 100644 --- a/app/views/animals/new.html.erb +++ b/app/views/animals/new.html.erb @@ -8,4 +8,5 @@

<%= link_to "Home", animals_path %>

+

<%= link_to 'Back', :back %>

diff --git a/app/views/animals/show.html.erb b/app/views/animals/show.html.erb index 33a9b28..30dcb4e 100644 --- a/app/views/animals/show.html.erb +++ b/app/views/animals/show.html.erb @@ -8,6 +8,7 @@

<%= button_to "Home", animals_path, :class =>"button", :method => :get %>

<%= button_to "Delete Animal", animal_path, :class => "button", :method => :delete %>

<%= button_to "Edit Animal", edit_animal_path, :class=> "button", :method=> :get %>

+

<%= button_to 'Back', :back, :method=> :get%>

diff --git a/config/routes.rb b/config/routes.rb index dd4d34e..e2436b8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + root to: 'animals#index' get 'animals', to: 'animals#index', as: 'animals' get 'animals/new', to: 'animals#new', as: 'new_animal' From bfc7b72937906432cb099da9c999727738970253 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Mon, 3 Apr 2017 10:18:11 -0700 Subject: [PATCH 11/11] fixed some spacing in views files and animal controller --- app/controllers/animals_controller.rb | 3 --- app/views/animals/index.html.erb | 2 +- app/views/animals/show.html.erb | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/animals_controller.rb b/app/controllers/animals_controller.rb index a7f1ed0..1cfd7a3 100644 --- a/app/controllers/animals_controller.rb +++ b/app/controllers/animals_controller.rb @@ -17,7 +17,6 @@ def show end def edit - # show @animal = find_animal end @@ -25,9 +24,7 @@ def update animal = find_animal animal.update_attributes(animal_params) animal.save - redirect_to animal_path - end def destroy diff --git a/app/views/animals/index.html.erb b/app/views/animals/index.html.erb index 29a0152..d8f443b 100644 --- a/app/views/animals/index.html.erb +++ b/app/views/animals/index.html.erb @@ -8,13 +8,13 @@

<%= button_to "Add an Animal", new_animal_path, :class => "button", :method => :get %>

+

Welcome

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-

Our Animals:

<% @animals.each do |animal| %>

<%= link_to animal[:name].capitalize, animal_path(animal.id) %>

diff --git a/app/views/animals/show.html.erb b/app/views/animals/show.html.erb index 30dcb4e..98fff60 100644 --- a/app/views/animals/show.html.erb +++ b/app/views/animals/show.html.erb @@ -13,7 +13,6 @@

About

-
  • Species: <%= @animal[:species] %>