ish_manager 0.1.8.484 → 0.1.8.485

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcdbbd6567ea0470001b2510d9a9cbb8b4c7d80d7039dbb59f59752db43c97e5
-  data.tar.gz: 1f61f7669a0a7e7cb86a70b3e58f9c56c6d394499ca9665b0f3aacad91d75358
+  metadata.gz: '02678fe84b00fba305b44750200135609fd9a241f201559c5cebf9b1883882e0'
+  data.tar.gz: '0584dbda773a9d2767f6f8c444bf23874c1a9d26cfe6f5d0ffdc4c92568c05eb'
 SHA512:
-  metadata.gz: ed089955bc512e0181fcfbca592a8279c0213472d3cf461d015aae01d9ac0aba1870b04cc0fd04e6f3495f0e00cad0a19fa5d0e5243f25370b943ee63a44de7e
-  data.tar.gz: c8bc7f3d499733d6fdc3eae89e68fc35f47c97486b6628ef92784957d68e4f6df7bdd8307f47cd44501ab3193609b9d80ee5d297549adbf6c9ede939f46c101b
+  metadata.gz: a46b672da3150b86baa338ccbfc90847b8cf9a277386bddc0ac3d379ce2f90ccf76d002ef56f2ce5f6c1afb6513b69f4bf6bb161b7955e44d3d1c2ceed2e9aa9
+  data.tar.gz: 34940ee437929577ef05d699a8ea1705a379ff4d500695591924439498cc2610068f72e9c838b6185ec71b026cc572841f2e359292ced736d5ebf65aa0d8c261

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

@@ -94,12 +94,16 @@ $(function () {
     $(this).parent().slideToggle()
   })
 
+
+
   $(".collapse-expand").each(function() {
     const thisId = $(this).attr('id')
-    const state = localStorage.getItem("collapse-expand#"+thisId)
-    if (state === 'collapsed') {
-      $(this).next().slideToggle()
-      $(this).addClass('collapsed')
+    if (thisId) {
+      const state = localStorage.getItem("collapse-expand#"+thisId)
+      if (state === 'collapsed') {
+        $(this).next().slideToggle()
+        $(this).addClass('wco-collapse')
+      }
     }
   })
   $(".collapse-expand").click(function (_e) {
@@ -107,16 +111,18 @@ $(function () {
     const state = localStorage.getItem("collapse-expand#"+thisId)
     if (state === 'collapsed') {
       localStorage.removeItem("collapse-expand#"+thisId)
-      $(this).removeClass('collapsed')
+      $(this).removeClass('wco-collapse')
     } else {
       localStorage.setItem("collapse-expand#"+thisId, "collapsed")
-      $(this).addClass('collapsed')
+      $(this).addClass('wco-collapse')
     }
     $(this).next().slideToggle();
   }).children().click(function (e) {
     e.stopPropagation()
   })
 
+
+
   $(".expand-next").click(function (_e) {
     $(this).next().slideToggle()
   })

data/app/assets/stylesheets/ish_manager/application.scss

@@ -4,6 +4,7 @@
  *= require ish_manager/vendor/jquery-ui
  * require ish_manager/vendor/summernote-bs4.min
  *
+ *= require ish_manager/variables
  *= require_self
  *= require ish_manager/appliances
  *= require ish_manager/email_contexts
@@ -93,12 +94,11 @@ ul:not(.browser-default).bullets, {
   width: 100vwh;
   overflow-x: auto;
 }
-.application-home {
-  .bordered-card {
-    display: inline-block;
-    // max-width: 400px;
-  }
-}
+// .application-home {
+//   .bordered-card {
+//     display: inline-block;
+//   }
+// }
 
 
 /* B */
@@ -118,6 +118,12 @@ ul:not(.browser-default).bullets, {
   padding: 1em;
 }
 
+div.bordered {
+  border: 1px solid black;
+  border-radius: 0.5em;
+
+  padding: 0.5em;
+}
 table.bordered {
   tbody {
     td {
@@ -126,13 +132,13 @@ table.bordered {
   }
 }
 
-.bordered-card {
-  border: 1px solid grey;
-  padding: .5em;
-  border-radius: 8px;
-  margin-bottom: .5em;
-  padding: 0.5em;
-}
+// .bordered-card {
+//   border: 1px solid grey;
+//   padding: .5em;
+//   border-radius: 8px;
+//   margin-bottom: .5em;
+//   padding: 0.5em;
+// }
 
 .btn {
   border: 1px solid red;
@@ -224,12 +230,11 @@ table.bordered {
 .collapse-expand::after {
   content: " [<]";
 }
-.collapsed::after {
+.wco-collapse::after {
   content: " [>]";
 }
-.expand-next + form {
-  // border: 1px solid red !important;
-  // display: none !important;
+.wco-collapsed {
+  display: none;
 }
 
 /* D */
@@ -450,7 +455,15 @@ textarea.large {
   display: inline;
 }
 
-
+.ml-100 {
+  margin-left: 100px;
+}
+.ml-200 {
+  margin-left: 200px;
+}
+.ml-300 {
+  margin-left: 300px;
+}
 
 /* N */
 

data/app/assets/stylesheets/ish_manager/email.scss

@@ -38,16 +38,11 @@ td.ctxs {
 
   display: inline-block;
 
-  // display: flex;
-  // flex-direction: column;
-
-  // max-width: 400px; // @TODO: where is this used?!
-
-  margin-left: 20px;
-
   border: 1px solid #666;
   border-radius: 5px;
+
   padding: 5px;
+
   background: #eee;
 
   * {

data/app/assets/stylesheets/ish_manager/email_conversations.scss

@@ -27,8 +27,6 @@
       border-bottom: 1px solid yellow;
       margin-bottom: 0.3em;
 
-      // display: flex;
-
       .subject {
         // background: #ccc;
 
@@ -51,48 +49,50 @@
 
   .header {
     display: flex;
-    align-items: baseline;
+    align-items: center;
 
     .label {
       padding-right: 0.2em;
     }
   }
 
-  .leads {
+  .leads-list {
+    margin: 1em 0;
+
     .item {
       display: inline;
+
       border: 1px solid green;
-      // background: cyan;
+      border-radius: 0.5em;
+      padding: 0.5em;
+
+      margin-right: 0.5em;
+
     }
   }
 
-  // these are inside a conversation. _vp_ 2023-02-28
-  .messages {
+  /* these are inside a conversation. _vp_ 2023-02-28 */
+  .messages-list {
     // border: 1px solid red;
 
     padding-left: 0;
     list-style-type: none;
 
     .item:first-child {
-      border-top: 1px solid yellow;
+      border-top: 1px solid var(--m3-dol-accent-color);
     }
     .item {
-      border-bottom: 1px solid yellow;
+      border-bottom: 1px solid var(--m3-dol-accent-color);
       margin-bottom: 0.2em;
 
-      // .expand {
-      //   border: 1px solid red;
-      //   max-height: 500px;
-      //   overflow: auto;
-      // }
+      padding: 0.5em 0;
 
       iframe {
-        border: 2px solid yellow;
+        // border: 2px solid yellow;
 
         width: 100%;
         min-height: 500px;
-        height: 80vh;
-        // display: none;
+        height: 75vh;
       }
 
       .my-actions {
@@ -157,13 +157,5 @@
     font-weight: bold;
   }
 
-  .tags {
-    display: flex;
-    flex-direction: column;
-
-    .chip {
-      border: 1px solid cyan;
-    }
-  }
 
 }

data/app/assets/stylesheets/ish_manager/leads_leadsets.scss

@@ -27,14 +27,17 @@
     }
   }
 
-  tr {
-    border-bottom: 1px solid yellow;
 
-    // :hover {
-    //   background: #eee;
-    // }
+  .chip {
+    display: inline;
+
+    border: 1px solid #eee;
+    border-radius: 0.5em;
+    padding: 0.1em .3em;
+    background: #fff;
   }
 
+
   th.leads {
     margin-left: 1em;
   }
@@ -91,6 +94,8 @@
     }
   }
 
+  /* belongs here, not in tags.scss */
+
   .tags {
     // background: #eee;
 
@@ -105,14 +110,6 @@
     vertical-align: top;
   }
 
-  .chip {
-    display: inline;
-
-    border: 1px solid #eee;
-    border-radius: 0.5em;
-    padding: 0.1em .3em;
-    background: #fff;
-  }
 
 }
 

data/app/assets/stylesheets/ish_manager/tags.scss

@@ -3,3 +3,26 @@ form.tags--form-mini {
   display: flex;
 }
 
+/*
+ * used in
+ *   .email-conversations-index
+ *   .email-conversations-show
+**/
+.tags-list {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: baseline;
+
+  // border: 1px dashed var(--m3-dol-text-color);
+  // border-radius: 5px;
+  // padding: 0.5em;
+
+  margin: 0.5em 0;
+
+  .label,
+  b {
+    margin-right: 0.5em;
+  }
+}
+
+

data/app/assets/stylesheets/ish_manager/variables.css

@@ -0,0 +1,5 @@
+
+:root {
+  --m3-dol-accent-color: red;
+  --m3-dol-text-color: #000;
+}

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

@@ -1,77 +1,79 @@
 
 .email-conversations-show
 
-  .header.max-width
-    -# %i.material-icons mail
+  .padded
 
-    = link_to '[<<-]', email_conversations_path
+    .header
+      = link_to '[<<-]', email_conversations_path
+      %i.material-icons mail
 
-    .subject #{@email_conversation.subject}
-    (#{@email_conversation.email_messages.all.count})
+      .subject #{@email_conversation.subject}
+      (#{@email_conversation.email_messages.all.count})
 
-  .tags.max-width
-    Tags (#{@email_conversation.tags.length}):
-    = @email_conversation.wp_term_ids
-    = @email_conversation.tags.map(&:name).join(", ")
+    .tags-list
+      %b Tags (#{@email_conversation.tags.length}):
+      -# = @email_conversation.wp_term_ids
+      - @email_conversation.tags.each do |tag|
+        .chip= link_to "[#{tag.term_id}] #{tag.name}", category_path( tag )
 
-  .leads.max-width
-    Leads (#{@email_conversation.leads.length}):
-    - @email_conversation.leads.each do |lead|
-      .item
-        = link_to "#{lead.id} #{lead.email}", lead_path(lead)
-        \(ctxs:
-        = link_to email_contexts_for_lead_path( lead ) do
-          = lead.email_contexts.count
-          %i.fa.fa-envelope
-        .relative.inline-block
-          %i.fa.fa-plus.expand-next
-          .expand-hide= render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank })
-        \)
-        .relative.inline-block
-          %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
-          .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
+    .leads-list
+      %b Leads (#{@email_conversation.leads.length}):
+      - @email_conversation.leads.each do |lead|
+        .item
+          = link_to "#{lead.id} #{lead.email}", lead_path(lead)
+          \(ctxs:
+          = link_to email_contexts_for_lead_path( lead ) do
+            = lead.email_contexts.count
+            %i.fa.fa-envelope
+          .relative.inline-block
+            %i.fa.fa-plus.expand-next
+            .expand-hide= render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank })
+          \)
+          .relative.inline-block
+            %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
+            .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
 
-  .messages.max-width
-    - @email_messages.each do |msg|
-      - lead = msg.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
+    .messages-list
+      - @email_messages.each do |msg|
+        - lead = msg.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
 
-      .item.msg-container{ data: { msg: { id: msg.id } } }
-        .row-1
-          .gray
-            %ul
-              %li
-                = msg.id
-                <b>To:</b> #{msg.to}
-                <b>From:</b> #{lead.email}
+        .item.msg-container{ data: { msg: { id: msg.id } } }
+          .row-1
+            .gray
+              <b>From:</b> #{lead.email}
+              <b>To:</b> #{msg.to}
+              = msg.id
+              <b>object_key:</b> #{msg.object_key}
 
 
-          .datetime
-            .date= msg.date&.strftime('%Y-%m-%d')
-            .time= msg.date&.strftime('%l:%M%P')
+            .datetime
+              .date= msg.date&.strftime('%Y-%m-%d')
+              .time= msg.date&.strftime('%l:%M%P')
 
-        .row-2
-          .flexy
-            = link_to "Expand w/img", ishapi.email_message_path(msg, jwt_token: @jwt_token, load_images: true ), target: msg.message_id, class: 'preview-btn', data: { msg: { id: msg.id.to_s } }
-            \- or -
-            = link_to "Expand",       ishapi.email_message_path(msg, jwt_token: @jwt_token ),                    target: msg.message_id, class: 'preview-btn', data: { msg: { id: msg.id.to_s } }
-            = msg.preview_str
+          .row-2
+            .flexy
+              = link_to "Expand w/img", ishapi.email_message_path(msg, jwt_token: @jwt_token, load_images: true ), target: msg.message_id, class: 'preview-btn', data: { msg: { id: msg.id.to_s } }
+              \- or -
+              = link_to "Expand",       ishapi.email_message_path(msg, jwt_token: @jwt_token ),                    target: msg.message_id, class: 'preview-btn', data: { msg: { id: msg.id.to_s } }
+              = msg.preview_str
 
-          .to-expand
+            .ml-200.to-expand
 
-            - if msg.attachments.present?
-              .attachments
-                - msg.attachments.map do |att|
-                  .item
-                    %h5= att.photo.original_filename
-                    = image_tag att.photo.url(:original)
+              - if msg.attachments.present?
+                .attachments
+                  - msg.attachments.map do |att|
+                    .item
+                      %h5= att.photo.original_filename
+                      = image_tag att.photo.url(:original)
 
-            %iframe{ name: msg.message_id }
+              %iframe{ name: msg.message_id }
 
-            = render 'ish_manager/email_contexts/form_reply', lead: lead
-            .bordered-card
-              = render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank_template, from_email: msg.to, subject: msg.subject, body: (msg.part_html||msg.part_txt) }), lead: lead
-            -# = button_to 'Reply'
-            -# = button_to 'Reply All'
-            -# = button_to 'New Template'
-            -# = button_to 'Schedule Reply'
-            -# = render 'ish_manager/email_templates/form_schedule_mini'
+              = render 'ish_manager/email_contexts/form_reply', lead: lead
+              .collapse-expand.wco-collapse Reply
+              .bordered.mt-3.wco-collapsed
+                = render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank_template, from_email: msg.to, subject: msg.subject, body: (msg.part_html||msg.part_txt) }), lead: lead
+              -# = button_to 'Reply'
+              -# = button_to 'Reply All'
+              -# = button_to 'New Template'
+              -# = button_to 'Schedule Reply'
+              -# = render 'ish_manager/email_templates/form_schedule_mini'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.484
+  version: 0.1.8.485
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -477,6 +477,7 @@ files:
 - app/assets/stylesheets/ish_manager/tags.scss
 - app/assets/stylesheets/ish_manager/trash/pagination.scss
 - app/assets/stylesheets/ish_manager/user_profiles.scss
+- app/assets/stylesheets/ish_manager/variables.css
 - app/assets/stylesheets/ish_manager/vendor/jquery-ui.css
 - app/assets/stylesheets/ish_manager/vendor/summernote-bs4.min.css
 - app/assets/stylesheets/ish_manager/videos.scss