ish_manager 0.1.8.302 → 0.1.8.305

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c0bacc8b9b210fa9260f3948e62e803e8df58db38425a41ba4895154b603f0
-  data.tar.gz: b789fe1ad3b9c05f7727266db3218a55a36749566e961f39e4e58df41692bfd7
+  metadata.gz: 215e65b2404d79cbe56fe9fbfb1b3bdb1946e7dad2ca093098b7b59c6a58543f
+  data.tar.gz: 25e0eaef6fc00b26a822fbe337c702213a8d9baaf8d4512b094cb4f20f841f05
 SHA512:
-  metadata.gz: 8cd33926ea86d45a7a2bdcb7cea012fa207880572752f792b598c0b2895994fae5f2a60cd8a5e46819978937d3886960cdb2ec665ac19d07a3c5c550d90bb3ab
-  data.tar.gz: 6e8cfe907449de5cc4f55b433980e70c07c2f56daf38fc678798a3ea559eea33ffb29e524c0d23c4421dbc8e91502937ddbcfe128a98c7d1eb28cf536ba31590
+  metadata.gz: e26833ee104f2c35815d5ced45f2e07f9fce439185c1da030ff4e22b5c769999a7b26a14b8be9883bad8912bdbc9d9f808cb3a7657ed15b0f29a65535067c28e
+  data.tar.gz: 6db88c7b55eaf76ae275b5ad7f9961b02491d2804736e7c702df4e0ca010d52fffe1b7852275bd67b7a6b040643aaaecfbd61b3a3e698c51d90055db48ba45a8

data/app/assets/javascripts/ish_manager/application.js

@@ -42,18 +42,25 @@ $(function () {
     });
   }
 
-
   $(".caret").each(function(idx) {
     $($(".caret")[idx]).html('')
   })
 
 
+
+
+
+
+
+
+
+
   // material_select & select2
   if ($('body').length > 0) {
     if ('function' === typeof $('body').material_select ) {
       $('select').material_select()
     }
-    $('.select2').select2()
+    if (!!$('body').select2) { $('.select2').select2() }
   }
 
 

data/app/assets/javascripts/ish_manager/application_materialize.js

@@ -0,0 +1,8 @@
+
+$(document).ready(function() {
+
+  if ($('body').length > 0) {
+    $('select').material_select()
+  }
+
+})

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

@@ -10,12 +10,15 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
+ * alphabetized : )
+ *
  *= require_self
- *= require ish_manager/tags
- *= require ish_manager/maps
- *= require ish_manager/jquery-ui
  *= require ish_manager/galleries
+ *= require ish_manager/jquery-ui
+ *= require ish_manager/maps
+ *= require ish_manager/leads
  *= require ish_manager/photos
+ *= require ish_manager/tags
  *= require ish_manager/user_profiles
  *= require ish_manager/videos
  */
@@ -71,7 +74,7 @@ ul:not(.browser-default).bullets, {
   }
 }
 .alert {
-  border: 1px solid yellow;
+  border: 1px solid red;
   padding: .8em;
 }
 
@@ -176,7 +179,8 @@ img .img-400 {
   width: 400px;
 }
 
-.inline {
+.inline,
+.inline-block {
   display: inline-block;
 }
 ul.inline li {

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

@@ -0,0 +1,10 @@
+
+.manager-leads-index {
+  th.company-url {
+    width: 10px;
+  }
+  th.created-at,
+  td.created-at {
+    width: 200px;
+  }
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -6,6 +6,20 @@ module IshManager
     check_authorization
     rescue_from ::CanCan::AccessDenied, :with => :access_denied
 
+    def email_test
+      authorize! :home, IshManager::Ability
+      IshManager::ApplicationMailer.test_email(' 3dva ').deliver_later
+
+      # wait_until = "2022-05-03T15:09".to_datetime.in_time_zone
+      # puts! wait_until, 'wait untl'
+
+      # # IshManager::TestEmailJob.set({ wait_until: wait_until }).perform_later
+      # IshManager::TestEmailJob.perform_later
+
+      flash[:notice] = 'Scheduled delivery.'
+      redirect_to request.referrer
+    end
+
     def home
       authorize! :home, IshManager::Ability
       render 'home'

data/app/controllers/ish_manager/galleries_controller.rb

@@ -100,7 +100,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
         ).select { |p| !old_shared_profile_ids.include?( p.id ) }
       ::IshManager::ApplicationMailer.shared_galleries( new_shared_profiles, @gallery ).deliver
       flash[:notice] = 'Success.'
-      redirect_to gallery_path(@gallery)
+      redirect_to edit_gallery_path(@gallery)
     else
       puts! @gallery.errors.messages, 'cannot save gallery'
       flash[:alert] = 'No Luck. ' + @gallery.errors.messages.to_s

data/app/controllers/ish_manager/leads_controller.rb

@@ -1,14 +1,33 @@
 class IshManager::LeadsController < IshManager::ApplicationController
 
+  ## alphabetized : )
+
+  def create
+    @lead = Ish::Lead.new params[:lead].permit!
+    @lead.profile = current_user.profile
+    authorize! :create, @lead
+    if @lead.save
+      flash[:notice] = "created lead"
+    else
+      flash[:alert] = "Cannot create lead: #{@lead.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  def edit
+    @lead = Ish::Lead.find params[:id]
+    authorize! :edit, @lead
+  end
+
   def index
     authorize! :index, Ish::Lead
-    @leads = Ish::Lead.where( :profile => current_user.profile, :is_trash => false )
+    @leads = Ish::Lead.all # where( :profile => current_user.profile, :is_trash => false )
     if params[:is_done]
       @leads = @leads.where( :is_done => true )
     else
       @leads = @leads.where( :is_done => false )
     end
-    render :layout => 'ish_manager/application_no_materialize'
+    render :layout => 'ish_manager/application_no_material'
   end
 
   def new
@@ -16,28 +35,11 @@ class IshManager::LeadsController < IshManager::ApplicationController
     authorize! :new, @new_lead
   end
 
-  def create
-    @lead = Ish::Lead.new params[:lead].permit!
-    @lead.profile = current_user.profile
-    authorize! :create, @lead
-    if @lead.save
-      flash[:notice] = "created lead"
-    else
-      flash[:alert] = "Cannot create lead: #{@lead.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
   def show
     authorize! :redirect, IshManager::Ability
     redirect_to :action => :edit, :id => params[:id]
   end
 
-  def edit
-    @lead = Ish::Lead.find params[:id]
-    authorize! :edit, @lead
-  end
-
   def update
     @lead = Ish::Lead.find params[:id]
     authorize! :update, @lead

data/app/controllers/ish_manager/maps_controller.rb

@@ -22,12 +22,10 @@ class IshManager::MapsController < IshManager::ApplicationController
     end
     authorize! :create, @map
 
-    respond_to do |format|
-      if @map.save
-        format.html { redirect_to map_path(@map), notice: 'Map was successfully created.' }
-      else
-        format.html { render :new }
-      end
+    if @map.save
+      redirect_to map_path(@map), notice: 'Map was successfully created.'
+    else
+      render :new
     end
   end
 
@@ -175,6 +173,17 @@ class IshManager::MapsController < IshManager::ApplicationController
 
     @map.config = JSON.parse map_params[:config]
 
+    # And update markers
+    # @TODO: rewrite and make this one query!
+    if map_marker_params.present?
+      markers = Marker.where( destination: @map )
+      markers.each do |m|
+        map_marker_params.each do |k, v|
+          m.update_attribute(k, v)
+        end
+      end
+    end
+
     respond_to do |format|
       if map_params[:parent_slug].present?
         @map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })
@@ -202,11 +211,17 @@ class IshManager::MapsController < IshManager::ApplicationController
     out
   end
 
+  def map_marker_params
+    out = map_params.slice( :shared_profiles, :is_public )
+    puts! out, 'map_marker_params'
+    out
+  end
+
   ## @TODO: remove all instances of unscoped, everywhere.
   def set_map
     @map = ::Gameui::Map.unscoped.where(id: params[:id]).first
     @map ||= Gameui::Map.unscoped.find_by(slug: params[:id])
-    @markers = @map.markers.unscoped
+    @markers = @map.markers.unscoped.includes( :destination )
   end
 
 end

data/app/controllers/ish_manager/markers_controller.rb

@@ -22,7 +22,6 @@ class IshManager::MarkersController < IshManager::ApplicationController
     authorize! :create_marker, @map
     @map_id = @map.id
     @marker.creator_profile_id = current_user.profile.id
-    @marker.destination = Gameui::Map.find_by( slug: @marker.slug )
 
     if params[:image]
       @marker.image = ::Ish::ImageAsset.new :image => params[:image]
@@ -32,12 +31,17 @@ class IshManager::MarkersController < IshManager::ApplicationController
       @marker.title_image = ::Ish::ImageAsset.new :image => params[:title_image]
       @marker.title_image.save
     end
+    if params[:asset3d]
+      @marker.asset3d = ::Gameui::Asset3d.new object: params[:asset3d]
+      @marker.asset3d.save
+    end
 
     respond_to do |format|
       if @marker.save
         @marker.map.touch
         format.html { redirect_to map_path(@map), notice: 'Marker was successfully created.' }
       else
+        puts! @marker.errors.full_messages.join(", "), "Could not create marker"
         flash[:alert] = @marker.errors.full_messages
         format.html { render :new }
       end
@@ -55,6 +59,10 @@ class IshManager::MarkersController < IshManager::ApplicationController
       @marker.title_image = ::Ish::ImageAsset.new :image => params[:title_image]
       @marker.title_image.save
     end
+    if params[:asset3d]
+      @marker.asset3d = ::Gameui::Asset3d.new object: params[:asset3d]
+      @marker.asset3d.save
+    end
 
     old_map = @marker.map
     respond_to do |format|

data/app/controllers/ish_manager/meetings_controller.rb

@@ -0,0 +1,56 @@
+
+class IshManager::MeetingsController < IshManager::ApplicationController
+
+  layout 'ish_manager/application_no_material'
+
+  # alphabetized
+
+  def create
+    authorize! :create, Ish::Meeting
+    @meeting = Ish::Meeting.new meeting_params
+    if @meeting.save
+      if @meeting.send_reminder_morning
+        y = @meeting.datetime.year
+        m = @meeting.datetime.month
+        d = @meeting.datetime.day
+        h = 9
+        m = 5 # 9:05am
+        IshManager::MeetingMailer.morning_reminder( meeting_id: @meeting.id.to_s
+        ).deliver_later({ wait_until: DateTime.new(y,m,d,h,m) })
+      end
+      if @meeting.send_reminder_15min
+      end
+      flash[:notice] = 'Meeting created'
+      redirect_to action: 'index'
+    else
+      flash[:alert] = "Cannot create meeting: #{@meeting.errors.full_messages.join(", ")}."
+      render 'new'
+    end
+  end
+
+  def destroy
+  end
+
+  def edit
+  end
+
+  def index
+    authorize! :index, Ish::Meeting
+    @meetings = Ish::Meeting.all
+  end
+
+  def new
+    @meeting = Ish::Meeting.new
+    authorize! :new, @meeting
+  end
+
+  def update
+  end
+
+  private
+
+  def meeting_params
+    params.require(:meeting).permit!
+  end
+
+end

data/app/controllers/ish_manager/unsubscribes_controller.rb

@@ -0,0 +1,17 @@
+
+class IshManager::UnsubscribesController < IshManager::ApplicationController
+
+  layout false
+
+  # alphabetized : )
+
+  def new
+    @unsubscribe = Ish::Unsubscribe.new
+    authorize! :new, @unsubscribe
+  end
+
+  def create
+    authorize! :open_permission, IshManager::Ability
+  end
+
+end

data/app/jobs/ish_manager/test_email_job.rb

@@ -0,0 +1,11 @@
+
+class IshManager::TestEmailJob < ApplicationJob
+
+  queue_as :mailers
+
+  def perform
+    puts! 'performing test job'
+    ::IshManager::ApplicationMailer.test_email.deliver_later
+  end
+
+end

data/app/mailers/ish_manager/application_mailer.rb

@@ -25,5 +25,10 @@ module IshManager
       mail( :to => stock.profile.email, :subject => "IshManager Stock Alert :: #{stock.ticker}" ).deliver
     end
 
+    def test_email s=''
+      puts! s, "#test_email - delivering"
+      mail( to: 'piousbox@gmail.com', subject: "Test #{s} :: #{DateTime.now.strftime("%Y-%m-%d %l:%M:%S %P")}" )
+    end
+
   end
 end

data/app/mailers/ish_manager/meeting_mailer.rb

@@ -0,0 +1,13 @@
+
+class IshManager::MeetingMailer < IshManager::ApplicationMailer
+  default from: 'piousbox@gmail.com'
+  # layout 'mailer'
+
+  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
+
+end

data/app/models/ish_manager/ability.rb

@@ -25,7 +25,6 @@ class IshManager::Ability
 
         can [ :create_newsitem, :show, :new_feature, :create_feature,
          :index, :new, :create, :edit, :update ], City
-        can [ :manage ], ::CoTailors
 
         can [ :new ], ::Feature
         can [ :friends_index, :friends_new ], ::Ish::UserProfile
@@ -113,5 +112,7 @@ class IshManager::Ability
       report.is_public
     end
 
+    can [ :new, :create ], Ish::Unsubscribe
+
   end
 end

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

@@ -36,9 +36,15 @@
         %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
         -# %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches (old m3)', stock_watches_path
         %li= link_to 'Stock Watches', '/iron_warbler/stock_watches'
-        %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles',  user_profiles_path
+        %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Ish::UserProfiles',  user_profiles_path
         %li
           = link_to "Ish::ImageAsset's", image_assets_path
-        %li= link_to 'GuydMe', 'https://localhost:3002'
+      %ul
+        %li= link_to 'Leads', leads_path
+        %li
+          = link_to 'Meetings', meetings_path
+          = link_to '[+]', new_meeting_path
+        %li
+          = button_to 'Test Email', email_test_path, { form_class: 'inline-block' }
   %hr
 

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

@@ -1,5 +1,5 @@
 
-Welcome home! Your role is #{current_user.profile.role_name}.
+Welcome home! Your role is `#{current_user.profile.role_name}`.
 
 .bordered{ style: 'width: 400px;' }
   = form_tag "https://www.cgtrader.com/free-3d-models", method: :get do

data/app/views/ish_manager/application_mailer/test_email.html.haml

@@ -0,0 +1,4 @@
+
+%h1 This is a test
+%p Hello, world!
+

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

@@ -1,22 +1,23 @@
 
-.manager--leads-index
+.manager-leads-index
   %h5
     = link_to 'Leads', leads_path
+    (#{Ish::Lead.all.count})
     = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
     = link_to '[done]', done_leads_path
-    
-  %table#dataTable
+
+  %table#dataTable.display.compact
     %thead
       %tr
         %th &nbsp;
-        %th Created At
+        %th.created-at Created At
         %th Company
         %th Tag
         %th Phone
         %th Email
         %th Job Url
-        %th Company Url
-        %th Yelp Url
+        %th.company-url Company Url
+        %th.yelp-url Yelp Url
         %th Location
         %th Description
         %th Address
@@ -24,14 +25,19 @@
       - @leads.each do |lead|
         %tr
           %td= link_to raw('<i class="fa fa-play"></i>'), lead_path( lead )
-          %td= pretty_date lead.created_at
+          %td.created-at= pretty_date lead.created_at
           %td= lead.company
           %td= lead.tag
           %td= lead.phone
-          %td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}"
-          %td= link_to raw('<i class="fa fa-user-md"></i>'), lead.job_url, :target => '_blank'
-          %td= lead.company_url
-          %td= lead.yelp_url
+          %td
+            = link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}" if lead.email.present?
+          %td
+            = link_to raw('<i class="fa fa-user-md"></i>'), lead.job_url, :target => '_blank' if lead.job_url.present?
+          %td
+            = link_to 'B', lead.company_url if lead.company_url.present?
+          %td
+            = link_to raw('<i class="fa fa-user-md"></i>'), lead.yelp_url if lead.yelp_url.present?
           %td= lead.location
           %td= lead.description
-          %td= lead.address
+          %td
+            = 'Y' if lead.address.present?

data/app/views/ish_manager/maps/_form.haml

@@ -2,7 +2,7 @@
 -# ish_manager / maps / _form
 -#
 
-- url = params[:action] == 'new' ? maps_path : map_path(@map.id)
+- url = %w| new create |.include?( params[:action] ) ? maps_path : map_path(@map.id)
 
 
 = form_for @map, :html => { :multipart => true, class: '--form maps--form' }, url: url do |f|
@@ -77,10 +77,10 @@
       %pre.small
         :plain
           description.collapsible: bool
-          map_panel_type: "Equirectangular" |
+          map_panel_type: "Equirectangular" | "Panoramic" |
             "MapPanel" | "MapPanelNoZoom" |
             "ThreePanelV1" | "ThreePanelV4" |
-            "GoogleMaps"
+            "GoogleMaps" | "TabiversePlanet"
   .row
     .col.s6
       .google-maps.row

data/app/views/ish_manager/maps/map_editor.haml

@@ -10,5 +10,5 @@
         = image_tag m.image ? m.image.image.url(:original) : image_missing
         = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{m.centerOffsetY-10}px; left: #{m.centerOffsetX-10}px;" )
 
-  = render 'ish_manager/markers/index_small', markers: @markers, map: @map
+  = render 'ish_manager/markers/index', markers: @markers, map: @map
 

data/app/views/ish_manager/markers/_form.haml

@@ -12,17 +12,17 @@
     .actions
       = f.submit 'Save'
     .row
-      .col.s1
+      .col.s4
         = f.label :map
-        = f.text_field :map_id, value: @marker.map_id || params[:map_id]
-      .col.s5
+        = f.select :map_id, options_for_select(@maps_list, selected: @marker.map_id || params[:map_id])
+      .col.s4
         .field
           = f.label :name
           = f.text_field :name
-      .col.s6
+      .col.s4
         .field
-          = f.label :slug
-          = f.text_field :slug
+          = f.label :destination
+          = f.select :destination_id, options_for_select(@maps_list, selected: @marker.destination_id)
     .row
       .col.s3
         .field
@@ -31,6 +31,9 @@
           .image-thumb
             = image_tag(@marker.image.image.url(:original)) rescue nil
             = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{@marker.centerOffsetY-10}px; left: #{@marker.centerOffsetX-10}px;" )
+        .field
+          = f.label :asset3d
+          = file_field_tag :asset3d
       .col.s3
         .field
           = f.label :centerOffsetX
@@ -81,17 +84,12 @@
               = f.check_box :is_active
               = f.label :is_active
           .col.s6
-            unused
-    .row
-      .col.s6
-        .google-maps.row
-          .col.s4
-            = f.label "x, y"
-          .col.s4
-            = f.text_field :x
-          .col.s4
-            = f.text_field :y
-      .col.s6
-        unused
+            .google-maps.row
+              .col.s4
+                = f.label "x, y"
+              .col.s4
+                = f.text_field :x
+              .col.s4
+                = f.text_field :y
     .actions
       = f.submit 'Save'

data/app/views/ish_manager/markers/_index.haml

@@ -3,11 +3,11 @@
   - markers.each do |marker|
     .Card
       - if marker.title_image
-        = image_tag marker.title_image.image.url(:original)
+        = image_tag marker.title_image.image.url(:thumb)
       - else
         = image_missing_tag
       .flex-row
-        .a= marker.slug
+        .a= marker.destination.name
         .a= button_to '~', edit_marker_path(marker), method: :get
         .a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
       .flex-row

data/app/views/ish_manager/markers/new.haml

@@ -1,4 +1,5 @@
-%h1 New marker for #{@map.slug}
+
+.a New marker
 
 = render 'form'
 

data/app/views/ish_manager/meeting_mailer/morning_reminder.haml

@@ -0,0 +1,13 @@
+
+%p Hello #{@meeting.invitee_name},
+
+%p
+  This is a reminder that you have an upcoming meeting with #{@meeting.host_name},
+  today at #{@meeting.datetime.strftime('%l:%M %P')}.
+
+%p
+  %small --<br />
+  %small The Piousbox Notifier<br />
+  %small If you are unable to attend or would like to reschedule, please notify #{@meeting.host_email}.
+  %small To submit an unsubscribe request, #{link_to 'click here', new_unsubscribe_url, style: 'color: gray'}
+

data/app/views/ish_manager/meetings/_form.haml

@@ -0,0 +1,51 @@
+
+- url = meeting.persisted? ? meeting_path( meeting.id ) : meetings_path
+
+= form_for meeting, :as => :meeting, :url => url do |f|
+
+  .input-field
+    = f.label :invitee_email
+    = f.text_field :invitee_email
+  .input-field
+    = f.label :invitee_name
+    = f.text_field :invitee_name
+
+  .input-field
+    = f.label :datetime
+    = f.text_field :datetime
+
+  .input-field
+    = f.check_box :send_reminder_morning
+    = f.label :send_reminder_morning
+
+  .input-field
+    = f.check_box :send_reminder_15min
+    = f.label :send_reminder_15min
+
+  .input-field
+    = f.select :template_name, options_for_select(Ish::Meeting.template_name_options)
+    = f.label :template_name
+
+  -# .input-field
+  -#   = f.label :company
+  -#   = f.text_field :company
+  -# .input-field
+  -#   = f.label :tag
+  -#   = f.text_field :tag
+  -# .input-field
+  -#   = f.label :location
+  -#   = f.text_field :location
+  -# .input-field
+  -#   = f.label :description
+  -#   = f.text_area :description
+  -# .input-field
+  -#   = f.label :address
+  -#   = f.text_area :address
+
+  -# .field
+  -#   = f.check_box :is_trash
+  -#   = f.label :is_trash
+
+  .actions{ :style => "margin-top: 1em;" }
+    = f.submit
+

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

@@ -0,0 +1,13 @@
+
+.manager-meeetings-index
+
+  %table#dataTable.display.compact
+    %thead
+      %tr
+        %th Invitee
+        %th Date Time
+    %tbody
+      - @meetings.each do |meeting|
+        %tr
+          %td= meeting.invitee_email
+          %td= meeting.datetime.to_s

data/app/views/ish_manager/meetings/new.haml

@@ -0,0 +1,3 @@
+
+%h1 New Meeting
+= render 'ish_manager/meetings/form', meeting: @meeting

data/app/views/ish_manager/unsubscribes/new.haml

@@ -0,0 +1,10 @@
+
+= form_for @unsubscribe, url: unsubscribes_path do |f|
+  .input-field
+    = f.label :email
+    = f.text_field :email
+  .input-field
+    = f.label :reason
+    = f.text_field :reason
+  .actions
+    = f.submit 'Submit Unsubscribe Request'

data/app/views/ish_manager/user_profiles/_show.haml

@@ -0,0 +1,35 @@
+- profile ||= user_profile
+
+.row
+  .col.s4
+    %ul
+      %li
+        <b>Email:</b> #{link_to profile.email, user_profile_path(profile)}
+        = link_to '[edit]', edit_user_profile_path( profile )
+      %li <b>Name:</b> #{profile.name}
+      %li <b>Role:</b> #{profile.role_name}
+      %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
+      %li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
+      %li
+        <b>Profile Photo:</b>
+        = image_tag profile.profile_photo.photo.url(:thumb) rescue nil
+
+  .col.s8
+    %h5 Shared galleries
+    - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|
+      &gt; #{link_to g.name, gallery_path(g.slug)} <br />
+      = render 'meta', :item => g
+    <hr />
+
+    %h5 Newsitems
+    - profile.newsitems.each do |n|
+      = render 'ish_manager/newsitems/item', n: n, profile_id: profile.id
+    <hr />
+
+    %h5 Bookmarked Locations (#{profile.bookmarked_locations.length})
+    %ul.browser-default
+      - profile.bookmarked_locations.each do |n|
+        %li
+          = n.slug
+
+

data/app/views/ish_manager/user_profiles/edit.haml

@@ -1,3 +1,5 @@
 
-%h5 Editing profile of user #{@profile.user.email}
+%h5 Editing profile of user `#{@profile.user&.email}`
+- if !@profile.user
+  .alert <b>Note:</b> This profile doesn't have an associated user.
 = render 'form', :profile => @profile

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

@@ -6,40 +6,9 @@
   User Profiles (#{@user_profiles.count})
   = link_to '[+]', new_user_profile_path
 
-
-- @user_profiles.each do |profile|
-  .panel
-    .panel-body
-      .row
-        .col.s4
-          %ul
-            %li
-              <b>Email:</b> #{link_to profile.email, user_profile_path(profile)}
-              = link_to '[edit]', edit_user_profile_path( profile )
-            %li <b>Name:</b> #{profile.name}
-            %li <b>Role:</b> #{profile.role_name}
-            %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
-            %li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
-            %li
-              <b>Profile Photo:</b>
-              = image_tag profile.profile_photo.photo.url(:thumb) rescue nil
-
-        .col.s8
-          %h5 Shared galleries
-          - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|
-            &gt; #{link_to g.name, gallery_path(g.slug)} <br />
-            = render 'meta', :item => g
-          <hr />
-
-          %h5 Newsitems
-          - profile.newsitems.each do |n|
-            = render 'ish_manager/newsitems/item', n: n, profile_id: profile.id
-          <hr />
-
-          %h5 Bookmarked Locations (#{profile.bookmarked_locations.length})
-          %ul.browser-default
-            - profile.bookmarked_locations.each do |n|
-              %li
-                = n.slug
-
+%ul.browser-default
+  - @user_profiles.each do |profile|
+    %li
+      = link_to '[~]', edit_user_profile_path(profile)
+      = profile.user&.email
 

data/app/views/layouts/ish_manager/application2.haml

@@ -19,6 +19,7 @@
 
     = javascript_include_tag "ish_manager/application"
     = javascript_include_tag "ish_manager/materialize"
+    = javascript_include_tag "ish_manager/application_materialize"
 
     = csrf_meta_tags
   %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
@@ -37,7 +38,7 @@
               %p.notice= notice
             - if alert
               %p.alert= alert
-      .container
+
         = yield
     = render 'ish_manager/application/main_footer'
     = render 'analytics' if Rails.env.production?

data/config/routes.rb

@@ -1,4 +1,8 @@
+
 IshManager::Engine.routes.draw do
+
+  post 'email_test', to: 'application#email_test', as: :email_test
+
   root :to => 'application#home'
 
   resources :campaigns
@@ -57,6 +61,8 @@ IshManager::Engine.routes.draw do
     resources 'markers'
   end
 
+  resources :meetings
+
   resources :newsitems
 
   resources :orders
@@ -97,6 +103,7 @@ IshManager::Engine.routes.draw do
     resources :videos
   end
 
+  resources :unsubscribes
   resources :user_profiles do
     resources :newsitems
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.302
+  version: 0.1.8.305
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -219,6 +219,7 @@ files:
 - app/assets/images/ui-icons_ffffff_256x240.png
 - app/assets/images/wait.gif
 - app/assets/javascripts/ish_manager/application.js
+- app/assets/javascripts/ish_manager/application_materialize.js
 - app/assets/javascripts/ish_manager/maps.js
 - app/assets/javascripts/ish_manager/materialize.js
 - app/assets/javascripts/ish_manager/shared.js
@@ -253,6 +254,7 @@ files:
 - app/assets/stylesheets/ish_manager/bootstrap.css
 - app/assets/stylesheets/ish_manager/galleries.scss
 - app/assets/stylesheets/ish_manager/jquery-ui.css
+- app/assets/stylesheets/ish_manager/leads.scss
 - app/assets/stylesheets/ish_manager/maps.scss
 - app/assets/stylesheets/ish_manager/materialize.css
 - app/assets/stylesheets/ish_manager/photos.scss
@@ -271,6 +273,7 @@ files:
 - app/controllers/ish_manager/leads_controller.rb
 - app/controllers/ish_manager/maps_controller.rb
 - app/controllers/ish_manager/markers_controller.rb
+- app/controllers/ish_manager/meetings_controller.rb
 - app/controllers/ish_manager/newsitems_controller.rb
 - app/controllers/ish_manager/orders_controller.rb
 - app/controllers/ish_manager/payments_controller.rb
@@ -278,6 +281,7 @@ files:
 - app/controllers/ish_manager/reports_controller.rb
 - app/controllers/ish_manager/sites_controller.rb
 - app/controllers/ish_manager/tags_controller.rb
+- app/controllers/ish_manager/unsubscribes_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/users_controller.rb
 - app/controllers/ish_manager/venues_controller.rb
@@ -285,7 +289,9 @@ files:
 - app/helpers/ish_manager/application_helper.rb
 - app/helpers/ish_manager/images_helper.rb
 - app/jobs/ish_manager/application_job.rb
+- app/jobs/ish_manager/test_email_job.rb
 - app/mailers/ish_manager/application_mailer.rb
+- app/mailers/ish_manager/meeting_mailer.rb
 - app/models/ish_manager/ability.rb
 - app/models/ish_manager/application_record.rb
 - app/views/ish_manager/application/_analytics.html
@@ -305,8 +311,8 @@ files:
 - app/views/ish_manager/application_mailer/option_alert.html.erb
 - app/views/ish_manager/application_mailer/shared_galleries.html.erb
 - app/views/ish_manager/application_mailer/stock_alert.html.erb
+- app/views/ish_manager/application_mailer/test_email.html.haml
 - app/views/ish_manager/application_mailer/welcome.html.erb
-- app/views/ish_manager/campaigns/index.haml
 - app/views/ish_manager/cities/_form.haml
 - app/views/ish_manager/cities/_header.haml
 - app/views/ish_manager/cities/edit.haml
@@ -368,9 +374,14 @@ files:
 - app/views/ish_manager/markers/_form.haml
 - app/views/ish_manager/markers/_header.haml
 - app/views/ish_manager/markers/_index.haml
-- app/views/ish_manager/markers/_index_small.haml
+- app/views/ish_manager/markers/_index_small.haml-trash
 - app/views/ish_manager/markers/edit.haml
 - app/views/ish_manager/markers/new.haml
+- app/views/ish_manager/meeting_mailer/morning_reminder.haml
+- app/views/ish_manager/meetings/_form.haml
+- app/views/ish_manager/meetings/edit.haml
+- app/views/ish_manager/meetings/index.haml
+- app/views/ish_manager/meetings/new.haml
 - app/views/ish_manager/newsitems/_form.haml
 - app/views/ish_manager/newsitems/_header.haml
 - app/views/ish_manager/newsitems/_index.haml
@@ -409,7 +420,9 @@ files:
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml
 - app/views/ish_manager/tags/show.haml
+- app/views/ish_manager/unsubscribes/new.haml
 - app/views/ish_manager/user_profiles/_form.haml
+- app/views/ish_manager/user_profiles/_show.haml
 - app/views/ish_manager/user_profiles/edit.haml
 - app/views/ish_manager/user_profiles/index.haml
 - app/views/ish_manager/user_profiles/new.haml

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

@@ -1,24 +0,0 @@
-
-.manager--campaigns-index
-  %h5
-    = link_to 'Campaigns', campaigns_path
-    (#{@campaigns.count})
-    = link_to raw("<i class='fa fa-plus-square'></i>"), new_campaign_path
-    -# = link_to '(done)', done_campaigns_path
-    
-  %table
-    %tr
-      %th &nbsp;
-      %th Created At
-      %th Company
-      %th Email
-      %th Job Url
-      %th Description
-    - @campaigns.each do |campaign|
-      %tr
-        %td= link_to raw('<i class="fa fa-play"></i>'), campaign_path( campaign )
-        %td= pretty_date campaign.created_at
-        %td= campaign.company
-        %td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{campaign.email}"
-        %td= link_to raw('<i class="fa fa-user-md"></i>'), campaign.job_url, :target => '_blank'
-        %td= campaign.description