wco_email 0.1.1.55 → 0.1.1.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de915ac821b3008a5eb3e64369c3aca53b92e3c9c35033b62b39ce7003db17c
-  data.tar.gz: bf8d61b396d4393ef46183a498186969fd492b5ecb2506222cbb55a20373ec1b
+  metadata.gz: ee69de6a781e7d30ee9a55bffd62814ec869211f0b97c4430fc49d45e138cfc9
+  data.tar.gz: 24123409b3c7261e75db576ce5c95839dcffd36583b25541246114143cdac0ba
 SHA512:
-  metadata.gz: adb423d238a850f679112cf1b041a2cd312d5e0b31d408f87f213c6fa6e2df721d9e3b9d0ddd487fc3a97766d548a2509eb32140257c373250f89a86ad2e17a7
-  data.tar.gz: 8d2826467735d3ca5c5249720ceb2144664fb14e4ad7f0e5d7879e2dd57aade3bdeb959a95151ff71f2bb95cb20e34807248770bafc92cfc965df6c0690e3e84
+  metadata.gz: 1786bc6c59b990a140dfae0209f1a2ab2bb6fa88986d59e16be31d699ef11227905aad42a90591c7376033637d953a7958ec8fe920d3e9044b79f14264d64f15
+  data.tar.gz: dfc0322f896a37e3ec10a45d8f85cbb3394b1152d846f480bb1494cfad78200410b919b67d8f4bfebae6bc7642a024cd4707ef26f380ada0ac2845fc50ebb90f

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

@@ -1,5 +1,4 @@
 //
-// trash: require rails-ujs
 //
 //= require ./contexts
 //= require ./conversations

data/app/controllers/wco_email/application_controller.rb

@@ -1,17 +1,6 @@
 
-EC   ||= WcoEmail::Conversation
-EF   ||= WcoEmail::EmailFilter
-EM   ||= WcoEmail::Message
-ET   ||= WcoEmail::EmailTemplate
-MS   ||= WcoEmail::MessageStub
-EMS  ||= MS
-OA   ||= Wco::OfficeAction
-OAT  ||= Wco::OfficeActionTemplate
-OATT ||= Wco::OfficeActionTemplateTie
-Sch  ||= WcoEmail::EmailAction
-
 class WcoEmail::ApplicationController < Wco::ApplicationController
-  # before_action :set_lists
+
   layout 'wco_email/application'
 
 

data/app/controllers/wco_email/conversations_controller.rb

@@ -52,11 +52,9 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
       @conversations = @conversations.where( lead_ids: params[:lead_id] )
     end
 
-    @conversations = @conversations.order_by( latest_at: :desc
-      ).includes( :leads, :messages
-      ).page( params[:conv_page]
-      ).per( current_profile.per_page
-      )
+    @conversations = @conversations.includes( :leads, :messages, :tags
+    ).order_by( latest_at: :desc
+    ).page( params[:conv_page] ).per( current_profile.per_page )
   end
 
   ## merge conv1 into conv2, and delete conv1
@@ -100,6 +98,8 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
     @messages     = @conversation.messages.order_by( date: :asc )
     @conversation.update_attributes({ status: Conv::STATUS_READ })
 
+    @conversation.messages.unread.update_all({ read_at: Time.now })
+
     @other_convs = WcoEmail::Message.where( :message_id.in => @messages.map( &:in_reply_to_id )
       ).where( :conversation_id.ne => @conversation.id
       ).map( &:conversation_id ).uniq

data/app/views/layouts/wco_email/application.haml

@@ -7,29 +7,25 @@
     %meta{ :charset => 'UTF-8' }
     %meta{ :description => @page_description }
 
-    = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
+    = javascript_include_tag "wco/application"
+    = stylesheet_link_tag    "wco/application", media: "all"
 
-    = javascript_include_tag "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"
-    = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
+    = javascript_include_tag "wco_email/application"
+    = stylesheet_link_tag    "wco_email/application", media: "all"
 
-    = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
-    = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
 
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
+    -# = javascript_include_tag "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"
+    -# = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
 
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js", defer: 'defer'
+    = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
 
+    = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
+
+    -# Allowed so far b/c I need to move fonts, too:
     = stylesheet_link_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css"
     = javascript_include_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"
 
-    = javascript_include_tag "wco/application"
-    = stylesheet_link_tag    "wco/application", media: "all"
 
-    = javascript_include_tag "wco_email/application"
-    = stylesheet_link_tag    "wco_email/application", media: "all"
 
 
     -# %script{crossorigin: "", src: "https://unpkg.com/react@18/umd/react.development.js"}
@@ -45,19 +41,9 @@
     = render "/wco/main_header"
     = render "/wco_email/main_header"
 
-
-    -# notice #{notice.inspect} alert #{alert.inspect}
     = render '/wco/alerts_notices' if notice || alert
     %hr
 
-    -# .padded
-    -#   .row
-    -#     .col-md-2.border-right
-    -#       = yield :sidebar
-    -#     .col-md-10
-    -#       %span.absolute.collapse-expand#mainW
-    -#       = yield
-
     .padded.flex-row
       = yield :sidebar
       %span.absolute.collapse-expand#mainW

data/app/views/wco_email/_sidebar.haml

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

data/lib/tasks/db_tasks.rake

@@ -22,6 +22,8 @@ namespace :db do
   desc "seed"
   task seed: :environment do
 
+    Wco::Profile.find_or_create_by({ email: 'piousbox@gmail.com' })
+
     blank_email_template = WcoEmail::EmailTemplate.find_or_create_by({ slug: 'blank' })
 
     inbox = Wco::Tag.find_or_create_by({ slug: 'inbox' })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.55
+  version: 0.1.1.58
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3