ish_manager 0.1.8.355 → 0.1.8.356

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41936b74cab9eb00d566912ce0bf799cad9994da03ad6488c30f825996541d85
-  data.tar.gz: eaf88d58f3189d9e0155a5d0fa5c7da9aa7c1be560068de9cbfd5f88ae52c0f6
+  metadata.gz: ce753c6d6bafa14c05b39e77a6d98f61984caff8cb6380d64b837bd48a0e6e28
+  data.tar.gz: aa7c9068d5a70d26f101317406234cabe535d13d32f0391b1fe9beca97297726
 SHA512:
-  metadata.gz: eca56720c4ed0101a5e1b55bfa0f8b55169a72a4e2450b6f558b21523aa5c62eb0b73aeca2f15cb7639ab20af1ad9181886feedcd36eb5e2225177858ca515b9
-  data.tar.gz: 1e3e8b689b5edb016e5ba3e6b54ccee260c0b949c38f298e14315651ab59ad4cc55b37cc1fc3261ef75027f85cd47ea2716b76818355b109bb7d7689c0cc6660
+  metadata.gz: f3800cd35e62cb88fb79f48b6b9b88037be8c91c00dadd74cd95fb02504e927a750f03211b9ff920598947db195a858356fb6f482ebe7b60bdf7802a7c71bc17
+  data.tar.gz: 6628e0f557aec949d0ec7910c0f0c9e4462804301a6d0e8bc4d850d5398338afc44388c91417293e48c021e3e7d9f307d078726beb14585d49c802286f9f0164

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

@@ -12,6 +12,7 @@
 //
 // require ish_manager/vendor/jquery-3.6.0.min
 // require ish_manager/vendor/bootstrap.min
+//
 //= require ish_manager/vendor/jquery.iframe-transport
 //= require ish_manager/vendor/jquery.ui.widget
 //= require ish_manager/vendor/jquery.fileupload
@@ -20,6 +21,7 @@
 //
 //= require ish_manager/maps
 //= require ish_manager/email_contexts
+//= require ish_manager/email_templates
 
 $(function () {
 
@@ -57,14 +59,16 @@ $(function () {
       $('select').material_select()
     }
     if (!!$('body').select2) {
-      $('.select2').select2({
-        width: 'element'
+      $('.select2').each(function() {
+        $( this ).select2({
+          width: '100%'
+        })
       })
     }
   }
 
 
-  $(".collapse-expand").each(function(idx, obj) {
+  $(".collapse-expand").each(function() {
     const thisId = $(this).attr('id')
     const state = localStorage.getItem("collapse-expand#"+thisId)
     if (state === 'collapsed') {
@@ -84,6 +88,10 @@ $(function () {
     e.stopPropagation()
   })
 
+  $(".expand-next").click(function (_e) {
+    // logg($(this).next(), 'expand?')
+    $(this).next().slideToggle()
+  })
 
   if ('function' === typeof $('body').DataTable) {
     const _props = {
@@ -105,29 +113,39 @@ $(function () {
     $('select').formSelect();
   }
 
-  if ($(".data-table").length) {
-    $("input[type='checkbox'].i-sel").change(() => {
-      $( $(".n-selected")[0] ).html( $("input[type='checkbox'].i-sel:checked").length )
-    })
-  }
+  //
+  // select-all
+  // _vp_ 2023-02-28
 
-  $("button.delete-btn").click(e => {
-    let out = []
+  $("input[type='checkbox'].i-sel").change(() => {
+    $( $(".n-selected")[0] ).html( $("input[type='checkbox'].i-sel:checked").length )
+  })
+
+  $(".delete-btn").click(function(e) {
+    logg(e, 'deleting...')
+
+    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)
     })
+    logg(out, 'out')
 
     $.ajax({
-      url: '/api/leadsets',
+      url: action_path,
       type: 'DELETE',
-      data: { leadset_ids: out },
+      data: {
+        ids: out,
+        jwt_token: localStorage.getItem('jwt_token'),
+      },
       success: e => {
-        logg(e, 'deleted Ok')
+        logg((e||{}).responseText, 'deleted Ok')
+        location.reload()
       },
       error: e => {
-        logg(e, 'deleted Err')
+        logg((e||{}).responseText, 'deleted Err')
       },
     })
 
@@ -135,7 +153,9 @@ $(function () {
 
   $(".select-all input[type='checkbox']").change((e) => {
     const count = $("input[type='checkbox'].i-sel:checked").length
-    const new_state = count ? false : true
+    const new_state = count ? false : true // all will be checked?
+
+    $(".select-all input[type='checkbox']").prop('checked', new_state)
 
     $( $("input[type='checkbox'].i-sel") ).each( i => {
       $( $("input[type='checkbox'].i-sel")[i] ).prop('checked', new_state)
@@ -144,5 +164,37 @@ $(function () {
     $( $(".n-selected")[0] ).html( $("input[type='checkbox'].i-sel:checked").length )
   })
 
+  //
+  // email conversations
+  //
+  $("body.email_conversations-show a.preview").click(function(e) {
+    // logg(e, 'clicked')
+
+    if ($(this).data('expanded')) {
+      $(this).parent().find(".expand").html('')
+      $(this).parent().find(".my-actions").addClass('hide')
+      $(this).data('expanded', false)
+      return
+    }
+
+    const action_path = "/api/email_messages/" + $(this).data('id')
+
+    $.ajax({
+      url: action_path,
+      type: 'GET',
+      data: {
+        jwt_token: localStorage.getItem('jwt_token'),
+      },
+      success: e => {
+        $(this).parent().find(".expand").html(e.item.part_html)
+        $(this).parent().find(".my-actions").removeClass('hide')
+        $(this).data('expanded', true)
+      },
+      error: e => {
+        logg((e||{}).responseText, 'cannot get email_message')
+      },
+    })
+  })
+
 });
 

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

@@ -1,6 +1,6 @@
 
 AppRouter = {
-  new_email_context_with: (slug) => `/manager/email_contexts/new_with/${slug}`
+  new_email_context_with: (slug) => `/manager/email_contexts/new_with_template/${slug}`
 }
 
 $(document).ready(() => {

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

@@ -0,0 +1,20 @@
+
+$(document).ready(() => {
+
+  if ($(".email-templates--form").length) {
+    $(".tab-labels > a").click(function() {
+      logg( $(this).data('ref'), 'ref')
+
+      $(this).parent().find("a").each((idx, item) => {
+        $(item).removeClass('active')
+      })
+      $( this ).addClass('active')
+
+      $(this).parent().parent().find(".tabs > div").each((idx, item) => {
+        $(item).css('display', 'none')
+      })
+      $(this).parent().parent().find( $(this).data('ref') ).css('display', 'block')
+    })
+  }
+
+})

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

@@ -4,19 +4,24 @@
  *= require ish_manager/jquery-ui
  *= require_self
  *
- *= require ish_manager/email_contexts_templates
+ *= require ish_manager/email_contexts
  *= require ish_manager/email_conversations
  *= require ish_manager/email_messages
+ *= require ish_manager/email_templates
+ *= require ish_manager/email
  *
  *= require ish_manager/galleries
+ *= require ish_manager/leads_leadsets
  *= require ish_manager/maps
  *= require ish_manager/markers
- *= require ish_manager/leads_leadsets
+ *= require ish_manager/office
+ *= require ish_manager/pagination
  *= require ish_manager/photos
+ *= require ish_manager/scheduled_actions_emails
+ *= require ish_manager/tags
  *= require ish_manager/user_profiles
  *= require ish_manager/videos
- *= require ish_manager/pagination
- *= require ish_manager/office
+ *
 **/
 
 a[target='_blank'] {
@@ -65,6 +70,11 @@ ul:not(.browser-default).bullets, {
 .collapse-expand::after {
   content: " [<>]";
 }
+.expand-next + form {
+  // border: 1px solid red !important;
+  // display: none !important;
+}
+
 .alert {
   border: 1px solid red;
   padding: .8em;
@@ -103,6 +113,12 @@ body.application-fullwidth {
   padding: 1em;
 }
 
+table.bordered {
+  td {
+    border: 1px solid black;
+  }
+}
+
 .bordered-card {
   border: 1px solid grey;
   padding: .5em;
@@ -111,6 +127,11 @@ body.application-fullwidth {
   padding: 0.5em;
 }
 
+/* B */
+
+.btn {
+  border: 1px solid red;
+}
 
 /* C */
 
@@ -185,9 +206,15 @@ table.dataTable {
   float: right;
 }
 
+/* G */
+.gray,
+.grey {
+  color: #999;
+}
+
 /* H */
 .hide, .hidden {
-  display: none;
+  display: none !important;
 }
 
 /* I */
@@ -214,6 +241,9 @@ ul.inline li {
   }
 }
 
+.input-date {
+  width: 100px;
+}
 
 /* L */
 textarea.large {
@@ -305,12 +335,13 @@ textarea.large {
 
 /* N */
 
-label.n-selected {
-  border: 1px solid red;
-  padding: 0.5em;
+.n-selected {
 
+  &::before {
+    content: "(";
+  }
   &::after {
-    content: " Selected";
+    content: ")";
   }
 }
 
@@ -325,6 +356,10 @@ label.n-selected {
 }
 
 /* P */
+.padded {
+  padding: 0.5em;
+}
+
 .panel-content {
   padding: .5em;
 }
@@ -335,6 +370,10 @@ label.n-selected {
   padding: .2em;
 }
 
+.relative {
+  position: relative;
+}
+
 /* S */
 
 .select2-container {

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

@@ -0,0 +1,44 @@
+
+
+.email-actions-edit,
+.email-actions-index,
+.email-filters-index,
+.email-templates-edit,
+.email-templates-show,
+.email-contexts-edit,
+.email-contexts-show,
+.emails-ns, // emails namespace
+.leads-edit,
+.leads-index {
+  .header {
+    display: flex;
+    justify-content: center;
+  }
+}
+
+
+.form-mini {
+
+  display: inline-block;
+
+  // display: flex;
+  // flex-direction: column;
+
+  max-width: 400px;
+
+  margin-left: 20px;
+
+  border: 1px solid #666;
+  border-radius: 5px;
+  padding: 5px;
+  background: #eee;
+
+  * {
+    display: inline;
+  }
+
+  .header {
+    display: block;
+  }
+}
+

data/app/assets/stylesheets/ish_manager/{email_contexts_templates.scss → email_contexts.scss}

@@ -19,47 +19,17 @@
 
 }
 
-.email-templates-index ul li,
-.email-contexts-index .header,
-.email-contexts-index ul.main li {
-
-   a {
-    margin-right: 0.5em;
-
-    &::before {
-      content: "[";
-    }
-
-    &::after {
-      content: "]";
-    }
-  }
-
-}
-
-
-.email-templates--form-mini {
-  border: 1px solid red;
-  padding: 1em;
+.email-contexts--form,
+.email-templates--form {
 
-  form {
+  .field-template {
     display: flex;
 
-    > * {
-      padding-right: 20px;
+    a.action-view {
+      width: 150px;
     }
   }
 
-}
-
-.email-templates--form-reply-mini,
-.email-templates--form-schedule-mini {
-
-}
-
-.email-contexts--form,
-.email-templates--form {
-
   textarea {
     width: 100%;
     min-height: 200px;
@@ -82,23 +52,33 @@
     margin: 10px;
   }
 
-
 }
 
-.form-mini {
-  margin-left: 20px;
-  display: inline-block;
-  border: 1px solid #666;
-  border-radius: 5px;
-  padding: 5px;
-  background: #eee;
+.email-contexts-index {
 
-  * {
-    display: inline;
+  > .collapse-expand {
+    display: flex;
+    justify-content: center;
+
+    .header {
+      a {
+        &:before {
+          content: '[';
+        }
+        &:after {
+          content: ']';
+        }
+      }
+    }
   }
-  .send-at {
-    input {
-      width: 150px;
+
+
+
+  table {
+    th.actions {
+      min-width: 100px;
     }
   }
-}
+
+}
+

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

@@ -2,43 +2,120 @@
 .email-conversations-index,
 .email-conversations-show {
 
+  font-size: 14px;
+
+  margin: 0 1em;
+
+  > .actions {
+    border: 1px solid cyan;
+
+    display: inline;
+
+    > * {
+      display: inline;
+      margin-right: .3em;
+    }
+  }
+
+  .conversations {
+
+    tr:hover {
+      background: #eee;
+    }
+
+    tr {
+      border-bottom: 1px solid yellow;
+      margin-bottom: 0.3em;
+
+      // display: flex;
+
+      .subject {
+        // background: #ccc;
+
+        flex-grow: 1;
+      }
+    }
+
+    tr.state_unread {
+      background: #fffdd2;
+    }
+  }
+
+  // refers to number of messages in a conversation
+  .count {
+    display: inline;
+    width: 30px;
+    text-align: right;
+  }
+
+  .datetime {
+    // background: #999;
+    width: 150px;
+
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .header {
+    display: flex;
+    align-items: baseline;
+
+    .label {
+      padding-right: 0.2em;
+    }
+  }
+
+  // these are inside a conversation. _vp_ 2023-02-28
   .messages {
     // border: 1px solid red;
 
     padding-left: 0;
-
     list-style-type: none;
 
-    li {
-
+    .item:first-child {
+      border-top: 1px solid yellow;
+    }
+    .item {
+      border-bottom: 1px solid yellow;
       margin-bottom: 0.2em;
 
-      // clear: both;
-
-      .date {
-        // border: 1px solid orange;
+      .expand {
+        border: 1px solid red;
+        max-height: 500px;
+        overflow: auto;
+      }
 
-        width: 120px;
-        float: left;
+      .my-actions {
+        display: flex;
       }
 
       .preview {
         // border: 1px solid gold;
 
+        display: inline-block;
+        width: 100%;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+      }
 
+      .row-1 {
+        display: flex;
+        justify-content: space-between;
       }
     }
   }
 
   .participants {
-    border: 1px solid #999900;
-    background: #ffffcc;
-    border-radius: 5px;
-    padding: 5px;
-    display: inline;
+    width: 250px;
+    padding-left: .3em;
+
+    // border: 1px solid #999900;
+    // background: #ffffcc;
+    // border-radius: 5px;
+    // padding: 5px;
+
+    // display: inline;
 
     ul {
       display: inline;
@@ -49,17 +126,18 @@
     }
   }
 
-}
+  .select-all.chip {
+    display: flex;
+    border: 1px solid cyan;
+  }
 
-.email-conversations-show {
-  .header {
+  .tags {
     display: flex;
-    align-items: baseline;
+    flex-direction: column;
 
-    .label {
-      padding-right: 0.2em;
+    .chip {
+      border: 1px solid cyan;
     }
   }
 
-
 }

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

@@ -0,0 +1,59 @@
+
+.email-templates--form {
+  form {
+    > .actions {
+      text-align: right;
+    }
+
+    .tab-labels {
+      // border: 1px solid red;
+      margin-top: 1em;
+
+
+      display: flex;
+
+      > * {
+        // border: 1px solid red;
+      }
+      > .active {
+        border: 2px solid red;
+        border-radius: 0.5em 0.5em 0 0;
+        border-bottom: 0;
+        margin-bottom: -2px;
+        background: white;
+        padding: 0 .5em;
+        margin: 0 .5em;
+      }
+
+    }
+    .tabs {
+      .tab-raw {
+        display: none;
+      }
+      .tab-preview {
+        height: 500px;
+        // display: none;
+      }
+    }
+
+  }
+}
+
+.email-templates--form-mini {
+  border: 1px solid red;
+  padding: 1em;
+
+  form {
+    display: flex;
+
+    > * {
+      padding-right: 20px;
+    }
+  }
+
+}
+
+.email-templates--form-reply-mini,
+.email-templates--form-schedule-mini {
+
+}