ish_manager 0.1.8.258 → 0.1.8.263

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e880865158238e4e853e2ff014bcdf33d2f7a34c090d340e1444215c1445b204
-  data.tar.gz: c52428e4febc8b285e8eecdeed98734f1dc40da6fb28eb8c98f43a7f507fada0
+  metadata.gz: 418646349055afb3072f68d9fc12527add24597969d62ce4ff4aa41eef0d879b
+  data.tar.gz: cc4e03f30e8c12df9227fb6424b33207f847ff12ef2bdf90df41dea1de2748e0
 SHA512:
-  metadata.gz: 10819c852f56a077077691f454b7894ceff83a6bfc0e0e7b6838fe9c86480b4a19e901f9513249f543c353ea87828591a4739b276eebdb80e3766f68d89b141d
-  data.tar.gz: e13e3aeedddfee4f4c798ef1350aa11a8f25d61c035bd923e1aa72f5c9a9cd332db63150f4b624ea3e786b891c75207eb72644d718d3d2af7615b3d02ef3b9d8
+  metadata.gz: d04670dd256406a4c75dab4a62796dcfde3fb22f38ec65b738ac6f2fe972a33b32b8fcc43f5613861b8e7400a7d3dd92582613eb68a1be59f4acda1494697864
+  data.tar.gz: 104e3b96eef1193d21ba175122c8de72dba98f93e572af83af5654479dfe767860d3f654e669bb2634d0f8e6e9a678fb13381316cd4d568f6b792806b376026c

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

@@ -21,7 +21,7 @@
  *= require ish_manager/videos
  */
 
- body {
+body {
   background: #dedede;
   font-size: 20px;
 }
@@ -111,6 +111,11 @@ hr {
 ul.inline li {
   display: inline;
 }
+.inline-search {
+  width: 20px;
+  bordeR: 1px solid white;
+  display: inline-block;
+}
 
 /* L */
 textarea.large {

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

@@ -8,15 +8,22 @@
 /*
  * Main - Maps
  */
-.maps--map-meta-row .a {
-  line-height: 1em;
+.maps--map-meta-row {
+  border-left: 10px solid #e3e3e3;
+  padding-left: 10px;
+
+  .a {
+    line-height: 1em;
+  }
 }
 
 .maps-index {
-  h1 {
-    padding-bottom: 10px;
-    border-bottom: 10px solid #cecece;
-  }
+
+  // h1 {
+  //   padding-bottom: 10px;
+  //   border-bottom: 10px solid #cecece;
+  // }
+
   .item {
     display: flex;
     flex-direction: row;

data/app/assets/stylesheets/ish_manager/materialize.css

@@ -4420,6 +4420,7 @@ nav .input-field label.active i {
   }
 }
 
+/*
 @font-face {
   font-family: "Roboto";
   src: local(Roboto Thin), url("../fonts/roboto/Roboto-Thin.woff2") format("woff2"), url("../fonts/roboto/Roboto-Thin.woff") format("woff");
@@ -4449,6 +4450,7 @@ nav .input-field label.active i {
   src: local(Roboto Bold), url("../fonts/roboto/Roboto-Bold.woff2") format("woff2"), url("../fonts/roboto/Roboto-Bold.woff") format("woff");
   font-weight: 700;
 }
+*/
 
 a {
   text-decoration: none;

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

@@ -13,7 +13,7 @@ ul:not(.browser-default).bullets, {
   justify-content: flex-start;
   align-content: flex-start;
 
-  height: 3em;
+  height: 2.4em;
   line-height: 3em;
 
   width: 100%;

data/app/controllers/ish_manager/application_controller.rb

@@ -29,11 +29,11 @@ module IshManager
       @cities_list = City.list
       @galleries_list = Gallery.all.list
       @locations_list = ::Gameui::Map.list
-      @maps_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 = IshModels::UserProfile.all.list
+      @user_profiles_list = Ish::UserProfile.all.list
       @venues_list = Venue.all.list
       @videos_list = Video.all.list
     end

data/app/controllers/ish_manager/cities_controller.rb

@@ -54,7 +54,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
       @city.profile_photo = photo
     end
     if @city.save
-      ::IshModels::CacheKey.one.update_attributes( :cities => Time.now, :feature_cities => Time.now )
+      ::Ish::CacheKey.one.update_attributes( :cities => Time.now, :feature_cities => Time.now )
       flash[:notice] = 'Success'
       redirect_to city_path @city.id
     else

data/app/controllers/ish_manager/galleries_controller.rb

@@ -7,7 +7,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   def create
     params[:gallery][:shared_profiles] ||= []
     params[:gallery][:shared_profiles].delete('')
-    params[:gallery][:shared_profiles] = IshModels::UserProfile.find params[:gallery][:shared_profiles]
+    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
@@ -103,7 +103,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     params[:gallery].delete :shared_profiles
 
     if @gallery.update_attributes( params[:gallery].permit! )
-      new_shared_profiles = IshModels::UserProfile.find( params[:gallery][:shared_profile_ids]
+      new_shared_profiles = Ish::UserProfile.find( params[:gallery][:shared_profile_ids]
         ).select { |p| !old_shared_profile_ids.include?( p.id ) }
       ::IshManager::ApplicationMailer.shared_galleries( new_shared_profiles, @gallery ).deliver
       flash[:notice] = 'Success.'

data/app/controllers/ish_manager/maps_controller.rb

@@ -2,26 +2,7 @@
 class IshManager::MapsController < IshManager::ApplicationController
 
   before_action :set_map, only: [:destroy, :edit, :map_editor, :show, :update, ]
-
-  def index
-    authorize! :index, ::Gameui::Map
-    @maps = ::Gameui::Map.where( parent_slug: "" ).order( slug: :asc )
-    @all_maps = Gameui::Map.all.order( slug: :asc )
-  end
-
-  def show
-    authorize! :show, @map
-    @maps = Gameui::Map.where( parent_slug: @map.slug )
-  end
-
-  def new
-    authorize! :new, ::Gameui::Map
-    @map = ::Gameui::Map.new
-  end
-
-  def edit
-    authorize! :edit, @map
-  end
+  before_action :set_lists
 
   def create
     @map = ::Gameui::Map.new(map_params)
@@ -46,6 +27,47 @@ class IshManager::MapsController < IshManager::ApplicationController
     end
   end
 
+  def destroy
+    authorize! :destroy, @map
+    @map.destroy
+    respond_to do |format|
+      format.html { redirect_to maps_path, notice: 'Map was successfully destroyed.' }
+    end
+  end
+
+  def edit
+    authorize! :edit, @map
+  end
+
+  def index
+    authorize! :index, ::Gameui::Map
+
+    if params[:q]
+      @maps = ::Gameui::Map.where({ slug: /#{params[:q]}/i })
+      if @maps.length == 1
+        redirect_to map_path(@maps[0])
+        return
+      end
+    end
+
+    @maps ||= ::Gameui::Map.unscoped.where( parent_slug: "" ).order( slug: :asc )
+    @all_maps = Gameui::Map.all.order( slug: :asc )
+  end
+
+  def map_editor
+    authorize! :update, @map
+  end
+
+  def new
+    authorize! :new, ::Gameui::Map
+    @map = ::Gameui::Map.new
+  end
+
+  def show
+    authorize! :show, @map
+    @maps = Gameui::Map.where( parent_slug: @map.slug )
+  end
+
   def update
     authorize! :update, @map
 
@@ -70,27 +92,23 @@ class IshManager::MapsController < IshManager::ApplicationController
     end
   end
 
-  def destroy
-    authorize! :destroy, @map
-    @map.destroy
-    respond_to do |format|
-      format.html { redirect_to maps_path, notice: 'Map was successfully destroyed.' }
-    end
-  end
-
-  def map_editor
-    authorize! :update, @map
-  end
-
   private
 
-    def set_map
-      @map = ::Gameui::Map.where(id: params[:id]).first
-      @map ||= Gameui::Map.find_by(slug: params[:id])
-    end
+  def map_params
+    out = params.require(:gameui_map).permit!
 
-    def map_params
-      params.require(:gameui_map).permit!
+    out[:shared_profiles].delete('')
+    if out[:shared_profiles].present?
+      out[:shared_profiles] = Ish::UserProfile.find( out[:shared_profiles] )
     end
 
+    out
+  end
+
+  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
+  end
+
 end

data/app/controllers/ish_manager/markers_controller.rb

@@ -3,6 +3,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
 
   before_action :set_map, except: [ :destroy, :edit, :update ]
   before_action :set_marker, only: [ :edit, :update ]
+  before_action :set_lists
 
   def new
     authorize! :new_marker, ::Gameui::Map
@@ -10,6 +11,8 @@ class IshManager::MarkersController < IshManager::ApplicationController
   end
 
   def edit
+    @marker = ::Gameui::Marker.unscoped.find params[:id]
+    @map = @marker.map
     authorize! :edit_marker, @map
   end
 
@@ -78,12 +81,19 @@ class IshManager::MarkersController < IshManager::ApplicationController
   end
 
   def set_marker
-    @marker = ::Gameui::Marker.find params[:id]
+    @marker = ::Gameui::Marker.unscoped.find params[:id]
     @map = @marker.map
   end
 
   def marker_params
-    params.require(:gameui_marker).permit!
+    out = params.require(:gameui_marker).permit!
+
+    out[:shared_profiles].delete('') if out[:shared_profiles]
+    if out[:shared_profiles].present?
+      out[:shared_profiles] = Ish::UserProfile.find( out[:shared_profiles] )
+    end
+
+    out
   end
 
 end

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -11,7 +11,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     @resource ||= Site.find params[:newsitem][:site_id]   if !params[:newsitem][:site_id].blank?
     @resource ||= Tag.find params[:tag_id]                if params[:tag_id]
     @resource ||= Tag.find params[:newsitem][:tag_id]     if !params[:newsitem][:tag_id].blank?
-    @resource ||= IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
+    @resource ||= Ish::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
     @resource ||= ::Gameui::Map.find params[:newsitem][:map_id] if !params[:newsitem][:map_id].blank?
     @resource.newsitems << @newsitem
     @resource.touch
@@ -26,7 +26,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     url = case @resource.class.name
     when "City"
       edit_city_path( @resource.id )
-    when "IshModels::UserProfile"
+    when "Ish::UserProfile"
       user_profiles_path
     when "Site"
       edit_site_path( @resource.id )

data/app/controllers/ish_manager/reports_controller.rb

@@ -3,6 +3,8 @@ class IshManager::ReportsController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  # alphabetized : )
+
   def create
     @report = Report.new params[:report].permit!
     @report.user_profile = current_user.profile # @TODO: this should not be hard-coded
@@ -40,12 +42,24 @@ class IshManager::ReportsController < IshManager::ApplicationController
     end
   end
 
+  def destroy
+    @report = Report.unscoped.find params[:id]
+    authorize! :destroy, @report
+    @report.is_trash = true
+    @report.save
+    redirect_to request.referrer
+  end
+
+  def edit
+    @report = Report.unscoped.find params[:id]
+    authorize! :edit, @report
+  end
+
   def index
     authorize! :index, Report
     @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 )
+      ).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
@@ -53,24 +67,34 @@ class IshManager::ReportsController < IshManager::ApplicationController
       @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
+        redirect_to report_path(@reports[0])
+        return
+      end
+    end
   end
 
-  def show
-    @report = Report.unscoped.find params[:id]
-    authorize! :show, @report
-  end
+  def new
+    @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
 
-  def edit
-    @report = Report.unscoped.find params[:id]
-    authorize! :edit, @report
+    respond_to do |format|
+      format.html do
+        render
+      end
+      format.json { render :json => @report }
+    end
   end
 
-  def destroy
+  def show
     @report = Report.unscoped.find params[:id]
-    authorize! :destroy, @report
-    @report.is_trash = true
-    @report.save
-    redirect_to request.referrer
+    authorize! :show, @report
   end
 
   def update
@@ -95,23 +119,5 @@ class IshManager::ReportsController < IshManager::ApplicationController
     end
   end
 
-  def new
-    @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
-        render
-      end
-      format.json { render :json => @report }
-    end
-  end
-
-
-
 end
 

data/app/controllers/ish_manager/stock_watches_controller.rb

@@ -1,17 +1,8 @@
 
 class IshManager::StockWatchesController < IshManager::ApplicationController
 
-  def index
-    authorize! :index, Ish::StockWatch
-    @profiles = IshModels::UserProfile.all
-    @stock_watches = Ish::StockWatch.order_by( ticker: :asc, direction: :asc, price: :desc
-      ).includes( :profile )
-    @stock_watch = Ish::StockWatch.new
-    render 'index', :layout => 'ish_manager/application_no_materialize'
-  end
-
   def create
-    @stock_watch = Ish::StockWatch.new params[:ish_stock_watch].permit!
+    @stock_watch = Warbler::StockWatch.new permitted_params
     authorize! :create, @stock_watch
     flag = @stock_watch.save
     if flag
@@ -22,10 +13,31 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
+  def destroy
+    @w = Warbler::StockWatch.find params[:id]
+    authorize! :destroy, @w
+    flag = @w.destroy
+    if flag
+      flash[:notice] = 'Success.'
+    else
+      flash[:alert] = @w.errors.messages
+    end
+    redirect_to action: 'index'
+  end
+
+  def index
+    authorize! :index, Warbler::StockWatch
+    @profiles = Ish::UserProfile.all
+    @stock_watches = Warbler::StockWatch.order_by( ticker: :asc, direction: :asc, price: :desc
+      ).includes( :profile )
+    @stock_watch = Warbler::StockWatch.new
+    # render 'index', :layout => 'ish_manager/application_no_materialize'
+  end
+
   def update
-    @stock_watch = Ish::StockWatch.find params[:id]
+    @stock_watch = Warbler::StockWatch.find params[:id]
     authorize! :update, @stock_watch
-    flag = @stock_watch.update_attributes params[:ish_stock_watch].permit!
+    flag = @stock_watch.update_attributes permitted_params
     if flag
       flash[:notice] = 'Updated stock watch.'
     else
@@ -34,16 +46,10 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
-  def destroy
-    @w = Ish::StockWatch.find params[:id]
-    authorize! :destroy, @w
-    flag = @w.destroy
-    if flag
-      flash[:notice] = 'Success.'
-    else
-      flash[:alert] = @w.errors.messages
-    end
-    redirect_to action: 'index'
+  private
+
+  def permitted_params
+    params[:warbler_stock_watch].permit!
   end
 
 end

data/app/controllers/ish_manager/{friends_controller.rb → trash/friends_controller.rb}

@@ -1,15 +1,15 @@
 class IshManager::FriendsController < IshManager::ApplicationController
 
   def index
-    authorize! :friends_index, IshModels::UserProfile
-    @new_friend = IshModels::UserProfile.new
+    authorize! :friends_index, Ish::UserProfile
+    @new_friend = Ish::UserProfile.new
 
     @friends = current_user.profile.friends
     friend_ids = @friends.map &:id
   end
 
   def create
-    @friend = ::IshModels::UserProfile.find_by( :email => params[:friend][:email] ) # .includes( :shared_galleries )
+    @friend = ::Ish::UserProfile.find_by( :email => params[:friend][:email] ) # .includes( :shared_galleries )
 
     authorize! :friends_new, @friend
 

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -4,22 +4,22 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   before_action :set_lists
 
   def index
-    @user_profiles = IshModels::UserProfile.all.includes( :user )
-    authorize! :index, IshModels::UserProfile
+    @user_profiles = Ish::UserProfile.all.includes( :user )
+    authorize! :index, Ish::UserProfile
   end
 
   def show
-    @user_profile = IshModels::UserProfile.find params[:id]
+    @user_profile = Ish::UserProfile.find params[:id]
     authorize! :show, @user_profile
   end
 
   def edit
-    @profile = IshModels::UserProfile.find params[:id]
+    @profile = Ish::UserProfile.find params[:id]
     authorize! :edit, @profile
   end
 
   def update
-    @profile = IshModels::UserProfile.find params[:id]
+    @profile = Ish::UserProfile.find params[:id]
     authorize! :update, @profile
 
     if params[:photo]
@@ -42,14 +42,14 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   end
 
   def new
-    @profile = IshModels::UserProfile.new
+    @profile = Ish::UserProfile.new
     authorize! :new, @profile
   end
 
   def create
     @user = User.find_or_create_by( :email => params[:profile][:email] )
     @user.password ||= (0...12).map { rand(100) }.join
-    @user.profile = IshModels::UserProfile.new params[:profile].permit!
+    @user.profile = Ish::UserProfile.new params[:profile].permit!
     authorize! :create, @user.profile
 
     if params[:photo]

data/app/controllers/ish_manager/videos_controller.rb

@@ -3,6 +3,58 @@ class IshManager::VideosController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  # alphabetized : )
+
+  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 |)
+    @video.user_profile = current_user.profile
+    if !params[:video][:site_id].blank?
+      @video.site = Site.find params[:video][:site_id]
+      @video.site.touch
+    else
+      if @site
+        @video.site = @site
+        @site.touch
+      end
+    end
+    authorize! :create, @video
+
+    if @video.save
+      flash[:notice] = 'Success'
+      redirect_to videos_path
+    else
+      flash[:alert] = 'No luck'
+      @tags_list = Tag.list
+      @cities_list = City.list
+      render :action => 'new'
+    end
+  end
+
+  def destroy
+    @video = Video.unscoped.find params[:id]
+    authorize! :destroy, @video
+    flag = @video.update_attributes( :is_trash => true )
+    @video.city.touch if @video.city
+    @video.site.touch if @video.site
+    @video.tags.map &:touch
+    if flag
+      flash[:notice] = "deleted video"
+    else
+      flash[:alert] = "Cannot delete video: #{@video.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  def edit
+    @video = Video.unscoped.find params[:id]
+    @user_profiles_list = Ish::UserProfile.list
+    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 )
@@ -59,41 +111,6 @@ class IshManager::VideosController < IshManager::ApplicationController
     @cities_list = City.list
   end
 
-  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 |)
-    @video.user_profile = current_user.profile
-    if !params[:video][:site_id].blank?
-      @video.site = Site.find params[:video][:site_id]
-      @video.site.touch
-    else
-      if @site
-        @video.site = @site
-        @site.touch
-      end
-    end
-    authorize! :create, @video
-
-    if @video.save
-      flash[:notice] = 'Success'
-      redirect_to videos_path
-    else
-      flash[:alert] = 'No luck'
-      @tags_list = Tag.list
-      @cities_list = City.list
-      render :action => 'new'
-    end
-  end
-
-  def edit
-    @video = Video.unscoped.find params[:id]
-    @user_profiles_list = IshModels::UserProfile.list
-    authorize! :edit, @video
-
-    @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
-    @cities_list = City.list
-  end
-
   def update
     @video = Video.unscoped.find params[:id]
     authorize! :update, @video
@@ -109,19 +126,4 @@ class IshManager::VideosController < IshManager::ApplicationController
     end
   end
 
-  def destroy
-    @video = Video.unscoped.find params[:id]
-    authorize! :destroy, @video
-    flag = @video.update_attributes( :is_trash => true )
-    @video.city.touch if @video.city
-    @video.site.touch if @video.site
-    @video.tags.map &:touch
-    if flag
-      flash[:notice] = "deleted video"
-    else
-      flash[:alert] = "Cannot delete video: #{@video.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
 end

data/app/models/ish_manager/ability.rb

@@ -28,7 +28,7 @@ class IshManager::Ability
         can [ :manage ], ::CoTailors
 
         can [ :new ], ::Feature
-        can [ :friends_index, :friends_new ], ::IshModels::UserProfile
+        can [ :friends_index, :friends_new ], ::Ish::UserProfile
 
         can [ :index, :new, :create, :create_photo ], ::Gallery
         can [ :edit, :update ], ::Gallery do |g|
@@ -47,7 +47,7 @@ class IshManager::Ability
         can [ :new, :show, :edit, :update, :create_newsitem, :new_feature, :create_feature, :newsitems_index ], ::Site do |site|
           !site.is_private && !site.is_trash
         end
-        can [ :manage ], Ish::StockWatch
+        can [ :manage ], ::Warbler::StockWatch
 
         can [ :index, :new, :create ], ::Tag
 

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

@@ -0,0 +1,16 @@
+
+.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;

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

@@ -1,41 +1,38 @@
 
-.manager--main-header
+
+.application--main-header-admin.manager--main-header
   .container
     %i.fa.fa-compress.collapse-expand#collapseHeader
     .content
       %ul
-        %li{ :class => params[:controller] == 'ish_manager/maps' ? 'active' : '' }= link_to 'GameUi::Maps', maps_path
-        %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
-        %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
-        %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
-        %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles',  user_profiles_path
-        %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
+        %li{ :class => params[:controller] == 'ish_manager/maps' ? 'active' : '' }
+          = 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' : '' }
+          = link_to 'Galleries', galleries_path
+          .inline-search
+            = form_tag galleries_path, method: :get do
+              = text_field_tag :q
+          = link_to '[+]', new_gallery_path
+        %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
       %ul
         %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
-        %li{ :class => params[:controller] == 'ish_manager/sites'         ? 'active' : '' }= link_to 'Sites',     sites_path
-        %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/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
-
-      - proc do # nothing
-        %ul.nav.nav-pills
-          -# %li{ :class => params[:controller] == 'ish_manager/ally'          ? 'active' : '' }= link_to 'Ally',      ally_root_path
-          -# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
-          -# %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
-          %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
-          -# %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
-          -# %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
-        %ul.nav.nav-pills
-          %li{ :class => params[:controller] == 'ish_manager/invoices'      ? 'active' : '' }= link_to 'Invoices', invoices_path
-          %li{ :class => params[:controller] == 'ish_manager/payments'      ? 'active' : '' }= link_to 'Payments', payments_path
-          %li{ :class => params[:controller] == 'ish_manager/orders'        ? 'active' : '' }= link_to 'Orders', orders_path
-          -# %li{ :class => params[:controller] == 'ish_manager/co_tailors'    ? 'active' : '' }= link_to 'Co Tailors', co_tailors_path
-        %ul.nav.nav-pills
-          %li{ :class => params[:controller] == 'ish_manager/leads'         ? 'active' : '' }= link_to 'Leads', leads_path
-          %li{ :class => params[:controller] == 'ish_manager/campaigns'     ? 'active' : '' }= link_to 'Campaigns', campaigns_path
-
-
+        %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
+        %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles',  user_profiles_path
   %hr
 

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

@@ -0,0 +1,21 @@
+
+
+        -# %li{ :class => params[:controller] == 'ish_manager/sites'         ? 'active' : '' }= link_to 'Sites',     sites_path
+        -# %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
+        -# %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
+        -# %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
+        -# %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
+        -# %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
+      - proc do # nothing
+        %ul.nav.nav-pills
+          -# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
+          -# %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
+          -# %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
+          -# %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
+        %ul.nav.nav-pills
+          %li{ :class => params[:controller] == 'ish_manager/invoices'      ? 'active' : '' }= link_to 'Invoices', invoices_path
+          %li{ :class => params[:controller] == 'ish_manager/payments'      ? 'active' : '' }= link_to 'Payments', payments_path
+          %li{ :class => params[:controller] == 'ish_manager/orders'        ? 'active' : '' }= link_to 'Orders', orders_path
+        %ul.nav.nav-pills
+          %li{ :class => params[:controller] == 'ish_manager/leads'         ? 'active' : '' }= link_to 'Leads', leads_path
+          %li{ :class => params[:controller] == 'ish_manager/campaigns'     ? 'active' : '' }= link_to 'Campaigns', campaigns_path

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

@@ -1,3 +1,9 @@
 
 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
+    %p Search CGTrader:
+    = hidden_field_tag "polygons", "lt_5k"
+    = text_field_tag "keywords"
+    = submit_tag 'search'

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

@@ -29,18 +29,9 @@
       = f.label :tags
       = f.select :tag_ids, @tags_list, {}, { multiple: true }
 
-  .row
-    .panel
-      .panel-body
-        .col.s4
-          = f.label 'Shared with'
-          = f.select :shared_profiles, options_for_select( [[nil,nil,:disabled=>true]]+current_user.profile.friends.map { |f| [ f.email, f.id ] }, :selected => gallery.shared_profiles.map(&:id) ), {}, { :multiple => true }
-        .col.s4
-          Shared with:<br />
-          - gallery.shared_profiles.each do |p|
-            &gt; #{p.email} <br />
-        .col.s4
-          "/
+  = render 'ish_manager/application/form_nonpublic', f: f, model: gallery
+
+
   .row
     = f.label :subhead
     = f.text_area :subhead
@@ -48,9 +39,6 @@
     = f.text_area :descr, class: :tinymce
 
   .row
-    .col.s3
-      = f.check_box :is_public
-      = f.label :is_public
     .col.s3
       = f.check_box :is_trash
       = f.label :is_trash

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

@@ -30,14 +30,21 @@
     .col.s2
       .field
         = f.label :ordering_type
-        = f.select :ordering_type, options_for_select(::Gameui::Map::ORDERING_TYPES)
+        = f.select :ordering_type, options_for_select(::Gameui::Map::ORDERING_TYPES, selected: @map.ordering_type)
+      .field
+        = f.label :rated
+        = f.select :rated, options_for_select(Location::RATED_OPTIONS, selected: @map.rated)
+      .field
+        = f.label :premium_tier
+        = f.number_field :premium_tier
     .col.s4
-
       .field
         = f.label :image
         = file_field_tag :image
         = image_tag @map.image.image.url(:thumb) rescue nil
 
+  = render 'ish_manager/application/form_nonpublic', f: f, model: @map
+
   .field
     = f.label :description
     = f.text_area :description, class: 'tinymce'
@@ -56,6 +63,6 @@
       = f.text_area :config, class: 'large'
       %pre.small
         description.collapsible: bool
-        map_panel_type: "MapPanel" | "MapPanelNoZoom" | "ThreePanelV1"
+        map_panel_type: "Equirectangular" | "MapPanel" | "MapPanelNoZoom" | "ThreePanelV1" | "ThreePanelV4"
   .actions
     = f.submit 'Save'

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

@@ -8,4 +8,4 @@
     .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
     .a= link_to '[api]', api_map_path(map)
     .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
-  .a= map.slug
+  .a slug:#{map.slug}

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

@@ -1,19 +1,20 @@
 
 .maps-map-editor
+  = render 'map_meta_row', map: @map
   %h1 Map Editor
 
   .map-editor
     = image_tag @map.image.image.url(:original)
-    - @map.markers.each do |m|
+    - @markers.each do |m|
       .marker{ data: { 'slug': m.slug, 'center-offset-x': m.centerOffsetX, 'center-offset-y': m.centerOffsetY }, style: "top: #{m.y-m.centerOffsetY}px; left: #{m.x-m.centerOffsetX}px;" }
         = image_tag m.image.image.url(:original)
         = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{m.centerOffsetY-10}px; left: #{m.centerOffsetX-10}px;" )
 
   .markers-list
     %h1
-      Markers (#{@map.markers.length})
+      Markers (#{@markers.length})
       = link_to '[+]', new_marker_path({ map_id: @map.id })
-    - @map.markers.each do |m|
+    - @markers.each do |m|
       = form_for m, { html: { class: "item #{m.slug}" }, url: marker_path(m.id) } do |f|
         = m.slug
         = link_to '[~]', edit_marker_path(m.id)

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

@@ -13,14 +13,14 @@
     [<>]
   .the-map
     = image_tag @map.image.image.url(:original) rescue nil
-    - @map.markers.each do |marker|
+    - @markers.each do |marker|
       -# @TODO: this should be a partial
       .marker{ style: "position: absolute; left: #{marker.x - marker.centerOffsetX}px; top: #{marker.y - marker.centerOffsetY}px;" }
         = image_tag marker.image.image.url(:original)
 
-  %p.addToggle Markers (#{@map.markers.count}) [<>]
+  %p.addToggle Markers (#{@markers.count}) [<>]
   .markers-list
-    - @map.markers.each do |marker|
+    - @markers.each do |marker|
       .flex-row.bordered
         = image_tag marker.image.image.url(:original)
         .flat-row
@@ -42,3 +42,5 @@
       .item
         = link_to m.slug, edit_map_path(m.id)
 
+%hr
+= render 'form'

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

@@ -57,6 +57,8 @@
           = file_field_tag :title_image
           = image_tag @marker.title_image.image.url(:thumb) rescue nil
 
+    = render 'ish_manager/application/form_nonpublic', f: f, model: @marker
+
     .field
       = f.label :url, "URL (if any)"
       = f.text_field :url

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

@@ -16,7 +16,8 @@
       .field
         = f.label :"Name"
         = f.text_field :name, :class=> 'form-control', :placeholder => "name of report", :type => "text"
-        -# = f.text_field :slug, :class=> 'form-control', :placeholder => "name seo", :type => "text"
+        = f.label "Slug"
+        = f.text_field :slug, :class=> 'form-control', :placeholder => "name seo", :type => "text"
 
     .col.s4
       .field

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

@@ -2,19 +2,12 @@
 .manager-reports-show
   .row
     .large-12.columns
-      %h1
+      %h1.flex-row
         = @report.name
         = link_to '[~]', edit_report_path( @report )
+        = button_to '[x]', report_path( @report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
 
-      .meta
-        -# By #{link_to @report.user_profile.username, user_path( @report.user )}
-        On #{@report.created_at.to_s.slice(0, 10)}
-        - if @report.site
-          In #{link_to "http://#{@report.site.domain}/#{@report.site.lang}", site_path( @report.site )}
-        -# - if @report.tag
-        -#   Tagged #{link_to @report.tag.name, manager_tag_path( @report.tag )}
-        - if @report.city
-          In #{link_to @report.city.name, city_path( @report.city )}
+      = render 'meta', item: @report
 
       - if @report.subhead.length > 3
         .subhead= @report.subhead
@@ -23,6 +16,5 @@
         - if @report.photo
           .float-left= image_tag @report.photo.photo.url( :small )
         = raw @report.descr
-        .c
-
-      .c
+  %hr
+  = render 'form', :url => report_path(@report.id), :report => @report

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

@@ -3,23 +3,26 @@
   .float-left= button_to '[X]', stock_watch_path(stock_watch.id), method: :delete, data: { confirm: 'Are you sure?' }
 
 
-- url = stock_watches_path if !stock_watch.persisted? 
+- url = stock_watches_path if !stock_watch.persisted?
 - url = stock_watch_path( stock_watch ) if stock_watch.persisted?
 
 = form_for stock_watch, :url => url, :html => { :class => 'form-inline well' } do |f|
-  .form-group
-    = f.select :action, options_for_select( Ish::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => stock_watch.action )
-  .form-group
-    = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => stock_watch.profile ? stock_watch.profile.id : nil )
-  .form-group
-    %label.control-label When
-    = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
-  .form-group
-    %label.control-label Price
-    = f.select :direction, options_for_select( Ish::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => stock_watch.direction )
-  .form-group
-    %label.control-label $
-    = f.number_field :price, :step => 0.01, :placeholder => "0.01"
-  .form-group
-    = f.submit ">", :class => %w(btn blue)
-  .c
+  .flex-row
+    .form-group
+      = f.label :action
+      = f.select :action, options_for_select( Warbler::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => stock_watch.action )
+    .form-group
+      = f.label :profile
+      = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => stock_watch.profile ? stock_watch.profile.id : nil )
+    .form-group
+      %label.control-label When
+      = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
+    .form-group
+      %label.control-label Price
+      = f.select :direction, options_for_select( Warbler::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => stock_watch.direction )
+    .form-group
+      %label.control-label $
+      = f.number_field :price, :step => 0.01, :placeholder => "0.01"
+    .form-group
+      = f.submit ">", :class => %w(btn blue)
+

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

@@ -24,7 +24,7 @@
         %br
 
       .input-field
-        = f.select :role_name, options_for_select( [[nil, nil]] + IshModels::UserProfile::ROLES.map { |r| [ r, r ] }, :selected => profile.role_name )
+        = f.select :role_name, options_for_select( [[nil, nil]] + Ish::UserProfile::ROLES.map { |r| [ r, r ] }, :selected => profile.role_name )
         %label role name
 
       .input-field

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

@@ -23,7 +23,6 @@
             %li
               <b>Profile Photo:</b>
               = image_tag profile.profile_photo.photo.url(:thumb) rescue nil
-            %li <b>Address:</b> #{profile.addresses[0].inspect}
 
         .col.s8
           %h5 Shared galleries

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

@@ -8,7 +8,8 @@
       %ul
         - @user_profile.premium_purchases.each do |purchase|
           %li
-            -# = purchase.item_type.constantize.find(purchase.item_id).inspect
-            = render 'ish_manager/reports/show_mini', report: purchase.item_type.constantize.find(purchase.item_id)
+            = 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)
 
 

data/config/routes.rb

@@ -48,7 +48,8 @@ IshManager::Engine.routes.draw do
       resources 'markers'
       resources 'newsitems'
     end
-    resources 'markers' # redundant
+    get 'maps/:id', to: 'maps#edit'
+    resources 'markers'
   end
 
   resources :newsitems

data/lib/tasks/ish_manager_tasks.rake

@@ -10,7 +10,7 @@ namespace :ish_manager do
   task :generate_user_profiles => :environment do
     User.all.map do |u|
       unless u.profile
-        p = ::IshModels::UserProfile.new :email => u.email, :user => u, :role_name => :guy
+        p = ::Ish::UserProfile.new :email => u.email, :user => u, :role_name => :guy
         u.profile = p
         u.save && p.save && print('.')
       end
@@ -18,42 +18,10 @@ namespace :ish_manager do
     puts 'OK'
   end
 
-=begin
-  desc 'watch the stocks, and trigger actions'
-  task :watch_stocks => :environment do
-    while true
-      stocks = Ish::StockWatch.where( :notification_type => :EMAIL )
-      puts! stocks.map(&:ticker), "Watching these stocks on #{Time.now}"
-      stocks.each do |stock|
-        begin
-          Timeout::timeout( 10 ) do
-            r = HTTParty.get "https://www.alphavantage.co/query?function=TIME_SERIES_INTRADAY&symbol=#{stock.ticker}&interval=1min&apikey=X1C5GGH5MZSXMF3O"
-          end
-        rescue Exception => e
-          puts! e, 'e in :watch_stocks'
-        end
-        r = JSON.parse( r.body )['Time Series (1min)']
-        r = r[r.keys.first]['4. close'].to_f
-        if stock.direction == :ABOVE &&  r >= stock.price ||
-           stock.direction == :BELOW && r <= stock.price
-          IshManager::ApplicationMailer.stock_alert( stock ).deliver
-
-          ## actions
-          # stock.stock_actions.where( :is_active => true ).each do |action|
-          #   # @TODO: actions
-          # end
-
-        end
-      end
-      sleep 60
-    end
-  end
-=end
-
   desc 'watch the stocks, and trigger actions - not alphavantage, tda now. 2021-08-08'
   task watch_stocks: :environment do
     while true
-      stocks = Ish::StockWatch.where( :notification_type => :EMAIL )
+      stocks = Warbler::StockWatch.where( :notification_type => :EMAIL )
       stocks.each do |stock|
         begin
           Timeout::timeout( 10 ) do
@@ -82,16 +50,4 @@ namespace :ish_manager do
     end
   end
 
-=begin
-  desc 'yahoo-watch the stocks'
-  task :stockwatcher => :environment do
-    watcher = YahooStockwatcher.new
-    while true
-      watcher.watch_once
-      print '.'
-      sleep 60 # seconds
-    end
-  end
-=end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.258
+  version: 0.1.8.263
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -194,14 +194,9 @@ files:
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/campaigns_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
-- app/controllers/ish_manager/co_tailors_controller.rb
-- app/controllers/ish_manager/covered_calls_controller.rb
-- app/controllers/ish_manager/events_controller.rb
 - app/controllers/ish_manager/features_controller.rb
-- app/controllers/ish_manager/friends_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
 - app/controllers/ish_manager/invoices_controller.rb
-- app/controllers/ish_manager/iron_condors_controller.rb
 - app/controllers/ish_manager/leads_controller.rb
 - app/controllers/ish_manager/maps_controller.rb
 - app/controllers/ish_manager/markers_controller.rb
@@ -213,6 +208,11 @@ files:
 - app/controllers/ish_manager/sites_controller.rb
 - app/controllers/ish_manager/stock_watches_controller.rb
 - app/controllers/ish_manager/tags_controller.rb
+- app/controllers/ish_manager/trash/co_tailors_controller.rb
+- app/controllers/ish_manager/trash/covered_calls_controller.rb
+- app/controllers/ish_manager/trash/events_controller.rb
+- app/controllers/ish_manager/trash/friends_controller.rb
+- app/controllers/ish_manager/trash/iron_condors_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/users_controller.rb
 - app/controllers/ish_manager/venues_controller.rb
@@ -226,9 +226,11 @@ files:
 - app/views/ish_manager/application/_analytics.html
 - app/views/ish_manager/application/_debug.haml
 - app/views/ish_manager/application/_form_errors.haml
+- app/views/ish_manager/application/_form_nonpublic.haml
 - app/views/ish_manager/application/_main_footer.haml
 - app/views/ish_manager/application/_main_header.haml
 - app/views/ish_manager/application/_main_header_admin.haml
+- app/views/ish_manager/application/_main_header_admin.haml-trash
 - app/views/ish_manager/application/_main_header_guy.haml
 - app/views/ish_manager/application/_main_header_manager.haml
 - app/views/ish_manager/application/_meta.haml