ish_manager 0.1.8.400 → 0.1.8.402

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e852f56630ecb6853fb58a102f50824fb8237f359d99033b35fb5735a1edf62
-  data.tar.gz: fffe66f056d0fde15b5553e1390902dffd49c3b4d093e56cd7886bccb5b95c43
+  metadata.gz: 99464fcd8fa7b0f58cb5d7eb6b62dec9e62fb6b5d8da4500bb7b11362a5042a0
+  data.tar.gz: 71fdb74c90c9d4d7ead1b5d410e2516f29dc51e2bc1a67aaf0d712189527a3e8
 SHA512:
-  metadata.gz: 5ce863f62c564c5245844ac2d3e7564a0766696ec4cf5ad3fbed01ae1423f7ceff4ca4f258fa91b976cbcb3c04662effa81b30aefab16703477dce61a9efa8b8
-  data.tar.gz: 800017a26feb619e985c6487d3c7fb3b563cb2154596bad08b9c88c0e7f92509e3b2fd10e30b344c0192f5fe8da2508e3488947ac947c15de264fdf68390774e
+  metadata.gz: 4123acb840e9676a335b2d8664182e6b81ab7f353ddd0627eea8ee637402269120c419bae5142ca62f5d2709da8f540bb083c5ac5cb5c2bc5bf76d7526fb19e9
+  data.tar.gz: 155d66ae258ed66afb40f01fa9083d422875e0a40e0f3b1249b34f23610626305bdf04c7b66071397197591c2dcb89acbdde98d634cc3d10b5573d3a008a5639

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

@@ -42,10 +42,20 @@ a[target='_blank'] {
 }
 html {
   height: 100%;
+  width: 100%;
+  // display: flex;
+  background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192823/weather-bg.png');
 }
 body {
   background: #dedede;
   font-size: 20px;
+  width: 100%;
+}
+
+body.application-fullwidth {
+  // height: 100%;
+  // display: flex;
+  // flex-direction: column;
 }
 hr {
   background: red;
@@ -95,11 +105,6 @@ ul:not(.browser-default).bullets, {
   width: 100vwh;
   overflow-x: auto;
 }
-body.application-fullwidth {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-}
 .application-home {
   .bordered-card {
     max-width: 400px;

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -70,6 +70,8 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
 
     if params[:notsent]
       @ctxs = @ctxs.where( sent_at: nil )
+    else
+      @ctxs = @ctxs.where( :sent_at.ne => nil )
     end
 
     if params[:lead_id]

data/app/mailers/ish_manager/application_mailer.rb

@@ -17,7 +17,10 @@ module IshManager
 
     def option_alert option
       @option = option
-      mail( :to => option.profile.email, :subject => "IshManager Option Alert :: #{option.ticker}" ).deliver
+      mail({
+        :to => option.profile.email,
+        :subject => "IshManager Option Alert :: #{option.ticker}",
+      })
     end
 
     def stock_alert watch_id

data/app/mailers/ish_manager/meeting_mailer.rb

@@ -7,7 +7,6 @@ class IshManager::MeetingMailer < IshManager::ApplicationMailer
   def morning_reminder meeting_id:
     @meeting = Ish::Meeting.find meeting_id
     mail( to: @meeting.invitee_email,
-          bcc: 'piousbox@gmail.com',
           subject: 'A reminder for your upcoming meeting' )
   end
 

data/app/mailers/ish_manager/office_mailer.rb

@@ -50,7 +50,6 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
 
     mail( from: @ctx.from_email,
       to: @lead.email,
-      bcc: 'piousbox@gmail.com', # @TODO: change _vp_ 2022-11-21
       subject: @ctx.subject,
       template_name: template )
   end
@@ -65,7 +64,6 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
 
     mail( from: @ctx.from_email,
           to: @ctx.to_email,
-          bcc: 'piousbox@gmail.com',
           subject: @ctx.subject,
           template_name: "render/_#{@ctx.tmpl.layout}" )
   end

data/app/views/ish_manager/application/_main_footer.haml

@@ -2,7 +2,7 @@
 #Config{ data: { jwt_token: @jwt_token } }
 
 .manager--main-footer
-  .container
+  .max-width
 
     %i.fa.fa-compress.collapse-expand#mainFooter
       Account & Session

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -58,7 +58,7 @@
           = link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
           = link_to '[+]', new_email_template_path
         %li
-          = link_to 'Contexts', notsent_email_contexts_path
+          = link_to "Contexts (#{Ctx.notsent.length})", notsent_email_contexts_path
           = link_to '[+]', new_email_context_path
         -# %li
         -#   = link_to 'Campaigns', email_campaigns_path

data/app/views/ish_manager/email_contexts/index.haml

@@ -3,16 +3,22 @@
 
   .header.collapse-expand-trash#emailContextsIndex
     %h2.title
+      - if params[:notsent]
+        <u>notsent</u>
+        = link_to '[sent]', sent_email_contexts_path
+      - else
+        = link_to '[notsent]', notsent_email_contexts_path
+        <u>sent</u>
       Email Contexts (#{@ctxs.length})
       - if @lead
         For lead `#{@lead.name}`
       = link_to '[+]', new_email_context_path
-      = link_to '[unsent]', notsent_email_contexts_path
+
 
   .W0
     = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
 
-    %table.bordered.data-table
+    %table.bordered
       %thead
         %tr
           %th.actions
@@ -20,6 +26,8 @@
           %th.to To
           %th.subject Subject
           %th.template Template
+          %th.send_at Send at
+          %th.sent_at Sent at
       %tbody
         - @ctxs.each do |ctx|
           %tr
@@ -36,6 +44,8 @@
               = link_to email_context_path(ctx) do
                 = ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
             %td= ctx.email_template.slug
+            %td= pp_date ctx.send_at
+            %td= pp_date ctx.sent_at
 
 
     = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager

data/app/views/ish_manager/email_contexts/show.haml

@@ -20,7 +20,7 @@
         %li <b>Send at:</b> #{@ctx.send_at&.strftime('%Y-%m-%d %l:%M%P')}
         %li <b>Sent at:</b> #{@ctx.sent_at&.strftime('%Y-%m-%d %l:%M%P')}
         %li
-          = button_to 'Send', email_context_send_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
+          = button_to 'Send', send_email_context_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
           = link_to '[~]', edit_email_context_path(@ctx)
 
   .max-width

data/config/routes.rb

@@ -73,9 +73,10 @@ IshManager::Engine.routes.draw do
   get  'email_contexts/for_lead/:lead_id',       to: 'email_contexts#index', as: :email_contexts_for_lead
   get  'email_contexts/iframe_src/:id',          to: 'email_contexts#iframe_src', as: :email_context_iframe
   get  'email_contexts/new_with_template/:template_slug', to: 'email_contexts#new'
-  post 'email_contexts/send/:id',                to: 'email_contexts#do_send',    as: :email_context_send
-  get  'email_contexts',                         to: 'email_contexts#index',      as: :email_contexts,         defaults: { notsent: false }
+  post 'email_contexts/send/:id',                to: 'email_contexts#do_send',    as: :send_email_context
+  get  'email_contexts',                         to: 'email_contexts#index',      as: :email_contexts,         defaults: { notsent: true }
   get  'email_contexts/notsent',                 to: 'email_contexts#index',      as: :notsent_email_contexts, defaults: { notsent: true }
+  get  'email_contexts/sent',                    to: 'email_contexts#index',      as: :sent_email_contexts,    defaults: { notsent: false }
   resources :email_contexts
 
   get    'email_templates/iframe_src/:id', to: 'email_templates#iframe_src', as: :email_template_iframe

data/lib/tasks/office_tasks.rake

@@ -51,16 +51,14 @@ namespace :office do
   task email_worker: :environment do
     while true do
 
-      ctxs = ::Ish::EmailContext.scheduled.unsent
-      puts! ctxs.count, 'ctxs'
+      ctxs = ::Ish::EmailContext.scheduled.notsent
       ctxs.map do |ctx|
         IshManager::OfficeMailer.send_context_email( ctx[:id].to_s ).deliver_later
-        print '.'
+        print '^'
       end
 
-      # sleep 1.minute
-      sleep 10.seconds
-      print '^'
+      sleep 60 # seconds
+      print '.'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.400
+  version: 0.1.8.402
 platform: ruby
 authors:
 - piousbox