diff --git a/app/assets/stylesheets/static_pages.scss b/app/assets/stylesheets/static_pages.scss index 5108d80..82bd882 100644 --- a/app/assets/stylesheets/static_pages.scss +++ b/app/assets/stylesheets/static_pages.scss @@ -45,20 +45,35 @@ footer#page-footer { } } -.slide1, .slide2, .slide3 { +.slide1, .slide2, .slide3, slide4, slide5, slide6, slide7, slide8 { min-height: 600px; /* Must have a height or min-height set due to use of background images */ background-size: cover; -moz-background-size: cover; background-position: center center; } .slide1 { - background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/dogs_on_cart.png'); + background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/dogs_in_cart.png'); } .slide2 { - background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/lovers_and_dogs.png'); + background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/jimwin2dogs.png'); } .slide3 { - background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/white_cat.png'); + background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/yogulookup.png'); +} +.slide4 { + background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/paigouside.png'); +} +.slide5 { + background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/tiggerside.png'); +} +.slide6 { + background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/winflo2dogs.png'); +} +.slide7{ + background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/yoguside.png'); +} +.slide8 { + background-image: url('https://s3-us-west-2.amazonaws.com/petshome-ca/background/tiggercloseup.png'); } /* Carousel Overlay */ diff --git a/app/controllers/categories/posts_controller.rb b/app/controllers/categories/posts_controller.rb index 236740e..d1209df 100644 --- a/app/controllers/categories/posts_controller.rb +++ b/app/controllers/categories/posts_controller.rb @@ -12,7 +12,7 @@ def new if current_user.locations.first @post.location = current_user.locations.first else - @post.build_location + @post.locations.build end end @@ -32,12 +32,12 @@ def create def edit @post = Post.find(params[:id]) - if @post.location.blank? + if @post.locations.blank? if current_user.locations.first @post.location = current_user.locations.first else - @post.build_location + @post.locations.build end end end diff --git a/app/models/location.rb b/app/models/location.rb index 432a31a..c6c8c4c 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -1,6 +1,6 @@ class Location < ActiveRecord::Base belongs_to :post - has_one :user, through: :post + belongs_to :user validates :street, format: { with: /\A[a-z0-9\s]+\z/i, allow_blank: true } validates :city, presence: true diff --git a/app/models/post.rb b/app/models/post.rb index b8146dc..774344c 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -3,13 +3,11 @@ class Post < ActiveRecord::Base belongs_to :user belongs_to :category - has_one :location, dependent: :destroy - - accepts_nested_attributes_for :location, - - allow_destroy: true - + has_many :locations, through: :user + accepts_nested_attributes_for :locations, + reject_if: proc { |attributes| attributes['name'].blank? }, + allow_destroy: true default_scope { order('created_at DESC') } diff --git a/app/models/user.rb b/app/models/user.rb index eac46a4..9866d1c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,7 +3,7 @@ class User < ActiveRecord::Base before_save :downcase_email before_create :create_activation_digest has_many :posts, dependent: :destroy - has_many :locations, through: :posts + has_many :locations, dependent: :destroy validates :name, presence: true, length: { maximum: 50 } VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\z/i validates :email, presence: true, length: { maximum: 250 }, diff --git a/app/views/categories/posts/show.html.erb b/app/views/categories/posts/show.html.erb index 1f84164..3c99aca 100644 --- a/app/views/categories/posts/show.html.erb +++ b/app/views/categories/posts/show.html.erb @@ -19,12 +19,12 @@
- <% if @post.location.present? %> + <% if @post.locations.present? %> - <% unless @post.location.street.blank? %> + <% unless @post.locations.street.blank? %>

<%= "#{@post.location.street}, #{@post.location.city}, #{@post.location.zipcode}".html_safe %>

<% end %> <% end %> diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb index d8c9acd..d999724 100644 --- a/app/views/static_pages/home.html.erb +++ b/app/views/static_pages/home.html.erb @@ -13,6 +13,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Welcome to the Pet Home!

diff --git a/db/migrate/20150801064532_create_locations.rb b/db/migrate/20150801064532_create_locations.rb index 049ef7c..61ccc81 100644 --- a/db/migrate/20150801064532_create_locations.rb +++ b/db/migrate/20150801064532_create_locations.rb @@ -4,7 +4,6 @@ def change t.string :street t.string :city t.integer :zipcode - t.references :post, index: true, foreign_key: true t.timestamps null: false end diff --git a/db/migrate/20150920031252_add_user_to_locations.rb b/db/migrate/20150920031252_add_user_to_locations.rb new file mode 100644 index 0000000..bf91005 --- /dev/null +++ b/db/migrate/20150920031252_add_user_to_locations.rb @@ -0,0 +1,6 @@ +class AddUserToLocations < ActiveRecord::Migration + def change + add_column :locations, :user_id, :integer + add_index :locations, :user_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 35f70d1..3c5bd12 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: 20150801064532) do +ActiveRecord::Schema.define(version: 20150920031252) do create_table "categories", force: :cascade do |t| t.string "name" @@ -40,12 +40,12 @@ t.string "street" t.string "city" t.integer "zipcode" - t.integer "post_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "user_id" end - add_index "locations", ["post_id"], name: "index_locations_on_post_id" + add_index "locations", ["user_id"], name: "index_locations_on_user_id" create_table "posts", force: :cascade do |t| t.string "title" 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/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