wco_email 0.1.1.55 → 0.1.1.58

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascript/wco_email/application.js +0 -1
  3. data/app/controllers/wco_email/application_controller.rb +1 -12
  4. data/app/controllers/wco_email/conversations_controller.rb +5 -5
  5. data/app/views/layouts/wco_email/application.haml +10 -24
  6. data/app/views/wco_email/_sidebar.haml +2 -3
  7. data/lib/tasks/db_tasks.rake +2 -0
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8de915ac821b3008a5eb3e64369c3aca53b92e3c9c35033b62b39ce7003db17c
4
- data.tar.gz: bf8d61b396d4393ef46183a498186969fd492b5ecb2506222cbb55a20373ec1b
3
+ metadata.gz: ee69de6a781e7d30ee9a55bffd62814ec869211f0b97c4430fc49d45e138cfc9
4
+ data.tar.gz: 24123409b3c7261e75db576ce5c95839dcffd36583b25541246114143cdac0ba
5
5
  SHA512:
6
- metadata.gz: adb423d238a850f679112cf1b041a2cd312d5e0b31d408f87f213c6fa6e2df721d9e3b9d0ddd487fc3a97766d548a2509eb32140257c373250f89a86ad2e17a7
7
- data.tar.gz: 8d2826467735d3ca5c5249720ceb2144664fb14e4ad7f0e5d7879e2dd57aade3bdeb959a95151ff71f2bb95cb20e34807248770bafc92cfc965df6c0690e3e84
6
+ metadata.gz: 1786bc6c59b990a140dfae0209f1a2ab2bb6fa88986d59e16be31d699ef11227905aad42a90591c7376033637d953a7958ec8fe920d3e9044b79f14264d64f15
7
+ data.tar.gz: dfc0322f896a37e3ec10a45d8f85cbb3394b1152d846f480bb1494cfad78200410b919b67d8f4bfebae6bc7642a024cd4707ef26f380ada0ac2845fc50ebb90f
data/app/assets/javascript/wco_email/application.js CHANGED
@@ -1,5 +1,4 @@
1
1
  //
2
- // trash: require rails-ujs
3
2
  //
4
3
  //= require ./contexts
5
4
  //= require ./conversations
data/app/controllers/wco_email/application_controller.rb CHANGED
@@ -1,17 +1,6 @@
1
1
 
2
- EC ||= WcoEmail::Conversation
3
- EF ||= WcoEmail::EmailFilter
4
- EM ||= WcoEmail::Message
5
- ET ||= WcoEmail::EmailTemplate
6
- MS ||= WcoEmail::MessageStub
7
- EMS ||= MS
8
- OA ||= Wco::OfficeAction
9
- OAT ||= Wco::OfficeActionTemplate
10
- OATT ||= Wco::OfficeActionTemplateTie
11
- Sch ||= WcoEmail::EmailAction
12
-
13
2
  class WcoEmail::ApplicationController < Wco::ApplicationController
14
- # before_action :set_lists
3
+
15
4
  layout 'wco_email/application'
16
5
 
17
6
 
data/app/controllers/wco_email/conversations_controller.rb CHANGED
@@ -52,11 +52,9 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
52
52
  @conversations = @conversations.where( lead_ids: params[:lead_id] )
53
53
  end
54
54
 
55
- @conversations = @conversations.order_by( latest_at: :desc
56
- ).includes( :leads, :messages
57
- ).page( params[:conv_page]
58
- ).per( current_profile.per_page
59
- )
55
+ @conversations = @conversations.includes( :leads, :messages, :tags
56
+ ).order_by( latest_at: :desc
57
+ ).page( params[:conv_page] ).per( current_profile.per_page )
60
58
  end
61
59
 
62
60
  ## merge conv1 into conv2, and delete conv1
@@ -100,6 +98,8 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
100
98
  @messages = @conversation.messages.order_by( date: :asc )
101
99
  @conversation.update_attributes({ status: Conv::STATUS_READ })
102
100
 
101
+ @conversation.messages.unread.update_all({ read_at: Time.now })
102
+
103
103
  @other_convs = WcoEmail::Message.where( :message_id.in => @messages.map( &:in_reply_to_id )
104
104
  ).where( :conversation_id.ne => @conversation.id
105
105
  ).map( &:conversation_id ).uniq
data/app/views/layouts/wco_email/application.haml CHANGED
@@ -7,29 +7,25 @@
7
7
  %meta{ :charset => 'UTF-8' }
8
8
  %meta{ :description => @page_description }
9
9
 
10
- = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
10
+ = javascript_include_tag "wco/application"
11
+ = stylesheet_link_tag "wco/application", media: "all"
11
12
 
12
- = javascript_include_tag "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"
13
- = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
13
+ = javascript_include_tag "wco_email/application"
14
+ = stylesheet_link_tag "wco_email/application", media: "all"
14
15
 
15
- = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
16
- = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
17
16
 
18
- = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
19
- = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
20
- = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
17
+ -# = javascript_include_tag "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"
18
+ -# = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
21
19
 
22
- = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
23
- = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js", defer: 'defer'
20
+ = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
24
21
 
22
+ = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
23
+
24
+ -# Allowed so far b/c I need to move fonts, too:
25
25
  = stylesheet_link_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css"
26
26
  = javascript_include_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"
27
27
 
28
- = javascript_include_tag "wco/application"
29
- = stylesheet_link_tag "wco/application", media: "all"
30
28
 
31
- = javascript_include_tag "wco_email/application"
32
- = stylesheet_link_tag "wco_email/application", media: "all"
33
29
 
34
30
 
35
31
  -# %script{crossorigin: "", src: "https://unpkg.com/react@18/umd/react.development.js"}
@@ -45,19 +41,9 @@
45
41
  = render "/wco/main_header"
46
42
  = render "/wco_email/main_header"
47
43
 
48
-
49
- -# notice #{notice.inspect} alert #{alert.inspect}
50
44
  = render '/wco/alerts_notices' if notice || alert
51
45
  %hr
52
46
 
53
- -# .padded
54
- -# .row
55
- -# .col-md-2.border-right
56
- -# = yield :sidebar
57
- -# .col-md-10
58
- -# %span.absolute.collapse-expand#mainW
59
- -# = yield
60
-
61
47
  .padded.flex-row
62
48
  = yield :sidebar
63
49
  %span.absolute.collapse-expand#mainW
data/app/views/wco_email/_sidebar.haml CHANGED
@@ -4,8 +4,7 @@
4
4
  - @tags.each do |tag|
5
5
  %li
6
6
  = link_to tag.slug, conversations_in_path( tag.slug )
7
- -# (#{tag.conversations.unread.length}, #{tag.conversations.length})
8
- (#{tag.conversations.unread.length})
9
- (#{tag.conversations.length})
7
+ -# (#{tag.conversations.unread.length})
8
+ -# (#{tag.conversations.length})
10
9
  = link_to "not", conversations_not_in_path( tag.slug )
11
10
 
data/lib/tasks/db_tasks.rake CHANGED
@@ -22,6 +22,8 @@ namespace :db do
22
22
  desc "seed"
23
23
  task seed: :environment do
24
24
 
25
+ Wco::Profile.find_or_create_by({ email: 'piousbox@gmail.com' })
26
+
25
27
  blank_email_template = WcoEmail::EmailTemplate.find_or_create_by({ slug: 'blank' })
26
28
 
27
29
  inbox = Wco::Tag.find_or_create_by({ slug: 'inbox' })
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wco_email
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1.55
4
+ version: 0.1.1.58
5
5
  platform: ruby
6
6
  authors:
7
7
  - Victor Pudeyev
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-02-13 00:00:00.000000000 Z
11
+ date: 2024-02-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk-s3