wco_models 3.1.0.89 → 3.1.0.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31a3f2a942a120f14f6749392ccae5a144062995f359be3827b989f238737da
-  data.tar.gz: fd1fb43f8997d6cfd7e4750db138a59fecc0d3afa1613a7ab93ba530ca714730
+  metadata.gz: c7d502c6769f16c3fee34412c86b5646aa84c22c9c399da8c56cc2b496aa96b4
+  data.tar.gz: a4d4fef5edd8dea9656e2526b60b8c6b2a421e1955bc4c79dc1f04dfd4402d40
 SHA512:
-  metadata.gz: 5bb910e3451c67d9703797fa050786c4895b978ae55752f281949daa245b40364dfe05d87c27b8b597baeb30bc43b8b258e54a8b41c86d0efc07744962fb45d8
-  data.tar.gz: cae491d9f519fa1cb60c0d0fa9509d0cd9b22ae97550d6910007c3af920a8aaf8d235b14866107779627fa58790a3e7f093732cab891e66be454bcda8fbad3aa
+  metadata.gz: 4fbd26066c57cc0796a23dbb647b59816553fd87d6dbf87bc56bc0e6aa2d6039e017c6bd204519d4f4fff85c668a020e13558a52ec0e6d708941b9e369e5dd79
+  data.tar.gz: 951707c1098329b6df362e3050c02e5d0310021e9ebc7b1bc50d41096d1ab7f79bce5382db6610875953ce12846a17b9b3db0e25f03ad7e7375fd17e0d606240

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

@@ -123,8 +123,12 @@ textarea.monospace {
 }
 
 /* H */
-h5.title {
+.header {
   display: flex;
+
+  h5.title {
+    display: flex;
+  }
 }
 
 .h-500px {

data/app/controllers/wco/application_controller.rb

@@ -10,6 +10,12 @@ class Wco::ApplicationController < ActionController::Base
     authorize! :home, Wco
   end
 
+  def tinymce
+    authorize! :home, Wco
+    render layout: false
+  end
+
+
   ##
   ## private
   ##

data/app/controllers/wco/leadsets_controller.rb

@@ -37,7 +37,7 @@ class Wco::LeadsetsController < Wco::ApplicationController
     authorize! :index, Leadset
     @leadsets = Leadset.all.includes(:leads)
     if params[:q].present?
-      @leadsets = @leadsets.where(" company_url LIKE ? ", "%#{params[:q]}%" )
+      @leadsets = @leadsets.where({ company_url: /.*#{params[:q]}.*/i })
       if @leadsets.length == 1
         return redirect_to action: :show, id: @leadsets[0][:id]
       end

data/app/mailers/wco_email/application_mailer.rb

@@ -6,6 +6,15 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
 
   layout 'mailer'
 
+  def self.renderer ctx:
+    out = self.new
+    out.instance_variable_set( :@ctx,              ctx )
+    out.instance_variable_set( :@lead,             ctx.lead )
+    out.instance_variable_set( :@utm_tracking_str, ctx.utm_tracking_str )
+    out.instance_variable_set( :@unsubscribe_url,  ctx.unsubscribe_url )
+    out.instance_variable_set( :@config,           ctx.config )
+    return out
+  end
 
   def forwarder_notify msg_id
     @msg = WcoEmail::Message.find msg_id
@@ -46,32 +55,10 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
 
   ## 2023-04-02 _vp_ Continue.
   ## 2023-09-24 _vp_ Continue : )
+  ## 2024-01-17 _vp_ Continue : )
   def send_context_email ctx_id
     @ctx         = Ctx.find ctx_id
-    @lead        = Wco::Lead.find @ctx.lead_id
-    @tmpl_config = OpenStruct.new JSON.parse( @ctx.tmpl[:config_json] )
-
-    @utm_tracking_str = {
-      'cid'          => @ctx.lead_id,
-      'utm_campaign' => @ctx.tmpl.slug,
-      'utm_medium'   => 'email',
-      'utm_source'   => @ctx.tmpl.slug,
-    }.map { |k, v| "#{k}=#{v}" }.join("&")
-
-    @unsubscribe_url = WcoEmail::Engine.routes.url_helpers.unsubscribes_url({
-      template_id: @ctx.tmpl.id,
-      lead_id:     @lead.id,
-      token:       @lead.unsubscribe_token,
-      host:        Rails.application.routes.default_url_options[:host],
-    })
-    renderer = WcoEmail::ApplicationMailer.new
-
-    renderer.instance_variable_set( :@ctx,              @ctx )
-    renderer.instance_variable_set( :@lead,             @ctx.lead )
-    renderer.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
-    renderer.instance_variable_set( :@unsubscribe_url,  @unsubscribe_url )
-    renderer.instance_variable_set( :@tmpl_config,      @tmpl_config )
-
+    renderer     = self.class.renderer ctx: @ctx
     rendered_str = renderer.render_to_string("/wco_email/email_templates/_#{@ctx.tmpl.layout}")
     @ctx.update({
       rendered_str: rendered_str,

data/app/models/wco_email/context.rb

@@ -24,6 +24,7 @@ class WcoEmail::Context
   end
 
   field :body
+  ## Looks good... 2024-01-17
   def body
     if self[:body].presence
       return self[:body]
@@ -91,14 +92,9 @@ class WcoEmail::Context
   attr_reader :tid
 
   def get_binding
-    @lead = lead()
-    @utm_tracking_str = {
-      'cid'          => lead.id,
-      'utm_campaign' => tmpl.slug,
-      'utm_medium'   => 'email',
-      'utm_source'   => tmpl.slug,
-    }.map { |k, v| "#{k}=#{v}" }.join("&")
-    eval( tmpl.config_exe )
+    @lead             = lead
+    @utm_tracking_str = utm_tracking_str
+    # eval( tmpl.config_exe ) ## @TODO: remove? 2024-01-17
     binding()
   end
 
@@ -113,6 +109,28 @@ class WcoEmail::Context
     outs.to_a
   end
 
+  def config
+    OpenStruct.new JSON.parse( tmpl[:config_json] )
+  end
+
+  def utm_tracking_str
+    {
+      'cid'          => lead_id,
+      'utm_campaign' => tmpl.slug,
+      'utm_medium'   => 'email',
+      'utm_source'   => tmpl.slug,
+    }.map { |k, v| "#{k}=#{v}" }.join("&")
+  end
+
+  def unsubscribe_url
+    WcoEmail::Engine.routes.url_helpers.unsubscribes_url({
+      host:        Rails.application.routes.default_url_options[:host],
+      lead_id:     lead_id,
+      template_id: tmpl.id,
+      token:       lead.unsubscribe_token,
+    })
+  end
+
 end
 Ctx = WcoEmail::Context
 

data/app/views/wco/application/tinymce.html.erb

@@ -0,0 +1,33 @@
+
+<html>
+  <head>
+    <!-- include libraries(jQuery, bootstrap) -->
+    <link href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet">
+    <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
+
+    <!-- include codemirror (codemirror.css, codemirror.js, xml.js, formatting.js) -->
+    <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.css">
+    <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/theme/monokai.css">
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.js"></script>
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/xml/xml.js"></script>
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/codemirror/2.36.0/formatting.js"></script>
+
+    <!-- include summernote css/js-->
+    <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css">
+    <script type="text/javascript" src="//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"></script>
+  </head>
+  <body>
+
+    <textarea class='tinymce'>
+    </textarea>
+
+  <script>
+    $('.tinymce').summernote({
+    height: 150,   //set editable area's height
+    codemirror: { // codemirror options
+      theme: 'monokai'
+    }
+  });
+  </script>
+  </body></html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.89
+  version: 3.1.0.90
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -443,6 +443,7 @@ files:
 - app/views/wco/application/_meta.haml
 - app/views/wco/application/_metaline.haml
 - app/views/wco/application/home.haml
+- app/views/wco/application/tinymce.html.erb
 - app/views/wco/galleries/_form.haml
 - app/views/wco/galleries/_header.haml
 - app/views/wco/galleries/_index.haml