- <%= t ".the_form_contains" %> <%= pluralize @user.errors.count, t(".error") %>.
+ <%= t ".the_form_contains" %> <%= pluralize object.errors.count, t(".error") %>.
- <% @user.errors.full_messages.each do |message| %>
+ <% object.errors.full_messages.each do |message| %>
- <%= message %>
<% end %>
diff --git a/app/views/shared/_feed.html.erb b/app/views/shared/_feed.html.erb
new file mode 100644
index 0000000..ce61492
--- /dev/null
+++ b/app/views/shared/_feed.html.erb
@@ -0,0 +1,6 @@
+<% if @feed_items.any? %>
+
+ <%= render @feed_items %>
+
+ <%= will_paginate @feed_items %>
+<% end %>
diff --git a/app/views/shared/_micropost_form.html.erb b/app/views/shared/_micropost_form.html.erb
new file mode 100644
index 0000000..e36bf8d
--- /dev/null
+++ b/app/views/shared/_micropost_form.html.erb
@@ -0,0 +1,10 @@
+<%= form_for @micropost do |f| %>
+ <%= render "shared/error_messages", object: f.object %>
+
+ <%= f.text_area :content, placeholder: t(".compose_new_micropost") %>
+
+ <%= f.submit t(".post"), class: "btn btn-primary" %>
+
+ <%= f.file_field :picture, accept: "image/jpeg,image/gif,image/png" %>
+
+<% end %>
diff --git a/app/views/shared/_user_info.html.erb b/app/views/shared/_user_info.html.erb
new file mode 100644
index 0000000..c2bc4eb
--- /dev/null
+++ b/app/views/shared/_user_info.html.erb
@@ -0,0 +1,5 @@
+<%= link_to gravatar_for(current_user, size: Settings.microposts.size_img),
+ current_user %>
+
<%= current_user.name %>
+
<%= link_to t(".view_my_profile"), current_user %>
+
<%= pluralize current_user.microposts.count, t(".micropost") %>
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
index ae45311..a7e1fc4 100644
--- a/app/views/static_pages/home.html.erb
+++ b/app/views/static_pages/home.html.erb
@@ -1,11 +1,28 @@
-
-
<%= t ".welcome" %>
+<% if logged_in? %>
+
+
+
+
<%= t ".micropost_feed" %>
+ <%= render "shared/feed" %>
+
+
+<% else %>
+
+
<%= t ".welcome" %>
-
- <%= t ".this_is_the_home_page" %>
- <%= link_to t(".rubyonrails"), "http://www.railstutorial.org/" %>
- <%= t ".sample_application" %>
-
+
+ <%= t ".this_is_the_home_page" %>
+ <%= link_to t(".rubyonrails"), "http://www.railstutorial.org/" %>
+ <%= t ".sample_application" %>
+
- <%= link_to t(".signup_now"), signup_path, class: "btn btn-lg btn-primary" %>
-
+ <%= link_to t(".signup_now"), signup_path, class: "btn btn-lg btn-primary" %>
+
+<% end %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 0074206..8790121 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -1,5 +1,5 @@
<%= form_for @user do |f| %>
- <%= render "shared/error_messages" %>
+ <%= render "shared/error_messages", object: f.object %>
<%= f.label t(".name") %>
<%= f.text_field :name, class: "form-control" %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 3142684..9301386 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -8,4 +8,15 @@
+
+ <% if @user.microposts.any? %>
+
+ <%= t ".micopost" %>(<%= @user.microposts.size %>)
+
+
+ <%= render @microposts %>
+
+ <%= will_paginate @microposts %>
+ <% end %>
+
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2bd8911..5d8ff99 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -32,6 +32,7 @@ en:
signup_now: "Sign up now!"
this_is_the_home_page: "This is the home page for the"
welcome: "Welcome to the Sample App"
+ micropost_feed: "Micropost feed"
layouts:
_footer:
about: "About"
@@ -78,18 +79,23 @@ en:
password_confirmation: "Password_confirmation"
index:
all_users: "All users"
- user:
- delete: "Delete"
- you_sure: "You sure ?"
destroy:
user_delete: "User deleted"
error: "deleted error"
update:
profile_updated: "Profile updated"
+ show:
+ micropost: "Micropost"
shared:
error_messages:
the_form_contains: "The form contains has"
error: "error"
+ micropost_form:
+ post: "Post"
+ compose_new_micropost: "Compose new micropost"
+ user_info:
+ view_my_profile: "View my profile"
+ micropost: "Micropost"
sessions:
create:
invalid: "Invalid email/password combination"
@@ -135,5 +141,13 @@ en:
update:
password_has_been_reset: "Password has been reset"
this_link: "This link will expire in two hours."
-
-
+ microposts:
+ create:
+ micropost_created!: "Micropost created !"
+ destroy:
+ micropost_deleted: "Micropost deleted"
+ micropost:
+ posted: "Posted"
+ ago: "ago."
+ delete: "delete"
+ you_sure: "You Sure ?"
diff --git a/config/routes.rb b/config/routes.rb
index 2658503..7f3eab4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,4 +10,5 @@
resources :users
resources :account_activations, only: :edit
resources :password_resets
+ resources :microposts, only: [:create, :destroy]
end
diff --git a/config/settings.yml b/config/settings.yml
index d006e86..e889783 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -4,6 +4,9 @@ model:
maximum_email: 255
minimum_password: 6
time: 2
+ microposts:
+ size_post: 140
+ size_bit: 5
view:
users:
size: 50
@@ -12,3 +15,7 @@ helpers:
controller:
user_controller:
size_page: 20
+microposts:
+ size_img: 50
+uploader:
+ size_img : 400
diff --git a/db/migrate/20170704010653_create_microposts.rb b/db/migrate/20170704010653_create_microposts.rb
new file mode 100644
index 0000000..84f428f
--- /dev/null
+++ b/db/migrate/20170704010653_create_microposts.rb
@@ -0,0 +1,11 @@
+class CreateMicroposts < ActiveRecord::Migration[5.1]
+ def change
+ create_table :microposts do |t|
+ t.text :content
+ t.references :user, foreign_key: true
+
+ t.timestamps
+ end
+ add_index :microposts, [:user_id, :created_at]
+ end
+end
diff --git a/db/migrate/20170704012248_add_picture_to_microposts.rb b/db/migrate/20170704012248_add_picture_to_microposts.rb
new file mode 100644
index 0000000..80b551d
--- /dev/null
+++ b/db/migrate/20170704012248_add_picture_to_microposts.rb
@@ -0,0 +1,5 @@
+class AddPictureToMicroposts < ActiveRecord::Migration[5.1]
+ def change
+ add_column :microposts, :picture, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6d1a95a..ffc95c0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,17 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20170630010620) do
+ActiveRecord::Schema.define(version: 20170704012248) do
+
+ create_table "microposts", force: :cascade do |t|
+ t.text "content"
+ t.integer "user_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "picture"
+ t.index ["user_id", "created_at"], name: "index_microposts_on_user_id_and_created_at"
+ t.index ["user_id"], name: "index_microposts_on_user_id"
+ end
create_table "users", force: :cascade do |t|
t.string "name"
diff --git a/db/seeds.rb b/db/seeds.rb
index c991ec3..e97edb9 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -10,3 +10,9 @@
password_confirmation: password, admin: false,
activated: true, activated_at: Time.zone.now
end
+
+users = User.order(:created_at).take 6
+10.times do
+ content = FFaker::Lorem.sentence 5
+ users.each {|user| user.microposts.create! content: content}
+end
diff --git a/public/uploads/micropost/picture/62/Screenshot_from_2017-03-29_10-34-41.png b/public/uploads/micropost/picture/62/Screenshot_from_2017-03-29_10-34-41.png
new file mode 100644
index 0000000..d2e79e6
Binary files /dev/null and b/public/uploads/micropost/picture/62/Screenshot_from_2017-03-29_10-34-41.png differ
diff --git a/public/uploads/micropost/picture/63/Screenshot_from_2017-03-29_10-34-41.png b/public/uploads/micropost/picture/63/Screenshot_from_2017-03-29_10-34-41.png
new file mode 100644
index 0000000..eff2241
Binary files /dev/null and b/public/uploads/micropost/picture/63/Screenshot_from_2017-03-29_10-34-41.png differ