wco_models 3.1.0.128 → 3.1.0.129

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 47c3681ac6d5c0c89404e8d0c658a68cee9e86fabf97d89fd50c6be1dc3d7e7f
4
- data.tar.gz: dbfe632f6d6517cb9c537adcf4ab6bf1b1811fc3a83414d69b8c2bf186939553
3
+ metadata.gz: 7d3ea64ba1ec38637bdb0384d2cb97992f0ee08580b3711603eb0b8d5074776d
4
+ data.tar.gz: 0a2686ddb9bcdf5751b3c55faef56d57e83e92aecc0d5857aa5724603f267c3f
5
5
  SHA512:
6
- metadata.gz: 905172496a4162311c73e6a2e86a9fa1cf698941200e061e0f8bf829d1fd613828486caebcb2b1a9e200621da6c7ac78f13b2de264876b7b667d7b01f6424055
7
- data.tar.gz: 7808190db66e80b94ee87269c0fcea21d3e69d577179f56e7096a646bc93f98e8cdeb61f9ad4b36817827ff0ea7d1ef13ef925970d59380145cf8ce527c0b78d
6
+ metadata.gz: e036d2bdf569ccc7bd9b30c9655c55ee239651c80c4bdd8422ecc3c1ad5fd67b1350d04facc6e47f111e190c376e5118c3c283c262d558d451f429961a677fb5
7
+ data.tar.gz: 52e1e727d1c88caeae6933a8c396c19d9040d9e682f8028230081e5121bc2e2e2d7b248b274889bb104551725f56e3c432af75231c965c37158bc72623f5bf2d
@@ -0,0 +1,8 @@
1
+
2
+
3
+ html {
4
+ --wco-color-1: #ff6666;
5
+ --wco-color-1contrast: #ffffcc; /* #0073e6; */
6
+ --wco-color-2: #009999;
7
+ --wco-color-2contrast: #ffffcc;
8
+ }
@@ -6,6 +6,7 @@
6
6
  * Skip for now b/c I need to move fonts, too:
7
7
  * require ../vendor/summernote-0.8.18
8
8
  *
9
+ *= require ../light_theme
9
10
  *= require_tree .
10
11
  *= require ../production_theme
11
12
  *= require_self
@@ -13,6 +14,7 @@
13
14
 
14
15
  $enable-important-utilities: false;
15
16
 
17
+
16
18
  /* A */
17
19
  .application--main-header.development {
18
20
  background: url('//wasyaco.com/wp-content/uploads/2024/02/weather-bg-development.png'),
@@ -1,33 +1,26 @@
1
1
 
2
- html {
3
- // --wco-color-1: red;
4
- --wco-color-2: #ddd;
5
- }
6
2
 
7
- .chip,
8
- .Chip {
9
- display: inline;
10
3
 
11
- border: 1px solid var(--wco-color-1);
12
- border-radius: 0.5em;
13
- padding: 0.1em .3em;
14
- margin-bottom: 0.1em;
15
- background: var(--wco-color-2);
16
4
 
17
- }
18
5
  .chip,
19
6
  .Chip {
20
- // border: 1px solid black;
7
+ background: var(--wco-color-2);
21
8
  border-radius: 1em 0 0 1em;
22
9
 
23
- margin-right: 32px;
10
+ color: var(--wco-color-2contrast);
11
+ a {
12
+ color: var(--wco-color-2contrast);
13
+ }
24
14
 
25
- padding: 0.2em 0.2em 0.2em 0.6em;
15
+ display: inline;
26
16
 
27
17
  height: 32px;
28
18
 
29
- background: var(--wco-color-2);
19
+ margin-right: 32px;
20
+ margin-bottom: 0.1em;
30
21
 
22
+ padding: 0.1em .3em;
23
+ padding: 0.2em 0.2em 0.2em 0.6em;
31
24
  position: relative;
32
25
 
33
26
  &::before {
@@ -1,4 +1,9 @@
1
1
 
2
+ .Conversations {
3
+ border: 1px solid var(--wco-color-1);
4
+ border-radius: .5em;
5
+ padding: 0.5em;
6
+ }
2
7
 
3
8
  td.convs {
4
9
  text-align: center;
@@ -0,0 +1,6 @@
1
+
2
+ .Leads {
3
+ border: 1px solid var(--wco-color-2);
4
+ border-radius: .5em;
5
+ padding: 0.5em;
6
+ }
@@ -147,7 +147,7 @@ textarea.monospace {
147
147
  }
148
148
 
149
149
  .mini {
150
- font-size: 0.8em;
150
+ font-size: 0.75em;
151
151
  }
152
152
 
153
153
  /* P */
@@ -41,6 +41,8 @@ class Wco::TagsController < Wco::ApplicationController
41
41
  def show
42
42
  @tag = Wco::Tag.find params[:id]
43
43
  authorize! :show, @tag
44
+
45
+ @reports = @tag.reports.page( params[:reports_page] ).per( current_profile.per_page )
44
46
  end
45
47
 
46
48
  def update
@@ -0,0 +1,19 @@
1
+
2
+ - config ||= {}
3
+
4
+ .reports--list
5
+ %ul
6
+ - reports.each do |ttt|
7
+ %li.Card
8
+ .flex-row
9
+ = button_to '[x]', report_path(ttt), method: :delete, data: { confirm: 'Are you sure?' }
10
+ = link_to '[~]', edit_report_path(ttt)
11
+ .a
12
+ = link_to ttt.title, report_path(ttt)
13
+ %br
14
+ `#{ttt.slug}`
15
+ .gray.mini= ttt.id
16
+ - if !config[:skip_tags]
17
+ .flex-row
18
+ = render '/wco/tags/index_inline', tags: ttt.tags
19
+
@@ -3,19 +3,4 @@
3
3
  .header
4
4
  %h5.title
5
5
  = render 'header'
6
-
7
- %ul
8
- - @reports.each do |ttt|
9
- %li.Card
10
- .flex-row
11
- = button_to '[x]', report_path(ttt), method: :delete, data: { confirm: 'Are you sure?' }
12
- = link_to '[~]', edit_report_path(ttt)
13
- .a
14
- = link_to ttt.title, report_path(ttt)
15
- %br
16
- `#{ttt.slug}`
17
- .gray.mini= ttt.id
18
- .flex-row
19
-
20
- = render '/wco/tags/index_inline', tags: ttt.tags
21
-
6
+ = render 'wco/reports/list', reports: @reports
@@ -1,8 +1,10 @@
1
1
 
2
2
 
3
- .tags--index-inline
3
+ .Tags.mb-2
4
4
  <b>Tags (#{tags.length}):</b>
5
5
  - tags.each_with_index do |tag, idx|
6
- = link_to tag.slug, tag_path(tag)
7
- - if idx+1 != tags.length
6
+ = link_to tag.slug, wco.tag_path(tag)
7
+ - if idx+1 == tags.length
8
+ \.
9
+ - else
8
10
  \,&nbsp;
@@ -0,0 +1 @@
1
+ app/views/wco/tags/_index_inline.haml
@@ -5,11 +5,17 @@
5
5
 
6
6
  %ul
7
7
  %li.d-flex
8
- <b>Headlines (#{@tag.headlines.length}):</b>
8
+ <b>Conversations (#{@tag.conversations.length}):&nbsp;</b>
9
+ - if @tag.conversations.present?
10
+ .Conversations
11
+ = render '/wco_email/conversations/table', convs: @tag.conversations
12
+ %li.d-flex
13
+ <b>Headlines (#{@tag.headlines.length}):&nbsp;</b>
9
14
  = render '/wco/headlines/index', headlines: @tag.headlines
10
- %li
11
- <b>N reports:</b> #{@tag.reports.length}
12
- %li
13
- <b>N stubs:</b> #{@tag.message_stubs.length}
15
+ %li.d-flex
16
+ <b>Reports (#{@reports.length}):&nbsp;</b>
17
+ = render 'wco/reports/list', reports: @reports, config: { skip_tags: true }
18
+ %li.d-flex
19
+ <b>Message Stubs (#{@tag.message_stubs.length}):&nbsp;</b>
14
20
  = render '/wco_email/message_stubs/index', stubs: @tag.message_stubs
15
21
 
@@ -10,38 +10,39 @@
10
10
  %th.subject subject, preview
11
11
  %th.tags Tags
12
12
  %th.latest-at latest_at
13
- - convs.each_with_index do |conv, idx|
14
- %tr
15
- %td.select-all
16
- .gray= idx+1
17
- = check_box_tag 'conversation_ids[]', conv.id.to_s, nil, { class: 'i-sel' }
18
- %td.leads.mini
19
- -# - conv.from_emails.each do |from|
20
- -# = link_to from, wco.lead_path( from )
21
- -# %hr
22
- - conv.leads.each do |lead|
23
- = link_to lead.email, wco.lead_path( lead )
24
- %td.subject
25
- - if conv.unread?
26
- <b>#{link_to conv.subject, wco_email.conversation_path(conv)}</b>
27
- - else
28
- = link_to conv.subject, wco_email.conversation_path(conv)
29
- <b>#{conv.messages.unread.length}</b> (#{conv.messages.length})
13
+ %tbody.conversations-list
14
+ - convs.each_with_index do |conv, idx|
15
+ %tr
16
+ %td.select-all
17
+ .gray= idx+1
18
+ = check_box_tag 'conversation_ids[]', conv.id.to_s, nil, { class: 'i-sel' }
19
+ %td.leads.mini
20
+ -# - conv.from_emails.each do |from|
21
+ -# = link_to from, wco.lead_path( from )
22
+ -# %hr
23
+ - conv.leads.each do |lead|
24
+ = link_to lead.email, wco.lead_path( lead )
25
+ %td.subject
26
+ - if conv.unread?
27
+ <b>#{link_to conv.subject, wco_email.conversation_path(conv)}</b>
28
+ - else
29
+ = link_to conv.subject, wco_email.conversation_path(conv)
30
+ <b>#{conv.messages.unread.length}</b> (#{conv.messages.length})
30
31
 
31
- .gray= conv.preview
32
+ .gray= conv.preview
32
33
 
33
- -# - conv.messages.unread.each do |msg|
34
- -# .border-bottom
35
- -# .gray= msg.preview_str
36
- -# = render '/wco_email/contexts/form_reply_mini', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })
37
- -# - if conv.messages.unread.blank?
38
- -# - msg = conv.messages.last
39
- -# .border-bottom
40
- -# .gray= msg.preview_str
41
- -# = render '/wco_email/contexts/form_reply_mini', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })
34
+ -# - conv.messages.unread.each do |msg|
35
+ -# .border-bottom
36
+ -# .gray= msg.preview_str
37
+ -# = render '/wco_email/contexts/form_reply_mini', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })
38
+ -# - if conv.messages.unread.blank?
39
+ -# - msg = conv.messages.last
40
+ -# .border-bottom
41
+ -# .gray= msg.preview_str
42
+ -# = render '/wco_email/contexts/form_reply_mini', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })
42
43
 
43
- %td.tags.mini
44
- = render '/wco/tags/chips', tags: conv.tags, cache_key: conv.cache_key
45
- %td.latest-at
46
- = pp_date conv.latest_at
47
- = pp_time conv.latest_at
44
+ %td.tags.mini
45
+ = render '/wco/tags/chips', tags: conv.tags, cache_key: conv.cache_key
46
+ %td.latest-at
47
+ = pp_date conv.latest_at
48
+ = pp_time conv.latest_at
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wco_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0.128
4
+ version: 3.1.0.129
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-03-06 00:00:00.000000000 Z
11
+ date: 2024-03-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk-s3
@@ -389,7 +389,8 @@ files:
389
389
  - app/assets/javascripts/wco/invoices.js
390
390
  - app/assets/javascripts/wco/office_action_templates.js
391
391
  - app/assets/javascripts/wco/shared.js
392
- - app/assets/stylesheets/dark_theme.scss
392
+ - app/assets/stylesheets/dark_theme.css
393
+ - app/assets/stylesheets/light_theme.css
393
394
  - app/assets/stylesheets/production_theme.scss
394
395
  - app/assets/stylesheets/vendor/bootstrap-4.6.2.min.css
395
396
  - app/assets/stylesheets/vendor/jquery.dataTables-1.10.16.css
@@ -403,6 +404,7 @@ files:
403
404
  - app/assets/stylesheets/wco/chip.scss
404
405
  - app/assets/stylesheets/wco/conversations.scss
405
406
  - app/assets/stylesheets/wco/galleries.scss
407
+ - app/assets/stylesheets/wco/leads.scss
406
408
  - app/assets/stylesheets/wco/pagination.scss
407
409
  - app/assets/stylesheets/wco/photos.scss
408
410
  - app/assets/stylesheets/wco/utils.scss
@@ -573,6 +575,7 @@ files:
573
575
  - app/views/wco/publishers/new.haml
574
576
  - app/views/wco/reports/_form.haml
575
577
  - app/views/wco/reports/_header.haml
578
+ - app/views/wco/reports/_list.haml
576
579
  - app/views/wco/reports/edit.haml
577
580
  - app/views/wco/reports/index.haml
578
581
  - app/views/wco/reports/index_table.haml
@@ -588,6 +591,7 @@ files:
588
591
  - app/views/wco/tags/_header.haml
589
592
  - app/views/wco/tags/_index.haml
590
593
  - app/views/wco/tags/_index_inline.haml
594
+ - app/views/wco/tags/_list_mini.haml
591
595
  - app/views/wco/tags/edit.haml
592
596
  - app/views/wco/tags/index.haml
593
597
  - app/views/wco/tags/new.haml