wco_models 3.1.0.159 → 3.1.0.161

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631a19b5362a0b67eb43d6883e89f2aa554cea9c0de5a35ab641c466f71350ec
-  data.tar.gz: b4aed0740e389a30eaa7f2b84d4a0802f251ff6c057f7436246575cc3e479ca6
+  metadata.gz: 96f8f41510a97ed15c15a6594f542a3c65b65590dbc710ea277f293db1d3429f
+  data.tar.gz: 2eaf694e31445856c59b081ee8ceb3fb0ef15a30a22c8d19556016d060c912b2
 SHA512:
-  metadata.gz: a525a6eabe3ac69ab09c789166ab875d9da4e075243216de90cd3aa2f2a8a6e1ca2132f218f61c5d571219bbf28886a431561b6e818e66496c3deaed583d3848
-  data.tar.gz: 3779643f6dc60f1212abe5c25d0b190a1f726ca3a58975b6510d06752287ac11eb28fac215989b4e577134877f859b5c17aeeebd64d2e0399fefb56d6d0fafb6
+  metadata.gz: db5d8c264282bc718451b273e6b50af0884e0dff64247368c1547784a9f3d3fe53898af6ee9d31bf73cae241df35a6efc3b39a898f389e2aad7586bc5e9543fc
+  data.tar.gz: f9ef6930a6bcbc40a59c5e5909693448083e60e650bae6913e2151f05ddab0b78c8a3af36ecaa84a82a6d1c514d149c6059807415078c164110ee097f81a1873

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

@@ -16,12 +16,14 @@ $enable-important-utilities: false;
 
 
 /* A */
+
 .application--main-header.development {
   background: url('//wasyaco.com/wp-content/uploads/2024/02/weather-bg-development.png'),
     linear-gradient(90deg, pink, rgba(255,255,255,0) 5% );
 }
 
 /* B */
+
 .bold {
   font-weight: bold;
 }
@@ -29,6 +31,23 @@ $enable-important-utilities: false;
   border-bottom: 1px solid grey !important;
 }
 
+/* F */
+
+.field {
+  display: flex;
+  margin-bottom: 0.5em;
+
+  input {
+    flex-grow: 1;
+  }
+
+  label {
+    margin-right: 0.5em;
+    min-width: 100px;
+  }
+}
+
+/* M */
 
 .main-footer {
   border-top: 2px solid #6395b9;
@@ -46,10 +65,14 @@ $enable-important-utilities: false;
   }
 }
 
+/* S */
+
 .select2 {
   min-width: 200px;
 }
 
+/* T */
+
 td.tags {
   min-width: 200px;
 }

data/app/controllers/wco/api/obfuscated_redirects_controller.rb

@@ -1,6 +1,8 @@
 
 class Wco::Api::ObfuscatedRedirectsController < Wco::ApiController
 
+  skip_before_action :decode_jwt
+
   def show
     @obf = Wco::ObfuscatedRedirect.find params[:id]
     # puts! @obf, '@obf'
@@ -16,7 +18,7 @@ class Wco::Api::ObfuscatedRedirectsController < Wco::ApiController
       render and return
     end
 
-    redirect_to @obf.to
+    redirect_to @obf.to_link
   end
 
 end

data/app/controllers/wco/leadsets_controller.rb

@@ -60,7 +60,7 @@ class Wco::LeadsetsController < Wco::ApplicationController
       @email_contexts[lead.email] = lead.email_contexts
     end
 
-    @leads     = @leadset.leads.page( params[:leads_page] ).per( current_profile.per_page )
+    @leads         = @leadset.leads.page( params[:leads_page] ).per( current_profile.per_page )
     @subscriptions = @leadset.subscriptions
     @invoices      = @leadset.invoices
   end

data/app/controllers/wco/videos_controller.rb

@@ -1,7 +1,7 @@
 
 class Wco::VideosController < Wco::ApplicationController
 
-  # before_action :set_lists
+  before_action :set_lists
 
   # Alphabetized : )
 
@@ -46,9 +46,7 @@ class Wco::VideosController < Wco::ApplicationController
     @videos = @videos.page( params[:videos_page] ).per( 9 )
 
     respond_to do |format|
-      format.html do
-        render '_index'
-      end
+      format.html
       format.json do
         render :json => @videos
       end
@@ -98,9 +96,20 @@ class Wco::VideosController < Wco::ApplicationController
       flash[:notice] = 'Success.'
       redirect_to video_path(@video)
     else
-      flash[:alert] = "No luck: #{@video.errors.full_messages.joing(', ')}"
+      flash[:alert] = "No luck: #{@video.errors.full_messages.join(', ')}"
       render :edit
     end
   end
 
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    super
+    @leads_list = Wco::Lead.list
+    @tags_list  = Wco::Tag.list
+  end
+
 end

data/app/models/wco/lead.rb

@@ -61,8 +61,8 @@ class Wco::Lead
   has_and_belongs_to_many :email_campaigns,         class_name: '::WcoEmail::Campaign'
   has_and_belongs_to_many :tags,                    class_name: '::Wco::Tag', index: true
 
-  # has_many :galleries, class_name: 'Wco::Gallery'
-  # has_many :videos, class_name: 'Wco::Video'
+  has_many :galleries, class_name: 'Wco::Gallery'
+  has_many :videos,    class_name: 'Wco::Video'
 
   OP_DELETE          = 'delete'
   OP_ADD_TO_CAMPAIGN = 'add_to_campaign'

data/app/models/wco/video.rb

@@ -32,6 +32,8 @@ class Wco::Video
   # belongs_to :user_profile,                  :class_name => 'Ish::UserProfile', :inverse_of => :videos
   # has_and_belongs_to_many :shared_profiles,  :class_name => 'Ish::UserProfile', :inverse_of => :shared_videos
 
+  belongs_to :lead, optional: true
+
   has_and_belongs_to_many :tags
 
 

data/app/views/wco/application/_meta.haml

@@ -6,8 +6,8 @@
     <b>By</b>
     = link_to item.profile.name, edit_profile_path( item.profile )
 
-  -# - if item.tags.length > 0
-  -#   <b>Tags:</b> #{ item.tags.map(&:name).join(', ') }
+  - if item.tags.length > 0
+    <b>Tags:</b> #{ item.tags.map(&:slug).join(', ') }
 
   - if defined?(item.premium_tier) && item.premium_tier > 0
     <b>Tier $#{item.premium_tier}</b>

data/app/views/wco/leads/_index.haml

@@ -2,7 +2,7 @@
 %ul.leads--list
   - leads.each do |lead|
     %li.item
-      = image_tag lead.photo.photo.url(:thumb)
+      = image_tag lead.photo.photo.url(:thumb) if lead.photo
       = link_to lead, lead_path(lead)
       = link_to '[~]', edit_lead_path(lead)
 

data/app/views/wco/office_action_templates/_form.haml

@@ -26,7 +26,7 @@
       .col-md-4
          
       .col-md-8
-        .field
+        .a
           %label Next Office Action Templates
           .eg rand(1..5).business_days.from_now.to_date + rand(8..16).hours + rand(1..59).minutes
           .eg This is not an interval! But you can do Time.now + 30.seconds
@@ -36,7 +36,7 @@
             .flex-row.field
               %label next_at_exe
               = next_f.text_field :next_at_exe, class: 'flex-grow w-100'
-            .flex-row.field
+            .flex-row
               %label to_delete
               = next_f.check_box :to_delete
               = next_f.select :next_office_action_template_id, options_for_select( @oats_list, selected: next_f.object.next_office_action_template_id ), { }, { class: 'select2' }

data/app/views/wco/tags/_index_table.haml

@@ -0,0 +1,31 @@
+
+%table.bordered.tags--index.data-table
+  %thead
+    %tr
+      %td  
+      %td N Conv
+      %td N Stubs
+
+      %td N Headlines
+
+      %td N Galleries
+      %td N Reports
+      %td N Videos
+
+      %td N Leads
+
+      %td N Logs
+  %tbody
+    - tags.each do |tag|
+      %tr
+        %td
+          = link_to '[~]', edit_tag_path(tag)
+          = link_to tag.slug, tag_path(tag)
+        %td= tag.conversations.length
+        %td= tag.message_stubs.length
+        %td= tag.headlines.length
+        %td= tag.galleries.length
+        %td= tag.reports.length
+        %td= tag.videos.length
+        %td= tag.leads.length
+        %td= tag.logs.length

data/app/views/wco/tags/index.haml

@@ -1,9 +1,9 @@
 
-.tags-index.maxwidth
+.tags-index.padded
   .header
     %h5.title Tags (#{@tags.length})
 
-  = render 'index', tags: @tags
+  = render 'index_table', tags: @tags
 
   %hr
 

data/app/views/wco/tags/show.haml

@@ -16,15 +16,15 @@
 
     %li.d-flex
       <b>Galleries (#{@galleries.length}):&nbsp;</b>
-      = render 'wco/galleries/index', galleries: @galleries, config: { skip_tags: true }
+      = render '/wco/galleries/index', galleries: @galleries, config: { skip_tags: true }
     %li.d-flex
       <b>Headlines (#{@tag.headlines.length}):&nbsp;</b>
       = render '/wco/headlines/index', headlines: @tag.headlines
 
     %li.d-flex
       <b>Leads (#{@tag.leads.length}):&nbsp;</b>
-      = render 'wco/leads/list', leads: @tag.leads
+      = render '/wco/leads/index', leads: @tag.leads
 
     %li.d-flex
       <b>Reports (#{@reports.length}):&nbsp;</b>
-      = render 'wco/reports/index', reports: @reports, config: { skip_tags: true }
+      = render '/wco/reports/index', reports: @reports, config: { skip_tags: true }

data/app/views/wco/videos/_form.haml

@@ -3,20 +3,17 @@
   .row
     .col-sm-6
       .field
-        = f.label :youtube_id
+        %label youtube_id
         = f.text_field :youtube_id
       .field
-        = f.label :name
+        %label Title (name)
         = f.text_field :name
-      -# .input-group
-      -#   = f.label :premium_tier
-      -#   = f.number_field :premium_tier
-      -# .input-group
-      -#   = f.check_box :is_trash
-      -#   = f.label :is_trash
-      -# .field
-      -#   %label Lead
-      -#   = f.select :lead_id, options_for_select(@leads_list, selected: video.lead_id), {}, class: :select2
+      .field
+        %label Lead
+        = f.select :lead_id, options_for_select(@leads_list, selected: video.lead_id), {}, class: :select2
+      .field
+        %label Tags
+        = f.select :tag_ids, options_for_select(@tags_list, selected: video.tag_ids), {  }, { class: :select2, multiple: 'multiple' }
     .col-sm-6
       .field
         = f.label :video
@@ -30,9 +27,8 @@
 
   .row
     .col-md-6
-      .field
-        = f.label :descr
-        = f.text_area :descr, class: :tinymce
+      %label descr
+      = f.text_area :descr, class: :tinymce
 
 
   .action

data/app/views/wco/videos/_index.haml

@@ -1,19 +1,5 @@
 
-- videos ||= @videos
-- this_videos_path ||= videos_path
-
 .videos--index.container-fluid
-  .videos--menu
-    = link_to "Videos (#{videos.count})", this_videos_path
-
-    -# = render 'search', path: this_videos_path
-    .inline-search
-      = form_tag this_videos_path, method: :get do
-        = text_field_tag :q
-
-    = link_to '[+]', new_video_path
-    %hr
-
   = paginate videos, param_name: :videos_page, views_prefix: 'wco'
 
   .row

data/app/views/wco/videos/index.haml

@@ -0,0 +1,11 @@
+
+.videos-index.container-fluid
+  .d-flex
+    = link_to "Videos (#{@videos.count})", videos_path
+
+    .inline-search
+      = form_tag videos_path, method: :get do
+        = text_field_tag :q
+
+    = link_to '[+]', new_video_path
+  = render '/wco/videos/index', videos: @videos

data/config/routes.rb

@@ -5,7 +5,8 @@ Wco::Engine.routes.draw do
   namespace :api do
     get 'leads/index_hash', to: 'leads#index_hash'
 
-    get '/obf/:id', to: 'obfuscared_redirects#show'
+    get 'obf',              to: 'obfuscated_redirects#show' ## testing only.
+    get 'obf/:id',          to: 'obfuscared_redirects#show'
   end
 
   get 'application/tinymce', to: 'application#tinymce'

data/lib/tasks/migrate_tasks.rake

@@ -2,19 +2,20 @@
 
 namespace :migrate do
 
-  desc 'obf to->to_link'
-  task :obf_to_to_link => :environment do
-    Wco::ObfuscatedRedirect.all.map do |obf|
-      if !obf[:to_link] && obf[:to]
-        obf[:to_link] = obf[:to]
-        if obf.save
-          print '^'
-        else
-          puts obf.errors.full_messages
-        end
-      end
-    end
-    puts 'ok'
-  end
+  ## 2024-05-15 Done.
+  # desc 'obf to->to_link'
+  # task :obf_to_to_link => :environment do
+  #   Wco::ObfuscatedRedirect.all.map do |obf|
+  #     if !obf[:to_link] && obf[:to]
+  #       obf[:to_link] = obf[:to]
+  #       if obf.save
+  #         print '^'
+  #       else
+  #         puts obf.errors.full_messages
+  #       end
+  #     end
+  #   end
+  #   puts 'ok'
+  # end
 
 end

data/lib/wco/scrape_wsj.rb

@@ -6,7 +6,8 @@ class Wco::ScrapeWsj
   def initialize site: nil, max_count: 2
     site ||= Wco::Site.find_by slug: 'wsj'
 
-    out = HTTParty.get( site.origin ).response.body
+    # out = HTTParty.get( site.origin ).response.body
+    # out = `curl #{site.origin}`
     out = Nokogiri::HTML(out)
     out.css('h3').each_with_index do |headline, idx|
       if idx < max_count
@@ -23,6 +24,7 @@ class Wco::ScrapeWsj
         end
       end
     end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.159
+  version: 3.1.0.161
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -639,6 +639,7 @@ files:
 - app/views/wco/tags/_header.haml
 - app/views/wco/tags/_index.haml
 - app/views/wco/tags/_index_chips.haml
+- app/views/wco/tags/_index_table.haml
 - app/views/wco/tags/_list_chips.haml
 - app/views/wco/tags/_menuitem.haml
 - app/views/wco/tags/edit.haml
@@ -651,6 +652,7 @@ files:
 - app/views/wco/videos/_header.haml
 - app/views/wco/videos/_index.haml
 - app/views/wco/videos/edit.haml
+- app/views/wco/videos/index.haml
 - app/views/wco/videos/new.haml
 - app/views/wco/videos/show.haml
 - app/views/wco_email/application_mailer/_footer_unsubscribe.html.erb