From 2df47779a340d7c7ea973f3f6c13bd53efe1272f Mon Sep 17 00:00:00 2001
From: Hassaku-kun <masaki.tani526@gmail.com>
Date: Mon, 27 Nov 2017 05:05:13 +0000
Subject: [PATCH 1/2] add modals

---
 app/assets/javascripts/script.js      | 26 ++++++++++++++++++++++++--
 app/assets/stylesheets/_general.scss  |  3 +++
 app/assets/stylesheets/_users.scss    |  3 ---
 app/views/books/index.html.erb        |  6 ++++--
 app/views/users/profile_edit.html.erb | 23 ++++++++++++++++++++---
 5 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/script.js b/app/assets/javascripts/script.js
index e9cd2c9..c631ecb 100644
--- a/app/assets/javascripts/script.js
+++ b/app/assets/javascripts/script.js
@@ -102,8 +102,30 @@ function remove(obj) {
     }
 }
 
-function confirm_delete() {
-  $("#modal").modal('show');
+function confirm_delete(modal) {
+  $(modal).modal('show');
+}
+
+function confirm_item_delete(bookid) {
+  var modal_box = document.getElementById("Delete-Modal-Box");
+  modal_box.innerHTML =
+  '<div id="Delete-Modal" class="modal fade">' +
+  '  <div class="modal-dialog">' +
+  '    <div class="modal-content">' +
+  '      <div class="modal-header">' +
+  '        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
+  '        <h3 class="modal-title">アイテム削除</h3>' +
+  '      </div>' +
+  '    <div class="modal-body">' +
+  '      <p>アイテムを削除しますか?</p>' +
+  '    </div>' +
+  '    <div class="modal-footer">' +
+  '       <button type="button" class="btn btn-default" data-dismiss="modal">キャンセル</button>' +
+  '       <a class="btn btn-primary" rel="nofollow" data-method="delete" href="/books/' + bookid + '">削除</a>' +
+  '    </div>' +
+  '  </div>' +
+  '</div>';
+  $('#Delete-Modal').modal('show');
 }
 
 function escape_html(string) {
diff --git a/app/assets/stylesheets/_general.scss b/app/assets/stylesheets/_general.scss
index b5266a7..b4bdfdc 100644
--- a/app/assets/stylesheets/_general.scss
+++ b/app/assets/stylesheets/_general.scss
@@ -81,6 +81,9 @@ hr{
   padding-top: 24px;
   }
 }
+.modal{
+  padding-top: 120px;
+}
 .triangle-top{
   position: relative;
   width: 0;
diff --git a/app/assets/stylesheets/_users.scss b/app/assets/stylesheets/_users.scss
index a301444..630240d 100644
--- a/app/assets/stylesheets/_users.scss
+++ b/app/assets/stylesheets/_users.scss
@@ -167,6 +167,3 @@
 #LogoutWithdrawButtons{
   margin-bottom: 15px;
 }
-#modal{
-  padding-top: 120px;
-}
diff --git a/app/views/books/index.html.erb b/app/views/books/index.html.erb
index bf81711..cfcccb8 100644
--- a/app/views/books/index.html.erb
+++ b/app/views/books/index.html.erb
@@ -78,7 +78,6 @@ else
 end
 hash_for_piechart.each{|key, value|
   if counter == piechart_size
-    p "a"
     temp_array_for_data.push(temp_sum_of_data - temp_sum_of_0to4)
     temp_array_for_labels.push("その他")
     break
@@ -182,7 +181,7 @@ options_for_piechart = {
                       <a href="<%= edit_book_path(book.id) %>">
                         <span class="glyphicon glyphicon-pencil"></span>
                       </a>
-                      <a href="<%= book_path(book.id) %>" data-method="delete">
+                      <a onclick='confirm_item_delete(<%= book.id %>);return false;'>
                         <span class="glyphicon glyphicon-remove"></span>
                       </a>
                     </td>
@@ -209,5 +208,8 @@ options_for_piechart = {
     <% end %>
 
     <%= link_to 'もどる', user_path(@user.id) %>
+
+    <div id="Delete-Modal-Box" class="col-xs-12">
+    </div>
   </div>
 </div>
diff --git a/app/views/users/profile_edit.html.erb b/app/views/users/profile_edit.html.erb
index a9886b2..0d43784 100644
--- a/app/views/users/profile_edit.html.erb
+++ b/app/views/users/profile_edit.html.erb
@@ -45,11 +45,11 @@
     </div>
 
     <div class="col-md-12 text-center" id="LogoutWithdrawButtons">
-      <%= link_to 'ログアウト', logout_path, class: 'btn btn-default' %>
-      <%= link_to '退会', {}, onclick: "confirm_delete();return false;", class: 'btn btn-danger' %>
+      <%= link_to 'ログアウト', {}, onclick: "confirm_delete(\"#Logout-Modal\");return false;", class: 'btn btn-default' %>
+      <%= link_to '退会', {}, onclick: "confirm_delete(\"#Leave-Modal\");return false;", class: 'btn btn-danger' %>
     </div>
     <div class="col-md-12 text-center">
-      <div id="modal" class="modal fade">
+      <div id="Leave-Modal" class="modal fade">
         <div class="modal-dialog">
           <div class="modal-content">
             <div class="modal-header">
@@ -68,6 +68,23 @@
           </div>
         </div>
       </div>
+      <div id="Logout-Modal" class="modal fade">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+              <h3 class="modal-title">ログアウト</h3>
+            </div>
+            <div class="modal-body">
+              <p>ログアウトしますか?</p>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal">キャンセル</button>
+              <%= link_to 'ログアウト', logout_path, class: 'btn btn-primary' %>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>

From b748d1d4d351b5e8cd3e763094ea29a3646822ae Mon Sep 17 00:00:00 2001
From: Tomoya Mikami <trymorecc@gmail.com>
Date: Mon, 27 Nov 2017 14:21:39 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B5=E3=83=A0=E3=83=8D=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/uploaders/image_uploader.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 604e283..0dbc375 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -32,9 +32,9 @@ def store_dir
   # end
 
   # Create different versions of your uploaded files:
-  # version :thumb do
-  #   process resize_to_fit: [50, 50]
-  # end
+  version :thumb do
+     process resize_to_limit: [106.5, 150]
+  end
 
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this: