superuser 0.2.3 → 0.3.3

data/lib/generators/superuser/templates/views/_form.html.erb

@@ -3,7 +3,6 @@
     <%= "<% if #{resource}.errors.any? %%>" %>
       <div id="error_explanation" class="alert alert-danger">
         <h3 class="error_title"><%= "<%= pluralize(#{resource}.errors.count, 'error') %%>" %> prohibited this resource from being saved:</h3>
-
         <ul>
           <%= "<% #{resource}.errors.full_messages.each do |message| %%>" %>
             <li><%= "<%= message %%>" %></li>
@@ -19,7 +18,6 @@
       </div>
     <% end -%>
 
-  <%= "<%= f.submit (#{resource}.new_record? ? 'Create resource' : 'Update resource'), class: 'btn btn-info btn-lg' %%>" %>
-
+  <%= "<%= f.submit (#{resource}.new_record? ? 'Create #{resource}' : 'Update #{resource}'), class: 'btn btn-info btn-lg' %%>" %>
 
 <%= "<% end %%>" %>

data/lib/generators/superuser/templates/views/_search.html.erb

@@ -1,31 +1,28 @@
 <div class="card p-2 p-md-4">
 
-    <div class="card-title">
-        Search :
-    </div>
-
-    <div class="text-center">
-
-        <%= "<%= form_tag [:superuser, obj], method: :get, class: 'search_form' do %%>" %>
-
-            <span class="condition-label">Condition :</span>
-
-            <%= """
-            <%
-                options = []
-                obj.classify.constantize.column_names.each do |column_name|
-                    options << column_name
-                end
-            %%>
-            """ %>
-            <%= "<%= hidden_field_tag :search, 'true' %%>" %>
-            <%= "<%= select_tag :search_field, options_for_select(options, params[:search_field]), class: 'form-control d-inline-block' %%>" %>
-            <%= "<%= select_tag :operator, options_for_select({'Equal': 'equal', 'Like': 'like', '>': 'gt', '<': 'lt', '>=': 'gte', '<=': 'lte'}, params[:operator]), class: 'form-control d-inline-block' %%>" %>
-            <%= "<%= text_field_tag :search_value, params[:search_value], placeholder: 'Search Value...', class: 'form-control d-inline-block' %%>" %>
-            <%= "<%= submit_tag :Search, class: 'btn btn-success' %%>" %>
-
-        <%= "<% end %%>" %>
-
-
-    </div>
+  <div class="card-title">
+    Search :
+  </div>
+
+  <div class="text-center">
+    <%= "<%= form_tag [:superuser, obj], method: :get, class: 'search_form' do %%>" %>
+
+      <span class="condition-label">Condition :</span>
+
+      <%= """
+        <%
+            options = []
+            obj.classify.constantize.column_names.each do |column_name|
+                options << column_name
+            end
+        %%>
+      """ %>
+      <%= "<%= hidden_field_tag :search, 'true' %%>" %>
+      <%= "<%= select_tag :search_field, options_for_select(options, params[:search_field]), class: 'form-control d-inline-block' %%>" %>
+      <%= "<%= select_tag :operator, options_for_select({'Equal': 'equal', 'Like': 'like', '>': 'gt', '<': 'lt', '>=': 'gte', '<=': 'lte'}, params[:operator]), class: 'form-control d-inline-block' %%>" %>
+      <%= "<%= text_field_tag :search_value, params[:search_value], placeholder: 'Search Value...', class: 'form-control d-inline-block' %%>" %>
+      <%= "<%= submit_tag :Search, class: 'btn btn-success' %%>" %>
+
+    <%= "<% end %%>" %>
+  </div>
 </div>

data/lib/generators/superuser/templates/views/dashboard_index.html.erb

@@ -1 +1 @@
-<h1>Welcome to your Dashboard</h1>
+<h1>Dashboard</h1>

data/lib/generators/superuser/templates/views/edit.html.erb

@@ -3,9 +3,8 @@
 <%= "<%= render 'form', #{resource}: @#{resource} %%>" %>
 
 <br>
-
 <hr>
 
 <div class="text-center">
-    <%= "<%= link_to 'Back', [:superuser, :#{resources}], class: 'btn btn-outline-secondary' %%>" %>
+  <%= "<%= link_to 'Back', [:superuser, :#{resources}], class: 'btn btn-outline-secondary' %%>" %>
 </div>

data/lib/generators/superuser/templates/views/index.html.erb

@@ -8,48 +8,39 @@
 <div class="table-responsive">
 
 	<table class="table my-3">
-
 	  <thead class="thead-light">
-
 	    <tr>
-	        <% editable_attributes.each do |attribute| -%>
-	          <th><%= attribute[:name] %></th>
-	        <% end -%>
-	        <th></th>
-
+        <% editable_attributes.each do |attribute| -%>
+          <th><%= attribute[:name] %></th>
+        <% end -%>
+        <th></th>
 	    </tr>
-
 	  </thead>
 
 	  <tbody>
 
-	      <%= "<% @#{resources}.each do |#{resource}| %%>" %>
-
-	          <tr>
-
-	            <% editable_attributes.each do |attribute| -%>
-	              <td><%= "<%= #{resource}[:#{attribute[:name]}] %%>" %></td>
-	            <% end -%>
-
-	            <td class="text-right">
-
-
-	                <div class="dropdown">
-	                    <button class="btn btn-secondary dropdown-toggle p-1 px-2" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-	                        Actions
-	                    </button>
-	                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
-	                        <div><%= "<%= link_to 'Show', [:superuser, #{resource}], class: 'dropdown-item' %%>" %></div>
-	                        <div><%= "<%= link_to 'Edit', [:edit, :superuser, #{resource}], class: 'dropdown-item' %%>" %></div>
-	                        <div><%= "<%= link_to 'Delete', [:superuser, #{resource}], method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item' %%>" %></div>
-	                    </div>
-	                </div>
-
-	            </td>
-
-	          </tr>
-
-	      <%= '<% end %%>' %>
+      <%= "<% @#{resources}.each do |#{resource}| %%>" %>
+
+        <tr>
+          <% editable_attributes.each do |attribute| -%>
+					<td><%= "<%= #{resource}[:#{attribute[:name]}] %%>" %></td>
+          <% end -%>
+
+          <td class="text-right">
+            <div class="dropdown">
+              <button class="btn btn-secondary dropdown-toggle p-1 px-2" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  Actions
+              </button>
+              <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+                <div><%= "<%= link_to 'Show', [:superuser, #{resource}], class: 'dropdown-item' %%>" %></div>
+                <div><%= "<%= link_to 'Edit', [:edit, :superuser, #{resource}], class: 'dropdown-item' %%>" %></div>
+                <div><%= "<%= link_to 'Delete', [:superuser, #{resource}], method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item' %%>" %></div>
+              </div>
+            </div>
+          </td>
+        </tr>
+
+      <%= '<% end %%>' %>
 
 	  </tbody>
 
@@ -59,6 +50,6 @@
 
 <hr class="mb-4">
 
-<div class="kaminari_pagination text-center">
-    <%= "<%= paginate @#{resources} %%>" %>
+<div class="pagy_pagination text-center">
+	<%= "<%== pagy_bootstrap_nav(@pagy) %%>" %>
 </div>

data/lib/generators/superuser/templates/views/layouts/application.html.erb

@@ -1,61 +1,67 @@
 <!DOCTYPE html>
 <html>
 
-<head>
+  <head>
     <title>Super User <%= '<%= controller_name %%>' %>#<%= '<%= action_name %%>' %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css" integrity="sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb" crossorigin="anonymous">
-    <%= '<%= stylesheet_link_tag    "superuser/application", media: "all" %%>' %>
-    <%= '<%= javascript_include_tag "superuser/application" %%>' %>
+
+<% if for_webpack_native -%>
+    <%= '<%= webpack_stylesheet_url "superuser", media: "all", "data-turbolinks-track": "reload" %%>' %>
+    <%= '<%= webpack_javascript_url "superuser", "data-turbolinks-track": "reload" %%>' %>
+<% else -%>
+    <%= '<%= stylesheet_link_tag "superuser", media: "all" %%>' %>
+    <%= '<%= javascript_pack_tag "superuser" %%>' %>
+<% end -%>
+
     <!-- CDN for flatpickr.css -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
     <!-- end CDN for flatpickr.css -->
     <%= '<%= csrf_meta_tags %%>' %>
+  </head>
 
-</head>
-
-<body>
+  <body class="superuser">
 
     <header>
-        <nav class="navbar navbar-expand-sm navbar-light fixed-top">
-
-            <%= '<%= link_to [:superuser, :root], class: "navbar-brand" do %%>' %>
-                <span class="logo_part_1">Super</span><span class="logo_part_2">user</span>
-            <%= '<% end %%>' %>
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-        </nav>
+      <nav class="navbar navbar-expand-sm navbar-light fixed-top">
+        <%= '<%= link_to [:superuser, :root], class: "navbar-brand" do %%>' %>
+          <span class="logo_part_1">Super</span><span class="logo_part_2">user</span>
+        <%= '<% end %%>' %>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+      </nav>
     </header>
 
     <aside class="sidebar">
-        <div class="">
-            <h2 class="sidebar_title">Resources</h2>
-            <div class="sidebar_dashboard_link">
-            </div>
-            <div class="sidebar_item">
-                <%#= link_to resources_name, [:superuser, :resources_name] %>
-            </div>
+      <div class="">
+        <h2 class="sidebar_title">Resources</h2>
+        <div class="sidebar_dashboard_link">
+        </div>
+        <div class="sidebar_item">
+          <%#= link_to resources_name, [:superuser, :resources_name] %>
         </div>
+      </div>
     </aside>
 
     <div class="main-content">
-        <div class="container-fluid">
-            <div class="row">
-                <div class="col">
-                    <div class="content">
-						<%= "<% flash.each do |key, value| %%>" %>
-                            <div class="alert alert-<%= '<%= flash_class(key) %%>' %>"><%= '<%= value %%>' %></div>
-                        <%= "<% end %%>" %>
-                        <%= '<%= yield %%>' %>
-                    </div>
+      <div class="container-fluid">
+        <div class="row">
+          <div class="col">
+            <div class="content">
+		          <%= "<% flash.each do |key, value| %%>" %>
+                <div class="alert alert-<%= '<%= flash_class(key) %%>' %>">
+                  <%= '<%= value %%>' %>
                 </div>
+              <%= "<% end %%>" %>
+              <%= '<%= yield %%>' %>
             </div>
+          </div>
         </div>
+      </div>
     </div>
 
-
     <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js" integrity="sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh" crossorigin="anonymous"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/js/bootstrap.min.js" integrity="sha384-alpBpkh1PFOepccYVYDB4do5UnbKysX5WZXm3XxPqe5iKTfUKjNkCk9SaVuEZflJ" crossorigin="anonymous"></script>
@@ -65,26 +71,21 @@
     <!-- end CDN for flatpickr.js -->
 
     <script type="text/javascript">
-
-        (function() {
-
-            document.querySelector('.navbar-toggler').addEventListener('click', function(){
-        		body = document.getElementsByTagName('body')[0];
-        		body.classList.toggle('open-sidebar');
-        	});
-
-            // if input has class 'isdate' : show flatpickr < date without time >
-            $(".date-field").flatpickr();
-            // if input has class 'isdatetime' : show flatpickr < date with time (Hours + Minutes + Seconds) >
-            $(".datetime-field").flatpickr({
-                enableTime: true,
-                enableSeconds: true
-            });
-
-        })();
-
+      (function() {
+        document.querySelector('.navbar-toggler').addEventListener('click', function(){
+    		  body = document.getElementsByTagName('body')[0];
+    		  body.classList.toggle('open-sidebar');
+    	  });
+        // if input has class 'isdate' : show flatpickr < date without time >
+        $(".date-field").flatpickr();
+        // if input has class 'isdatetime' : show flatpickr < date with time (Hours + Minutes + Seconds) >
+        $(".datetime-field").flatpickr({
+          enableTime: true,
+          enableSeconds: true
+        });
+      })();
     </script>
 
-</body>
+  </body>
 
 </html>

data/lib/generators/superuser/templates/views/new.html.erb

@@ -5,9 +5,8 @@
 <%= "<%= render 'form', #{resource}: @#{resource} %%>" %>
 
 <br>
-
 <hr>
 
 <div class="text-center">
-    <%= "<%= link_to 'Back', [:superuser, :#{resources}], class: 'btn btn-outline-secondary' %%>" %>
+  <%= "<%= link_to 'Back', [:superuser, :#{resources}], class: 'btn btn-outline-secondary' %%>" %>
 </div>

data/lib/generators/superuser/templates/views/show.html.erb

@@ -4,12 +4,11 @@
 
 <% editable_attributes.each do |attribute| -%>
 	<div class="attribute-line">
-    	<%= attribute[:name].capitalize %> :
+    <%= attribute[:name].capitalize %> :
 		<%= "<%= @#{resource}.#{attribute[:name]} %%>" %>
 	</div>
 <% end -%>
 
-
 <hr>
 
 <%= "<%= link_to 'Edit', [:edit, :superuser, @#{resource}], class: 'btn btn-primary' %%>" %>

data/lib/generators/superuser/templates/webpack_native_base.js

@@ -0,0 +1,3 @@
+import '../stylesheets/superuser.scss';
+// the following line requires that images folder exists
+require.context('../images', true, /\.(gif|jpeg|jpg|png|svg)$/i);

data/lib/superuser.rb

@@ -1,4 +1,5 @@
 require "superuser/version"
+require "pagy"
 
 module Superuser
   # Your code goes here...

data/lib/superuser/version.rb

@@ -1,3 +1,3 @@
 module Superuser
-  VERSION = "0.2.3"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superuser
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.3
 platform: ruby
 authors:
 - mody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: pagy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.3
 description: This gem will help you scaffold an admin area very quickly so you can
   have full control over your code when you need customization
 email:
@@ -61,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/generators/superuser/USAGE
+- lib/generators/superuser/init_generator.rb
 - lib/generators/superuser/superuser_generator.rb
 - lib/generators/superuser/templates/base_controller.rb
 - lib/generators/superuser/templates/controller_template.rb
@@ -75,6 +88,7 @@ files:
 - lib/generators/superuser/templates/views/layouts/application.html.erb
 - lib/generators/superuser/templates/views/new.html.erb
 - lib/generators/superuser/templates/views/show.html.erb
+- lib/generators/superuser/templates/webpack_native_base.js
 - lib/superuser.rb
 - lib/superuser/version.rb
 homepage: https://github.com/scratchoo/superuser
@@ -96,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Build An Admin Area Easily.