ish_manager 0.1.8.397 → 0.1.8.399

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48dd240bd2406498ff4432cced69350c3c66efb13c339ed5dfaefb421d256e5b
-  data.tar.gz: 97c1195165ccac014df21e423315cebacf3bcdc51aac7c40095f7d8a3bd4ac2f
+  metadata.gz: ab3eb4ae2c3ce1d114b30a3327dcb37631d38599df86c5e12dbe4cc1ce0fd44a
+  data.tar.gz: 109c4fe36fc77458ea0fbfdd6615e1264a2985116f16b5466ef1d3594fde8b9c
 SHA512:
-  metadata.gz: dc4895c6a5da8056ef2557cb3609fd512a71f3c14bd4181120337323b6ec6161863e385e8aa119ae7827260406ae07e2888e0bbb2c21fe28873f2838dc58c251
-  data.tar.gz: dcee31234fecc15bfd8db0f09d6169c99116ddbd63edd81a871a7e55d5b23e9243add1870d8951d62620398317a82562a46be04830f95032a0dac76a4aebe0c5
+  metadata.gz: 0e262ac280849d4fab6fcb951224a813d9664e097b2a28b11399d380d145f6f8d4623b086702b3898c60d553270e230f09874093f56647ac994a2cb5e0056338
+  data.tar.gz: 1a684d88b90fc52f9ceac39bf4380eb57153f48c653c0e4eefa711e9e47306eed8b5ae5af4c5d007bfdab2b7074fd0f7a63ce8a08baf0073e48b97b41bed977a

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

@@ -94,6 +94,7 @@
 
       .my-actions {
         display: flex;
+        flex-direction: column;
       }
 
       .preview {

data/app/controllers/ish_manager/application_controller.rb

@@ -1,99 +1,101 @@
 
 require 'business_time'
 
-module IshManager
-  class ApplicationController < ActionController::Base
-
-    protect_from_forgery :with => :exception, :prepend => true
-    before_action :set_current_ability
-    before_action :set_changelog
-    before_action :set_title
-    before_action :set_jwt
-    check_authorization
-    rescue_from ::CanCan::AccessDenied, :with => :access_denied
-
-    before_action :basic_auth
-    def basic_auth
-      return if Rails.env.test?
-      http_basic_authenticate_or_request_with :name => BASIC_AUTH_NAME, :password => BASIC_AUTH_PASSWORD
-    end
 
-    def home
-      authorize! :home, IshManager::Ability
-      render 'home'
-    end
+class IshManager::ApplicationController < ActionController::Base
 
-    #
-    # private
-    #
-    private
+  protect_from_forgery :with => :exception, :prepend => true
+  before_action :set_current_ability
+  before_action :set_changelog
+  before_action :set_title
+  before_action :set_jwt
+  check_authorization
+  rescue_from ::CanCan::AccessDenied, :with => :access_denied
 
-    def access_denied exception
-      store_location_for :user, request.path
-      redirect_to user_signed_in? ? root_path : Rails.application.routes.url_helpers.new_user_session_path, :alert => exception.message
-    end
+  before_action :basic_auth
+  def basic_auth
+    return if Rails.env.test?
+    http_basic_authenticate_or_request_with :name => BASIC_AUTH_NAME, :password => BASIC_AUTH_PASSWORD
+  end
 
-    def encode(payload, exp = 48.hours.from_now) # @TODO: definitely change, right now I expire once in 2 days.
-      payload[:exp] = exp.to_i
-      JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
-    end
+  def home
+    authorize! :home, IshManager::Ability
+    render 'home'
+  end
 
-    def pp_errors err
-      err
-    end
+  #
+  # private
+  #
+  private
 
-    def puts! a, b=''
-      puts "+++ +++ #{b}"
-      puts a.inspect
-    end
+  def access_denied exception
+    store_location_for :user, request.path
+    redirect_to user_signed_in? ? root_path : Rails.application.routes.url_helpers.new_user_session_path, :alert => exception.message
+  end
 
-    def set_changelog
-      @version = Gem.loaded_specs['ish_manager'].version.to_s
-    end
+  def encode(payload, exp = 48.hours.from_now) # @TODO: definitely change, right now I expire once in 2 days.
+    payload[:exp] = exp.to_i
+    JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
+  end
 
-    def set_current_ability
-      if !current_user
-        raise ::CanCan::AccessDenied
-      end
-      @current_profile ||= ::Ish::UserProfile.find_by({ email: current_user.email })
-      @current_ability ||= ::IshManager::Ability.new( @current_profile )
-    end
+  def pp_errors err
+    err
+  end
 
-    def set_jwt
-      @jwt_token = encode(user_profile_id: @current_user.profile.id.to_s)
-    end
+  def puts! a, b=''
+    puts "+++ +++ #{b}"
+    puts a.inspect
+  end
 
-    def set_lists
-      @galleries_list       = Gallery.all.list
-      @locations_list       = ::Gameui::Map.list
-      @maps_list            = ::Gameui::Map.list # @TODO: missing nonpublic!
-      @reports_list         = Report.all.list
-      @user_profiles_list   = Ish::UserProfile.list
-      @videos_list          = Video.all.list
-      @leads_list           = Lead.list
-      @leadsets_list        = Leadset.list
-      @email_actions_list   = [[nil,nil]] + Office::EmailAction.all.map { |a| [ a.slug, a.id ] }
-      @email_templates_list = [[nil,nil]] + Ish::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
-    end
+  def set_changelog
+    @version = Gem.loaded_specs['ish_manager'].version.to_s
+  end
 
-    def set_title
-      @page_title = "#{ params[:controller].gsub('ish_manager/', '') } #{params[:action]} #{params[:slug]||params[:id]} ".gsub("  ", " ")
+  def set_current_ability
+    if !current_user
+      raise ::CanCan::AccessDenied
     end
+    @current_profile ||= ::Ish::UserProfile.find_by({ email: current_user.email })
+    @current_ability ||= ::IshManager::Ability.new( @current_profile )
+  end
 
-    # @TODO: obsolete, remove _vp_ 2022-10-15
-    def update_profile_pic
-      return unless params[:photo]
-      @photo = Photo.new :photo => params[:photo]
-      @photo.user_profile = @current_profile
-      flag = @photo.save
-      @resource.profile_photo = @photo
-      flagg = @resource.save
-      if flag && flagg
-        flash[:notice] = 'Success'
-      else
-        flash[:alert] = "No Luck. #{@photo.errors.messages} #{@resource.errors.messages}"
-      end
-    end
+  def set_jwt
+    @jwt_token = encode(user_profile_id: @current_user.profile.id.to_s)
+  end
 
+  def set_lists
+    @blank_template       = Tmpl.new
+
+    @email_actions_list   = [[nil,nil]] + Office::EmailAction.all.map { |a| [ a.slug, a.id ] }
+    @email_templates_list = [[nil,nil]] + Ish::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
+    @galleries_list       = Gallery.all.list
+    @leads_list           = Lead.list
+    @leadsets_list        = Leadset.list
+    @locations_list       = ::Gameui::Map.list
+    @maps_list            = ::Gameui::Map.list # @TODO: missing nonpublic!
+    @profiles_list        = Ish::UserProfile.list
+    @reports_list         = Report.all.list
+    @user_profiles_list   = Ish::UserProfile.list
+    @videos_list          = Video.all.list
   end
+
+  def set_title
+    @page_title = "#{ params[:controller].gsub('ish_manager/', '') } #{params[:action]} #{params[:slug]||params[:id]} ".gsub("  ", " ")
+  end
+
+  # @TODO: obsolete, remove _vp_ 2022-10-15
+  def update_profile_pic
+    return unless params[:photo]
+    @photo = Photo.new :photo => params[:photo]
+    @photo.user_profile = @current_profile
+    flag = @photo.save
+    @resource.profile_photo = @photo
+    flagg = @resource.save
+    if flag && flagg
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = "No Luck. #{@photo.errors.messages} #{@resource.errors.messages}"
+    end
+  end
+
 end

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -5,7 +5,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
   def create
     @newsitem = Newsitem.new params[:newsitem].permit!
-    @resource ||= Ish::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
+    @resource ||= Ish::UserProfile.find params[:newsitem][:profile_id] if !params[:newsitem][:profile_id].blank?
     @resource ||= ::Gameui::Map.find params[:newsitem][:map_id] if !params[:newsitem][:map_id].blank?
     @resource.newsitems << @newsitem
     @resource.touch

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -6,11 +6,14 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   def index
     @user_profiles = Ish::UserProfile.all
     authorize! :index, Ish::UserProfile
+    if params[:q]
+      @user_profiles = @user_profiles.where({ :email => /#{params[:q]}/i })
+    end
   end
 
   def show
-    @user_profile = Ish::UserProfile.find params[:id]
-    authorize! :show, @user_profile
+    @profile = Ish::UserProfile.find params[:id]
+    authorize! :show, @profile
   end
 
   def edit

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

@@ -26,10 +26,14 @@
         %li= link_to 'Categories & Tags', categories_path
       %ul
         %li= link_to '+Newsitem', new_newsitem_path
-        %li= link_to 'Ish::UserProfiles',  user_profiles_path
+        %li
+          = link_to 'Ish::UserProfiles',  user_profiles_path
+          .inline-search
+            = form_tag user_profiles_path, method: :get do
+              = text_field_tag :q
         %li= link_to "Ish::ImageAsset's", image_assets_path
         %li
-          = link_to 'Locations (maps)', maps_path
+          = link_to 'Locations', maps_path
           .inline-search
             = form_tag maps_path, method: :get do
               = text_field_tag :q

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

@@ -54,6 +54,8 @@
 
           .my-actions.hide
             = render 'ish_manager/email_contexts/form_reply', lead: lead
+            .bordered-card
+              = render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank_template, from_email: msg.to, subject: msg.subject, body: (msg.part_html||msg.part_txt) }), lead: lead
             -# = button_to 'Reply'
             -# = button_to 'Reply All'
             -# = button_to 'New Template'

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

@@ -2,6 +2,7 @@
 .item{ style: "display: flex; flex-direction: column;" }
   = render 'map_meta_row', map: map
   - if map.childs.length > 0
+    .collapse-expand{ id: map.id.to_s } <e>
     %ul{ style: "margin-left: 5em;" }
       - map.childs.each do |m|
         %li

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

@@ -2,10 +2,11 @@
 -# ish_manager / maps / index.haml
 -#
 
-.maps-index
-  %h1
-    Maps (#{@maps.length})
-    = link_to '[+]', new_map_path
+.maps-index.padded
+  .header
+    %h1.title
+      Maps (#{@maps.length})
+      = link_to '[+]', new_map_path
 
   .red-border
     = form_tag import_map_path, :multipart => true do
@@ -15,11 +16,12 @@
         = check_box_tag :delete_existing
       = submit_tag 'Import Map'
 
-  - @maps.each do |map|
-    = render 'index_item', map: map
+  .collapse-expand#collapseExpandMapsIndex Maps
+  .a
+    - @maps.each do |map|
+      = render 'index_item', map: map
 
-
-  %h1 All Maps (#{@all_maps.length})
+  .collapse-expand#collapseExpandMapsIndex2 All Maps (#{@all_maps.length})
   %ul
     - @all_maps.each do |m|
       %li

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

@@ -8,6 +8,9 @@
       .field
         = f.label :map
         = f.select :map_id, options_for_select( @maps_list, selected:( newsitem[:map_id] || params[:map_id] ) ), {}, class: 'select2'
+      .field
+        = f.label :profile
+        = f.select :profile_id, options_for_select( @profiles_list, selected: newsitem[:profile_id] ), {}, class: 'select2'
     .col-sm-6
       = f.submit :submit
 

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

@@ -0,0 +1 @@
+app/views/ish_manager/newsitems/_item.haml

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

@@ -1,5 +1,5 @@
 
-.newsitems-new
+.newsitems-new.max-width
   %h1
     New Newsitem
   = render 'form', :newsitem => @newsitem

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

@@ -1,4 +1,6 @@
 
-%h5 Editing profile for: `#{@profile.email}`
+.user-profiles-edit.max-width
+  .header
+    %h2.title Editing profile for: `#{@profile.email}`
 
-= render 'form', :profile => @profile
+  = render 'form', :profile => @profile

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

@@ -10,5 +10,5 @@
   - @user_profiles.each do |profile|
     %li
       = link_to '[~]', edit_user_profile_path(profile)
-      = profile.email
+      = link_to profile.email, user_profile_path(profile)
 

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

@@ -1,15 +1,16 @@
 
-.user-profiles--show
-  %ul
-    %li
-      User profile: #{@user_profile.inspect}
-    %li
-      Purchased Items:
-      %ul
-        - @user_profile.premium_purchases.each do |purchase|
-          %li
-            = purchase.item_type.constantize.find(purchase.item_id).inspect
-            -## this doesn't work b/c an unlocked map has no city.
-            -# = render 'ish_manager/reports/show_mini', report: purchase.item_type.constantize.find(purchase.item_id)
+.user-profiles-show.max-width
+  .header
+    %h2.title Profile #{@profile.email}
 
+  .newsitems
+    .title Newsitems (#{@profile.newsitems.length})
+    - @profile.newsitems.each do |newsitem|
+      = render 'ish_manager/newsitems/show', newsitem: newsitem
 
+  .premium-purchases
+    Payments (purchased items) (#{@profile.payments.length}):
+    - @profile.payments.each do |payment|
+      .Card.item
+        = payment.inspect
+        = payment.item&.inspect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.397
+  version: 0.1.8.399
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -521,6 +521,7 @@ files:
 - app/views/ish_manager/newsitems/_header.haml
 - app/views/ish_manager/newsitems/_index.haml
 - app/views/ish_manager/newsitems/_item.haml
+- app/views/ish_manager/newsitems/_show.haml
 - app/views/ish_manager/newsitems/edit.haml
 - app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml