wco_email 0.1.1.8 → 0.1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cb594372790e81db691120124ed8941ce1f25325f7b38a34ad572d473992a16
-  data.tar.gz: b0912e04e796b7ba376f19400d54cf216f2750853dcb39114a283629bc7b6a86
+  metadata.gz: d5e0454d0fd76de0c619c9ea26e84ce685f648e8441c39dacbe89b05fcc21e1a
+  data.tar.gz: 44b968d0696f37d5375e24c96139ed6aec53ac3f3d77c75d3b9b227f52180e99
 SHA512:
-  metadata.gz: d52986031ee908e382886d14cb37e005ddaa789f49d05b81e844e34613b73d9d6fa8b9775bcff980c3a95f85a569ff3e9c2b10d53c00d603267133d0d332f8ef
-  data.tar.gz: 0c9e01f40cd3ebd04b8323df18d01272b865e8ac3069bc0dcb2e87a81f0f0cc5deb173ad24da1482f710ad5e5a9f1566856b74400ef0b3ff54d0222314f77a30
+  metadata.gz: 868ea88e638147cbba1c6b51a298dadde124c59a31082aa7c96ac71b0dd6fa9998fe4868c5e36d138616101aa0f89b0eac7376098874f199d2ca48afacb5943f
+  data.tar.gz: dc02b95154d45c05d52a9ef41d4fe6a1508abac22e63df18dc3b15cf1105ca0d01b248cfa29546a0a32a9f0b3b6aae44af2020bc1d1c73761179ddffb6d524bf

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

@@ -1,9 +1,16 @@
 //
-// require rails-ujs
+// trash: require rails-ujs
 //
-// require wco/application
-// require ./contexts
-// require ./conversations
+//= require ./contexts
+//= require ./conversations
 //
 
-console.log('loaded wco_email/application.js')
+$(function () {
+
+if ($(".tinymce").length > 0) {
+  $(".tinymce").summernote()
+}
+
+logg('loaded wco_email/application.js')
+}) // END
+

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

@@ -16,4 +16,5 @@ $(document).ready(() => {
     })
   }
 
-})
+  logg('loaded wco_email/contexts.js')
+}) // END

data/app/assets/stylesheets/wco_email/contexts.scss

@@ -7,7 +7,8 @@
 .email-templates--form {
   form {
     > .actions {
-      text-align: right;
+      display: flex;
+      justify-content: space-between;
     }
 
     .tab-labels {
@@ -31,6 +32,9 @@
 
     }
     .tabs {
+      > div {
+        border: 2px dotted gray;
+      }
       .tab-raw {
         display: none;
       }

data/app/controllers/wco_email/api_controller.rb

@@ -5,7 +5,7 @@ class WcoEmail::ApiController < ActionController::Base
   skip_before_action :verify_authenticity_token
 
   def create_email_message
-    # puts! params, 'params'
+    puts! params, 'params'
 
     stub = WcoEmail::MessageStub.create!({
       bucket:     params[:bucket],
@@ -23,7 +23,7 @@ class WcoEmail::ApiController < ActionController::Base
 
   def check_credentials
     if params[:secret] != AWS_SES_LAMBDA_SECRET
-      render status: 400, json: { status: 400 }
+      render status: 400, json: { status: 400, message: "#check_credentials says unauthorized." }
       return
     end
   end

data/app/controllers/wco_email/application_controller.rb

@@ -9,8 +9,8 @@ class WcoEmail::ApplicationController < Wco::ApplicationController
   ##
   private
 
-  # def set_lists
-  #   @tags = Wco::Tag.all
-  # end
+  ## Nothing should be here.
+  def set_lists
+  end
 
 end

data/app/controllers/wco_email/contexts_controller.rb

@@ -78,7 +78,7 @@ class WcoEmail::ContextsController < WcoEmail::ApplicationController
     authorize! :new, WcoEmail::Context
     @tmpl = @email_template = WcoEmail::EmailTemplate.where( slug: params[:template_slug] ).first ||
       WcoEmail::EmailTemplate.where( id: params[:template_slug] ).first ||
-      WcoEmail::EmailTemplate.new
+      WcoEmail::EmailTemplate.where({ slug: 'blank' }).last
     attrs = {}
     if @tmpl
       attrs = @tmpl.attributes.slice( :subject, :body, :from_email )
@@ -146,10 +146,9 @@ class WcoEmail::ContextsController < WcoEmail::ApplicationController
   private
 
   def set_lists
-    super
     @email_layouts_list   = WcoEmail::EmailTemplate::LAYOUTS
     @email_templates_list = [ [nil, nil] ] + WcoEmail::EmailTemplate.all.map { |tmpl| [ tmpl.slug, tmpl.id ] }
-    @leads_list = Wco::Lead.list
+    @leads_list           = Wco::Lead.list
   end
 
 end

data/app/controllers/wco_email/email_filters_controller.rb

@@ -34,7 +34,7 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
   def index
     authorize! :index, WcoEmail::EmailFilter.new
     @email_filter  = WcoEmail::EmailFilter.new
-    @email_filters = WcoEmail::EmailFilter.all
+    @email_filters = WcoEmail::EmailFilter.all.page( params[WcoEmail::EmailFilter::PAGE_PARAM_NAME] ).per( current_profile.per_page )
   end
 
   def new

data/app/controllers/wco_email/email_templates_controller.rb

@@ -2,8 +2,6 @@
 
 class WcoEmail::EmailTemplatesController < WcoEmail::ApplicationController
 
-  # before_action :set_lists, only: %i| new |
-
   def create
     authorize! :create, WcoEmail::EmailTemplate
     @template = WcoEmail::EmailTemplate.create params[:template].permit!

data/app/jobs/wco_email/message_intake_job.rb

@@ -8,11 +8,8 @@ require 'sidekiq'
 ## 2023-03-07 _vp_ Continue
 ## 2023-12-28 _vp_ Continue
 ##
-## class_name EIJ
-##
 class WcoEmail::MessageIntakeJob
   include Sidekiq::Job
-  # include Sidekiq::Util
 
   sidekiq_options queue: 'wco_email_rb'
 

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

@@ -9,7 +9,7 @@
 
     = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
 
-    %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.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 "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'

data/app/views/wco_email/contexts/_form.haml

@@ -1,30 +1,23 @@
 
--# = ctx.inspect
+-# - blank_tmpl_id = WcoEmail::EmailTemplate.where({ slug: 'blank' }).first&.id
 
 .email-contexts--form
-  -# - url = ctx.new_record? ? contexts_path : context_path(ctx)
   = form_for ctx, as: :context do |f|
 
     .flex-row
-      = f.label "Template"
-      = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2' }
+      = f.label :email_template_id
+      = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2', required: true }
       - if ctx.email_template_id
         = link_to '[view]', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
         = link_to '[~]', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
         <b>Layout:</b>
         = ctx.email_template.layout
 
-    -# .field
-    -#   %label Layout
-    -#   = f.select :layout, options_for_select( @layouts_list, selected: ctx.layout_id )
-
     .flex-row
       %label From
       = f.select :from_email, options_for_select(WcoEmail::EmailTemplate.from_emails_list, selected: ctx.from_email), {}, { class: 'select2' }
-
       %label To lead
       = f.select :lead_id, options_for_select( @leads_list, selected: ctx.lead_id ), {}, { class: 'select2' }
-
       %label cc
       = f.text_field :cc, class: 'w-100'
 
@@ -36,6 +29,7 @@
       = f.label :reply_to_message
       = f.select :reply_to_message_id, options_for_select([[ ctx.reply_to_message, ctx.reply_to_message_id ]], selected: ctx.reply_to_message_id), {}, class: 'w-100'
 
+
     .tab-labels.flex-row
       %a.label-raw{ href: "javascript: void(0)", data: { ref: '.tab-raw' } } Raw
       %a.label-preview.active{ href: "javascript: void(0)", data: { ref: '.tab-preview' } } Preview

data/app/views/wco_email/email_filters/index.haml

@@ -12,6 +12,7 @@
     = render 'form', email_filter: @email_filter
   %hr
 
+  = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
   %table.bordered.data-table
     %thead
       %tr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.8
+  version: 0.1.1.10
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -317,7 +317,6 @@ files:
 - app/controllers/wco_email/unsubscribes_controller.rb
 - app/helpers/wco_email/application_helper.rb
 - app/jobs/wco_email/message_intake_job.rb
-- app/mailers/wco_email/application_mailer.rb
 - app/views/202212 Mailchimp Templates/202212 1col fixed-width.html
 - app/views/202212 Mailchimp Templates/202212 1col full-width.html
 - app/views/202212 Mailchimp Templates/202212 2col fixed-width 2.html
@@ -355,13 +354,12 @@ files:
 - app/views/202310 Email Templates/_acknowledgement_of_document_receipt.html.erb
 - app/views/202310 Email Templates/_support_ticket_created.html.erb
 - app/views/layouts/wco_email/application.haml
-- app/views/layouts/wco_email/mailbox.haml-trash
 - app/views/wco_email/_analytics.erb
 - app/views/wco_email/_main_header.haml
 - app/views/wco_email/_sidebar.haml
 - app/views/wco_email/application_mailer/_footer_unsubscribe.html.erb
 - app/views/wco_email/application_mailer/_header_logo.html.erb
-- app/views/wco_email/application_mailer/forwarder_notify.html.erb
+- app/views/wco_email/application_mailer/forwarder_notify.html.erb-trash
 - app/views/wco_email/contexts/_form.haml
 - app/views/wco_email/contexts/_form_reply.haml
 - app/views/wco_email/contexts/_header.haml
@@ -448,9 +446,9 @@ files:
 - app/views/wco_email/sessions/new.html.erb
 - app/views/wco_email/unsubscribes/_header.haml
 - app/views/wco_email/unsubscribes/_table.haml
-- config/credentials.yml.enc
 - config/initializers/assets.rb
 - config/routes.rb
+- config/trash/credentials.yml.enc
 - lib/systemd/system/wco_email_sidekiq.service
 - lib/tasks/bjjcollective/sitemap.rb
 - lib/tasks/db_tasks.rake

data/app/mailers/wco_email/application_mailer.rb

@@ -1,98 +0,0 @@
-
-class WcoEmail::ApplicationMailer < ActionMailer::Base
-
-  default from: 'WasyaCo Consulting <no-reply@wco.com.de>'
-  helper(Wco::ApplicationHelper)
-
-  layout 'mailer'
-
-
-  def forwarder_notify msg_id
-    @msg = WcoEmail::Message.find msg_id
-    mail( to:      "poxlovi@gmail.com",
-          subject: "POX::#{@msg.subject}" )
-  end
-
-  def shared_galleries profiles, gallery
-    return if profiles.count == 0
-    @gallery        = gallery
-    @domain         = Rails.application.config.action_mailer.default_url_options[:host]
-    @galleries_path = IshManager::Engine.routes.url_helpers.galleries_path
-    @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.slug)
-    mail( :to => '314658@gmail.com',
-          :bcc => profiles.map { |p| p.email },
-          :subject => 'You got new shared galleries on pi manager' )
-  end
-
-  def option_alert option
-    @option = option
-    mail({
-      :to => option.profile.email,
-      :subject => "IshManager Option Alert :: #{option.ticker}",
-    })
-  end
-
-  def stock_alert watch_id
-    @watch = Iro::OptionWatch.find watch_id
-    mail({
-      to: @watch.profile.email,
-      subject: "Iro Watch Alert :: #{@watch.ticker} is #{@watch.direction} #{@watch.mark}."
-    })
-  end
-
-  def test_email
-    mail( to: DEFAULT_RECIPIENT, subject: "Test email at #{Time.now}" )
-  end
-
-  ## 2023-04-02 _vp_ Continue.
-  ## 2023-09-24 _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("&")
-
-    # @origin         = "https://#{Rails.application.config.action_mailer.default_url_options[:host]}"
-
-    @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 = Tmp6Ctl.new
-    # renderer = IshManager::ApplicationController.new
-    # renderer.send( :include, ::IshManager::ApplicationHelper )
-    # renderer.send( :request, { host: 'test-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 )
-
-    # eval( @ctx.tmpl.config_exe )
-
-    rendered_str = renderer.render_to_string("/wco_email/email_templates/_#{@ctx.tmpl.layout}")
-    @ctx.update({
-      rendered_str: rendered_str,
-      sent_at: Time.now.to_s,
-    })
-
-    mail( from:    @ctx.from_email,
-          to:      @ctx.to_email,
-          cc:      @ctx.cc,
-          bcc:     "poxlovi@gmail.com",
-          subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
-          body:    rendered_str,
-          content_type: "text/html" )
-  end
-
-end

data/app/views/layouts/wco_email/mailbox.haml-trash

@@ -1,62 +0,0 @@
-!!!
-%html
-  %head
-    %title #{@page_title} | wco_email_rb-mailbox
-    %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
-    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2' }
-    %meta{ :charset => 'UTF-8' }
-    %meta{ :description => @page_description }
-
-    = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
-
-    %script{ :src => "//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 "//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"
-
-    = 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"
-
-    -# summernote
-    = 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"
-    -# quill core
-    -# = stylesheet_link_tag "//cdn.quilljs.com/1.3.6/quill.core.css"
-    -# = javascript_include_tag "//cdn.quilljs.com/1.3.6/quill.core.js"
-    -# quill
-    -# = stylesheet_link_tag "//cdn.quilljs.com/1.3.6/quill.snow.css"
-    -# = javascript_include_tag "//cdn.quilljs.com/1.3.6/quill.min.js"
-
-    = javascript_include_tag "wco_email/application"
-    = stylesheet_link_tag    "wco_email/application", media: "all"
-    = stylesheet_link_tag    "wco/application", media: "all"
-
-    -# %script{crossorigin: "", src: "https://unpkg.com/react@18/umd/react.development.js"}
-    -# %script{crossorigin: "", src: "https://unpkg.com/react-dom@18/umd/react-dom.development.js"}
-    -# %script{src: "https://unpkg.com/prop-types@15.6/prop-types.min.js"}
-    -# %script{src: "https://unpkg.com/axios/dist/axios.min.js"}
-    -# %script{src: "https://unpkg.com/recharts/umd/Recharts.js"}
-
-    = csrf_meta_tags
-  %body{ class: [ params[:controller].gsub("wco_email/",""), "#{params[:controller].gsub("wco_email/","")}-#{params[:action]}", params[:action], "application-fullwidth" ] }
-
-    = render "/wco/main_header"
-    = render "/wco_email/main_header"
-    = render '/wco/alerts_notices' if notice || alert
-    %hr
-
-    .padded
-      .row
-        .col-md-2.border-right
-          = render 'wco_email/sidebar'
-        .col-md-10
-          %span.absolute.collapse-expand#mainW
-          = yield
-
-    = render '/wco/main_footer'
-    = render '/wco_email/analytics' if Rails.env.production?