diff --git a/Gemfile b/Gemfile
index c1f1ee3e2..5c584893e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,10 +16,9 @@ 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'
+gem 'bootstrap-sass', '~> 3.3.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
@@ -40,6 +39,11 @@ gem 'jbuilder', '~> 2.5'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
+gem 'jquery-rails'
+
+group :production do
+ gem 'pg', '~> 0.20'
+end
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
diff --git a/Gemfile.lock b/Gemfile.lock
index 3b212e9b7..820da127a 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.1.3)
+ execjs
bcrypt (3.1.12)
bcrypt (3.1.12-java)
bcrypt (3.1.12-x64-mingw32)
bcrypt (3.1.12-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.2)
capybara (2.18.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.4-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.2)
puma (3.12.0)
puma (3.12.0-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..38d5802a2 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,3 +13,5 @@
//= require rails-ujs
//= require turbolinks
//= require_tree .
+//= require jquery
+//= require bootstrap-sprockets
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..68e7bddea 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'
\ No newline at end of file
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss
new file mode 100644
index 000000000..1cc92d7b7
--- /dev/null
+++ b/app/assets/stylesheets/style.scss
@@ -0,0 +1,50 @@
+
+.form-style{
+border:2px grey solid;
+border-radius: 10px;
+margin: 10px;
+}
+
+.button-tweet{
+ border-radius: 5px;
+ padding: 5px 15px;
+ margin-right: 0px;
+ margin-bottom: 10px;
+}
+
+.tweet-item{
+ margin: 10px;
+ border: 1px solid #ddd;
+ padding: 10px 10px;
+}
+
+
+.tweet-avatar{
+ margin: 0px 0px 0px 0px;
+ width: 50px;
+}
+
+.nav-avatar{
+ padding: 0px 0px;
+ margin: 0px 0px;
+}
+
+.navbar-nav > li > a {
+ padding: 0px 0px;
+}
+
+.user-avatar{
+ margin: 0px 0px 0px 0px;
+ width: 200px
+}
+
+.user-item {
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ padding: 4px;
+ margin-bottom: 20px;
+}
+
+.reply-area {
+ padding: 15px 15px;
+}
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 4a89583f5..f80163781 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -1,3 +1,15 @@
class Admin::BaseController < ApplicationController
+ before_action :authenticate_user!
+ before_action :authenticate_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..d499e9a3d 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.all.order(created_at: :desc)
end
def destroy
+ @tweet = Tweet.find(params[:id])
+ @tweet.destroy
+ redirect_to admin_root_path
+ flash[:alert] = "Tweet has been deleted!"
end
end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 3ba9f0a36..cb8361f84 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(followers_count: :desc)
end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0da627f1a..3ef939bcb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,16 @@
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 兩種參數要處理
+
+ protected
+ # Devise 客製化屬性的使用說明： https://github.com/plataformatec/devise#strong-parameters
+ def configure_permitted_parameters
+ devise_parameter_sanitizer.permit(:sign_up, keys: [:name])
+ devise_parameter_sanitizer.permit(:account_update, keys: [:name])
+ end
+
end
diff --git a/app/controllers/followships_controller.rb b/app/controllers/followships_controller.rb
index 05f01b552..4eb5a89e4 100644
--- a/app/controllers/followships_controller.rb
+++ b/app/controllers/followships_controller.rb
@@ -1,7 +1,22 @@
class FollowshipsController < ApplicationController
def create
+
+ @followship = current_user.followships.build(following_id: params[:following_id])
+ if @followship.user_id != @followship.following_id
+ if @followship.save
+ flash[:notice] = "Successfilly followed"
+ redirect_back(fallback_location: tweets_user_path(params[:following_id]))
+ else
+ flash[:alert] = @followship.errors.full_messages.to_sentence
+ redirect_back(fallback_location: tweets_user_path(params[:following_id]))
+ 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: tweets_user_path(params[:id]))
end
end
diff --git a/app/controllers/replies_controller.rb b/app/controllers/replies_controller.rb
index a9b6a315b..67063f6cf 100644
--- a/app/controllers/replies_controller.rb
+++ b/app/controllers/replies_controller.rb
@@ -1,9 +1,23 @@
class RepliesController < ApplicationController
def index
+ @tweet = Tweet.find(params[:tweet_id])
+ @replies = @tweet.replies
+ @reply = Reply.new
end
def create
+ @tweet = Tweet.find(params[:tweet_id])
+ @reply = @tweet.replies.build(replied_params)
+ @reply.user = current_user
+ @reply.save!
+ redirect_to tweet_replies_path(@tweet)
+ end
+
+ private
+
+ def replied_params
+ params.require(:reply).permit(:comment)
end
end
diff --git a/app/controllers/tweets_controller.rb b/app/controllers/tweets_controller.rb
index ad14115c1..dc5eed54d 100644
--- a/app/controllers/tweets_controller.rb
+++ b/app/controllers/tweets_controller.rb
@@ -1,16 +1,41 @@
class TweetsController < ApplicationController
def index
- @users # 基於測試規格，必須講定變數名稱，請用此變數中存放關注人數 Top 10 的使用者資料
+ @tweets = Tweet.all.order(created_at: :desc)
+ @tweet = Tweet.new
+ @users = User.order(followers_count: :desc).limit(10)# 基於測試規格，必須講定變數名稱，請用此變數中存放關注人數 Top 10 的使用者資料
end
def create
+ @tweet = Tweet.new(tweet_params)
+ @tweet.user = current_user
+ if @tweet.save
+ flash[:notice] = "You Tweet was successfully created"
+ redirect_to tweets_path
+ else
+ flash.now[:alert] = "Your Tweet was failed to create"
+ render :index
+ end
end
def like
+ @tweet = Tweet.find(params[:id])
+ @tweet.likes.create!(user: current_user)
+ redirect_back(fallback_location: tweets_path)
end
def unlike
+ @tweet = Tweet.find(params[:id])
+ like_items = Like.where(tweet: @tweet, user: current_user)
+ like_items.destroy_all
+ redirect_back(fallback_location: 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..ddea264ca 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,24 +1,40 @@
class UsersController < ApplicationController
def tweets
+ @user = User.find(params[:id])
+ @tweets = @user.tweets.order(created_at: :desc)
end
def edit
+ @user = User.find(params[:id])
+ if @user != current_user
+ redirect_to tweets_user_path(@user)
+ end
end
def update
+ @user = User.find(params[:id])
+ @user.update(user_params)
+ redirect_to tweets_user_path(@user)
end
def followings
- @followings # 基於測試規格，必須講定變數名稱
+ @user = User.find(params[:id])
+ @followings = @user.followings.order(created_at: :desc) # 基於測試規格，必須講定變數名稱
end
def followers
- @followers # 基於測試規格，必須講定變數名稱
+ @user = User.find(params[:id])
+ @followers = @user.followers.order(created_at: :desc)# 基於測試規格，必須講定變數名稱
end
def likes
- @likes # 基於測試規格，必須講定變數名稱
+ @user = User.find(params[:id])
+ @likes = @user.liked_tweets.order(created_at: :desc)# 基於測試規格，必須講定變數名稱
+ 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..d21c6439f 100644
--- a/app/models/followship.rb
+++ b/app/models/followship.rb
@@ -1,4 +1,6 @@
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..0d1910145 100644
--- a/app/models/like.rb
+++ b/app/models/like.rb
@@ -1,2 +1,4 @@
class Like < ApplicationRecord
+ belongs_to :user, counter_cache: true
+ belongs_to :tweet, counter_cache: true
end
diff --git a/app/models/reply.rb b/app/models/reply.rb
index bae6f9463..dd3679577 100644
--- a/app/models/reply.rb
+++ b/app/models/reply.rb
@@ -1,2 +1,4 @@
class Reply < ApplicationRecord
+ belongs_to :user
+ belongs_to :tweet, counter_cache: true
end
diff --git a/app/models/tweet.rb b/app/models/tweet.rb
index 6715fada2..92690834d 100644
--- a/app/models/tweet.rb
+++ b/app/models/tweet.rb
@@ -1,4 +1,13 @@
class Tweet < ApplicationRecord
validates_length_of :description, maximum: 140
+ belongs_to :user
+ has_many :replies, dependent: :destroy
+ has_many :replied_users, through: :replies, source: :user
+ has_many :likes, dependent: :destroy
+ has_many :liked_users, through: :likes, source: :user
+
+ def is_like?(user)
+ self.liked_users.include?(user)
+ end
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 6b05b8c21..881b95f53 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,11 +4,32 @@ class User < ApplicationRecord
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable
+ validates_presence_of :name
+ validates_uniqueness_of :name
+ 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 :replies, dependent: :destroy
+ has_many :replied_tweets, through: :replies, source: :tweet
+
+ has_many :likes, dependent: :destroy
+ has_many :liked_tweets, through: :likes, source: :tweet
+
mount_uploader :avatar, AvatarUploader
# 需要 app/views/devise 裡找到樣板，加上 name 屬性
# 並參考 Devise 文件自訂表單後通過 Strong Parameters 的方法
validates_presence_of :name
# 加上驗證 name 不能重覆 (關鍵字提示: uniqueness)
+ def admin?
+ self.role == "admin"
+ end
+ def following?(user)
+ self.followings.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..572a05b2c
--- /dev/null
+++ b/app/views/admin/tweets/index.html.erb
@@ -0,0 +1,25 @@
+
+
+
+ <% @tweets.each do |tweet| %>
+
+
+
+ <% end %>
+
+
+
+
+ <%= f.label :name %>
+ <%= f.text_field :name, autofocus: true %>
+
+
<%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+ <%= f.email_field :email, autocomplete: "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..e1874d569 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -3,9 +3,16 @@
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
+
+
+ <%= f.label :name %>
+ <%= f.text_field :name, autofocus: true %>
+
+
+
<%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+ <%= f.email_field :email, autocomplete: "email" %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 952cb7a1b..e8f093ccf 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,20 +9,74 @@
- <% 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) %>
+
+
+
+ <% if flash[:notice] %>
+
+
+
+
+ <%= notice %>
+
+
+
+ <% end %>
+
+ <% if flash[:alert] %>
+
<% end %>
-
<%= notice %>
-
<%= alert %>
+
<%= yield %>