ish_manager 0.1.8.317 → 0.1.8.320

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46aac642f2935fba5fd3fbdde3b5c8db3d5de1e662548ade2034e92b9139a85b
-  data.tar.gz: bca3a8046029e062114dd953e3c176bfca6b1bd707af2884a40005eae3f3245c
+  metadata.gz: ac66a26a9fff0be8e482db83b11f2722b4a1f6a7f231883ce400ee6e8d4c0086
+  data.tar.gz: 1a0dab969757ea87cb5d17529190296124a9e97f74815a63586fcc404cad81c8
 SHA512:
-  metadata.gz: c272991b54c0d0e841e01df392da16147210066e95fff67c680f9c80f95da58924b4cc15e98ff8024d2c0ce939bd358f5375e08dffd0aa34149f1f0ea6c27d4a
-  data.tar.gz: fb6f0a1676f62df1719a529d64804fa17b163ab82aa6000e8855e9e6e069ef6a6a98d7c4d7d2da0e1791b64009bfb56ad97b4d1479f33340c0587d8a8826dfb1
+  metadata.gz: 7fb00435a7c902e497a334a71dc26a4ece34e127e6be2a3f9f2b7d9cbd90fd2b54a5d117f50e8e458f82d3496f9e00b36ebb8f519bc697f3a749f578aca65e50
+  data.tar.gz: 2617d260f1498668323bf8b5a36fca1a9fa3e7cb2ca0ff0ccd5c75adbbe8c720e48c2720d967ef0a55e601b3a2806e9bf2a9351fe14e4023664e01a80d241ca2

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

@@ -78,6 +78,8 @@ $(function () {
       localStorage.setItem("collapse-expand#"+thisId, "collapsed")
     }
     $(this).next().slideToggle();
+  }).children().click(function (e) {
+    e.stopPropagation()
   })
 
 

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

@@ -18,6 +18,12 @@
  *= require ish_manager/pagination
 **/
 
+a[target='_blank'] {
+  &::after {
+    content: ' ^]' !important;
+    // font-size: .5em;
+  }
+}
 
 body {
   background: #dedede;
@@ -27,6 +33,12 @@ hr {
   background: red;
   height: 1px !important;
 }
+
+input[type='file'] {
+  overflow: auto;
+  max-width: 100%;
+}
+
 pre {
   background: #e0e0e0;
   padding: 1em;
@@ -105,8 +117,13 @@ ul:not(.browser-default).bullets, {
   text-align: center;
 }
 
+
 .collapse-expand {
   cursor: pointer;
+
+  > * {
+    display: inline-block;
+  }
 }
 
 /* D */
@@ -296,6 +313,14 @@ textarea.large {
 
 /* W */
 
+.WBordered {
+  border: 1px solid gray;
+  border-radius: 4px;
+  padding: 1em;
+}
+
+/* Y */
+
 .youtube_img {
   width: 100px;
 }

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

@@ -7,10 +7,11 @@
   }
 }
 
-.email-contexts-show {
+.email-contexts-show,
+.email-templates-show {
 
   iframe {
-    min-height: 500px;
+    min-height: 80vh;
   }
 
 }
@@ -32,6 +33,7 @@
 
 }
 
+
 .email-templates--form {
   border: 1px solid red;
   padding: 1em;

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

@@ -2,22 +2,23 @@
  * Alphabetized : )
 **/
 
+.maps--map-meta-row {
+  .flat-row {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-content: flex-start;
 
-.flat-row {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-content: flex-start;
-
-  height: 2.4em;
-  line-height: 3em;
+    // height: 2.4em;
+    line-height: 3em;
 
-  width: 100%;
-  margin: 1em 0 0 0;
-  padding: 0;
+    width: 100%;
+    margin: 1em 0 0 0;
+    padding: 0;
 
-  > * {
-    padding-right: 1em;
+    > * {
+      padding-right: 1em;
+    }
   }
 }
 

data/app/controllers/ish_manager/application_controller.rb

@@ -40,15 +40,12 @@ module IshManager
 
     def set_lists
       # alphabetized! : )
-      @cities_list = City.list
       @galleries_list = Gallery.all.list
       @locations_list = ::Gameui::Map.list
       @maps_list = ::Gameui::Map.list # @TODO: missing nonpublic!
       @reports_list = Report.all.list
-      @sites_list = Site.all.list
       @tags_list = Tag.list
       @user_profiles_list = Ish::UserProfile.list
-      @venues_list = Venue.all.list
       @videos_list = Video.all.list
     end
 
@@ -83,12 +80,8 @@ module IshManager
 
     def resource_path resource
       case resource.class.name
-      when 'City'
-        city_path( resource.id )
       when 'Event'
         event_path( resource.id )
-      when 'Venue'
-        venue_path( resource.id )
       end
     end
 

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -32,7 +32,8 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   def iframe_src
     authorize! :iframe_src, Ish::EmailContext
     @email_ctx = EmailContext.find params[:id]
-    render layout: false
+    @email_template = @email_ctx.email_template
+    render 'ish_manager/email_templates/iframe_src', layout: false
   end
 
   def index

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -25,6 +25,10 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
 
   def iframe_src
     authorize! :iframe_src, Ish::EmailTemplate
+    @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
+      Ish::EmailTemplate.find_by({ slug: params[:id] })
+    @email_ctx = EmailContext.new({ body: Ish::LoremIpsum.html })
+    render layout: false
   end
 
   def index
@@ -34,9 +38,11 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
 
   def show
     authorize! :show, Ish::EmailTemplate
-    @email_ctx = EmailContext.new
-    @template = Ish::EmailTemplate.where({ id: params[:id] }).first || Ish::EmailTemplate.find_by({ slug: params[:id] })
-    # render params[:id], layout: false
+    @templates = Ish::EmailTemplate.all.page( params[:templates_page] )
+
+    @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
+      Ish::EmailTemplate.find_by({ slug: params[:id] })
+    @email_ctx = EmailContext.new({ body: Ish::LoremIpsum.html })
   end
 
 

data/app/controllers/ish_manager/galleries_controller.rb

@@ -38,15 +38,17 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def index
     authorize! :index, Gallery
-    @galleries = Gallery.unscoped.where(
-      # :is_done.in => [false, nil],
-      # :is_trash.in => [false, nil],
-      # :user_profile => current_user.profile
+    @galleries = Gallery.unscoped.where( ## This must be so for role `guy`. _vp_ 2022-10-03
+      :is_done.in => [false, nil],
+      :is_trash.in => [false, nil],
+      :user_profile => current_user.profile
     ).order_by( :created_at => :desc )
+
     if params[:q]
       @galleries = @galleries.where({ :name => /#{params[:q]}/i })
       # @galleries.selector.delete('is_done')
     end
+
     @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
     render params[:render_type]
   end

data/app/controllers/ish_manager/reports_controller.rb

@@ -32,8 +32,6 @@ class IshManager::ReportsController < IshManager::ApplicationController
         format.html do
           flash[:alert] = @report.errors.full_messages
           @tags_list = Tag.all.list
-          @sites_list = Site.all.list
-          @cities_list = City.all.list
 
           render :action => "new"
         end
@@ -60,13 +58,6 @@ class IshManager::ReportsController < IshManager::ApplicationController
     @reports = Report.unscoped.order_by( :created_at => :desc
       ).where( :is_trash => false, :user_profile => current_user.profile
       ).page( params[:reports_page] ).per( Report::PER_PAGE )
-    if false === params[:site]
-      @reports = @reports.where( :site_id => nil )
-    end
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @reports = @reports.where( :site_id => params[:site_id] )
-    end
     if params[:q]
       @reports = @reports.or({ slug: /#{params[:q]}/i }, { name: /#{params[:q]}}/i }) # @TODO: why can't I have space in search term?
       if @reports.length == 1
@@ -80,9 +71,6 @@ class IshManager::ReportsController < IshManager::ApplicationController
     @report = Report.new
     authorize! :new, @report
     @tags_list = Tag.all.where( :is_public => true ).list
-    @sites_list = Site.all.list
-    @cities_list = City.list
-    @venues_list = Venue.all.list
 
     respond_to do |format|
       format.html do

data/app/controllers/ish_manager/videos_controller.rb

@@ -7,7 +7,7 @@ class IshManager::VideosController < IshManager::ApplicationController
 
   def create
     @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
-      tags city site user_profile premium_tier premium_purchases thumb video |)
+      tags site user_profile premium_tier premium_purchases thumb video |)
     @video.user_profile = current_user.profile
     if !params[:video][:site_id].blank?
       @video.site = Site.find params[:video][:site_id]
@@ -26,7 +26,6 @@ class IshManager::VideosController < IshManager::ApplicationController
     else
       flash[:alert] = 'No luck'
       @tags_list = Tag.list
-      @cities_list = City.list
       render :action => 'new'
     end
   end
@@ -35,7 +34,6 @@ class IshManager::VideosController < IshManager::ApplicationController
     @video = Video.unscoped.find params[:id]
     authorize! :destroy, @video
     flag = @video.delete
-    @video.city.touch if @video.city
     @video.site.touch if @video.site
     @video.tags.map &:touch
     if flag
@@ -52,18 +50,12 @@ class IshManager::VideosController < IshManager::ApplicationController
     authorize! :edit, @video
 
     @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
-    @cities_list = City.list
   end
 
   def index
     authorize! :index, Video.new
     @videos = Video.unscoped.where( is_trash: false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
 
-    if params[:city_id]
-      city = City.find params[:city_id]
-      @videos = @videos.where( :city => city )
-    end
-
     if params[:tag_id]
       tag = Tag.find params[:tag_id]
       @videos = @videos.where( :tag => tag )
@@ -108,7 +100,6 @@ class IshManager::VideosController < IshManager::ApplicationController
     authorize! :new, @video
 
     @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
-    @cities_list = City.list
   end
 
   def update

data/app/models/ish_manager/ability.rb

@@ -23,10 +23,6 @@ class IshManager::Ability
       #
       if user.profile && [ :admin ].include?( user.profile.role_name )
 
-        can [ :create_newsitem, :show, :new_feature, :create_feature,
-         :index, :new, :create, :edit, :update ], City
-
-        can [ :new ], ::Feature
         can [ :friends_index, :friends_new ], ::Ish::UserProfile
 
         can [ :index, :new, :create, :create_photo ], ::Gallery
@@ -37,7 +33,7 @@ class IshManager::Ability
           :new_marker, :edit_marker, :create_marker, :update_marker,
         ], Gameui::Map
 
-        can [ :cities_index, :home, :sites_index ], ::Manager
+        can [ :home, :sites_index ], ::Manager
 
         can [ :new ], Newsitem
 
@@ -46,9 +42,6 @@ class IshManager::Ability
           !g.is_trash && ( g.is_public || g.user_profile == user.profile )
         end
 
-        can [ :show, :edit, :update, :create_newsitem, :new_feature, :create_feature, :newsitems_index ], ::Site do |site|
-          !site.is_private && !site.is_trash
-        end
         # can [ :manage ], ::Warbler::StockWatch
 
         can [ :index, :new, :create ], ::Tag
@@ -58,16 +51,12 @@ class IshManager::Ability
           !v.is_trash && ( v.is_public || v.user_profile == user.profile )
         end
 
-        can [ :index, :add, :create, :edit, :update, :show ], Venue
-
       end
 
       #
       # role manager
       #
       if user.profile && :manager == user.profile.role_name
-        can [ :create_newsitem, :show, :new_feature, :create_feature,
-         :index, :new, :create, :edit, :update ], City
 
          can [ :edit, :index, :show, :update,
                :new_marker, :edit_marker, :create_marker, :update_marker,

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

@@ -1,16 +1,14 @@
 
 .application--form-nonpublic
-  .panel
-    .panel-body
-      .row
-        .col.s3
-          = f.check_box :is_public
-          = f.label :is_public
-        .col.s4
-          = f.label 'Shared with'
-          = f.select :shared_profiles, options_for_select(@user_profiles_list, selected: model.shared_profile_ids), {}, { :multiple => true }
-        .col.s4
-          Shared with:<br />
-          - model.shared_profiles.each do |p|
-            &gt; #{p.email} <br />
-        .col.s4 &nbsp;
+  .WBordered
+    .row
+      .col-sm-3
+        = f.check_box :is_public
+        = f.label :is_public
+      .col-sm-4
+        = f.label 'Shared with'
+        = f.select :shared_profiles, options_for_select(@user_profiles_list, selected: model.shared_profile_ids), {}, { :multiple => true }
+      .col-sm-4
+        Shared with:<br />
+        - model.shared_profiles.each do |p|
+          &gt; #{p.email} <br />

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

@@ -7,8 +7,9 @@
       .row
         .col-sm-6
           - if @current_user
-            %div >[ #{@current_user.email} ]<
-            %div >[ #{@current_user.profile&.role_name} ]<
+            %ul
+              %li <b>Email:</b> #{@current_user.email}
+              %li <b>Role name:</b> #{@current_user.profile&.role_name}
           - else
             Please log in
             = link_to '[+]', main_app.new_user_session_path

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

@@ -2,42 +2,54 @@
 
 .application--main-header-admin.main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
   .container
+
+    %i.fa.fa-compress.collapse-expand#collapseHeaderPiCMS
+      PiousboxCMS
+    %ul
+      %li
+        = link_to 'Photos', photos_path
+        = link_to '[+]', new_photo_path
+      %li
+        = render 'ish_manager/galleries/menu'
+      %li
+        = link_to 'Reports',   reports_path
+        .inline-search
+          = form_tag reports_path, method: :get do
+            = text_field_tag :q
+        = link_to '[+]', new_report_path
+      %li
+        = link_to 'Videos',    videos_path
+        .inline-search
+          = form_tag videos_path, method: :get do
+            = text_field_tag :q
+        = link_to '[+]', new_video_path
+    .c
+
     %i.fa.fa-compress.collapse-expand#collapseHeaderIsh
+      Gameui
     .content
       %ul
-        %li{ :class => params[:controller] == 'ish_manager/maps'          ? 'active' : '' }
+        %li
           = link_to 'Maps', maps_path
           .inline-search
             = form_tag maps_path, method: :get do
               = text_field_tag :q
           = link_to '[+]', new_map_path
 
-        %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }
-          = render 'ish_manager/galleries/menu'
-        %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }
-          = link_to 'Reports',   reports_path
-          .inline-search
-            = form_tag reports_path, method: :get do
-              = text_field_tag :q
-          = link_to '[+]', new_report_path
-        %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }
-          = link_to 'Videos',    videos_path
-          .inline-search
-            = form_tag videos_path, method: :get do
-              = text_field_tag :q
-          = link_to '[+]', new_video_path
-        %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }
+        %li
           = link_to 'Tags',      tags_path
       %ul
-        %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
+        %li= 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/users' ? 'active' : '' }= link_to 'Users',  users_path
-        %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Ish::UserProfiles',  user_profiles_path
+        %li= link_to 'Users',  users_path
+        %li= link_to 'Ish::UserProfiles',  user_profiles_path
         %li
           = link_to "Ish::ImageAsset's", image_assets_path
     .c
+
     %i.fa.fa-compress.collapse-expand#collapseHeaderOffice
+      Office
     .namespace
       %ul
         %li= link_to 'Leads', leads_path
@@ -51,9 +63,5 @@
           = link_to 'Email Contexts', email_contexts_path
         %li
           = link_to 'Email Campaigns', email_campaigns_path
-        %li
-          = link_to 'Sent Emails', sent_emails_path
-        %li
-          = button_to 'Test Email', email_test_path, { form_class: 'inline-block' }
   %hr
 

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

@@ -1,15 +1,25 @@
 
-.main-header
+.application--main-header-guy.main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
   .container
-    .row
-      .col.s12
-        %i.fa.fa-compress.collapse-expand#collapseHeader
-        .content
-          %ul.nav.nav-pills
-            %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }= link_to 'Galleries', galleries_path
-            -# %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
-            -# %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
-            -# %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
-          %ul.nav.nav-pills
-  %hr
 
+    %i.fa.fa-compress.collapse-expand#collapseHeaderPiCMS
+      PiousboxCMS
+    %ul
+      %li
+        = link_to 'Photos', photos_path
+        = link_to '[+]', new_photo_path
+      %li
+        = render 'ish_manager/galleries/menu'
+      %li
+        = link_to 'Reports',   reports_path
+        .inline-search
+          = form_tag reports_path, method: :get do
+            = text_field_tag :q
+        = link_to '[+]', new_report_path
+      %li
+        = link_to 'Videos',    videos_path
+        .inline-search
+          = form_tag videos_path, method: :get do
+            = text_field_tag :q
+        = link_to '[+]', new_video_path
+    .c

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

@@ -8,11 +8,6 @@
 
   - if item.tags.length > 0
     <b>Tags:</b> #{ item.tags.map(&:name).join(', ') }
-  - if item.city
-    <b>In City:</b> #{link_to item.city.name, city_path( item.city )}
-  - if item.respond_to?( :venue ) && item.venue
-    <b>Venue:</b>
-    = link_to item.venue.name, venue_path( item.venue )
 
   - if defined?(item.premium_tier) && item.premium_tier > 0
     <b>Tier:$#{item.premium_tier}</b>

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

@@ -0,0 +1,2 @@
+
+%h2 Email Campaigns

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

@@ -14,8 +14,6 @@
           = link_to '~', edit_email_context_path(ctx)
         = link_to email_context_path(ctx) do
           view
-          -# %i.fa.fa-external-link
-        = link_to email_context_iframe_path(ctx), target: :_blank do
-          iframe
-          %i.fa.fa-external-link
+        -# = link_to 'iframe', email_context_iframe_path(ctx), target: :_blank do
+
         To #{ctx.to_email}: #{ctx.subject}

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

@@ -8,7 +8,9 @@
     - if @email_ctx.sent_at
       %li <b>Sent at:</b> #{@email_ctx.sent_at.strftime('%Y-%m-%d %l:%M%P')}
     - else
-      %li= button_to 'Send', email_context_send_path(@email_ctx)
+      %li
+        = button_to 'Send', email_context_send_path(@email_ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
+        = link_to '[~]', edit_email_context_path(@email_ctx)
 
   - if @email_ctx.sent_at
     =raw @email_ctx.rendered_str

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

@@ -0,0 +1,15 @@
+
+%h3.collapse-expand#emailTemplatesIndex
+  Email Templates
+.email-templates-index
+
+  = render 'ish_manager/email_templates/form', email_template: ::Ish::EmailTemplate.new
+  %ul
+    - @templates.each do |tmpl|
+      %li
+        = link_to 'Use', new_email_context_path({ email_template_id: tmpl.id })
+        = link_to 'View', email_template_path({ id: tmpl })
+        = link_to 'iFrame', email_template_iframe_path({ id: tmpl }), target: :_blank
+        = tmpl.slug
+        = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
+