ish_manager 0.1.8.318 → 0.1.8.321

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc1e1c6fd0e576fee2cf327929a540a650cc4da39b025eb0ff97332ada0439e
-  data.tar.gz: 83eb8dc00dd3fd7647ef6b65cf165f43d52986683ca8ce64cab8e8cefd9943ae
+  metadata.gz: 7b554f3447bbf60499ac307a8efeb764f61f5db98d420ef4d927c5d6eed58ff7
+  data.tar.gz: 1b494df22a16f71380129f99a69a95acde34d52d217afb884f93486b7cc98dbb
 SHA512:
-  metadata.gz: 51f0cde29fabb31471868d98df64781619746d210388b6a5ff5f0228143f06b35f52ed1f9144d847e781be7e2e4607749b387080b07e696bfd3aae1424a2d69c
-  data.tar.gz: df027163d5387582f1a8edd003151864544ef15dd7e09d0f5cb59d94774bb822a6de471049b82ec645ab5e6f6e6f8b432774a40e61f2123497687cf0326f2a84
+  metadata.gz: 821d34cfce66540bc6ccd23cfd653a8838e1bbabc6701e8caf2f93ff91d6cd5294ceeacd8a04d18af0e1dfb61a3a3b29ebbded4c211c2c8abe98b7883b21dde0
+  data.tar.gz: cfda033dae665b39fe6bc71614ad1ab1620217590ee313529f09e021496f8525a873d947a940846ef6af0606b6a19eaf75196dd34123dbe37f64036bc01d3613

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

@@ -4,7 +4,7 @@
  *= require ish_manager/jquery-ui
  *= require_self
  *
- * includes email contexts:
+ * includes email context:
  *= require ish_manager/email_templates
  *
  *= require ish_manager/galleries
@@ -12,12 +12,17 @@
  *= require ish_manager/markers
  *= require ish_manager/leads
  *= require ish_manager/photos
- *= require ish_manager/tags
  *= require ish_manager/user_profiles
  *= require ish_manager/videos
  *= require ish_manager/pagination
 **/
 
+a[target='_blank'] {
+  &::after {
+    content: ' ^]' !important;
+    // font-size: .5em;
+  }
+}
 
 body {
   background: #dedede;
@@ -27,6 +32,12 @@ hr {
   background: red;
   height: 1px !important;
 }
+
+input[type='file'] {
+  overflow: auto;
+  max-width: 100%;
+}
+
 pre {
   background: #e0e0e0;
   padding: 1em;
@@ -105,8 +116,13 @@ ul:not(.browser-default).bullets, {
   text-align: center;
 }
 
+
 .collapse-expand {
   cursor: pointer;
+
+  > * {
+    display: inline-block;
+  }
 }
 
 /* D */
@@ -186,7 +202,7 @@ textarea.large {
 
 
 .main-header {
-  background: url('/assets/bg/weather.png');
+  background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192823/weather-bg.png');
 
   a {
     background: white;
@@ -222,9 +238,8 @@ textarea.large {
   }
 }
 
-.main-header.development,
-.main-header.development_production {
-  background: url('/assets/bg/weather-development.png');
+.main-header.development {
+  background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192822/weather-bg-development.png');
 }
 
 .menu-secondary {
@@ -296,6 +311,18 @@ textarea.large {
 
 /* W */
 
+.W0 {
+  margin-top: 10px;
+}
+
+.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/galleries.scss

@@ -5,14 +5,16 @@
 }
 
 .galleries--title {
-  text-align: center;
+  // text-align: center;
 }
 
 .galleries-show {
-  .row {
-    display: block;
+  > * {
     border-bottom: 2px solid red;
+  }
 
+  > *:last-child {
+    border-bottom: none;
   }
 
   .row-large .goto {
@@ -30,7 +32,8 @@
 // }
 
 .row-large .item {
-  border: 1px solid red;
+  // border: 1px solid red;
+  border-radius: 20px;
 
   display: block;
   margin-bottom: 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

@@ -1,25 +1,11 @@
 module IshManager
   class ApplicationController < ActionController::Base
-    # protect_from_forgery :with => :exception, :prepend => true
+    protect_from_forgery :with => :exception, :prepend => true
     before_action :set_current_ability
     before_action :set_changelog
     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'
@@ -35,20 +21,17 @@ module IshManager
     end
 
     def set_current_ability
-      @current_ability ||= ::IshManager::Ability.new( current_user )
+      @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 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
 
@@ -66,10 +49,11 @@ module IshManager
       puts a.inspect
     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_user.profile
+      @photo.user_profile = @current_profile
       flag = @photo.save
       @resource.profile_photo = @photo
       flagg = @resource.save
@@ -83,12 +67,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/{unsubscribes_controller.rb → email_unsubscribes_controller.rb}

@@ -1,5 +1,5 @@
 
-class ::IshManager::UnsubscribesController < IshManager::ApplicationController
+class ::IshManager::EmailUnsubscribesController < IshManager::ApplicationController
 
   layout false
 

data/app/controllers/ish_manager/galleries_controller.rb

@@ -38,15 +38,18 @@ 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
+    @page_title = 'Galleries'
+    @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
@@ -68,11 +71,13 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def new
     @gallery = Gallery.new
+    @page_title = 'New Gallery'
     authorize! :new, @gallery
   end
 
   def shared_with_me
     authorize! :index, Gallery
+    @page_title = 'Galleries Shared With Me'
     @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
       ).order_by( :created_at => :desc
       ).page( params[:shared_galleries_page] ).per( 10 )
@@ -116,6 +121,8 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     rescue
       @gallery = Gallery.unscoped.find params[:id]
     end
+    @page_title = "#{@gallery.name} Gallery"
+    @page_description = @gallery.subhead
   end
 
 end

data/app/controllers/ish_manager/photos_controller.rb

@@ -5,9 +5,7 @@ class IshManager::PhotosController < IshManager::ApplicationController
   skip_authorization_check :only => [ :j_create ]
   protect_from_forgery :except => [ :j_create]
 
-  def without_gallery
-    @photos = Photo.unscoped.where( :gallery => nil, :is_trash => false )
-  end
+  ## Alphabetized : )
 
   def destroy
     @photo = Photo.unscoped.find params[:id]
@@ -23,9 +21,9 @@ class IshManager::PhotosController < IshManager::ApplicationController
     redirect_to request.referrer || root_path
   end
 
-  def show
-    @photo = Photo.unscoped.find params[:id]
-    authorize! :show, @photo
+  def index
+    authorize! :index, Photo
+    @photos = Photo.all.page( params[:photos_page] )
   end
 
   def j_create
@@ -63,5 +61,19 @@ class IshManager::PhotosController < IshManager::ApplicationController
     end
   end
 
+  def new
+    authorize! :new, Photo
+    @photo = Photo.new
+  end
+
+  def show
+    @photo = Photo.unscoped.find params[:id]
+    authorize! :show, @photo
+  end
+
+  def without_gallery
+    @photos = Photo.unscoped.where( :gallery => nil, :is_trash => false )
+  end
+
 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 |)
+      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/mailers/ish_manager/application_mailer.rb

@@ -25,10 +25,5 @@ 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/models/ish_manager/ability.rb

@@ -2,17 +2,17 @@
 class IshManager::Ability
   include ::CanCan::Ability
 
-  def initialize user
+  def initialize user_profile
 
     #
     # signed in user
     #
-    if !user.blank?
+    if !user_profile.blank?
 
       #
       # only sudoer... total power
       #
-      if user.profile && user.profile.sudoer?
+      if user_profile.sudoer?
         can :manage, :all
       end
 
@@ -21,53 +21,42 @@ class IshManager::Ability
       #
       # role admin
       #
-      if user.profile && [ :admin ].include?( user.profile.role_name )
+      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
         can [ :edit, :update ], ::Gallery do |g|
-          !g.is_trash && ( g.is_public || g.user_profile == user.profile )
+          !g.is_trash && ( g.is_public || g.user_profile == user_profile )
         end
         can [ :edit, :index, :show, :update,
           :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
 
         can [ :index, :new, :create ], Report
         can [ :edit, :update, :destroy ], Report do |g|
-          !g.is_trash && ( g.is_public || g.user_profile == user.profile )
+          !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
 
         can [ :index, :new, :create ], ::Video
         can [ :edit, :update, :destroy ], ::Video do |v|
-          !v.is_trash && ( v.is_public || v.user_profile == user.profile )
+          !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
+      if user_profile && :manager == user_profile.role_name
 
          can [ :edit, :index, :show, :update,
                :new_marker, :edit_marker, :create_marker, :update_marker,
@@ -79,14 +68,14 @@ class IshManager::Ability
       #
       # role guy (and manager)
       #
-      if user.profile && [ :manager, :guy ].include?( user.profile.role_name )
+      if user_profile && [ :manager, :guy ].include?( user_profile.role_name )
 
         can [ :index, :new, :create ], ::Gallery
         can [ :show, :edit, :update, :create_photo ], ::Gallery do |gallery|
-          gallery.user_profile == user.profile
+          gallery.user_profile == user_profile
         end
         can [ :show ], ::Gallery do |gallery|
-          gallery.shared_profiles.include? user.profile
+          gallery.shared_profiles.include? user_profile
         end
 
         # can [ :index ], ::Report
@@ -100,7 +89,7 @@ class IshManager::Ability
     #
     # anonymous user
     #
-    user ||= ::User.new
+    user_profile ||= ::Ish::UserProfile.new
 
     can [ :open_permission ], IshManager::Ability
 
@@ -112,7 +101,7 @@ class IshManager::Ability
       report.is_public
     end
 
-    can [ :new, :create ], Ish::Unsubscribe
+    can [ :new, :create ], Ish::EmailUnsubscribe
 
   end
 end

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 />