Merge pull request #85 from we-have-TTA/fix#84

Fix #84

Author: noracami

app/controllers/application_controller.rb

@@ -1,16 +1,4 @@
 # frozen_string_literal: true
 
 class ApplicationController < ActionController::Base
-  before_action :configure_permitted_parameters, if: :devise_controller?
-
-  def after_sign_in_path_for(_resource)
-    rooms_path
-  end
-
-  private
-
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_up, keys: [:username])
-    devise_parameter_sanitizer.permit(:account_update, keys: [:username])
-  end
 end

app/controllers/questions_controller.rb

@@ -4,8 +4,8 @@ class QuestionsController < ApplicationController
   layout 'dashboard'
   before_action :find_question, only: %i[show edit update destroy]
   def index
-    keyword = params[:keyword]
-    @questions = Question.where('title like ?', "%#{keyword}%")
+    @questions = Question.where(team: current_user.team)
+    @questions = Question.where('title like ?', "%#{params[:keyword]}%") if params[:keyword]
   end
 
   def new

app/controllers/users/registrations_controller.rb

@@ -2,8 +2,8 @@
 
 module Users
   class RegistrationsController < Devise::RegistrationsController
-    # before_action :configure_sign_up_params, only: [:create]
-    # before_action :configure_account_update_params, only: [:update]
+    before_action :configure_sign_up_params, only: [:create]
+    before_action :configure_account_update_params, only: [:update]
     # GET /resource/sign_up
     # def new
     #   super
@@ -41,19 +41,19 @@ class RegistrationsController < Devise::RegistrationsController
     # protected
 
     # If you have extra params to permit, append them to the sanitizer.
-    # def configure_sign_up_params
-    #   devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute])
-    # end
+    def configure_sign_up_params
+      devise_parameter_sanitizer.permit(:sign_up, keys: [:username])
+    end
 
     # If you have extra params to permit, append them to the sanitizer.
-    # def configure_account_update_params
-    #   devise_parameter_sanitizer.permit(:account_update, keys: [:attribute])
-    # end
+    def configure_account_update_params
+      devise_parameter_sanitizer.permit(:account_update, keys: [:username])
+    end
 
     # The path used after sign up.
-    # def after_sign_up_path_for(resource)
-    #   super(resource)
-    # end
+    def after_sign_up_path_for(_resource)
+      room_path
+    end
 
     # The path used after sign up for inactive accounts.
     # def after_inactive_sign_up_path_for(resource)

app/javascript/stylesheets/rooms/room.scss

@@ -62,7 +62,7 @@
   font-family: "Source Code Pro", monospace;
   font-size: 14px;
   font-weight: 400;
-  height: 560px;
+  height: 100vh;
   letter-spacing: normal;
   line-height: 20px;
   padding: 10px;

app/javascript/stylesheets/shared/btnstyle.scss

@@ -1,7 +1,11 @@
-.btnstyle {
-  @apply inline-block px-10 py-2 bg-indigo-700 text-white rounded-full;
-  cursor: pointer;
+.btn-dashboard-create {
+  @apply px-3 py-1 border-2 text-white bg-purple-500 hover:bg-purple-800 font-bold rounded-md;
 }
 .btnstyle_dashboard {
-  @apply px-3 py-5 border-2 text-white bg-blue-500 hover:bg-blue-800 font-bold rounded-md inline-block my-2;
+  @apply px-3 py-1 border-2 text-white bg-blue-500 hover:bg-blue-800 font-bold rounded-md inline-block;
+}
+
+.btn-index {
+  @apply inline-block px-10 py-2 bg-indigo-700 text-white rounded-full;
+  cursor: pointer;
 }

app/mailers/room_mailer.rb

@@ -3,7 +3,12 @@
 class RoomMailer < ApplicationMailer
   def send_invitation_to(user, room)
     @user = user
-    @room_url = Rails.application.routes.url_helpers.room_uuid_url(uuid: room.uuid, host: 'localhost', port: 3000)
+    host_ip = if ENV['RAILS_ENV'] == 'production'
+                ENV.fetch('HOST_IP', nil)
+              else
+                '127.0.0.1'
+              end
+    @room_url = Rails.application.routes.url_helpers.room_uuid_url(uuid: room.uuid, host: host_ip, port: 3000)
     mail to: @user.email, subject: '你好!!'
   end
 end

app/views/pages/_hero_block.html.erb

@@ -7,7 +7,7 @@
         {<b class="text-yellow-400">i</b>}Coder</h1>
       <p>Developers trust {<b class="text-yellow-400">i</b>}Coder to help hire the right candidates because
         it’s simple – and just works</p>
-      <a href="/users" class="btnstyle">免費註冊</a>
+      <a href="/users" class="btn-index">免費註冊</a>
     </div>
     <div class="img">
       <%= image_tag("coderpic.jpg") %>

app/views/questions/_form.html.erb

@@ -20,10 +20,8 @@
         <%= form.label :code, "題目內容", class: "mb-1 block" %>
         <%= form.text_area :code, class: "border border-gray-900 mb-5" %>
       </div>
-      <div>
-        <%= form.submit "建立題目", class: "btnstyle_dashboard"%>
-      </div>
+      <%= form.submit "建立題目", class: "btn-dashboard-create mb-4"%>
     </div>
   </div>
 <% end %>
-<%= link_to "返回", questions_path, class: "btnstyle_dashboard" %>
+<%= link_to "返回", questions_path, class: "btn-dashboard-create" %>

app/views/questions/index.html.erb

@@ -1,10 +1,10 @@
 <div class="flex justify-between mt-3">
   <h2 class="font-bold text-2xl">面試題庫目錄</h2>
-  <%= link_to "創建題目",  new_question_path , :class => "createBtn", class: "btnstyle_dashboard" %></div>
+  <%= link_to "創建題目",  new_question_path ,class: "btn-dashboard-create" %></div>
 <span class="block mb-10">管理您的面試的題庫，創建題目、進行查詢、與調整及刪除。</span>
 <div class="rounded">
   <div>
-    <form action="./questions" method="get" class="mt-2">
+    <form action="./questions" method="get" class="mt-2 mb-4">
       搜尋：<input type="text" placeholder="關鍵字查詢" name="keyword" class="px-2 border border-black">
       <button>送出</button>
     </form>

app/views/room_mailer/send_invitation_to.html.erb

@@ -1,4 +1,6 @@
-<p><%= @user.username %>，你好：</p>
-<p>今天你也有過得開心嗎!</p>
-<p>謝謝你的來信，再見!</p>
+<p>親愛的 <%= @user.username %>，您好：</p>
+<p>我們是 We-have-tta</p>
+<p>很高興您願意參與此次線上面試，請您透過以下連結進入</p>
 <p><%= link_to "會議室連結(開新視窗)", @room_url, target: '_blank' %></p>
+<br>
+<p>We-have-tta 團隊敬上</p>