jera_push 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efee65617eb9d612ce38593a5c623d57b336e56ae1017a27d4ced3e8680c862b
-  data.tar.gz: '00954314ef516fbb4c7711ddcb85dd0ee4063332006ef63d8f8c5500e55e135f'
+  metadata.gz: 94afb52f8fb32e6554bdb73f7b03ba48a1ea0cc57cd1789df19f914593739b45
+  data.tar.gz: 7586cb6aebe1df7119a2bd9a87ec1cb9de37ac8343c8488477cc5cc99dfc234c
 SHA512:
-  metadata.gz: 1371cda26262aefcbb61bf47897a537c6af623eaf703481f10e1770357165b9b23f07eaf5ed38baebb7dc53447663869c6e27f0f086ddb93d4badcf8361ccc39
-  data.tar.gz: b40dd9d3a328961467dd0d373436a31833165ad3e34e043099451745109002eac483037078bdc80920503dde8d1fa670d776aaaac835ed46d279bf9ff960c77f
+  metadata.gz: 9d917503e6bc9904fab6e3c309856491f2c1230baa7b8cd8e946c9560c9aa938a0be3fc40dbb9e9329869cad622cbf49bf9e88701204b383a94f11e871f7858b
+  data.tar.gz: b2147d84acdead00ff1351f65e5da1e2ff1061c397b5a754a870f4c112f7bb9c84b57849653fd8bef7adadb0d9207a070755f91a35ad1e1942ea3311114273b0

data/app/assets/styles/jera_push/components/_devices.scss

@@ -1,6 +1,5 @@
 .devices-list {
-  overflow-y: scroll;
-  height: 500px;
+  overflow: hidden;
   width: 100%;
   margin-bottom: 40px;
 
@@ -13,4 +12,4 @@
     font-size: 14px;
     font-weight: 400;
   }
-}
+}

data/app/assets/styles/jera_push/jera_push.scss

@@ -13,5 +13,5 @@
 @import "pages/messages/new";
 
 .brand-logo{
-  margin: 10px 0 0 22px;
-}
+  margin: 0px 0 0 22px;
+}

data/app/assets/styles/jera_push/materialize/components/_global.scss

@@ -371,6 +371,10 @@ table {
   width:100%;
   display: table;
 
+  tbody > tr {
+    word-break: break-all;
+  }
+
   &.bordered > thead > tr,
   &.bordered > tbody > tr {
     border-bottom: 1px solid $table-border-color;
@@ -406,7 +410,7 @@ thead {
 }
 
 td, th{
-  padding: 15px 5px;
+  padding: 20px 20px 20px 4px;
   display: table-cell;
   text-align: left;
   vertical-align: middle;

data/app/assets/styles/jera_push/materialize/components/_navbar.scss

@@ -1,7 +1,7 @@
 nav {
   color: $navbar-font-color;
   @extend .z-depth-1;
-  background-color: $primary-color;
+  background-color: $navbar-background-color;
   width: 100%;
   height: $navbar-height-mobile;
   line-height: $navbar-height-mobile;
@@ -20,6 +20,12 @@ nav {
   .nav-wrapper {
     position: relative;
     height: 100%;
+
+    li {
+      a {
+        font-weight: 500;
+      }
+    }
   }
 
   @media #{$large-and-up} {
@@ -50,10 +56,11 @@ nav {
     font-size: $navbar-brand-font-size;
     padding: 0;
     white-space: nowrap;
-    
+
     img {
       width: 100px;
       height: auto;
+      vertical-align: middle;
     }
 
     &.center {

data/app/assets/styles/jera_push/materialize/components/_variables.scss

@@ -221,6 +221,7 @@ $navbar-height-mobile: 56px !default;
 $navbar-font-size: 1rem !default;
 $navbar-font-color: #fff !default;
 $navbar-brand-font-size: 2.1rem !default;
+$navbar-background-color: rgba(0, 0, 0, 0.87);
 
 /* 14. Side Navigation
    ========================================================================== */

data/app/assets/styles/jera_push/pages/devices/_list.scss

@@ -1,3 +1,12 @@
 .devices-list-container {
   padding-bottom: 40px;
-}
+
+  .custom-col {
+    width: auto !important;
+    margin-left: -9px !important;
+  }
+
+  .fix-left-label {
+    left: 22px !important;
+  }
+}

data/app/assets/styles/jera_push/pages/messages/_new.scss

@@ -1,7 +1,15 @@
 .container-messages-new {
 
+  h3 {
+    margin-left: -14px;
+  }
+
   .options {
     margin-bottom: 32px;
+
+    label {
+      margin-left: -4px;
+    }
   }
 
   .message-attributes {
@@ -12,13 +20,14 @@
     text-decoration: underline;
     color: #0000EE;
     cursor: pointer;
+    float: left;
   }
 
   .btn-submit {
-    margin-right: 24px;
+    margin-left: -10px;
   }
 }
 
 #message_devices {
   display: none;
-}
+}

data/app/controllers/jera_push/admin/devices_controller.rb

@@ -3,7 +3,7 @@ module JeraPush
 
     def index
       @filter = JeraPush::DeviceFilter.new params_filter
-      @devices = @filter.search.order(created_at: :desc).page(params[:page]).per(params[:per])
+      @devices = @filter.search.order(created_at: :desc).page(params[:page]).per(10)
 
       respond_to do |format|
         format.js {}

data/app/helpers/jera_push/admin/devices_helper.rb

@@ -2,25 +2,35 @@ module JeraPush::Admin::DevicesHelper
 
   def resource_extras(device)
     if JeraPush.resource_attributes && JeraPush.resource_attributes.any?
-      return resource_attributes(JeraPush.resource_attributes, device.pushable)
+      return resource_attributes(JeraPush.resource_attributes, device.try(:pushable))
     end
-    return [device.pushable]
+    return [device.try(:pushable)]
   end
 
   def resource_attributes(attributes, resource)
-    if resource
-      attrs = attributes.collect do |attribute|
-        "#{attribute}: #{resource.send(attribute)}"
+    return [] unless resource.present?
+
+    attrs = attributes.collect do |attribute|
+      if resource&.send(attribute)
+        "#{I18n.t("activerecord.attributes.#{resource.class.to_s.downcase}.#{attribute}")}: #{resource.send(attribute)}"
       end
-      return attrs.delete_if { |v| v.nil?}
+    end
+    attrs.delete_if { |v| v.nil?}
+  end
+
+  def translate_resource_names(resources_name=[])
+    resources_name.collect do |resource|
+      ["#{I18n.t("activerecord.models.#{resource.downcase}.one")}", resource]
     end
   end
 
   def devices_fields_for_filter_select
-    fields = [:token]
+    fields = []
+    fields << [I18n.t("jera_push.admin.attributes.token"), "token"]
+
     if JeraPush.resource_attributes && JeraPush.resource_attributes.any?
       JeraPush.resource_attributes.each do |attribute|
-        fields << attribute
+        fields << ["#{I18n.t("jera_push.admin.attributes.#{attribute}")}", attribute]
       end
     end
     fields

data/app/views/jera_push/admin/devices/_checkbox_list.html.erb

@@ -1,4 +1,4 @@
-<table class="highlight">
+<table class="striped">
   <thead>
     <tr>
       <th data-field="checkbox"></th>
@@ -22,7 +22,7 @@
           <%= label_tag "device_#{device.id}", ''%>
         </td>
         <td><%= device.id %></td>
-        <td><%= device.token.truncate(40) %></td>
+        <td><%= device.token.truncate(50) %></td>
         <td><%= device.platform %></td>
         <td colspan="4">
           <% resource_extras(device).each do |attribute| %>
@@ -32,4 +32,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

data/app/views/jera_push/admin/devices/_filter.html.erb

@@ -2,7 +2,7 @@
   <%= form_tag filter_path, method: :get, class: 'col s12', remote: true do |f| %>
     <div class="row">
       <% JeraPush::Device.platform.values.each do |platform|  %>
-        <div class="input-field col s2">
+        <div class="input-field col s2 custom-col">
           <p>
             <%= check_box_tag :"platform[]", platform, filter.platform.include?(platform), id: "platform_#{platform}"  %>
             <label for="platform_<%= platform %>"><%= platform %><label>
@@ -12,7 +12,7 @@
     </div>
     <div class="row">
       <div class="input-field col s12">
-        <%= select_tag :resource_name, options_for_select(JeraPush.resources_name, filter.resource_name) %>
+        <%= select_tag :resource_name, options_for_select(translate_resource_names(JeraPush.resources_name), filter.resource_name) %>
       </div>
     </div>
     <div class="row">
@@ -22,7 +22,7 @@
       <div class="input-field col s9">
         <div class="col s6">
           <%= text_field_tag :value, filter.value %>
-          <label for="value"><%= t('jera_push.admin.filter.value') %></label>
+          <label class="fix-left-label" for="value"><%= t('jera_push.admin.filter.value') %></label>
         </div>
 
         <div class="input-field col s3">
@@ -31,4 +31,4 @@
       </div>
     </div>
   <% end %>
-</div>
+</div>

data/app/views/jera_push/admin/devices/_list.html.erb

@@ -1,24 +1,24 @@
-<table class="highlight">
+<table class="highlight bordered">
   <thead>
     <tr>
       <th data-field="id"><%= t('jera_push.admin.devices.attributes.id') %></th>
-      <th data-field="token"><%= t('jera_push.admin.devices.attributes.token') %></th>
       <th data-field="platform"><%= t('jera_push.admin.devices.attributes.platform') %></th>
       <th data-field="resource"><%= t('jera_push.admin.devices.attributes.resource') %></th>
+      <th data-field="token"><%= t('jera_push.admin.devices.attributes.token') %></th>
     </tr>
   </thead>
   <tbody>
     <% devices.each do |device| %>
       <tr>
-        <td><%= device.id %></td>
-        <td><%= device.token.truncate(50) %></td>
-        <td><%= device.platform %></td>
-        <td>
+        <td class="col s2"><%= device.id %></td>
+        <td class="col s2"><%= device.platform %></td>
+        <td class="col s2">
           <% resource_extras(device).each do |attribute| %>
             <div><%= attribute %></div>
           <% end %>
         </td>
+        <td class="col s2"><%= device.token %></td>
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

data/app/views/jera_push/admin/messages/index.html.erb

@@ -19,9 +19,9 @@
     <% @messages.each do |message| %>
       <tr>
         <td width="5%"><%= message.id %></td>
-        <td width="75%"><div class="json-message"><%= message.list_content %></div></td>
-        <td width="20%"><%= message.display_created_at %></td>
-        <td width="10%"><%= message.show_link %></td>
+        <td width="60%"><div class="json-message"><%= message.list_content %></div></td>
+        <td width="15%"><%= message.display_created_at %></td>
+        <td width="25%"><%= message.show_link %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/kaminari/_gap.html.erb

@@ -1,3 +1,4 @@
-<li class="disabled">
-  <%= content_tag :a, raw(t 'views.pagination.truncate') %>
+<!-- <li class="disabled">
+  < %= content_tag :a, raw(t 'views.pagination.truncate') %>
 </li>
+ -->

data/app/views/layouts/jera_push/_navbar.html.erb

@@ -1,7 +1,7 @@
 <nav>
   <div class="nav-wrapper">
     <a href="<%= jera_push_admin_path %>" class="brand-logo">
-      <img src="https://jera.com.br/images/logo-facebook.png" alt="Jera Software Logo">
+      <img src="https://jera.com.br/images/logo-jera-light.svg" alt="Jera Software Logo">
     </a>
     <ul id="nav-mobile" class="right hide-on-med-and-down">
       <li class="<%= 'active' if current_page?(jera_push_admin_devices_path) %>">
@@ -21,4 +21,4 @@
       </li>
     </ul>
   </div>
-</nav>
+</nav>

data/config/locale/jera_push.pt-BR.yml

@@ -27,6 +27,10 @@ pt-BR:
           id: ID
           platform: Plataforma
     admin:
+      attributes:
+        id: Identificador
+        name: Nome
+        email: Email
       navbar:
         devices: Aparelhos
         messages: Mensagens
@@ -39,12 +43,12 @@ pt-BR:
         send: Enviar
         send_all: Todos
         remove_all: Nenhum
-      devices: 
+      devices:
         attributes:
           id: Identificador
           token: Token
           platform: Plataforma
-          resource: Recurso 
+          resource: Recurso
       message_devices:
         attributes:
           device: Aparelho
@@ -72,4 +76,3 @@ pt-BR:
           new_attribute: Novo Atributo
           specific: Específico
           broadcast: Broadcast
-        

data/lib/jera_push/version.rb

@@ -1,3 +1,3 @@
 module JeraPush
-  VERSION = "1.2.1"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jera_push
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Jera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: enumerize
   requirement: !ruby/object:Gem::Requirement