<%= @dog.name %>
-
<% @dog.images.each do |image| %>
<%= image_tag url_for(image), alt: "Photo of #{@dog.name}" %>
<% end %>
<%= @dog.description %>
- <%= link_to "Edit #{@dog.name}'s Profile", edit_dog_path %>
-
- <%= link_to "Delete #{@dog.name}'s Profile", dog_path, method: :delete, data: { confirm: 'Are you sure?' } %>
+
+ <%= "#{@dog.likes.count} likes" %>
+
+ <% if current_user && current_user.id != @dog.user_id %>
+ <% if !@like %>
+
+ <% end %>
+ <% end %>
+
+
+
+
+ <%= link_to "Edit #{@dog.name}'s Profile", edit_dog_path %>
+
+ <%= link_to "Delete #{@dog.name}'s Profile", dog_path, method: :delete, data: { confirm: 'Are you sure?' } %>
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 06b01adc..36ba9abc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,8 @@
Rails.application.routes.draw do
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
devise_for :users
- resources :dogs
- root to: "dogs#index"
+ resources :dogs do
+ resources :likes, only: %i[create]
+ end
+ root to: 'dogs#index'
end
diff --git a/db/migrate/20201108205017_add_user_to_create_dogs.rb b/db/migrate/20201108205017_add_user_to_create_dogs.rb
new file mode 100644
index 00000000..c080aecb
--- /dev/null
+++ b/db/migrate/20201108205017_add_user_to_create_dogs.rb
@@ -0,0 +1,5 @@
+class AddUserToCreateDogs < ActiveRecord::Migration[5.2]
+ def change
+ add_reference :dogs, :user, foreign_key: true
+ end
+end
diff --git a/db/migrate/20201109223410_create_likes.rb b/db/migrate/20201109223410_create_likes.rb
new file mode 100644
index 00000000..60f6dcea
--- /dev/null
+++ b/db/migrate/20201109223410_create_likes.rb
@@ -0,0 +1,10 @@
+class CreateLikes < ActiveRecord::Migration[5.2]
+ def change
+ create_table :likes do |t|
+ t.references :user, foreign_key: true
+ t.references :dog, foreign_key: true
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 462bd430..f3ba44a3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2018_06_07_114248) do
+ActiveRecord::Schema.define(version: 2020_11_09_223410) do
create_table "active_storage_attachments", force: :cascade do |t|
t.string "name", null: false
@@ -40,6 +40,17 @@
t.text "description"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.integer "user_id"
+ t.index ["user_id"], name: "index_dogs_on_user_id"
+ end
+
+ create_table "likes", force: :cascade do |t|
+ t.integer "user_id"
+ t.integer "dog_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["dog_id"], name: "index_likes_on_dog_id"
+ t.index ["user_id"], name: "index_likes_on_user_id"
end
create_table "users", force: :cascade do |t|
diff --git a/db/seeds.rb b/db/seeds.rb
index d3e6fde3..6ae9fb92 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -17,7 +17,7 @@
},
{
name: 'Jax',
- description: '',
+ description: ''
},
{
name: 'Jiro',
@@ -31,7 +31,7 @@
name: 'Bijou',
description: 'Bijou is the fluffiest of them all'
},
- {
+ {
name: 'Britta',
description: 'Britta has two different colored eyes'
},
@@ -46,16 +46,16 @@
{
name: 'Tonks',
description: 'Tonks loves to run'
- },
+ }
]
dogs.each do |dog|
- dog = Dog.find_or_create_by(name: dog[:name], description: dog[:description])
- directory_name = File.join(Rails.root, 'db', 'seed', "#{dog[:name].downcase}", "*")
+ dog = Dog.find_or_create_by(name: dog[:name], description: dog[:description], user: User.all.sample)
+ directory_name = File.join(Rails.root, 'db', 'seed', dog[:name].downcase.to_s, '*')
Dir.glob(directory_name).each do |filename|
- if !dog.images.any?{|i| i.filename == filename}
- dog.images.attach(io: File.open(filename), filename: filename.split("/").pop)
+ unless dog.images.any? { |i| i.filename == filename }
+ dog.images.attach(io: File.open(filename), filename: filename.split('/').pop)
sleep 1
end
end
diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb
new file mode 100644
index 00000000..6c4e73de
--- /dev/null
+++ b/spec/controllers/likes_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe LikesController, type: :controller do
+
+end
diff --git a/spec/factories/likes.rb b/spec/factories/likes.rb
new file mode 100644
index 00000000..2f6fd75c
--- /dev/null
+++ b/spec/factories/likes.rb
@@ -0,0 +1,7 @@
+FactoryBot.define do
+ factory :like do
+ like_count { "MyString" }
+ user { nil }
+ dog { nil }
+ end
+end
diff --git a/spec/helpers/likes_helper_spec.rb b/spec/helpers/likes_helper_spec.rb
new file mode 100644
index 00000000..bc196878
--- /dev/null
+++ b/spec/helpers/likes_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the LikesHelper. For example:
+#
+# describe LikesHelper do
+# describe "string concat" do
+# it "concats two strings with spaces" do
+# expect(helper.concat_strings("this","that")).to eq("this that")
+# end
+# end
+# end
+RSpec.describe LikesHelper, type: :helper do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb
new file mode 100644
index 00000000..76ea93df
--- /dev/null
+++ b/spec/models/like_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Like, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4e322aeb..22901f46 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,14 +1,13 @@
# This file is copied to spec/ when you run 'rails generate rspec:install'
require 'spec_helper'
ENV['RAILS_ENV'] ||= 'test'
-require File.expand_path('../../config/environment', __FILE__)
+require File.expand_path('../config/environment', __dir__)
# Prevent database truncation if the environment is production
-abort("The Rails environment is running in production mode!") if Rails.env.production?
+abort('The Rails environment is running in production mode!') if Rails.env.production?
require 'rspec/rails'
# Add additional requires below this line. Rails is not loaded until this point!
require 'support/factory_bot'
-
# Requires supporting ruby files with custom matchers and macros, etc, in
# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
# run as spec files by default. This means that files in spec/support that end