pagination

jenniferwills · Jun 2, 2020 · 2c25343 · 2c25343
1 parent 31d2a11
commit 2c25343
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -31,6 +31,7 @@ gem 'jquery-rails', '~> 4.4.0'
 gem 'image_processing', '~> 1.11.0'
 gem 'active_storage-send_zip', '~> 0.3.3'
 gem 'active_storage_validations', '~> 0.8.9'
+gem 'kaminari', '~> 1.2.1'
 
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.4.2', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -101,6 +101,18 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    kaminari (1.2.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
+      actionview
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
+      activerecord
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -225,6 +237,7 @@ DEPENDENCIES
   image_processing (~> 1.11.0)
   jbuilder (~> 2.7)
   jquery-rails (~> 4.4.0)
+  kaminari (~> 1.2.1)
   listen (~> 3.2)
   pg
   puma (~> 4.1)

diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
@@ -6,7 +6,8 @@ class ImagesController < ApplicationController
   # GET /images
   # GET /images.json
   def index
-    @images = Image.all
+    @images = Image.all.page params[:page]
+
   end
 
   # GET /images/1
@@ -43,7 +44,7 @@ def create
 
     end
     if errors.empty?
-      redirect_to root_path, notice: 'Image was successfully created.'
+      redirect_to action: :index, notice: 'Image was successfully created.', uploaded_success: true
     end
   end
 

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
diff --git a/app/helpers/site_helper.rb b/app/helpers/site_helper.rb
diff --git a/app/models/image.rb b/app/models/image.rb
@@ -1,6 +1,8 @@
 class Image < ApplicationRecord
   has_one_attached :file
+
   validates :file, attached: true, content_type: ['image/png', 'image/jpg', 'image/jpeg'], size: { less_than: 10.megabytes , message: 'is too big' }
 
+  paginates_per 10
 
 end
diff --git a/app/views/images/index.html.erb b/app/views/images/index.html.erb
@@ -1,4 +1,11 @@
 
+<% if params[:uploaded_success] %>
+  <div class="alert alert-success" role="alert">
+    Files Uploaded Successfully!
+  </div>
+<% end %>
+<%= paginate @images %>
+
 <div class="card-columns">
   <% @images.each do |img| %>
     <div class="card">

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,6 +1,5 @@
 Rails.application.routes.draw do
 
-  # get 'site/upload'
   get 'images/upload'
   post 'images/create'
   delete 'images/destroy_all'