wco_email 0.1.1.61 → 0.1.1.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b82b0b780a32dc0536435691c43bd337e7f868f31eb1107dc3a1ddbc26bb816c
-  data.tar.gz: 0ffce82f7e29d66f6def36004685b2ed4b43a07305dc6ea2e7450b5842107701
+  metadata.gz: f805c9c1a7afca2746021a03262841dea1d91082a484a8466fbf97aec6f33a45
+  data.tar.gz: ee6aa3515782753729fed878741e8e10e8751699d0c40c885ca2b4a3c1d1ebbd
 SHA512:
-  metadata.gz: 5f9c43740eea5dd1a0aa6df539422cc545ae6dec7659ca16ef0b59ede7ce41da8b9fb5a639ccfd754a59fb3f16233cb6febf532079d729bfae1c55d203b35fdb
-  data.tar.gz: 4996db4ce2668cf8d0109db6ff591398d769d040880941581a2ad0751f71fda62828483be75a3d6af8145bbff1a41f347066644bdfac1bf313fdfe803d18e39f
+  metadata.gz: 3c76002ef3aeda957bf51df966885aa2167e267812f974869d912a78031e46103d912030f3d0074d0322b2dd96b9e7b2c7d1b5edd4a3ffaa054bf58bc75eed4e
+  data.tar.gz: 2f27caae727569baa76656185c9fc68940c11ed5ba42ca29826611ef912b6b848aca4033d37d0646e0553e50b2d3a312d3781743b422ca7185b3152bb322bfed

data/app/assets/javascript/wco_email/conversations.js

@@ -115,7 +115,7 @@ $(".remove-tag-btn").click(function(e) {
   const emailtag = $("select[name='emailtag']").val()
   const out = []
 
-  $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+  $( $(".conversations-list input[type='checkbox'].i-sel:checked") ).each( idx => {
     let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
     out.push(val)
   })

data/app/assets/stylesheets/wco_email/contexts.scss

@@ -1,4 +1,10 @@
 
+.Context {
+  border: 1px solid var(--wco-color-2);
+  border-radius: .5em;
+  padding: 0.5em;
+}
+
 .email-contexts--form-reply {
   margin-bottom: 2em;
 }

data/app/assets/stylesheets/wco_email/conversations.scss

@@ -4,6 +4,7 @@
 //   display: flex;
 // }
 
+
 th.select-all {
   width: 50px;
 

data/app/assets/stylesheets/wco_email/messages.scss

@@ -0,0 +1,21 @@
+
+.Message {
+  border: 1px solid var(--wco-color-1);
+  border-radius: .5em;
+  padding: 0.5em;
+}
+
+.Meta {
+  ul {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+
+    li {
+      border-left: 3px solid var(--wco-color-2);
+      padding-left: 0.5em;
+      margin-bottom: 0.5em;
+    }
+
+  }
+}

data/app/views/wco_email/_sidebar.haml

@@ -4,7 +4,7 @@
     - @tags.each do |tag|
       %li
         = link_to tag.slug, conversations_in_path( tag.slug )
-        -# <b>#{tag.conversations.unread.length}</b>
-        -# (#{tag.conversations.length})
+        <b>#{tag.conversations.unread.length}</b>
+        (#{tag.conversations.length})
         = link_to "not", conversations_not_in_path( tag.slug )
 

data/app/views/wco_email/contexts/_form_reply.haml

@@ -1,29 +1,29 @@
 
 -# = ctx.inspect
 
-.email-contexts--form-reply.form-mini
+.Context.email-contexts--form-reply.form-mini
   = form_for ctx do |f|
 
     .flex-row
       .flex-row
-        %label from
+        %label from 
         = f.select :from_email, options_for_select( WcoEmail::EmailTemplate.from_emails_list, selected: ctx.from_email ), {}, class: 'select2'
-        %label to (lead)
+        %label  to 
         = f.select :lead, options_for_select( @leads_list, selected: lead_id ), {}, class: 'select2', required: true
       .flex-row
-        = f.label :template
+        %label  template 
         = f.select :email_template_id, options_for_select( @email_templates_list, selected: ctx.email_template_id ), {}, class: 'select2', required: true
         = link_to '[+]', new_email_template_path, target: :_blank
-    .flex-row
-      %label Subject
-      = f.text_field :subject, class: 'w-100'
+    -# .flex-row
+    -#   %label Subject 
+    -#   = f.text_field :subject, class: 'w-100', disabled: true
     .field
       = f.text_area :body, class: 'tinymce'
     .flex-row
       .flex-row
-        %label Respond inline?
+        %label Respond inline? 
         = check_box_tag :respond_inline, message.id, checked: true
       .flex-row
-        = f.label :send_at
+        %label  send_at 
         = f.text_field :send_at, placeholder: 'YYYY-MM-DD', value: Time.now, size: 30, class: 'input-date'
       = f.submit 'Send/Schedule'

data/app/views/wco_email/conversations/_actions.haml

@@ -1,24 +1,14 @@
 
-.conversations--actions.bordered.d-flex
 
-  -# %a.btn.archive-btn{ href: "javascript: void(0)", data: { url: conversations_rmtag_path(Wco::Tag::INBOX) } }
-  -#   %i.material-icons archive
-  -#   archive
-  -# %a.btn.delete-btn{ href: "javascript: void(0)", data: { url: conversations_path } }
-  -#   %i.material-icons delete
-  -#   delete
-  -# %a.btn.reload-btn{ href: "javascript: location.reload()" }
-  -#   %i.material-icons refresh
-  -#   refresh
+.bordered.inline-block.mb-2
+  .d-inline-block
+    = select_tag :emailtag, options_for_select(@tags_list), class: 'select2'
+  = check_box_tag :is_move
+  %label move?
+  %a.btn.add-tag-btn{ href: "javascript: void(0)", data: { url: conversations_addtag_path } }
+    %i.material-icons add
+    Addtag
+  %a.btn.remove-tag-btn{ href: "javascript: void(0)", data: { url: conversations_rmtag_path } }
+    %i.material-icons remove
+    Rmtag
 
-  .bordered.inline-block
-    .d-inline-block
-      = select_tag :emailtag, options_for_select(@tags_list), class: 'select2'
-    = check_box_tag :is_move
-    %label move?
-    %a.btn.add-tag-btn{ href: "javascript: void(0)", data: { url: conversations_addtag_path } }
-      %i.material-icons add
-      Addtag
-    %a.btn.remove-tag-btn{ href: "javascript: void(0)", data: { url: conversations_rmtag_path } }
-      %i.material-icons remove
-      Rmtag

data/app/views/wco_email/conversations/show.haml

@@ -2,29 +2,37 @@
 - content_for :sidebar do
   = render 'wco_email/sidebar'
 
+.conversations-list
+  = check_box_tag 'conversation_ids[]', @conversation.id.to_s, true, { class: 'i-sel', disabled: true }
 .conversations-show.maxwidth
   %h5
     = @conversation.subject
     <b>(#{@conversation.messages.length})</b>
     = link_to '[~]', edit_conversation_path(@conversation)
     %span.gray.mini= @conversation.id
-  .leads
+
+  = render 'wco/tags/list_mini', tags: @conversation.tags
+
+
+  = render '/wco_email/conversations/actions'
+
+  .Leads.mb-2
     .d-inline <b>Leads:</b>
     - @conversation.leads.each do |lead|
       .Chip= link_to lead.email, wco.lead_path( lead )
 
-  -# - if @other_convs.present?
-  -#   - @other_convs.each do |conv|
-  -#     .d-flex
-  -#       = button_to "Merge", merge_conversations_path( @conversation, conv ), data: { confirm: 'Are you sure?' }
-  -#       = conv.subject
-  -#       (#{conv.messages.length})
-  -#       %span.gray.mini= conv.id
+  - if @other_convs.present?
+    - @other_convs.each do |conv|
+      .d-flex
+        = button_to "Merge", merge_conversations_path( @conversation, conv ), data: { confirm: 'Are you sure?' }
+        = conv.subject
+        (#{conv.messages.length})
+        %span.gray.mini= conv.id
 
 
-  %ul.m-0.p-0
+  .m-0.p-0
     - @conversation.messages.each do |msg|
-      %li
+      .Message.mb-2
         = render '/wco_email/messages/meta', message: msg
         = link_to '[expand]', message_iframe_path(msg, expand_history: true), target: "iframe_#{msg.id}"
         = link_to '[collapse]', message_iframe_path(msg), target: "iframe_#{msg.id}"

data/app/views/wco_email/messages/_meta.haml

@@ -1,6 +1,6 @@
 
-.d-inline-block
-  .collapse-expand{ id: "meta_#{message.id}" }
+.d-inline-block.Meta
+  %i.fa.fa-compress.collapse-expand
     Meta
   .messages--meta.flex-row{ style: 'display: none' }
 

data/app/views/wco_email/messages/show.haml

@@ -8,6 +8,6 @@
 
   = render 'meta', message: @message
   %iframe.message-iframe{ src: message_iframe_path(@message) }
-  = render '/wco_email/contexts/form_reply', lead_id: @message.lead_id, message: @message
+  = render '/wco_email/contexts/form_reply', lead_id: @message.lead_id, message: @message, ctx: WcoEmail::Context.new({ from_email: @message.to&.downcase, subject: @message.subject, email_template_id: ET.find_by( slug: 'blank').id })
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.61
+  version: 0.1.1.63
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -306,6 +306,7 @@ files:
 - app/assets/stylesheets/wco_email/application.scss
 - app/assets/stylesheets/wco_email/contexts.scss
 - app/assets/stylesheets/wco_email/conversations.scss
+- app/assets/stylesheets/wco_email/messages.scss
 - app/assets/stylesheets/wco_email/tags.scss
 - app/controllers/wco_email/api_controller.rb
 - app/controllers/wco_email/application_controller.rb