ish_manager 0.1.8.287 → 0.1.8.288

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 237abaf7bf4203c9e2a2f4f83b44f191f28083cc8d76a97683643446d798d14c
-  data.tar.gz: 3a670cfeb3f49711419734dd1d28f3b241326607550d5231ad9edde1d54b560c
+  metadata.gz: 7a2940ad94a0e59f20f02943f0b7cb77bb28f2466e829d751e093dda92645dab
+  data.tar.gz: aa46582d41d8d4496af4b28746b6ef164b3181cdb3299856f07606a766519b7c
 SHA512:
-  metadata.gz: 9d4f055b9d0af25a25a50e4d9ac256e1a350a470fdcde56bd2c923108a26446c00c8ecf0062f3131a49a56f3deb5cd5a249ee2d9abdf1d3872a5bde268ce799a
-  data.tar.gz: 21d8017a28f7a23d24c0163ff4a8ef30acacb75797ff49a40475e75948ff9c3998bc25b1f51feef0b9b10d9448c1ca1a97c2c294824a3f097dbabd03ec0867c5
+  metadata.gz: bd800dc93b83766dbbf23c171cb35e2fd7cf01501a2bf41be5f7e76a24d77f75e8e332483e30176cb6dc4caeedda5aaf4fb71d7e9cd294b810dd2d5ddce64628
+  data.tar.gz: 7841ecdf5a818bf2ca3a10f0d7cdcdd54cc275d6d809fbf95ae12c66f8971572dfc5f13657b237b8cb1a11d13754db207b4fe1052d78ee4d05e58b036ac99a1b

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

@@ -42,9 +42,9 @@ $(function () {
     });
   }
 
-  /* if ($('body').length > 0) {
+  if ($('body').length > 0) {
       $('select').material_select()
-  } */
+  }
 
   $(".caret").each(function(idx) {
     $($(".caret")[idx]).html('')

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

@@ -150,6 +150,9 @@ hr {
 }
 
 /* I */
+img .img-400 {
+  width: 400px;
+}
 
 .inline {
   display: inline-block;
@@ -197,7 +200,8 @@ textarea.large {
 }
 
 
-.manager--main-header.development {
+.manager--main-header.development,
+.manager--main-header.development_production {
   background: url('/assets/bg/weather-development.png');
 }
 
@@ -252,7 +256,11 @@ ul.inline li {
 }
 
 
-
+/* R */
+.red-border {
+  border: 1px solid red;
+  padding: .2em;
+}
 
 /**
  * reports

data/app/controllers/ish_manager/application_controller.rb

@@ -33,7 +33,7 @@ module IshManager
       @reports_list = Report.all.list
       @sites_list = Site.all.list
       @tags_list = Tag.list
-      @user_profiles_list = Ish::UserProfile.all.list
+      @user_profiles_list = Ish::UserProfile.list
       @venues_list = Venue.all.list
       @videos_list = Video.all.list
     end

data/app/controllers/ish_manager/galleries_controller.rb

@@ -10,7 +10,6 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     params[:gallery][:shared_profiles] = Ish::UserProfile.find params[:gallery][:shared_profiles]
     @gallery = Gallery.new params[:gallery].permit!
     @gallery.user_profile = current_user.profile
-    @gallery.username = current_user.profile.username
     authorize! :create, @gallery
 
     if @gallery.save
@@ -40,14 +39,16 @@ 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 ).order_by( :created_at => :desc )
+    @galleries = Gallery.unscoped.where(
+      :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/image_assets_controller.rb

@@ -0,0 +1,10 @@
+
+class IshManager::ImageAssetsController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, Ish::ImageAsset
+    @image_assets = Ish::ImageAsset.all.order_by( created_at: :desc ).limit(10)
+  end
+
+end
+

data/app/controllers/ish_manager/maps_controller.rb

@@ -1,9 +1,11 @@
 
 class IshManager::MapsController < IshManager::ApplicationController
 
-  before_action :set_map, only: [:destroy, :edit, :map_editor, :show, :update, ]
+  before_action :set_map, only: [ :destroy, :edit, :export, :map_editor, :show, :update, ] # alphabetized
   before_action :set_lists
 
+  # alphabetized
+
   def create
     @map = ::Gameui::Map.new(map_params)
 
@@ -39,6 +41,82 @@ class IshManager::MapsController < IshManager::ApplicationController
     authorize! :edit, @map
   end
 
+  def export
+    authorize! :edit, @map
+    result = @map.export_subtree
+    send_data result
+  end
+
+  def import
+    authorize! :create, Map
+
+    file_data = params[:input]
+    if file_data.respond_to?(:read)
+      contents = file_data.read
+    elsif file_data.respond_to?(:path)
+      contents = File.read(file_data.path)
+    else
+      logger.error "Bad file_data: #{file_data.class.name}: #{file_data.inspect}"
+    end
+    contents = JSON.parse contents
+    contents.deep_symbolize_keys!
+    puts! contents, 'contents'
+
+    ##
+    ## process content
+    ##
+    errors = []
+
+    # profiles
+    profiles = contents[:profiles]
+    contents.delete :profiles
+    profiles.each do |profile|
+      puts! profile, 'a profile'
+      if Ish::UserProfile.where( _id: profile[:_id] ).first
+        errors.push({ message: "profile #{profile[:email]} already exists." })
+      else
+        p = Profile.new({ email: profile[:email], _id: profile[:_id] })
+        u = User.where( email: profile[:email] ).first
+        if u
+          u.profile = p
+        else
+          u = User.new( email: profile[:email], password: rand.to_s, profile: p )
+        end
+        flag = u.save && p.save
+        if flag
+          errors.push({ message: "Profile created for #{profile[:email]}." })
+        else
+          errors.push({ message: u.errors.full_messages.join(", ") })
+          errors.push({ message: p.errors.full_messages.join(", ") })
+        end
+      end
+    end
+
+    # everything else
+    contents.each do |k, v|
+      puts! [k,v], 'k-v'
+      item = Map.export_key_to_class[k].constantize
+      v.map do |inn|
+        n = item.new inn
+        puts! n, 'n'
+        begin
+          flag = n.save
+        rescue Mongo::Error::OperationFailure => e
+          errors.push({ class: k, id: inn[:_id], messages: "Mongo::Error::OperationFailure :: |#{e.to_s}|" })
+        end
+        if flag
+          errors.push({ class: k, id: inn[:_id], messages: 'ok' })
+        else
+          puts! n.errors.full_messages.join(", ")
+          errors.push({ class: k, id: inn[:_id], messages: "Could not save: |#{n.errors.full_messages.join(", ")}|." })
+        end
+      end
+    end
+
+    flash[:notice] = errors
+    redirect_to action: :index
+  end
+
   def index
     authorize! :index, ::Gameui::Map
 
@@ -74,6 +152,7 @@ class IshManager::MapsController < IshManager::ApplicationController
     if params[:image]
       image = ::Ish::ImageAsset.new :image => params[:image]
       @map.image = image
+      image.save
     end
 
     @map.config = JSON.parse map_params[:config]
@@ -105,6 +184,7 @@ class IshManager::MapsController < IshManager::ApplicationController
     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])

data/app/controllers/ish_manager/markers_controller.rb

@@ -21,6 +21,8 @@ class IshManager::MarkersController < IshManager::ApplicationController
     @marker.map = @map
     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]
@@ -36,6 +38,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
         @marker.map.touch
         format.html { redirect_to map_path(@map), notice: 'Marker was successfully created.' }
       else
+        flash[:alert] = @marker.errors.full_messages
         format.html { render :new }
       end
     end
@@ -53,9 +56,11 @@ class IshManager::MarkersController < IshManager::ApplicationController
       @marker.title_image.save
     end
 
+    old_map = @marker.map
     respond_to do |format|
       if @marker.update(marker_params)
         @marker.map.touch
+        old_map.touch
         format.html { redirect_to location_map_editor_path(@map.id), notice: 'Marker was successfully updated.' }
       else
         format.html { render :edit }
@@ -81,7 +86,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
   end
 
   def set_marker
-    @marker = ::Gameui::Marker.unscoped.find params[:id]
+    @marker = ::Gameui::Marker.find params[:id]
     @map = @marker.map
   end
 

data/app/controllers/ish_manager/sites_controller.rb

@@ -1,42 +1,7 @@
 
 class IshManager::SitesController < IshManager::ApplicationController
 
-  ## params:
-  ## :domain, :lang, :title, :subhead, :description, :homepage_layout, :layout,
-  ##   :n_features, :n_newsitems, :newsitems_per_page, :is_trash, :is_ads_enabled,
-  ##   :is_private, :play_videos_in_preview, :private_user_emails,
-
-  def index
-    authorize! :sites_index, ::Manager
-    @site_groups = Site.where( :is_trash => false ).order_by( :lang => :desc ).group_by {|s|s.domain}
-  end
-
-  # not trash
-  def trash
-    @sites = Site.unscoped.where( :is_trash => true ).order_by( :domainname => :desc, :lang => :desc )
-    render :action => :index
-  end
-
-  def show
-    @site = Site.unscoped.find params[:id]
-    authorize! :show, @site
-    @galleries = @site.galleries.page( params[:galleries_page] ).per( 10 )
-    @reports = @site.reports.page( params[:reports_page] ).per( 10 )
-    @videos = @site.videos.page( params[:videos_page] ).per( 5 )
-    @tags = Tag.where( :site_id => @site.id, :parent_tag_id => nil ).page( params[:tags_page] ).per( 100 )
-    @features = @site.features.limit( @site.n_features ) # page( params[:features_page] ).per( 9 )
-    @newsitems = @site.newsitems.page( params[:newsitems_page] ).per( @site.newsitems_per_page )
-  end
-
-  def edit
-    @site = Site.unscoped.find params[:id]
-    authorize! :update, @site
-  end
-
-  def new
-    @site = Site.new
-    authorize! :new, @site
-  end
+  # alphabetized
 
   def create
     authorize! :create, Site.new
@@ -47,21 +12,29 @@ class IshManager::SitesController < IshManager::ApplicationController
     else
       flash[:alert] = 'No Luck. ' + @site.errors.inspect
     end
+
     redirect_to sites_path
   end
 
-  def update
+  def edit
     @site = Site.unscoped.find params[:id]
     authorize! :update, @site
+  end
 
-    params[:site][:private_user_emails] = params[:site][:private_user_emails].gsub(/\s+/m, ' ').strip.split(" ")
+  def galleries
+    @site = Site.find params[:site_id]
+    authorize! :galleries_index, @site
+    @galleries = @site.galleries.page( params[:galleries_page] )
+  end
 
-    if @site.update_attributes params[:site].permit!
-      flash[:notice] = 'Success'
-    else
-      flash[:alert] = 'No Luck'
-    end
-    redirect_to sites_path
+  def index
+    authorize! :sites_index, ::Manager
+    @site_groups = Site.where( :is_trash => false ).order_by( :lang => :desc ).group_by {|s|s.domain}
+  end
+
+  def new
+    @site = Site.new
+    authorize! :new, @site
   end
 
   def newsitem_delete
@@ -82,10 +55,35 @@ class IshManager::SitesController < IshManager::ApplicationController
     render 'ish_manager/reports/index'
   end
 
-  def galleries
-    @site = Site.find params[:site_id]
-    authorize! :galleries_index, @site
-    @galleries = @site.galleries.page( params[:galleries_page] )
+  def show
+    @site = Site.unscoped.find params[:id]
+    authorize! :show, @site
+    @galleries = @site.galleries.page( params[:galleries_page] ).per( 10 )
+    @reports = @site.reports.page( params[:reports_page] ).per( 10 )
+    @videos = @site.videos.page( params[:videos_page] ).per( 5 )
+    @tags = Tag.where( :site_id => @site.id, :parent_tag_id => nil ).page( params[:tags_page] ).per( 100 )
+    @features = @site.features.limit( @site.n_features ) # page( params[:features_page] ).per( 9 )
+    @newsitems = @site.newsitems.page( params[:newsitems_page] ).per( @site.newsitems_per_page )
+  end
+
+  # not trash
+  def trash
+    @sites = Site.unscoped.where( :is_trash => true ).order_by( :domainname => :desc, :lang => :desc )
+    render :action => :index
+  end
+
+  def update
+    @site = Site.unscoped.find params[:id]
+    authorize! :update, @site
+
+    params[:site][:private_user_emails] = params[:site][:private_user_emails].gsub(/\s+/m, ' ').strip.split(" ")
+
+    if @site.update_attributes params[:site].permit!
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = 'No Luck'
+    end
+    redirect_to sites_path
   end
 
   #

data/app/helpers/ish_manager/images_helper.rb

@@ -4,27 +4,27 @@ module IshManager::ImagesHelper
   def image_doc
     image_tag 'icons/32x32/doc.png'
   end
-  
+
   def image_pdf
     image_tag 'icons/32x32/pdf.png'
   end
-  
+
   def image_linkedin
     image_tag 'icons/32x32/linkedin.png'
   end
-  
+
   def image_facebook
     image_tag 'icons/32x32/facebook.png'
   end
-  
+
   def image_twitter
     image_tag 'icons/32x32/twitter.png'
   end
-  
+
   def image_github
     image_tag 'icons/32x32/github.png'
   end
-  
+
   def image_email
     image_tag 'icons/32x32/email.png'
   end
@@ -37,15 +37,15 @@ module IshManager::ImagesHelper
   def image_city cityname
     image_tag 'icons/48x48/city.png'
   end
-  
+
   def image_customize
     image_tag 'icons/28x28/customize.png'
   end
-  
+
   def image_new_photo
     image_tag 'icons/48x48/new_photo.png'
   end
-  
+
   def button_fb_login
     link_to image_tag('http://s3.amazonaws.com/ish-assets/loginWithFacebook.png'), user_omniauth_authorize_path(:facebook), :class => :fb
   end
@@ -58,19 +58,19 @@ module IshManager::ImagesHelper
     # image_tag 'icons/28x28/expand.png'
     image_tag 'icons/16x16/expand_down.png'
   end
-  
+
   def image_expand_down
     image_tag 'drag.png'
   end
-  
+
   def image_contact
     image_tag 'http://s3.amazonaws.com/ish-assets/contact.png', :class => :contact
   end
-  
+
   def image_expand_up
     image_tag 'drag.png'
   end
-  
+
   def image_ppf
     image_tag 'ppf.gif'
   end
@@ -78,7 +78,7 @@ module IshManager::ImagesHelper
   def image_new_report
     image_tag 'icons/64x64/new_report.png'
   end
-  
+
   def image_ish
     # image_tag 'logo.png'
     image_tag 'ish_logo_100.png'
@@ -87,7 +87,7 @@ module IshManager::ImagesHelper
   def image_new_addritem
     image_tag 'icons/64x64/new_addritem.png'
   end
-  
+
   def image_top
     image_tag('top.gif')
   end
@@ -103,27 +103,27 @@ module IshManager::ImagesHelper
   def image_extended_forms
     image_tag 'icons/64x64/extended_forms.png'
   end
-  
+
   def image_close
     image_tag('close.png')
   end
-    
+
   def image_email
     image_tag 'email.gif'
   end
-  
+
   def image_add
     image_tag 'new.png'
   end
-  
+
   def image_search args = {}
     image_tag 'icons/16x16/search.png', args
   end
-  
+
   def image_cac
     s3_image_tag 'cac.png'
   end
-  
+
   def image_delete
     raw('<i class="fa fa-trash"></i>')
   end
@@ -131,37 +131,37 @@ module IshManager::ImagesHelper
   def image_index
     image_tag 'icons/32x32/list.png'
   end
-  
+
   def image_new
     raw('<i class="fa fa-plus-square"></i>')
 		# image_tag 'icons/32x32/new.png', :alt => '[+]'
 	end
-  
+
   # @deprecated, should use image_3s
   def s3_image_tag input
     image_tag 'https://s3.amazonaws.com/ish-assets/' + input
   end
-  
+
   def image_fb
     image_tag 'http://s3.amazonaws.com/ish-assets/loginWithFacebook.png'
   end
-  
+
   def image_3s input
     image_tag 'https://s3.amazonaws.com/ish-assets/' + input
   end
-  
+
   # @TODO:
   def video_thumb video
     warn 'todo wtf?'
     image_tag 'no_image.png'
   end
-  
+
   #
   # missing stuff
   #
-  
+
   def image_or_missing photo, size = :thumb
-    
+
     if defined? photo.photo
       if defined? photo.photo.url
         if photo.photo.url == '/photos/original/missing.png'
@@ -171,21 +171,22 @@ module IshManager::ImagesHelper
         end
       end
     end
-    
+
     image_missing
   end
-  
+
+  ## This needs to be a string url, not an image_tag. _vp_ 2020-02-25
   def image_missing
-    # image_tag 'no_photo.png'
+    'missing.png'
   end
   def image_missing_tag
-    image_missing
+    image_tag image_missing
   end
-  
+
   def missing
     image_missing
   end
-  
+
   def missing? item
     if defined? item.photo and defined? item.photo.url
       if item.photo.url == "/photos/original/missing.png"
@@ -194,7 +195,7 @@ module IshManager::ImagesHelper
         return false
       end
     end
-    
+
     return true
   end
 
@@ -236,7 +237,7 @@ module IshManager::ImagesHelper
       image_tag 'icons/20x20/private.png'
     end
   end
-  
+
   def edit_img
     raw('<i class="fa fa-pencil-square"></i>')
   end

data/app/models/ish_manager/ability.rb

@@ -34,6 +34,9 @@ class IshManager::Ability
         can [ :edit, :update ], ::Gallery do |g|
           !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
 
@@ -44,10 +47,10 @@ class IshManager::Ability
           !g.is_trash && ( g.is_public || g.user_profile == user.profile )
         end
 
-        can [ :new, :show, :edit, :update, :create_newsitem, :new_feature, :create_feature, :newsitems_index ], ::Site do |site|
+        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 [ :manage ], ::Warbler::StockWatch
 
         can [ :index, :new, :create ], ::Tag
 

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

@@ -2,5 +2,6 @@
 
 %ul{ style: "margin: 2em;" }
   %li= params.inspect
+  %li= "Cached?: #{Rails.application.config.action_controller.perform_caching}"
   %li= "Cache key: #{@cache_key.inspect}"     if @cache_key
-  %li= "Cached? #{Rails.application.config.action_controller.perform_caching}"
+  %li= "Env: #{Rails.env}"

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

@@ -1,6 +1,6 @@
 
 
-.application--main-header-admin.manager--main-header{ class: ENV['RAILS_ENV'] }
+.application--main-header-admin.manager--main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
   .container
     %i.fa.fa-compress.collapse-expand#collapseHeader
     .content
@@ -32,7 +32,11 @@
           = link_to '[+]', new_video_path
       %ul
         %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', stock_watches_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
+          = link_to "Ish::ImageAsset's", image_assets_path
+        %li= link_to 'GuydMe', 'https://localhost:3002'
   %hr
 

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

@@ -0,0 +1,6 @@
+
+.image-assets
+  - @image_assets.each do |a|
+    .red-border
+      |#{a.id}| - <b>#{a.image_file_name}</b><br />
+      = image_tag a.image.url, class: 'img-400'

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

@@ -42,6 +42,10 @@
         = f.label :image
         = file_field_tag :image
         = image_tag @map.image.image.url(:thumb) rescue nil
+    .col.s4
+      .field
+        = f.label :creator_profile
+        = f.select :creator_profile, options_for_select(@user_profiles_list, selected: @current_user.profile.id)
 
   = render 'ish_manager/application/form_nonpublic', f: f, model: @map
 

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

@@ -3,7 +3,14 @@
 -#
 
 .maps-index
-  %h1 Maps (#{@maps.length}) #{link_to '[+]', new_map_path}
+  %h1
+    Maps (#{@maps.length})
+    = link_to '[+]', new_map_path
+  .red-border
+    = form_tag import_map_path, :multipart => true do
+      = file_field_tag :input
+      = submit_tag 'Import Map'
+
   - @maps.each do |map|
     = render 'index_item', map: map