Змінені стилі, додані дрібні правки, додана посторінкова навігація, в…

…иправлена помилка праці пошуку з посторінковою навігацією
lakatoshv · May 26, 2018 · 59cd3fd · 59cd3fd
1 parent 1b4fbec
commit 59cd3fd
Show file tree

Hide file tree

Showing 11 changed files with 1,549 additions and 145 deletions.
diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb
@@ -74,6 +74,6 @@ def set_book
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def book_params
-      params.require(:book).permit(:title, :auth, :zhanr, :pages_qty, :description, :image_url)
+      params.require(:book).permit(:title, :auth, :zhanr, :pages_qty, :description, :image_url, :mini_description)
     end
 end
diff --git a/app/models/book.rb b/app/models/book.rb
@@ -1,6 +1,6 @@
 class Book < ApplicationRecord
 
-	validates :title, :auth, :zhanr, :pages_qty, :description, :image_url, :presence => true
+	validates :title, :auth, :zhanr, :pages_qty, :description, :image_url, :mini_description, :presence => true
 	def self.search(search)
 		where(['title LIKE ? OR auth LIKE ? OR zhanr LIKE ? OR description LIKE ? ', "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%"])
 

diff --git a/app/views/books/_book.json.jbuilder b/app/views/books/_book.json.jbuilder
@@ -1,2 +1,2 @@
-json.extract! book, :id, :title, :auth, :zhanr, :pages_qty, :description, :image_url, :created_at, :updated_at
+json.extract! book, :id, :title, :auth, :zhanr, :pages_qty, :description, :image_url, :mini_description, :created_at, :updated_at
 json.url book_url(book, format: :json)
diff --git a/app/views/books/_form.html.erb b/app/views/books/_form.html.erb
@@ -5,6 +5,7 @@
       :label_Z => "Жанр",
       :label_Q => "Кількість сторінок",
       :label_D => "Опис",
+      :label_MD => "Короткий опис",
       :label_I => "Адреса до картинки",
       :submit => "Підтвердити"
     } 
@@ -15,6 +16,7 @@
       :label_Z => "Genre",
       :label_Q => "Number of pages",
       :label_D => "Description",
+      :label_MD => "Mini description",
       :label_I => "Address to the picture",
       :submit => "Submit"
     } 
@@ -25,6 +27,7 @@
       :label_Z => "Жанр",
       :label_Q => "Количество страниц",
       :label_D => "Описание",
+      :label_MD => "Краткое описание",
       :label_I => "Адрес к картинке",
       :submit => "Подтвердить"
     } 
@@ -64,6 +67,11 @@
         <%= f.text_field :pages_qty, :class => "form-control" %>
       </div>
 
+      <div class="form-group">
+        <label class="col-xs-2 control-label"><%= text[:label_MD] %></label>
+        <%= f.text_area :mini_description, :class => "form-control" %>
+      </div>
+
       <div class="form-group">
         <label class="col-xs-2 control-label"><%= text[:label_D] %></label>
         <%= f.text_area :description, :class => "form-control" %>

diff --git a/app/views/books/index.html.erb b/app/views/books/index.html.erb
@@ -64,9 +64,9 @@
               <i class="fa fa-desktop fa-3x"></i>
             </div>
             <p>
-              <%= book.description %>
+              <%= book.mini_description %><br/>
+               <%= link_to 'Видалити', book, method: :delete, data: { confirm: 'Ви впевнені?' } %>
             </p>
-
           </div>
         </div>
       </div>

diff --git a/db/development.sqlite3 b/db/development.sqlite3
diff --git a/db/migrate/20170429130500_create_books.rb b/db/migrate/20170429130500_create_books.rb
@@ -6,8 +6,10 @@ def change
       t.string :zhanr
       t.string :pages_qty
       t.text :description
+      t.text :mini_description
+      t.integer :likes_qty
+      t.integer :dislikes_qty
       t.string :image_url
-
       t.timestamps
     end
   end

diff --git a/db/schema.rb b/db/schema.rb
@@ -18,9 +18,12 @@
     t.string   "zhanr"
     t.string   "pages_qty"
     t.text     "description"
+    t.text     "mini_description"
+    t.integer  "likes_qty"
+    t.integer  "dislikes_qty"
     t.string   "image_url"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.datetime "created_at",       null: false
+    t.datetime "updated_at",       null: false
   end
 
   create_table "line_items", force: :cascade do |t|

diff --git a/log/development.log b/log/development.log
diff --git a/tmp/cache/assets/sprockets/v3.0/_a/_abZaIwZUSdhy4ehIcHLNQqfFdqSZ0d1w8RTgRQSaP0.cache b/tmp/cache/assets/sprockets/v3.0/_a/_abZaIwZUSdhy4ehIcHLNQqfFdqSZ0d1w8RTgRQSaP0.cache
diff --git a/tmp/cache/assets/sprockets/v3.0/nl/nl8aoP6kXBibB6Sk3_C05LAKjGGzGIw_TneXfvPRJl4.cache b/tmp/cache/assets/sprockets/v3.0/nl/nl8aoP6kXBibB6Sk3_C05LAKjGGzGIw_TneXfvPRJl4.cache
@@ -1 +1 @@
-I"~app/assets/stylesheets/application.scss?type=text/css&id=35e15a1cce284e45244954027d061a97bef85c97d52c4f6270aeb409e6d340fc:ET
+I"~app/assets/stylesheets/application.scss?type=text/css&id=4ff89ab7ef0ed289feb5b62ae0a3da67bd96f088f999bede7cf21713cf1a4d01:ET
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		I"~app/assets/stylesheets/application.scss?type=text/css&id=35e15a1cce284e45244954027d061a97bef85c97d52c4f6270aeb409e6d340fc:ET
		I"~app/assets/stylesheets/application.scss?type=text/css&id=4ff89ab7ef0ed289feb5b62ae0a3da67bd96f088f999bede7cf21713cf1a4d01:ET