<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 602803cff..74dd4b95f 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -2,7 +2,11 @@
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
-
+
+
<%= f.label :email %>
<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 952cb7a1b..d30fe304a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,18 +9,45 @@
- <% if current_user %>
- <% if current_user&.admin? %>
-
<%= link_to 'Admin Panel', admin_restaurants_path %>
- <% end %>
-
Hi, <%= current_user.email %>
-
<%= link_to('登出', destroy_user_session_path, method: :delete) %>
-
<%= link_to('修改個人資料', edit_user_path(current_user)) %>
-
<%= link_to('修改密碼', edit_user_registration_path) %>
- <% else %>
-
<%= link_to('註冊', new_user_registration_path) %>
-
<%= link_to('登入', new_user_session_path) %>
- <% end %>
+
+
+
+
+
+
+
+
+
+
+ <% if current_user %>
+ <% if current_user&.admin? %>
+ <%= link_to 'Admin Panel', admin_tweets_path %>
+ <% end %>
+
+ <%= image_tag current_user.avatar, width:"40px", class: "img-responsive" %>
+ <%= link_to('登出', destroy_user_session_path, method: :delete) %>
+ <%= link_to('修改個人資料', edit_user_path(current_user)) %>
+ <%= link_to('修改密碼', edit_user_registration_path) %>
+ <% else %>
+ <%= link_to('註冊', new_user_registration_path) %>
+ <%= link_to('登入', new_user_session_path) %>
+ <% end %>
+
+
+
+
+
<%= notice %>
<%= alert %>
<%= yield %>
diff --git a/app/views/replies/index.html.erb b/app/views/replies/index.html.erb
new file mode 100644
index 000000000..fbaa11ccf
--- /dev/null
+++ b/app/views/replies/index.html.erb
@@ -0,0 +1,61 @@
+
+
+
+ <%= image_tag @user.avatar, width: "200px"%>
+
@<%= link_to @user.name, tweets_user_path(@tweet) %>
+
<%= @user.introduction %>
+
+
+ <%= render partial: "shared/count", locals:{user: @user} %>
+ <%= link_to "Edit Profile", edit_user_path(current_user), class: "btn btn-primary" %>
+
+
+
Tweets
+
+
+
@<%= link_to @tweet.user.name, tweets_user_path(@tweet.user) %> ,
<%= @tweet.created_at.strftime("%Y-%m-%d, %H:%M") %>
+
+
<%= simple_format(@tweet.description)%>
+ <%= link_to tweet_replies_path(@tweet) do %>
+ Reply (<%= @tweet.replies.count %>)
+ <% end %>
+
+ <%= render partial: "shared/like", locals:{tweet: @tweet} %>
+
+
+
Replies
+
+ <% @replies.each do |reply| %>
+
+
+
+ <%= image_tag reply.user.avatar, width: "80px"%>
+
+
+
@<%= link_to reply.user.name, tweets_user_path(reply.user) %> , <%= reply.created_at.strftime("%Y-%m-%d, %H:%M") %>
+
<%= reply.comment %>
+
+
+
+
+
+
+ <% end %>
+
+
+
+
+
+
+
+
+
diff --git a/app/views/shared/_count.html.erb b/app/views/shared/_count.html.erb
new file mode 100644
index 000000000..f0008cbe9
--- /dev/null
+++ b/app/views/shared/_count.html.erb
@@ -0,0 +1,4 @@
+
<%= link_to 'Tweets',tweets_user_path(user) %> <%= @user.tweets.count %>
+
<%= link_to 'Following',followings_user_path(user) %> <%= @user.followings.count %>
+
<%= link_to 'Follower', followers_user_path(user) %> <%= @user.followers.count %>
+
<%= link_to 'Like', likes_user_path(user) %> <%= @user.likes.count %>
\ No newline at end of file
diff --git a/app/views/shared/_follow.html.erb b/app/views/shared/_follow.html.erb
new file mode 100644
index 000000000..8f6d4b9ad
--- /dev/null
+++ b/app/views/shared/_follow.html.erb
@@ -0,0 +1,7 @@
+<% if user != current_user %>
+ <% if current_user.following?(user) %>
+ <%= link_to "Unfollow", followship_path(user), method: :delete, class: "btn btn-primary" %>
+ <% else %>
+ <%= link_to "Follow", followships_path(following_id: user), method: :post, class: "btn btn-primary" %>
+ <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/shared/_like.html.erb b/app/views/shared/_like.html.erb
new file mode 100644
index 000000000..da8c1bb05
--- /dev/null
+++ b/app/views/shared/_like.html.erb
@@ -0,0 +1,10 @@
+
+<% if tweet.is_liked?(current_user) %>
+ <%= link_to unlike_tweet_path(tweet),method: :post do %>
+ Unlike(<%= tweet.likes.count %>)
+ <% end %>
+<% else %>
+ <%= link_to like_tweet_path(tweet), method: :post do %>
+ Like (<%= tweet.likes.count %>)
+ <% end %>
+<% end %>
diff --git a/app/views/tweets/index.html.erb b/app/views/tweets/index.html.erb
new file mode 100644
index 000000000..426b344b6
--- /dev/null
+++ b/app/views/tweets/index.html.erb
@@ -0,0 +1,65 @@
+
+
+
+
+
Popular
+ <% @users.each do |user| %>
+
+
+
+ <%= image_tag user.avatar, width: "80px"%>
+
@<%= link_to user.name, tweets_user_path(user) %>
+
<%= user.introduction %>
+
+ <%= render partial: "shared/follow",locals: {user: user} %>
+
+
+
+ <% end %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
new file mode 100644
index 000000000..44ee42450
--- /dev/null
+++ b/app/views/users/edit.html.erb
@@ -0,0 +1,35 @@
+
\ No newline at end of file
diff --git a/app/views/users/followers.html.erb b/app/views/users/followers.html.erb
new file mode 100644
index 000000000..40e68134c
--- /dev/null
+++ b/app/views/users/followers.html.erb
@@ -0,0 +1,51 @@
+
+
+
+ <%= image_tag @user.avatar, width: "80px"%>
+
@<%= link_to @user.name, tweets_user_path(@user) %>
+
<%= @user.introduction %>
+
+
+ <%= render partial: "shared/count", locals:{user: current_user} %>
+ <% if @user.email == current_user.email %>
+ <%= link_to "Edit Profile", edit_user_path(@user), class: "btn btn-primary" %>
+ <% end %>
+ <%= render partial: "shared/follow", locals:{user: @user} %>
+
+
+
+
+
+
+
Follower
+ <% @followers.each do |user| %>
+
+
+
+
+
+
+
+ <%= image_tag user.avatar, width: "120px"%>
+
+
+
+ <%= truncate(user.introduction, length: 80) %>
+
+
+
+
+
+
+
+ <% end %>
+
+
+ <%= paginate @followers %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/users/followings.html.erb b/app/views/users/followings.html.erb
new file mode 100644
index 000000000..a77592eb9
--- /dev/null
+++ b/app/views/users/followings.html.erb
@@ -0,0 +1,55 @@
+
+
+
+ <%= image_tag @user.avatar, width: "80px"%>
+
@<%= link_to @user.name, tweets_user_path(@user) %>
+
<%= @user.introduction %>
+
+
+ <%= render partial: "shared/count", locals:{user: current_user} %>
+ <% if @user.email == current_user.email %>
+ <%= link_to "Edit Profile", edit_user_path(@user), class: "btn btn-primary" %>
+ <% end %>
+ <%= render partial: "shared/follow", locals:{user: @user} %>
+
+
+
+
+
+
+
Following
+ <% @followings.each do |user| %>
+
+
+
+
+
+
+
+ <%= image_tag user.avatar, width: "120px"%>
+
+
+
+ <%= truncate(user.introduction, length: 80) %>
+
+
+
+
+
+
+
+ <% end %>
+
+
+ <%= paginate @followings %>
+
+
+
+
+
+
+
diff --git a/app/views/users/likes.html.erb b/app/views/users/likes.html.erb
new file mode 100644
index 000000000..e56f08f6f
--- /dev/null
+++ b/app/views/users/likes.html.erb
@@ -0,0 +1,43 @@
+
+
+
+ <%= image_tag @user.avatar, width: "80px"%>
+
@<%= link_to @user.name, tweets_user_path(@user) %>
+
<%= @user.introduction %>
+
+
+ <%= render partial: "shared/count", locals:{user: current_user} %>
+ <% if @user.email == current_user.email %>
+ <%= link_to "Edit Profile", edit_user_path(@user), class: "btn btn-primary" %>
+ <% end %>
+ <%= render partial: "shared/follow", locals:{user: @user} %>
+
+
+
+
+
+
+ <% @likes.each do |tweet| %>
+
+
+
+ <%= image_tag tweet.user.avatar, width: "120px" %>
+
+
+
@<%= link_to tweet.user.name, tweets_user_path(tweet.user) %> , <%= tweet.created_at.strftime("%Y-%m_%d, %H:%M") %>
+
<%= tweet.user.introduction %>
+
+
+
+
+
+ <% end %>
+
+
+
+ <%= paginate @likes %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/users/tweets.html.erb b/app/views/users/tweets.html.erb
new file mode 100644
index 000000000..3c1f4d263
--- /dev/null
+++ b/app/views/users/tweets.html.erb
@@ -0,0 +1,37 @@
+
+
+
+ <%= image_tag @user.avatar, width: "80px"%>
+
@<%= link_to @user.name, tweets_user_path(@user) %>
+
<%= @user.introduction %>
+
+
+ <%= render partial: "shared/count", locals: {user: @user} %>
+ <% if @user.email == current_user.email %>
+ <%= link_to "Edit Profile", edit_user_path(@user), class: "btn btn-primary" %>
+ <% end %>
+ <%= render partial: "shared/follow", locals: {user: @user} %>
+
+
+ <% @user.tweets.each do |tweet| %>
+
+
+
+ <%= image_tag tweet.user.avatar,width: "80px" %>
+
+
+
@<%= link_to tweet.user.name, tweets_user_path(tweet.user) %> , <%= tweet.created_at.strftime("%Y-%m-%d, %H:%M") %>
+
<%= tweet.description %>
+
+
+
+
+
+ <% end %>
+
+
+
+
+
+
+
diff --git a/config/database.yml b/config/database.yml
index 0d02f2498..1c8d40f2a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -21,5 +21,5 @@ test:
database: db/test.sqlite3
production:
- <<: *default
- database: db/production.sqlite3
+ adapter: postgresql
+ encoding: Unicode
diff --git a/config/routes.rb b/config/routes.rb
index 90856d4fe..96164f3bd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,5 +3,34 @@
devise_for :users
# 請依照專案指定規格來設定路由
+ root "tweets#index"
+ resources :tweets, only:[:index, :create] do
+ resources :replies, only:[:index, :create]
+ member do
+ post :like
+ post :unlike
+ end
+ end
+ resources :users, only:[:edit, :update] do
+ member do
+ get :tweets
+
+ get :likes
+
+ get :followings
+
+ get :followers
+
+ end
+ end
+
+
+ resources :followships, only:[:create, :destroy]
+
+ namespace :admin do
+ root "tweets#index"
+ resources :tweets, only:[:index, :destroy]
+ resources :users, only:[:index]
+ end
end
diff --git a/db/migrate/20180724112943_add_tweets_count_to_users.rb b/db/migrate/20180724112943_add_tweets_count_to_users.rb
new file mode 100644
index 000000000..abb23c746
--- /dev/null
+++ b/db/migrate/20180724112943_add_tweets_count_to_users.rb
@@ -0,0 +1,5 @@
+class AddTweetsCountToUsers < ActiveRecord::Migration[5.1]
+ def change
+ add_column :users, :tweets_count, :integer, default: 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6a6842c86..c4b636a4f 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: 20180201102838) do
+ActiveRecord::Schema.define(version: 20180724112943) do
create_table "followships", force: :cascade do |t|
t.integer "user_id"
@@ -66,6 +66,7 @@
t.integer "likes_count", default: 0
t.string "role", default: "normal"
t.integer "followers_count", default: 0
+ t.integer "tweets_count", default: 0
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["name"], name: "index_users_on_name", unique: true
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
diff --git a/db/seeds.rb b/db/seeds.rb
index 1beea2acc..6ae598c5f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,6 @@
#
# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
# Character.create(name: 'Luke', movie: movies.first)
+
+User.create(name: "Zion", email: "bone000@gmail.com", password: "zero000", role: "admin")
+puts "Default admin created!"
\ No newline at end of file
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 9b1e87ae4..2484d3d51 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -20,4 +20,20 @@ namespace :dev do
end
end
+ task fake_tweet: :environment do
+ Tweet.destroy_all
+ User.all.each do |user|
+ 5.times do |i|
+ user.tweets.create!(description: FFaker::LoremCN.sentence,
+ user: User.all.sample)
+ end
+ end
+
+ puts "have created fake tweets"
+ puts "now you have #{Tweet.count} tweets data"
+
+
+
+ end
+
end