diff --git a/Gemfile b/Gemfile
index c1f1ee3e2..34950007a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,11 +17,13 @@ gem 'ffaker'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.1.4'
 # Use sqlite3 as the database for Active Record
-gem 'sqlite3'
+
 # Use Puma as the app server
 gem 'puma', '~> 3.7'
 # Use SCSS for stylesheets
+gem 'bootstrap-sass', '~> 3.3.7'
 gem 'sass-rails', '~> 5.0'
+gem 'jquery-rails'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
@@ -51,6 +53,7 @@ group :development, :test do
   gem 'factory_bot_rails'
   gem 'shoulda-matchers', '~> 3.1'
   gem 'rails-controller-testing'
+  gem 'sqlite3'
 end
 
 group :development do
@@ -64,3 +67,9 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+group :production do
+  gem 'pg', '~> 0.20'
+end
+
+
diff --git a/Gemfile.lock b/Gemfile.lock
index e55e9522f..007b15f85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,11 +41,16 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     arel (8.0.0)
+    autoprefixer-rails (9.0.0)
+      execjs
     bcrypt (3.1.11)
     bcrypt (3.1.11-java)
     bcrypt (3.1.11-x64-mingw32)
     bcrypt (3.1.11-x86-mingw32)
     bindex (0.5.0)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     builder (3.2.3)
     byebug (10.0.0)
     capybara (2.17.0)
@@ -97,6 +102,10 @@ GEM
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
+    jquery-rails (4.3.3)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -124,6 +133,9 @@ GEM
     nokogiri (1.8.1-x86-mingw32)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
+    pg (0.21.0)
+    pg (0.21.0-x64-mingw32)
+    pg (0.21.0-x86-mingw32)
     public_suffix (3.0.1)
     puma (3.11.2)
     puma (3.11.2-java)
@@ -251,6 +263,7 @@ PLATFORMS
   x86-mswin32
 
 DEPENDENCIES
+  bootstrap-sass (~> 3.3.7)
   byebug
   capybara (~> 2.13)
   carrierwave
@@ -259,7 +272,9 @@ DEPENDENCIES
   factory_bot_rails
   ffaker
   jbuilder (~> 2.5)
+  jquery-rails
   listen (>= 3.0.5, < 3.2)
+  pg (~> 0.20)
   puma (~> 3.7)
   rails (~> 5.1.4)
   rails-controller-testing
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 46b20359f..7919e6468 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,4 +12,6 @@
 //
 //= require rails-ujs
 //= require turbolinks
-//= require_tree .
+//= require jquery
+//= require bootstrap-sprockets
+//= require_tree .
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss
similarity index 90%
rename from app/assets/stylesheets/application.css
rename to app/assets/stylesheets/application.scss
index d05ea0f51..ade33e787 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.scss
@@ -10,6 +10,7 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
- *= require_tree .
- *= require_self
  */
+@import "bootstrap-sprockets";
+@import "bootstrap";
+@import "style";
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss
new file mode 100644
index 000000000..f1830ebd5
--- /dev/null
+++ b/app/assets/stylesheets/style.scss
@@ -0,0 +1,65 @@
+.edit_user img {
+  width: 250px;
+  margin: 10px;
+}
+
+.user-avatar{
+  width: 250px;
+  margin: 10px;
+}
+
+.usertweet-avatar{
+  margin: 5px;
+  width: 70px;
+  height: 70px;
+  float: left;
+}
+
+.twpanel{
+  min-height: 80px;
+}
+
+.ppanel{
+  min-height: 160px;
+}
+
+.twuser{
+  color:#666666;
+}
+
+h2{
+  color:#008B8B;
+}
+
+h5{
+  color:#4682B4;
+}
+
+h3{
+  color:#4682B4; 
+}
+
+.movebtn{
+  float: right;
+}
+
+.twnavbar{
+  background-color:#ADD8E6;
+}
+
+
+.twnavbar-ul {
+  font-size: 20px;
+  color: #008B8B;
+  margin-top: 10px;
+}
+
+.twnavbar-ul img {
+  height: 40px;
+  position:relative; top:-5px; left:0px;
+}
+
+.navbar-nav > li > a {
+    padding-top: 10px;
+    padding-bottom: 0px;
+}
\ No newline at end of file
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 4a89583f5..8014fc291 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -1,3 +1,11 @@
 class Admin::BaseController < ApplicationController
-
+  before_action :authenticate_admin
+  #admin才可以進後台
+  private 
+    def authenticate_admin
+      unless current_user.admin?
+        flash[:alert] = "Not allow!"
+        redirect_to root_path
+      end
+    end
 end
diff --git a/app/controllers/admin/tweets_controller.rb b/app/controllers/admin/tweets_controller.rb
index 24a57566c..578e30573 100644
--- a/app/controllers/admin/tweets_controller.rb
+++ b/app/controllers/admin/tweets_controller.rb
@@ -1,7 +1,12 @@
 class Admin::TweetsController < Admin::BaseController
   def index
+    @tweets = Tweet.order(created_at: :desc)
   end
 
   def destroy
+    tweet = Tweet.find(params[:id])
+    tweet.destroy
+    flash[:alert] = "tweets delete!"
+    redirect_to admin_root_path
   end
 end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 3ba9f0a36..d22aa7d89 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,4 +1,5 @@
 class Admin::UsersController < Admin::BaseController
   def index
+    @users = User.order(tweets_count: :desc)
   end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0da627f1a..dde7bbabb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,15 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
-
+  before_action :configure_permitted_parameters, if: :devise_controller?
+  before_action :authenticate_user!
   # 請參考 Devise 文件自訂表單後通過 Strong Parameters 的方法
   # https://github.com/plataformatec/devise#strong-parameters
   # 注意有 sign_up 和 account_update 兩種參數要處理
-end
+
+  protected
+
+    def configure_permitted_parameters
+      devise_parameter_sanitizer.permit(:sign_up, keys: [:name])
+      devise_parameter_sanitizer.permit(:account_update, keys: [:name])
+    end
+end
\ No newline at end of file
diff --git a/app/controllers/followships_controller.rb b/app/controllers/followships_controller.rb
index 05f01b552..d0b2c36a3 100644
--- a/app/controllers/followships_controller.rb
+++ b/app/controllers/followships_controller.rb
@@ -1,7 +1,26 @@
 class FollowshipsController < ApplicationController
   def create
+    @user = User.find(params[:following_id])
+    if @user == current_user
+      flash[:notice] = "Can't follow self!"
+      redirect_to root_path
+    else
+      @followship = current_user.followships.build(following_id: params[:following_id])
+
+      if @followship.save
+        flash[:notice] = "Successfully followed"
+        redirect_back(fallback_location: root_path)
+      else
+        flash[:alert] = @followship.errors.full_messages.to_sentence
+        redirect_back(fallback_location: root_path)
+      end
+    end
   end
 
   def destroy
+    @followship = current_user.followships.where(following_id: params[:id]).first
+    @followship.destroy
+    flash[:alert] = "Followship destroyed"
+    redirect_back(fallback_location: root_path)
   end
 end
diff --git a/app/controllers/replies_controller.rb b/app/controllers/replies_controller.rb
index a9b6a315b..2c8757986 100644
--- a/app/controllers/replies_controller.rb
+++ b/app/controllers/replies_controller.rb
@@ -1,9 +1,34 @@
 class RepliesController < ApplicationController
 
   def index
+    @tweet = Tweet.find(params[:tweet_id])
+    @reply = Reply.new
+    @replies = @tweet.replies
+    @user = @tweet.user
+    @tweets = @user.tweets
+    @followings = @user.followings
+    @followers = @user.followers
+    @likes = @user.likes
   end
 
   def create
+    @tweet = Tweet.find(params[:tweet_id])
+    @reply = @tweet.replies.build(reply_params)
+    @reply.user = current_user
+    if @reply.save
+      flash[:notice] = "回覆成功！"
+      redirect_to tweet_replies_path(@tweet)
+    else
+      @tweet = Tweet.find(params[:tweet_id])     
+      flash[:alert] = "回覆不可空白!!"
+      redirect_to tweet_replies_path(@tweet)
+    end
+  end
+
+  private
+
+  def reply_params
+    params.require(:reply).permit(:comment)
   end
 
 end
diff --git a/app/controllers/tweets_controller.rb b/app/controllers/tweets_controller.rb
index ad14115c1..8fbfb49dc 100644
--- a/app/controllers/tweets_controller.rb
+++ b/app/controllers/tweets_controller.rb
@@ -1,16 +1,45 @@
 class TweetsController < ApplicationController
 
+
   def index
-    @users # 基於測試規格，必須講定變數名稱，請用此變數中存放關注人數 Top 10 的使用者資料
+    @tweets = Tweet.order(created_at: :desc)
+    @tweet = Tweet.new
+    @users = User.order(followers_count: :desc).includes(:followers).limit(10)
+    # 基於測試規格，必須講定變數名稱，請用此變數中存放關注人數 Top 10 的使用者資料
   end
 
   def create
+    @tweet = Tweet.new(tweet_params)
+    @tweet.user = current_user
+    if @tweet.save
+      flash[:notice] = "推播建立！"
+      redirect_to :tweets
+    else
+      flash.now[:alert] = "推播不可空白！"
+      render :index
+    end
+
   end
 
+
   def like
+    @tweet = Tweet.find(params[:id])
+    @tweet.likes.create!(user: current_user)
+    redirect_to tweets_path
   end
 
   def unlike
+    @tweet = Tweet.find(params[:id])
+    like = Like.where(tweet: @tweet, user: current_user)
+    like.destroy_all
+    redirect_to tweets_path
+  end
+
+
+
+  private 
+  def tweet_params
+    params.require(:tweet).permit(:description)
   end
 
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 750e3c6b5..ea958a6fc 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,24 +1,61 @@
 class UsersController < ApplicationController
+  before_action :set_user, only: [:edit, :update, :tweets, :followings, :followers, :likes]
 
   def tweets
+    @tweets = @user.tweets
+    @order_user_tweets = @user.tweets.order(created_at: :desc)
+    @followings = @user.followings
+    @followers = @user.followers
+    @likes = @user.likes
+
   end
 
   def edit
+    unless @user == current_user
+      redirect_to tweets_user_path(@user)
+    end
   end
 
+
   def update
+    @user.update(user_params)
+    redirect_to tweets_user_path(@user)
   end
 
   def followings
-    @followings # 基於測試規格，必須講定變數名稱
+    @followings = @user.followings.order('followships.created_at DESC')
+    # 基於測試規格，必須講定變數名稱
+    @tweets = @user.tweets
+    @followers = @user.followers
+    @likes = @user.likes
   end
 
   def followers
-    @followers # 基於測試規格，必須講定變數名稱
+    @followers = @user.followers.order('followships.created_at DESC')
+    # 基於測試規格，必須講定變數名稱
+    @tweets = @user.tweets
+    @followings = @user.followings
+    @likes = @user.likes
   end
 
   def likes
-    @likes # 基於測試規格，必須講定變數名稱
+    @likes = @user.liked_tweets.order('likes.created_at DESC')
+    # 基於測試規格，必須講定變數名稱
+    @tweets = @user.tweets
+    @followings = @user.followings
+    @followers = @user.followers
   end
 
+
+  private
+
+  def set_user
+    @user = User.find(params[:id])
+  end
+
+  def user_params
+    params.require(:user).permit(:name, :introduction, :avatar)
+  end
+
+
 end
diff --git a/app/models/followship.rb b/app/models/followship.rb
index 1aed01396..10e336a93 100644
--- a/app/models/followship.rb
+++ b/app/models/followship.rb
@@ -1,4 +1,5 @@
 class Followship < ApplicationRecord
   validates :following_id, uniqueness: { scope: :user_id }
-
+  belongs_to :user
+  belongs_to :following, class_name: "User", counter_cache: :followers_count
 end
diff --git a/app/models/like.rb b/app/models/like.rb
index d99b93a32..42d487577 100644
--- a/app/models/like.rb
+++ b/app/models/like.rb
@@ -1,2 +1,4 @@
 class Like < ApplicationRecord
+  belongs_to :user
+  belongs_to :tweet, counter_cache: true
 end
diff --git a/app/models/reply.rb b/app/models/reply.rb
index bae6f9463..c7f16d932 100644
--- a/app/models/reply.rb
+++ b/app/models/reply.rb
@@ -1,2 +1,5 @@
 class Reply < ApplicationRecord
+  validates_presence_of :comment
+  belongs_to :user
+  belongs_to :tweet, counter_cache: true
 end
diff --git a/app/models/tweet.rb b/app/models/tweet.rb
index 6715fada2..a11146bc7 100644
--- a/app/models/tweet.rb
+++ b/app/models/tweet.rb
@@ -1,4 +1,15 @@
 class Tweet < ApplicationRecord
   validates_length_of :description, maximum: 140
+  belongs_to :user, counter_cache: true
+  #tweet只有一個作者
+  
+  has_many :likes, dependent: :destroy
+  has_many :liked_users, through: :likes, source: :user
 
-end
+  has_many :replies, dependent: :destroy
+
+  def is_liked?(user)
+    self.liked_users.include?(user)
+  end
+
+end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
index 6b05b8c21..9a51b8cf1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,9 +6,34 @@ class User < ApplicationRecord
 
   mount_uploader :avatar, AvatarUploader
 
+  validates_presence_of :name
   # 需要 app/views/devise 裡找到樣板，加上 name 屬性
   # 並參考 Devise 文件自訂表單後通過 Strong Parameters 的方法
-  validates_presence_of :name
+  validates_uniqueness_of :name
   # 加上驗證 name 不能重覆 (關鍵字提示: uniqueness)
+  
+  has_many :tweets, dependent: :destroy
+
+  has_many :followships, dependent: :destroy
+  has_many :followings, through: :followships
+
+  has_many :inverse_followships, class_name: "Followship", foreign_key: "following_id"
+  has_many :followers, through: :inverse_followships, source: :user
+
+  has_many :likes, dependent: :destroy
+  has_many :liked_tweets, through: :likes, source: :tweet
+
+  has_many :replies, dependent: :restrict_with_error
+
+
+
+
+  def admin?
+    self.role == "admin"
+  end
+  
+  def following?(user)
+    self.followers.include?(user)
+  end
 
 end
diff --git a/app/views/admin/tweets/index.html.erb b/app/views/admin/tweets/index.html.erb
new file mode 100644
index 000000000..ef0d2f2ef
--- /dev/null
+++ b/app/views/admin/tweets/index.html.erb
@@ -0,0 +1,31 @@
+<div class="container"> 
+  <h1>Tweet後台 <%= link_to 'User List', admin_users_path, class: "btn btn-default" %></h1>
+    <div class="row"> 
+      <div class="col-md-12">
+        <table class="table table-hover table-bordered">
+          <thead>
+            <tr class="active">
+              <th>Name</th>
+              <th>Tweets</th>
+              <th>All Replies</th>            
+              <th>Delete</th>            
+            </tr>
+          </thead>
+          <tbody>
+            <% @tweets.each do |tweet| %>
+              <tr class="warning">
+                <th scope="row"><%= tweet.user.name %></th>
+                  <td><%= tweet.description %></td>
+                  <td><% tweet.replies.each do |reply| %>
+                        [<%= reply.comment %>]<br>
+                      <% end %></td>
+                  <td>
+                    <%= link_to 'Delete', admin_tweet_path(tweet), method: :delete, data: { confirm: "Are you sure?"} %>
+                  </td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>        
+      </div> 
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
new file mode 100644
index 000000000..37e94d0e3
--- /dev/null
+++ b/app/views/admin/users/index.html.erb
@@ -0,0 +1,29 @@
+<div class="container"> 
+  <h1>User List <%= link_to 'Tweet後台', admin_root_path, class: "btn btn-default" %></h1>
+    <div class="row"> 
+      <div class="col-md-12">
+        <table class="table table-hover table-bordered">
+          <thead>
+            <tr class="active">
+              <th>Name</th>
+              <th>推播數量</th>
+              <th>關注人數</th>            
+              <th>跟隨者人數</th>            
+              <th>like 過的推播數</th>            
+            </tr>
+          </thead>
+          <tbody>
+            <% @users.each do |user| %>
+              <tr class="warning">
+                <th scope="row"><%= user.name %></th>
+                  <td><%= user.tweets.count %></td>
+                  <td><%= user.followings.count %></td>
+                  <td><%= user.followers.count %></td>
+                  <td><%= user.liked_tweets.count %></td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>        
+      </div> 
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 10ed32a9e..aea2d3cc9 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -5,7 +5,7 @@
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, autocomplete: "email" %>
   </div>
 
   <% 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..11ce92142 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,13 +1,22 @@
-<h2>Sign up</h2>
+<div class="container col-md-4" >
+
+<h3>註冊</h3>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, autocomplete: "email" %>
   </div>
 
+  <!-- 增加 name 輸入框之後，需要讓 name 屬性通過 Strong Parameter 驗證，在 Devise 文件裡有說明：https://github.com/plataformatec/devise#strong-parameters -->
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name, autofocus: true %>
+  </div>
+
+
   <div class="field">
     <%= f.label :password %>
     <% if @minimum_password_length %>
@@ -24,6 +33,9 @@
   <div class="actions">
     <%= f.submit "Sign up" %>
   </div>
-<% end %>
 
-<%= render "devise/shared/links" %>
+  <% end %>
+
+  <%= render "devise/shared/links" %>
+
+  </div>
\ No newline at end of file
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 3ebb001d1..7e03e09db 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,4 +1,5 @@
-<h2>Log in</h2>
+<div class="container col-md-4" >
+<h3>登入</h3>
 
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="field">
@@ -24,3 +25,5 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
+
+</div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 952cb7a1b..d19dcf44f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,20 +9,60 @@
   </head>
 
   <body>
-    <% if current_user %>
-      <% if current_user&.admin? %>
-        <li><%= link_to 'Admin Panel', admin_restaurants_path %></li>
-      <% end %>
-      <li><p class="navbar-text">Hi, <%= current_user.email %></p></li>
-      <li><%= link_to('登出', destroy_user_session_path, method: :delete) %></li>
-      <li><%= link_to('修改個人資料', edit_user_path(current_user)) %></li>
-      <li><%= link_to('修改密碼', edit_user_registration_path) %></li>
-    <% else %>
-      <li><%= link_to('註冊', new_user_registration_path) %></li>
-      <li><%= link_to('登入', new_user_session_path) %></li>
+  <nav class="navbar twnavbar">
+    <div class="container-fluid">
+        <!-- Brand and toggle get grouped for better mobile display -->
+          <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+              <span class="sr-only">Toggle navigation</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+            <h2><%= link_to '簡易推特', root_path %></h2>
+          </div>
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+          <ul class="pull-right text-right nav navbar-nav">
+            <% if current_user %>
+              <% if current_user&.admin? %>
+                <li><%= link_to '後台', admin_root_path %></li>
+              <% end %>
+              <li><%= link_to "個人檔案", tweets_user_path(current_user), style: "color:#008B8B" %></li>
+              <li><%= link_to('登出', destroy_user_session_path, method: :delete) %></li>
+            <% else %>
+              <li><%= link_to('註冊', new_user_registration_path) %></li>
+              <li><%= link_to('登入', new_user_session_path) %></li>
+            <% end %>
+
+         </ul>
+      </div>
+    </div>
+  </nav>
+
+  <% if flash[:notice] %>
+      <div class="container">
+        <div class="row">
+          <div class="alert alert-success alert-dismissible" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <%= notice %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+ 
+    <% if flash[:alert] %>
+      <div class="container">
+        <div class="row">
+          <div class="alert alert-warning alert-dismissible" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <%= alert %>
+          </div>
+        </div>
+      </div>
     <% end %>
-    <p class="notice"><%= notice %></p>
-    <p class="alert"><%= alert %></p>
+
     <%= yield %>
+
   </body>
 </html>
diff --git a/app/views/replies/index.html.erb b/app/views/replies/index.html.erb
new file mode 100644
index 000000000..a131dec94
--- /dev/null
+++ b/app/views/replies/index.html.erb
@@ -0,0 +1,37 @@
+ <div class="container">
+  <div class="row">
+
+ <%= render partial: "shared/user_intro" %>
+
+<div class="col-md-8">
+ <h2>Tweets</h2>
+
+ <%= image_tag (@tweet.user.avatar), class: "usertweet-avatar" %>
+     <h5>@<%= link_to @tweet.user.name, tweets_user_path(@user) %>,<%= @tweet.created_at.to_date %>,<%= @tweet.created_at.strftime("%k:%M") %></h5>
+      <%= simple_format @tweet.description, style: "color:#808080" %>
+
+      <%= link_to tweet_replies_path(@tweet) do %>
+      Reply (<%= @tweet.replies_count %>)
+      <% end %>
+
+
+    <h2>Replies</h2>
+      <% @replies.each do |reply| %>
+        <div class="panel panel-default twpanel">
+          <%= image_tag (reply.user.avatar), class: "usertweet-avatar" %>
+          <h5>@<%= link_to reply.user.name, tweets_user_path(@user) %>,<%= reply.created_at.to_date %>,<%= reply.created_at.strftime("%k:%M") %></h5>
+          <%= simple_format reply.comment, style: "color:#808080" %>
+        </div>
+      <% end %>
+
+      <%= form_for [@tweet, @reply] do |f| %>
+            <div class="form-group">
+              <%= f.text_area :comment, class: "form-control", rows: "5" %>
+            </div>
+            <div class="form-group">
+              <%= f.submit "Reply", class: "btn btn-primary movebtn" %>
+            </div>
+          <% end %>
+
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/shared/_user_intro.html.erb b/app/views/shared/_user_intro.html.erb
new file mode 100644
index 000000000..a1c55bdfd
--- /dev/null
+++ b/app/views/shared/_user_intro.html.erb
@@ -0,0 +1,31 @@
+<div class="col-md-4">
+    <div><%= image_tag (@user.avatar), class: "user-avatar" %></div>
+    <h2><%= @user.name %></h2>
+    <%= simple_format @user.introduction, style: "color:#4682B4" %>
+    <h3><%= link_to tweets_user_path(@user), class: "twuser" do %>
+          Tweets <%= @tweets.count %>
+        <% end %></h3>
+    <h3><%= link_to followings_user_path(@user), class: "twuser" do %>
+          Following <%= @followings.count %>
+        <% end %></h3>
+    <h3><%= link_to followers_user_path(@user), class: "twuser" do %>
+          Follower <%= @followers.count %>
+        <% end %></h3>
+    <h3><%= link_to likes_user_path(@user), class: "twuser" do %>
+          Like <%= @likes.count %>
+        <% end %></h3>
+
+
+    <% if @user.email == current_user.email %>
+      <%= link_to 'Edit Profile', edit_user_path(@user), class: "btn btn-primary" %>
+    <%else %>
+      <% if @user.following?(current_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 %>
+
+
+
+</div>
\ 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..929f9cbfb
--- /dev/null
+++ b/app/views/tweets/index.html.erb
@@ -0,0 +1,61 @@
+<div class="container">
+  <div class="row">
+    <div class="col-md-8">
+
+      <%=form_for [@user, @tweet] do |f|%>
+        <div class="form-group">
+        <%= f.text_area :description, placeholder: "你想說什麼？", class: "form-control", rows: "10" %>
+        </div>
+        <div class="form-group">
+        <%= f.submit "推吧", class: "btn btn-primary movebtn" %>
+        </div>
+      <% end %>
+
+      <br>
+      <br>
+      <br>
+
+
+      <% @tweets.each do |tweet| %>
+        <div class="panel panel-default twpanel">
+          <%= image_tag (tweet.user.avatar), class: "usertweet-avatar" %>
+          <h5><%= link_to tweet.user.name, tweets_user_path(tweet.user) %>,<%= tweet.created_at.to_date %>,<%= tweet.created_at.strftime("%k:%M") %></h5>
+          <%= simple_format tweet.description, style: "color:#808080" %>
+          <%= link_to tweet_replies_path(tweet) do %>
+          Reply(<%= tweet.replies_count %>)
+          <% end %>
+
+          <% if tweet.is_liked?(current_user) %>
+            <%= link_to unlike_tweet_path(tweet), method: :post, class: "text-danger" do %>
+              Unlike(<%= tweet.likes_count %>)
+            <% end %>
+          <% else %>
+            <%= link_to like_tweet_path(tweet), method: :post, class: "text-danger" do %>
+              Like(<%= tweet.likes_count %>)
+            <% end %>    
+          <% end %>
+        </div>
+
+      <% end %>
+    </div>
+
+    <div class="col-md-4">
+      <h2>熱門玩家</h2>
+        <% @users.each do |user| %>
+          <div class="panel panel-default ppanel">
+            <%= image_tag (user.avatar), class: "usertweet-avatar" %>
+            <h3>@<%= link_to user.name, tweets_user_path(user) %></h3>
+              <%= simple_format user.introduction, style: "color:#808080" %>
+            <% if user != current_user %>
+              <% if user.following?(current_user)%> 
+                <%= link_to 'Unfollow', followship_path(user), method: :delete, class: "btn btn-primary movebtn" %>
+              <% else %>
+                <%= link_to 'Follow', followships_path(following_id: user), method: :post, class: "btn btn-primary movebtn" %>
+              <% end %>
+            <% end %>
+          </div>
+        <% end %>
+    </div>
+
+  </div>
+</div>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
new file mode 100644
index 000000000..e6b4fc3dd
--- /dev/null
+++ b/app/views/users/edit.html.erb
@@ -0,0 +1,31 @@
+<div class="container">
+  <div class="row">
+
+  <%= form_for @user do |f| %>
+    <div class="col-md-4">
+      <div class="form-group">
+        <%= image_tag @user.avatar if @user.avatar? %>
+        <%= f.file_field :avatar%>
+      </div>
+    </div>
+
+    <div class="col-md-8">
+      <div class="form-group">
+        <%= f.label :name %>
+        <%= f.text_field :name,placeholder: "Your name",class: "form-control" %>
+      </div>
+
+      <div class="form-group">
+        <%= f.label :introduction %>
+        <%= f.text_area :introduction,placeholder: "Introduce yourself", class: "form-control", row: "10" %>
+      </div>
+
+      <div class="form-group">
+        <%= f.submit "Update", class: "btn btn-primary" %>
+      </div>
+    </div>
+
+  <% end %>
+
+  </div>
+</div>
diff --git a/app/views/users/followers.html.erb b/app/views/users/followers.html.erb
new file mode 100644
index 000000000..69175e283
--- /dev/null
+++ b/app/views/users/followers.html.erb
@@ -0,0 +1,28 @@
+<div class="container">
+  <div class="row">
+  
+  <%= render partial: "shared/user_intro" %>
+  
+    <div class="col-md-8">
+      <h2>Follower</h2>
+        <% @followers.each do |user| %>
+          <div class="col-md-6">
+            <div class="panel panel-default ppanel">
+              <%= image_tag (user.avatar), class: "usertweet-avatar" %>
+              <h3>@<%= link_to user.name, tweets_user_path(user) %></h3>
+                <%= simple_format user.introduction, style: "color:#808080" %>
+              <% if user != current_user %>
+                <% if user.following?(current_user)%>
+                  <%= link_to 'Unfollow', followship_path(user), method: :delete, class: "btn btn-primary movebtn" %>
+                <% else %>
+                  <%= link_to 'Follow', followships_path(following_id: user), method: :post, class: "btn btn-primary movebtn" %>
+                <% end %>
+              <% end %>    
+            </div>
+          </div>
+        <% end %>
+    </div>
+
+    </div>
+  </div>
+</div>
\ 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..990dd8dd7
--- /dev/null
+++ b/app/views/users/followings.html.erb
@@ -0,0 +1,28 @@
+<div class="container">
+  <div class="row">
+
+  <%= render partial: "shared/user_intro" %>
+
+    <div class="col-md-8">
+      <h2>Following</h2>
+        <% @followings.each do |user| %>
+          <div class="col-md-6">
+            <div class="panel panel-default ppanel">
+              <%= image_tag (user.avatar), class: "usertweet-avatar" %>
+              <h3>@<%= link_to user.name, tweets_user_path(user) %></h3>
+                <%= simple_format user.introduction, style: "color:#808080" %>
+              <% if user != current_user %>
+                <% if user.following?(current_user)%>
+                  <%= link_to 'Unfollow', followship_path(user), method: :delete, class: "btn btn-primary movebtn" %>
+                <% else %>
+                  <%= link_to 'Follow', followships_path(following_id: user), method: :post, class: "btn btn-primary movebtn" %>
+                <% end %>
+              <% end %>  
+            </div>  
+          </div>
+        <% end %>
+    </div>
+
+    </div>
+  </div>
+</div>
\ 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..ce1b94003
--- /dev/null
+++ b/app/views/users/likes.html.erb
@@ -0,0 +1,31 @@
+<div class="container">
+  <div class="row">
+  
+  <%= render partial: "shared/user_intro" %>
+
+  <div class="col-md-8">
+    <h2>Like</h2>
+    <% @likes.each do |tweet| %>
+      <div class="panel panel-default twpanel">
+          <%= image_tag (tweet.user.avatar), class: "usertweet-avatar" %>
+          <h5>@<%= link_to tweet.user.name, tweets_user_path(tweet.user) %>,<%= tweet.created_at.to_date %>,<%= tweet.created_at.strftime("%k:%M") %></h5>
+          <%= simple_format tweet.description, style: "color:#808080" %>
+          <%= link_to tweet_replies_path(tweet) do %>
+            Reply(<%= tweet.replies.count %>)
+          <% end %>
+          <% if tweet.is_liked?(current_user) %>
+            <%= link_to unlike_tweet_path(tweet), method: :post, class: "text-danger" do %>
+              Unlike(<%= tweet.likes_count %>)
+            <% end %>
+          <% else %>
+            <%= link_to like_tweet_path(tweet), method: :post, class: "text-danger" do %>
+              Like(<%= tweet.likes_count %>)
+            <% end %>
+          <% end %>     
+      </div>
+    <% end %>
+  </div>
+
+
+  </div>
+</div>
\ 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..bb87a0668
--- /dev/null
+++ b/app/views/users/tweets.html.erb
@@ -0,0 +1,19 @@
+<div class="container">
+  <div class="row">
+
+  <%= render partial: "shared/user_intro" %>
+
+  <div class="col-md-8">
+    <% @order_user_tweets.each do |tweet| %>
+      <div class="panel panel-default twpanel">
+          <%= image_tag (tweet.user.avatar), class: "usertweet-avatar" %>
+          <h5>@<%= link_to tweet.user.name, tweets_user_path(@user) %>,<%= tweet.created_at.to_date %>,<%= tweet.created_at.strftime("%k:%M") %></h5>
+          <%= simple_format tweet.description, style: "color:#808080" %>     
+      </div>
+    <% end %>
+  </div>
+
+
+
+  </div>
+</div>
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..fffa1aa92 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,31 @@
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   devise_for :users
+  root "tweets#index"
 
-  # 請依照專案指定規格來設定路由
+  resources :users, only: [:edit, :update] do 
+    member do
+      get :tweets
+      get :followings
+      get :followers
+      get :likes
+    end
+  end
+
+  resources :tweets, only: [:index,:create] do
+    resources :replies, only: [:index,:create]
+    member do 
+      post :like
+      post :unlike
+    end
+  end
+
+  resources :followships, only: [:create,:destroy]
+
+  namespace :admin do
+    resources :tweets, only: [:index, :destroy]
+    resources :users, only: [:index]
+    root "tweets#index"
+  end
 
 end
diff --git a/db/migrate/20180127070040_devise_create_users.rb b/db/migrate/20180127070040_devise_create_users.rb
index c1099cb8d..925e61690 100644
--- a/db/migrate/20180127070040_devise_create_users.rb
+++ b/db/migrate/20180127070040_devise_create_users.rb
@@ -31,7 +31,7 @@ def change
       # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
-
+      t.string   :role
 
       t.timestamps null: false
     end
diff --git a/db/migrate/20180730050340_add_tweets_count_to_users.rb b/db/migrate/20180730050340_add_tweets_count_to_users.rb
new file mode 100644
index 000000000..abb23c746
--- /dev/null
+++ b/db/migrate/20180730050340_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..5f73a4bc8 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: 20180730050340) 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..8bc123f17 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)
+User.create(email: "root@example.com", password: "123456", role: "admin",name: "root")
+puts "Default admin created!"