ish_manager 0.1.8.380 → 0.1.8.381

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1ccdbb8b5690e2af9de00c78266a89f897fbe9faf0aae8de83f8353e0e9c47
-  data.tar.gz: 68da18a96da28c456018c3792507b190bb87c7927020b481eb240ac92d842788
+  metadata.gz: 4d2e5be382bc48dfdf58151137f5038df66d50c386e046cb44a0700fe0b6c3c7
+  data.tar.gz: 361c1da27ebd6b09c154e0a101e65eb7e9c11260411be5847cc6c6bc17c6e710
 SHA512:
-  metadata.gz: d8ed260c26f354e7ceab70994df4a2bba7d4d527f7f6ef10f6523102ddb5fd18fd1e5a330a874aafd3d84498f80306e45d5791c64c0cd254f1c2fa8c59cf3ff8
-  data.tar.gz: 125401f5699b1eded426dd8137c71763f1971c8fb875c1137411f1b421d9dad3d71e475d340db23c0f3a71e32c5d6d581fb0fd360a74bd0db4b61ffd1f9fb1d2
+  metadata.gz: 5b0de89b4b160a00565e0806fd5fcf5f9495090c64c040d2f4c06897766ecf8db96e54c0a5e259cbd31fcb79dc43ae9ba2f78e45dc29535cdb0399d1587671e6
+  data.tar.gz: 999d4cff0011f3ad55e53bfa5c26c0432be283f1c811b33719de12aa0dfdd19333ea71143f4655005bb3f32403149b84f9dd60c37fae4e9b78ceef9254fe62c9

data/app/assets/javascripts/ish_manager/email_conversations.js

@@ -16,6 +16,33 @@ $(document).ready(() => {
 
   })
 
+  $(".archive-btn").click(function(e) {
+    const jwt_token = $("#Config").data('jwt-token')
+    const action_path = $(this).data('url')
+    const out = []
+
+    $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+      out.push(val)
+    })
+
+    $.ajax({
+      url: action_path,
+      type: 'POST',
+      data: {
+        ids: out,
+        jwt_token: jwt_token,
+      },
+      success: e => {
+        logg((e||{}).responseText, 'archived Ok')
+        location.reload()
+      },
+      error: e => {
+        logg((e||{}).responseText, 'archived Err')
+      },
+    })
+
+  })
 
   $(".delete-btn").click(function(e) {
     const jwt_token = $("#Config").data('jwt-token')

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -5,11 +5,13 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
 
   def index
     authorize! :email_conversations_index, IshManager::Ability
+    @email_conversations = ::Office::EmailConversation.all
 
     if params[:slug]
-      @email_conversations = ::Office::EmailConversation.in_emailtag( params[:slug] )
-    else
-      @email_conversations = ::Office::EmailConversation.in_no_trash
+      @email_conversations = @email_conversations.in_emailtag( params[:slug] )
+    end
+    if params[:not_slug]
+      @email_conversations = @email_conversations.not_in_emailtag(params[:not_slug])
     end
     @email_conversations = @email_conversations.order_by( latest_at: :desc )
   end

data/app/views/ish_manager/application/_alerts_notices.haml

@@ -1,5 +1,5 @@
 
-.row
+.row.max-width
   .col-sm-12
     - if notice
       - if notice.class == Array

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -29,7 +29,7 @@
         %li= link_to 'Ish::UserProfiles',  user_profiles_path
         %li= link_to "Ish::ImageAsset's", image_assets_path
         %li
-          = link_to 'Maps', maps_path
+          = link_to 'Locations (maps)', maps_path
           .inline-search
             = form_tag maps_path, method: :get do
               = text_field_tag :q
@@ -41,13 +41,12 @@
     .a
       %ul
         %li
-          = link_to "Inbox (#{Office::EmailConversation.in_inbox.length})", email_conversations_path
+          = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX)
           = link_to '[+]', new_email_context_path
         %li
           = link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
           = link_to '[+]', new_email_template_path
         %li
-          -# = link_to 'Contexts', email_contexts_path
           = link_to 'Contexts', notsent_email_contexts_path
           = link_to '[+]', new_email_context_path
         -# %li

data/app/views/ish_manager/categories/index.haml

@@ -1,11 +1,12 @@
 
-.row
-  .col-md-6
-    %h1 Categories
-    = render 'ish_manager/categories/subtree', subtree: @categories_flat, config: { parent_id: nil, parent_ids: @categories_flat.map { |c| c[5] }.uniq }
+.categories-index.max-width
+  .row
+    .col-md-6
+      %h1 Categories
+      = render 'ish_manager/categories/subtree', subtree: @categories_flat, config: { parent_id: nil, parent_ids: @categories_flat.map { |c| c[5] }.uniq }
 
-  .col-md-6
-    %h1 Tags
-    %ul
-      - @tags.each do |tag|
-        %li= tag[:name]
+    .col-md-6
+      %h1 Tags
+      %ul
+        - @tags.each do |tag|
+          %li= tag[:name]

data/app/views/ish_manager/email_conversations/index.haml

@@ -3,21 +3,32 @@
 
   .second-header
     %i.material-icons mail
-    = link_to email_conversations_in_emailtag_path(WpTag::EMAILTAG_INBOX) do
-      Inbox (#{Office::EmailConversation.in_inbox.length})
-    = link_to email_conversations_path do
-      Archived (#{Office::EmailConversation.in_no_trash.length})
-    = link_to email_conversations_in_emailtag_path(WpTag::EMAILTAG_TRASH) do
-      Trash (#{Office::EmailConversation.in_emailtag(WpTag::EMAILTAG_TRASH).length})
+    = link_to email_conversations_in_path(WpTag::INBOX) do
+      Inbox (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})
+    = link_to email_conversations_notin_path(WpTag::INBOX) do
+      Not Inbox (#{Office::EmailConversation.not_in_emailtag(WpTag::INBOX).length})
 
-    Selected: #{params[:slug] || 'archived' }
+    = link_to email_conversations_in_path(WpTag::TRASH) do
+      Trash (#{Office::EmailConversation.in_emailtag(WpTag::TRASH).length})
+    = link_to email_conversations_notin_path(WpTag::TRASH) do
+      Not Trash (#{Office::EmailConversation.not_in_emailtag(WpTag::TRASH).length})
+
+    - if params[:slug]
+      slug: #{params[:slug]}
+    - if params[:not_slug]
+      not slug: #{params[:not_slug]}
 
   .actions
 
+    %a.btn.archive-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/rmtag/#{WpTag::INBOX}" } }
+      %i.material-icons archive
+      archive
     %a.btn.delete-btn{ href: "javascript: void(0)", data: { url: '/api/email_conversations' } }
       %i.material-icons delete
+      delete
     %a.btn.reload-btn{ href: "javascript: location.reload()" }
       %i.material-icons refresh
+      refresh
 
   %table.conversations
     %tr

data/app/views/ish_manager/maps/map_editor.haml

@@ -1,5 +1,5 @@
 
-.maps-map-editor
+.maps-map-editor.max-width
   = render 'map_meta_row', map: @map
   %h1 Map Editor
 

data/app/views/ish_manager/maps/new.haml

@@ -1,4 +1,8 @@
-%h1 New map
 
-= render 'form'
+.maps-new
+  .max-width
+    .header
+      %h3.title New map
+
+    = render 'form'
 

data/app/views/ish_manager/maps/show.haml

@@ -2,7 +2,7 @@
 -# ish_manager / maps / show.haml
 -#
 
-.maps-show
+.maps-show.max-width
   = render 'map_meta_row', map: @map
   %hr
 

data/app/views/ish_manager/markers/_form.haml

@@ -68,21 +68,11 @@
     .field
       = f.label :url, "URL (if any)"
       = f.text_field :url
-    .row
-      .col-sm-3  
-      .col-sm-5
-        .field
-          = f.label :description
-          = f.text_area :description
     .row
       .col-sm-4
         .field
           = f.label :item_type
           = f.select :item_type, options_for_select( ::Gameui::Marker::ITEM_TYPES, selected: @marker.item_type )
-      .col-sm-4
-        .field
-          = f.label :ordering
-          = f.text_field :ordering
       .col-sm-4
         .field
           = f.check_box :is_active

data/app/views/ish_manager/markers/edit.haml

@@ -1,4 +1,5 @@
 
-Editing marker for map `#{@map.slug}`
+.markers-edit.max-width
+  Editing marker for map `#{@map.slug}`
 
-= render 'form'
+  = render 'form'

data/app/views/ish_manager/markers/new.haml

@@ -1,5 +1,7 @@
 
-.a New marker
+.markers-new.max-width
+  .header
+    %h3.title New Marker
 
-= render 'form'
+  = render 'form'
 

data/config/routes.rb

@@ -62,7 +62,8 @@ IshManager::Engine.routes.draw do
   resources :email_messages
 
   get 'email_conversations',                   to: 'email_conversations#index'
-  get 'email_conversations/in_emailtag/:slug', to: 'email_conversations#index', as: :email_conversations_in_emailtag
+  get 'email_conversations/in/:slug',          to: 'email_conversations#index',         as: :email_conversations_in
+  get 'email_conversations/notin/:not_slug',   to: 'email_conversations#index',         as: :email_conversations_notin
   get 'email_conversations/show/:id',          to: 'email_conversations#show', as: :email_conversation
 
   get  'email_contexts/for_lead/:lead_id',       to: 'email_contexts#index', as: :email_contexts_for_lead

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.380
+  version: 0.1.8.381
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails