diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 10ed32a9e..63fca694f 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -3,9 +3,14 @@
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
<%= devise_error_messages! %>
+
+ <%= f.label :name %>
+
<%= f.label :email %>
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 602803cff..e26e35509 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -3,9 +3,14 @@
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
+
+ <%= f.label :name %>
+
<%= f.label :email %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 3ebb001d1..a85adcb34 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -3,7 +3,7 @@
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<%= f.label :email %>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index cfe8aa816..3a04b87b0 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -5,7 +5,7 @@
<%= f.label :email %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 952cb7a1b..c3f00ff3b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,4 +1,4 @@
-
+
SimpleTwitter
@@ -9,20 +9,60 @@
- <% 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 %>
-
<%= notice %>
-
<%= alert %>
+
+
+
+ Toggle navigation
+
+ <%= link_to "LOGO", root_path, class: "navbar-brand" %>
+
+
+
+
+
+ <% if current_user %>
+ <% if current_user.admin? %>
+ <%= link_to 'Admin後台', admin_tweets_path %>
+ <% end %>
+ Hi,
+ <%=link_to current_user.name,tweets_user_path(current_user) %>
<%= image_tag current_user.avatar, class:"img-responsive" %>
+ <%= link_to('Profile', edit_user_path(current_user)) %>
+ <%= link_to('Logout', destroy_user_session_path, method: :delete) %>
+
+ <% else %>
+ <%= link_to('註冊', new_user_registration_path) %>
+ <%= link_to('登入', new_user_session_path) %>
+ <% end %>
+
+
+
+
+
+ <% if flash[:notice] %>
+
+
+
+
+ ×
+
+ <%= notice %>
+
+
+
+ <% end %>
+
+ <% if flash[:alert] %>
+
+ <% end %>
+
<%= yield %>
diff --git a/app/views/replies/index.html.erb b/app/views/replies/index.html.erb
new file mode 100644
index 000000000..73f8c7b30
--- /dev/null
+++ b/app/views/replies/index.html.erb
@@ -0,0 +1,39 @@
+
+
+
+ <%= render partial: "shared/user_info", locals: {user: @user} %>
+
+
+
+
+
+
\ 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..6b25621e4
--- /dev/null
+++ b/app/views/shared/_follow.html.erb
@@ -0,0 +1,7 @@
+ <% unless user == current_user %>
+ <% if current_user.following?(user) %>
+ <%= link_to 'Unfollow', followship_path(user), method: :delete, class: "btn btn-info" %>
+ <% 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..e059f5cb5
--- /dev/null
+++ b/app/views/shared/_like.html.erb
@@ -0,0 +1,5 @@
+<% if tweet.is_liked?(current_user) %>
+ <%= link_to 'Unlike', unlike_tweet_path(tweet), method: :post, class: "btn btn-info" %>
+<% else %>
+ <%= link_to 'Like', like_tweet_path(tweet), method: :post, class: "btn btn-primary" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/shared/_tweet_item.html.erb b/app/views/shared/_tweet_item.html.erb
new file mode 100644
index 000000000..fe5d26d67
--- /dev/null
+++ b/app/views/shared/_tweet_item.html.erb
@@ -0,0 +1,21 @@
+
+
+
+
diff --git a/app/views/shared/_user_info.html.erb b/app/views/shared/_user_info.html.erb
new file mode 100644
index 000000000..66f7e0612
--- /dev/null
+++ b/app/views/shared/_user_info.html.erb
@@ -0,0 +1,29 @@
+ <%= image_tag @user.avatar, class:"img-responsive" %>
+
+
<%= @user.name %>
+
<%= simple_format @user.introduction %>
+
+
<%= link_to tweets_user_path(@user) do %>
+ Tweets: <%= @user.tweets.size %>
+ <% end %>
+
+
<%= link_to followings_user_path(@user) do %>
+ Followings: <%= @user.followings.size %>
+ <% end %>
+
+
+
<%= link_to followers_user_path(@user) do %>
+ Follower: <%= @user.followers.size %>
+ <% end %>
+
+
+
<%= link_to likes_user_path(@user) do %>
+ Likes: <%= @user.likes.size %>
+ <% end %>
+
+
+ <% if user == current_user %>
+ <%= link_to 'Edit Profile', edit_user_path(@user), class: "btn btn-primary" %>
+ <% else %>
+ <%= render partial: "shared/follow", locals: {user: user} %>
+ <% end %>
\ No newline at end of file
diff --git a/app/views/shared/_user_item.html.erb b/app/views/shared/_user_item.html.erb
new file mode 100644
index 000000000..ece8b5a6f
--- /dev/null
+++ b/app/views/shared/_user_item.html.erb
@@ -0,0 +1,12 @@
+
+
+ <%= image_tag user.avatar, class: "img-responsive" %>
+
+
+
+
<%=link_to user.name,tweets_user_path(user)%>
+ <%= simple_format user.introduction, length: 200 %>
+ <%= render partial: "shared/follow", locals: {user: user} %>
+
+
+
\ No newline at end of file
diff --git a/app/views/tweets/index.html.erb b/app/views/tweets/index.html.erb
new file mode 100644
index 000000000..c5b7204c1
--- /dev/null
+++ b/app/views/tweets/index.html.erb
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
Popular
+ <%= @users.each do |user| %>
+ <%= render partial: "shared/user_item", locals: {user: user} %>
+ <% end %>
+
+
+
+
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
new file mode 100644
index 000000000..82293a742
--- /dev/null
+++ b/app/views/users/edit.html.erb
@@ -0,0 +1,35 @@
+
+
+
+ <%= form_for @user do |f| %>
+
+
+
+
+ <%= image_tag @user.avatar if @user.avatar? %>
+ <%= f.file_field :avatar %>
+
+
+
+
+
+
+ <%= f.text_field :name,placeholder: "Name", class: "form-control" %>
+
+
+
+ <%= f.text_area :introduction,placeholder: "Type anything about you here....", class: "form-control" %>
+
+
+
+
+ <%= f.submit "Update", class: "btn btn-primary" %>
+
+
+
+ <% end %>
+
+
+
+
+
\ 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..fa3ca454d
--- /dev/null
+++ b/app/views/users/followers.html.erb
@@ -0,0 +1,24 @@
+
+
+
+
+ <%= render partial: "shared/user_info", locals: {user: @user} %>
+
+
+
+
+
Follower
+
+ <% @followers.each do |follower| %>
+
+
+
+
+ <% end %>
+
+
\ 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..76369992e
--- /dev/null
+++ b/app/views/users/followings.html.erb
@@ -0,0 +1,24 @@
+
+
+
+
+ <%= render partial: "shared/user_info", locals: {user: @user} %>
+
+
+
+
+
Followimgs
+
+ <% @followings.each do |following| %>
+
+
+
+
+ <% end %>
+
+
\ No newline at end of file
diff --git a/app/views/users/likes.html.erb b/app/views/users/likes.html.erb
new file mode 100644
index 000000000..73939bc7b
--- /dev/null
+++ b/app/views/users/likes.html.erb
@@ -0,0 +1,21 @@
+
+
+
+
+ <%= render partial: "shared/user_info", locals: {user: @user} %>
+
+
+
+
+
Like
+
+
+
+
+
+
+
\ 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..509b8c6d8
--- /dev/null
+++ b/app/views/users/tweets.html.erb
@@ -0,0 +1,21 @@
+
+
+
+
+ <%= render partial: "shared/user_info", locals: {user: @user} %>
+
+
+
+
+
Tweets
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
index 0d02f2498..816288eaa 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -23,3 +23,5 @@ test:
production:
<<: *default
database: db/production.sqlite3
+ adapter: postgresql
+ encoding: Unicode
diff --git a/config/routes.rb b/config/routes.rb
index 90856d4fe..8eb8c3272 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,4 +4,33 @@
# 請依照專案指定規格來設定路由
+ namespace :admin do
+ resources :tweets, only: [:index, :destroy]
+ resources :users, only: [:index]
+ root "tweets#index"
+ end
+
+ resources :tweets, only: [:index, :create] do
+ resources :replies, only:[:index, :create]
+
+ member do
+ post :like
+ post :unlike
+ end
+ end
+
+ resources :users, only: [:tweet, :edit, :update] do
+
+ member do
+ get :tweets
+ get :likes
+ get :followings
+ get :followers
+ end
+ end
+
+ resources :followships, only: [:create, :destroy]
+
+ root "tweets#index"
+
end
diff --git a/db/seeds.rb b/db/seeds.rb
index 1beea2acc..4ff65e25f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,5 @@
#
# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
# Character.create(name: 'Luke', movie: movies.first)
+
+
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 9b1e87ae4..fda85d4a7 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -1,23 +1,66 @@
namespace :dev do
# 請先執行 rails dev:fake_user，可以產生 20 個資料完整的 User 紀錄
# 其他測試用的假資料請依需要自行撰寫
+
task fake_user: :environment do
User.destroy_all
20.times do |i|
name = FFaker::Name::first_name
file = File.open("#{Rails.root}/public/avatar/user#{i+1}.jpg")
+
user = User.new(
name: name,
email: "#{name}@example.co",
password: "12345678",
introduction: FFaker::Lorem::sentence(30),
avatar: file
- )
+ )
user.save!
- puts user.name
+
+ end
+
+ User.create(name: "Dojo AC", email: "root@example.com", password: "12345678",introduction: FFaker::Lorem::sentence(30), role: "admin",avatar: file)
+ puts "Default admin created!"
+
+
+ puts "now you have #{User.count} users data"
+
+ end
+
+ task fake_tweets: :environment do
+ Tweet.destroy_all()
+ 100.times do |i|
+ Tweet.create!(
+ description: FFaker::Lorem.sentence(5),
+ user: User.all.sample
+ )
end
+ puts "now you have #{Tweet.count} tweets are created"
end
+ task fake_replies: :environment do
+ Reply.destroy_all()
+ 178.times do |i|
+ Reply.create!(
+ comment: FFaker::Lorem.sentence(30),
+ tweet: Tweet.all.sample,
+ user: User.all.sample
+ )
+ end
+ puts "now you have #{Reply.count} rsplies are created"
+ end
+
+ task fake_all: :environment do
+ Rake::Task["db:migrate"].execute
+ Rake::Task["dev:fake_user"].execute
+ Rake::Task["dev:fake_tweets"].execute
+ Rake::Task["dev:fake_replies"].execute
+ end
+
+
+
+
+
end